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
7c08b799
Commit
7c08b799
authored
Dec 10, 2021
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update diff patches
parent
dcb897fb
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
18 deletions
+18
-18
02-add-missing-mock-arguments.patch
...pts/upgradeable/patch/02-add-missing-mock-arguments.patch
+1
-1
03-remove-erc20votes-chained-init.patch
...upgradeable/patch/03-remove-erc20votes-chained-init.patch
+2
-2
04-remove-erc20votes-comp-chained-init.patch
...deable/patch/04-remove-erc20votes-comp-chained-init.patch
+2
-2
05-fix-governor-initializers.patch
scripts/upgradeable/patch/05-fix-governor-initializers.patch
+13
-13
No files found.
scripts/upgradeable/patch/02-add-missing-mock-arguments.patch
View file @
7c08b799
...
@@ -4,7 +4,7 @@ index d06c8722..6211da1f 100644
...
@@ -4,7 +4,7 @@ index d06c8722..6211da1f 100644
+++ b/contracts/mocks/MulticallTokenMockUpgradeable.sol
+++ b/contracts/mocks/MulticallTokenMockUpgradeable.sol
@@ -9,7 +9,7 @@ import "../proxy/utils/Initializable.sol";
@@ -9,7 +9,7 @@ import "../proxy/utils/Initializable.sol";
contract MulticallTokenMockUpgradeable is Initializable, ERC20MockUpgradeable, MulticallUpgradeable {
contract MulticallTokenMockUpgradeable is Initializable, ERC20MockUpgradeable, MulticallUpgradeable {
function __MulticallTokenMock_init(uint256 initialBalance) internal
initializer
{
function __MulticallTokenMock_init(uint256 initialBalance) internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
- __ERC20_init_unchained(name, symbol);
- __ERC20_init_unchained(name, symbol);
+ __ERC20_init_unchained("MulticallToken", "BCT");
+ __ERC20_init_unchained("MulticallToken", "BCT");
...
...
scripts/upgradeable/patch/03-remove-erc20votes-chained-init.patch
View file @
7c08b799
...
@@ -6,12 +6,12 @@ index a7a9af54..0b7f838d 100644
...
@@ -6,12 +6,12 @@ index a7a9af54..0b7f838d 100644
* _Available since v4.2._
* _Available since v4.2._
*/
*/
abstract contract ERC20VotesUpgradeable is Initializable, ERC20PermitUpgradeable {
abstract contract ERC20VotesUpgradeable is Initializable, ERC20PermitUpgradeable {
- function __ERC20Votes_init() internal
initializer
{
- function __ERC20Votes_init() internal
onlyInitializing
{
- __Context_init_unchained();
- __Context_init_unchained();
- __EIP712_init_unchained(name, "1");
- __EIP712_init_unchained(name, "1");
- __ERC20Votes_init_unchained();
- __ERC20Votes_init_unchained();
- }
- }
-
-
function __ERC20Votes_init_unchained() internal
initializer
{
function __ERC20Votes_init_unchained() internal
onlyInitializing
{
}
}
struct Checkpoint {
struct Checkpoint {
scripts/upgradeable/patch/04-remove-erc20votes-comp-chained-init.patch
View file @
7c08b799
...
@@ -6,13 +6,13 @@ index 6f1f8182..0f09ea48 100644
...
@@ -6,13 +6,13 @@ index 6f1f8182..0f09ea48 100644
* _Available since v4.2._
* _Available since v4.2._
*/
*/
abstract contract ERC20VotesCompUpgradeable is Initializable, ERC20VotesUpgradeable {
abstract contract ERC20VotesCompUpgradeable is Initializable, ERC20VotesUpgradeable {
- function __ERC20VotesComp_init() internal
initializer
{
- function __ERC20VotesComp_init() internal
onlyInitializing
{
- __Context_init_unchained();
- __Context_init_unchained();
- __EIP712_init_unchained(name, "1");
- __EIP712_init_unchained(name, "1");
- __ERC20Votes_init_unchained();
- __ERC20Votes_init_unchained();
- __ERC20VotesComp_init_unchained();
- __ERC20VotesComp_init_unchained();
- }
- }
-
-
function __ERC20VotesComp_init_unchained() internal
initializer
{
function __ERC20VotesComp_init_unchained() internal
onlyInitializing
{
}
}
/**
/**
scripts/upgradeable/patch/05-fix-governor-initializers.patch
View file @
7c08b799
...
@@ -3,7 +3,7 @@ index 1f6895a6..86518b84 100644
...
@@ -3,7 +3,7 @@ index 1f6895a6..86518b84 100644
--- a/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
--- a/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
+++ b/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
+++ b/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
@@ -21,7 +21,6 @@ abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGover
@@ -21,7 +21,6 @@ abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGover
function __GovernorCompatibilityBravo_init() internal
initializer
{
function __GovernorCompatibilityBravo_init() internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -15,7 +15,7 @@ index 4873166b..6a88e6b4 100644
...
@@ -15,7 +15,7 @@ index 4873166b..6a88e6b4 100644
--- a/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol
--- a/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol
@@ -14,7 +14,6 @@ abstract contract GovernorCountingSimpleUpgradeable is Initializable, GovernorUp
@@ -14,7 +14,6 @@ abstract contract GovernorCountingSimpleUpgradeable is Initializable, GovernorUp
function __GovernorCountingSimple_init() internal
initializer
{
function __GovernorCountingSimple_init() internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -27,7 +27,7 @@ index c6ed355a..9236c546 100644
...
@@ -27,7 +27,7 @@ index c6ed355a..9236c546 100644
--- a/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol
--- a/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol
@@ -96,7 +96,6 @@ abstract contract GovernorTimelockCompoundUpgradeable is Initializable, IGoverno
@@ -96,7 +96,6 @@ abstract contract GovernorTimelockCompoundUpgradeable is Initializable, IGoverno
function __GovernorTimelockCompound_init(ICompoundTimelockUpgradeable timelockAddress) internal
initializer
{
function __GovernorTimelockCompound_init(ICompoundTimelockUpgradeable timelockAddress) internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -39,7 +39,7 @@ index 3d6a5de5..ad5f505e 100644
...
@@ -39,7 +39,7 @@ index 3d6a5de5..ad5f505e 100644
--- a/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol
--- a/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol
@@ -33,7 +33,6 @@ abstract contract GovernorTimelockControlUpgradeable is Initializable, IGovernor
@@ -33,7 +33,6 @@ abstract contract GovernorTimelockControlUpgradeable is Initializable, IGovernor
function __GovernorTimelockControl_init(TimelockControllerUpgradeable timelockAddress) internal
initializer
{
function __GovernorTimelockControl_init(TimelockControllerUpgradeable timelockAddress) internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -51,7 +51,7 @@ index cc83b3ed..5398f15b 100644
...
@@ -51,7 +51,7 @@ index cc83b3ed..5398f15b 100644
--- a/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol
--- a/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol
@@ -17,7 +17,6 @@ abstract contract GovernorVotesCompUpgradeable is Initializable, GovernorUpgrade
@@ -17,7 +17,6 @@ abstract contract GovernorVotesCompUpgradeable is Initializable, GovernorUpgrade
function __GovernorVotesComp_init(ERC20VotesCompUpgradeable token_) internal
initializer
{
function __GovernorVotesComp_init(ERC20VotesCompUpgradeable token_) internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -63,7 +63,7 @@ index 5d7a88bc..39f97903 100644
...
@@ -63,7 +63,7 @@ index 5d7a88bc..39f97903 100644
--- a/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol
--- a/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol
@@ -19,7 +19,6 @@ abstract contract GovernorVotesQuorumFractionUpgradeable is Initializable, Gover
@@ -19,7 +19,6 @@ abstract contract GovernorVotesQuorumFractionUpgradeable is Initializable, Gover
function __GovernorVotesQuorumFraction_init(uint256 quorumNumeratorValue) internal
initializer
{
function __GovernorVotesQuorumFraction_init(uint256 quorumNumeratorValue) internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -75,7 +75,7 @@ index cdfd0ae7..48408d9c 100644
...
@@ -75,7 +75,7 @@ index cdfd0ae7..48408d9c 100644
--- a/contracts/governance/extensions/GovernorVotesUpgradeable.sol
--- a/contracts/governance/extensions/GovernorVotesUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorVotesUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorVotesUpgradeable.sol
@@ -18,7 +18,6 @@ abstract contract GovernorVotesUpgradeable is Initializable, GovernorUpgradeable
@@ -18,7 +18,6 @@ abstract contract GovernorVotesUpgradeable is Initializable, GovernorUpgradeable
function __GovernorVotes_init(ERC20VotesUpgradeable tokenAddress) internal
initializer
{
function __GovernorVotes_init(ERC20VotesUpgradeable tokenAddress) internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -87,7 +87,7 @@ index c66ebc16..3bba9501 100644
...
@@ -87,7 +87,7 @@ index c66ebc16..3bba9501 100644
--- a/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol
--- a/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol
@@ -14,7 +14,6 @@ abstract contract GovernorProposalThresholdUpgradeable is Initializable, Governo
@@ -14,7 +14,6 @@ abstract contract GovernorProposalThresholdUpgradeable is Initializable, Governo
function __GovernorProposalThreshold_init() internal
initializer
{
function __GovernorProposalThreshold_init() internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -99,7 +99,7 @@ index fbbb5ec1..06e8b9dd 100644
...
@@ -99,7 +99,7 @@ index fbbb5ec1..06e8b9dd 100644
--- a/contracts/governance/extensions/GovernorSettingsUpgradeable.sol
--- a/contracts/governance/extensions/GovernorSettingsUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorSettingsUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorSettingsUpgradeable.sol
@@ -30,7 +30,6 @@ abstract contract GovernorSettingsUpgradeable is Initializable, GovernorUpgradea
@@ -30,7 +30,6 @@ abstract contract GovernorSettingsUpgradeable is Initializable, GovernorUpgradea
) internal
initializer
{
) internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -111,7 +111,7 @@ index df6ccdaf..db9998ed 100644
...
@@ -111,7 +111,7 @@ index df6ccdaf..db9998ed 100644
--- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
--- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
@@ -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
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -124,7 +124,7 @@ index b07261a4..4ec9b6ce 100644
...
@@ -124,7 +124,7 @@ index b07261a4..4ec9b6ce 100644
--- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
--- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
@@ -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
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -137,7 +137,7 @@ index 223ccb94..e05b6ce7 100644
...
@@ -137,7 +137,7 @@ index 223ccb94..e05b6ce7 100644
--- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
--- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
+++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
@@ -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
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
@@ -150,7 +150,7 @@ index 9b48de71..c28f3b50 100644
...
@@ -150,7 +150,7 @@ index 9b48de71..c28f3b50 100644
--- a/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
--- a/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
+++ b/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
@@ -38,7 +38,6 @@ abstract contract GovernorPreventLateQuorumUpgradeable is Initializable, Governo
@@ -38,7 +38,6 @@ abstract contract GovernorPreventLateQuorumUpgradeable is Initializable, Governo
function __GovernorPreventLateQuorum_init(uint64 initialVoteExtension) internal
initializer
{
function __GovernorPreventLateQuorum_init(uint64 initialVoteExtension) internal
onlyInitializing
{
__Context_init_unchained();
__Context_init_unchained();
__ERC165_init_unchained();
__ERC165_init_unchained();
- __EIP712_init_unchained(name_, version());
- __EIP712_init_unchained(name_, version());
...
...
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