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
2e43f682
Commit
2e43f682
authored
Nov 15, 2021
by
github-actions
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Transpile
cfda3e32
parent
5b7f3ef3
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
4 deletions
+43
-4
transpile.yml
.github/workflows/transpile.yml
+1
-1
MyGovernor1Upgradeable.sol
contracts/mocks/wizard/MyGovernor1Upgradeable.sol
+1
-1
MyGovernor2Upgradeable.sol
contracts/mocks/wizard/MyGovernor2Upgradeable.sol
+1
-1
MyGovernor3Upgradeable.sol
contracts/mocks/wizard/MyGovernor3Upgradeable.sol
+1
-1
05-fix-governor-initializers.patch
scripts/upgradeable/patch/05-fix-governor-initializers.patch
+39
-0
No files found.
.github/workflows/transpile.yml
View file @
2e43f682
...
@@ -6,7 +6,7 @@ on:
...
@@ -6,7 +6,7 @@ on:
branches
:
[
patched/*
]
branches
:
[
patched/*
]
concurrency
:
concurrency
:
group
:
transpile
group
:
transpile
-${{ github.ref_name }}
cancel-in-progress
:
true
cancel-in-progress
:
true
jobs
:
jobs
:
...
...
contracts/mocks/wizard/MyGovernor1Upgradeable.sol
View file @
2e43f682
...
@@ -18,7 +18,7 @@ contract MyGovernor1Upgradeable is
...
@@ -18,7 +18,7 @@ contract MyGovernor1Upgradeable is
function __MyGovernor1_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
function __MyGovernor1_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
__EIP712_init_unchained(
name_
, version());
__EIP712_init_unchained(
"MyGovernor"
, version());
__IGovernor_init_unchained();
__IGovernor_init_unchained();
__IGovernorTimelock_init_unchained();
__IGovernorTimelock_init_unchained();
__Governor_init_unchained("MyGovernor");
__Governor_init_unchained("MyGovernor");
...
...
contracts/mocks/wizard/MyGovernor2Upgradeable.sol
View file @
2e43f682
...
@@ -20,7 +20,7 @@ contract MyGovernor2Upgradeable is
...
@@ -20,7 +20,7 @@ contract MyGovernor2Upgradeable is
function __MyGovernor2_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
function __MyGovernor2_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
__EIP712_init_unchained(
name_
, version());
__EIP712_init_unchained(
"MyGovernor"
, version());
__IGovernor_init_unchained();
__IGovernor_init_unchained();
__IGovernorTimelock_init_unchained();
__IGovernorTimelock_init_unchained();
__Governor_init_unchained("MyGovernor");
__Governor_init_unchained("MyGovernor");
...
...
contracts/mocks/wizard/MyGovernor3Upgradeable.sol
View file @
2e43f682
...
@@ -18,7 +18,7 @@ contract MyGovernorUpgradeable is
...
@@ -18,7 +18,7 @@ contract MyGovernorUpgradeable is
function __MyGovernor_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
function __MyGovernor_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
__EIP712_init_unchained(
name_
, version());
__EIP712_init_unchained(
"MyGovernor"
, version());
__IGovernor_init_unchained();
__IGovernor_init_unchained();
__IGovernorTimelock_init_unchained();
__IGovernorTimelock_init_unchained();
__IGovernorCompatibilityBravo_init_unchained();
__IGovernorCompatibilityBravo_init_unchained();
...
...
scripts/upgradeable/patch/05-fix-governor-initializers.patch
View file @
2e43f682
...
@@ -106,3 +106,42 @@ index fbbb5ec1..06e8b9dd 100644
...
@@ -106,3 +106,42 @@ index fbbb5ec1..06e8b9dd 100644
__IGovernor_init_unchained();
__IGovernor_init_unchained();
__GovernorSettings_init_unchained(initialVotingDelay, initialVotingPeriod, initialProposalThreshold);
__GovernorSettings_init_unchained(initialVotingDelay, initialVotingPeriod, initialProposalThreshold);
}
}
diff --git a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
index df6ccdaf..db9998ed 100644
--- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
@@ -18,7 +18,7 @@ contract MyGovernor1Upgradeable is
function __MyGovernor1_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
__Context_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
+ __EIP712_init_unchained("MyGovernor", version());
__IGovernor_init_unchained();
__IGovernorTimelock_init_unchained();
__Governor_init_unchained("MyGovernor");
diff --git a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
index b07261a4..4ec9b6ce 100644
--- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
@@ -20,7 +20,7 @@ contract MyGovernor2Upgradeable is
function __MyGovernor2_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
__Context_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
+ __EIP712_init_unchained("MyGovernor", version());
__IGovernor_init_unchained();
__IGovernorTimelock_init_unchained();
__Governor_init_unchained("MyGovernor");
diff --git a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
index 223ccb94..e05b6ce7 100644
--- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
@@ -18,7 +18,7 @@ contract MyGovernorUpgradeable is
function __MyGovernor_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
__Context_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
+ __EIP712_init_unchained("MyGovernor", version());
__IGovernor_init_unchained();
__IGovernorTimelock_init_unchained();
__IGovernorCompatibilityBravo_init_unchained();
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