GitBross Home Explore Help
Register Sign In
sol_Bo8des9o
/
openzeppelin-contracts
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 47de4b8f94
Branches Tags
openzeppelin-co...
/
scripts
/
upgradeable
/
patch
/
05-fix-governor-initializers.patch

05-fix-governor-initializers.patch 2.2 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839 
  1. diff --git a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
    2. 

  2. index 66662e9e..c53c6479 100644
    3. 

  3. --- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
    4. 

  4. +++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
    5. 

  5. @@ -16,7 +16,7 @@ contract MyGovernor1Upgradeable is
    6. 

  6.      GovernorCountingSimpleUpgradeable
    7. 

  7.  {
    8. 

  8.      function __MyGovernor1_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
    9. 

  9. -        __EIP712_init_unchained(name_, version());
    10. 

  10. +        __EIP712_init_unchained("MyGovernor", version());
    11. 

  11.          __Governor_init_unchained("MyGovernor");
    12. 

  12.          __GovernorTimelockControl_init_unchained(_timelock);
    13. 

  13.          __GovernorVotes_init_unchained(_token);
    14. 

  14. diff --git a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
    15. 

  15. index 63bc024c..0f854226 100644
    16. 

  16. --- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
    17. 

  17. +++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
    18. 

  18. @@ -18,7 +18,7 @@ contract MyGovernor2Upgradeable is
    19. 

  19.      GovernorCountingSimpleUpgradeable
    20. 

  20.  {
    21. 

  21.      function __MyGovernor2_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
    22. 

  22. -        __EIP712_init_unchained(name_, version());
    23. 

  23. +        __EIP712_init_unchained("MyGovernor", version());
    24. 

  24.          __Governor_init_unchained("MyGovernor");
    25. 

  25.          __GovernorTimelockControl_init_unchained(_timelock);
    26. 

  26.          __GovernorVotes_init_unchained(_token);
    27. 

  27. diff --git a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
    28. 

  28. index 27a8411c..2f59b8e5 100644
    29. 

  29. --- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
    30. 

  30. +++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
    31. 

  31. @@ -16,7 +16,7 @@ contract MyGovernorUpgradeable is
    32. 

  32.      GovernorVotesQuorumFractionUpgradeable
    33. 

  33.  {
    34. 

  34.      function __MyGovernor_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
    35. 

  35. -        __EIP712_init_unchained(name_, version());
    36. 

  36. +        __EIP712_init_unchained("MyGovernor", version());
    37. 

  37.          __Governor_init_unchained("MyGovernor");
    38. 

  38.          __GovernorTimelockControl_init_unchained(_timelock);
    39. 

  39.          __GovernorVotes_init_unchained(_token);
    40.