Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
584a6c77
Commit
584a6c77
authored
Feb 08, 2022
by
github-actions
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Transpile
5a081475
parent
47de4b8f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
55 deletions
+4
-55
.gitkeep
scripts/upgradeable/patch/.gitkeep
+0
-0
02-add-missing-mock-arguments.patch
...pts/upgradeable/patch/02-add-missing-mock-arguments.patch
+0
-13
05-fix-governor-initializers.patch
scripts/upgradeable/patch/05-fix-governor-initializers.patch
+0
-39
transpile.sh
scripts/upgradeable/transpile.sh
+4
-3
No files found.
scripts/upgradeable/patch/.gitkeep
0 → 100644
View file @
584a6c77
scripts/upgradeable/patch/02-add-missing-mock-arguments.patch
deleted
100644 → 0
View file @
47de4b8f
diff --git a/contracts/mocks/MulticallTokenMockUpgradeable.sol b/contracts/mocks/MulticallTokenMockUpgradeable.sol
index 7bd4ae88..7be0c4ff 100644
--- a/contracts/mocks/MulticallTokenMockUpgradeable.sol
+++ b/contracts/mocks/MulticallTokenMockUpgradeable.sol
@@ -8,7 +8,7 @@ import "../proxy/utils/Initializable.sol";
contract MulticallTokenMockUpgradeable is Initializable, ERC20MockUpgradeable, MulticallUpgradeable {
function __MulticallTokenMock_init(uint256 initialBalance) internal onlyInitializing {
- __ERC20_init_unchained(name, symbol);
+ __ERC20_init_unchained("MulticallToken", "BCT");
__ERC20Mock_init_unchained("MulticallToken", "BCT", msg.sender, initialBalance);
}
scripts/upgradeable/patch/05-fix-governor-initializers.patch
deleted
100644 → 0
View file @
47de4b8f
diff --git a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
index 66662e9e..c53c6479 100644
--- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
@@ -16,7 +16,7 @@ contract MyGovernor1Upgradeable is
GovernorCountingSimpleUpgradeable
{
function __MyGovernor1_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
- __EIP712_init_unchained(name_, version());
+ __EIP712_init_unchained("MyGovernor", version());
__Governor_init_unchained("MyGovernor");
__GovernorTimelockControl_init_unchained(_timelock);
__GovernorVotes_init_unchained(_token);
diff --git a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
index 63bc024c..0f854226 100644
--- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
@@ -18,7 +18,7 @@ contract MyGovernor2Upgradeable is
GovernorCountingSimpleUpgradeable
{
function __MyGovernor2_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
- __EIP712_init_unchained(name_, version());
+ __EIP712_init_unchained("MyGovernor", version());
__Governor_init_unchained("MyGovernor");
__GovernorTimelockControl_init_unchained(_timelock);
__GovernorVotes_init_unchained(_token);
diff --git a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
index 27a8411c..2f59b8e5 100644
--- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
@@ -16,7 +16,7 @@ contract MyGovernorUpgradeable is
GovernorVotesQuorumFractionUpgradeable
{
function __MyGovernor_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
- __EIP712_init_unchained(name_, version());
+ __EIP712_init_unchained("MyGovernor", version());
__Governor_init_unchained("MyGovernor");
__GovernorTimelockControl_init_unchained(_timelock);
__GovernorVotes_init_unchained(_token);
scripts/upgradeable/transpile.sh
View file @
584a6c77
...
@@ -17,6 +17,7 @@ npx @openzeppelin/upgrade-safe-transpiler@latest -D \
...
@@ -17,6 +17,7 @@ npx @openzeppelin/upgrade-safe-transpiler@latest -D \
-x
'!contracts/proxy/beacon/IBeacon.sol'
\
-x
'!contracts/proxy/beacon/IBeacon.sol'
\
-p
'contracts/**/presets/**/*'
-p
'contracts/**/presets/**/*'
for
p
in
scripts/upgradeable/patch/
*
.patch
;
do
# this is currently no longer used but could be useful again in the future
git apply
"
$p
"
# for p in scripts/upgradeable/patch/*.patch; do
done
# git apply "$p"
# done
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment