Transpile 2d97b6b4

scripts/upgradeable/patch/05-fix-governor-initializers.patch

@@ -1,159 +1,39 @@
-diff --git a/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol b/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
-index 1f6895a6..86518b84 100644
---- a/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
-+++ b/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
-@@ -21,7 +21,6 @@ abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGover
-     function __GovernorCompatibilityBravo_init() internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __IGovernorTimelock_init_unchained();
-         __IGovernorCompatibilityBravo_init_unchained();
-diff --git a/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol b/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol
-index 4873166b..6a88e6b4 100644
---- a/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol
-+++ b/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol
-@@ -14,7 +14,6 @@ abstract contract GovernorCountingSimpleUpgradeable is Initializable, GovernorUp
-     function __GovernorCountingSimple_init() internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __GovernorCountingSimple_init_unchained();
-     }
-diff --git a/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol b/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol
-index c6ed355a..9236c546 100644
---- a/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol
-+++ b/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol
-@@ -96,7 +96,6 @@ abstract contract GovernorTimelockCompoundUpgradeable is Initializable, IGoverno
-     function __GovernorTimelockCompound_init(ICompoundTimelockUpgradeable timelockAddress) internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __IGovernorTimelock_init_unchained();
-         __GovernorTimelockCompound_init_unchained(timelockAddress);
-diff --git a/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol b/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol
-index 3d6a5de5..ad5f505e 100644
---- a/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol
-+++ b/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol
-@@ -33,7 +33,6 @@ abstract contract GovernorTimelockControlUpgradeable is Initializable, IGovernor
-     function __GovernorTimelockControl_init(TimelockControllerUpgradeable timelockAddress) internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __IGovernorTimelock_init_unchained();
-         __GovernorTimelockControl_init_unchained(timelockAddress);
-diff --git a/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol b/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol
-index cc83b3ed..5398f15b 100644
---- a/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol
-+++ b/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol
-@@ -17,7 +17,6 @@ abstract contract GovernorVotesCompUpgradeable is Initializable, GovernorUpgrade
-     function __GovernorVotesComp_init(ERC20VotesCompUpgradeable token_) internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __GovernorVotesComp_init_unchained(token_);
-     }
-diff --git a/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol b/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol
-index 5d7a88bc..39f97903 100644
---- a/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol
-+++ b/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol
-@@ -19,7 +19,6 @@ abstract contract GovernorVotesQuorumFractionUpgradeable is Initializable, Gover
-     function __GovernorVotesQuorumFraction_init(uint256 quorumNumeratorValue) internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __GovernorVotesQuorumFraction_init_unchained(quorumNumeratorValue);
-     }
-diff --git a/contracts/governance/extensions/GovernorVotesUpgradeable.sol b/contracts/governance/extensions/GovernorVotesUpgradeable.sol
-index cdfd0ae7..48408d9c 100644
---- a/contracts/governance/extensions/GovernorVotesUpgradeable.sol
-+++ b/contracts/governance/extensions/GovernorVotesUpgradeable.sol
-@@ -18,7 +18,6 @@ abstract contract GovernorVotesUpgradeable is Initializable, GovernorUpgradeable
-     function __GovernorVotes_init(IVotesUpgradeable tokenAddress) internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __GovernorVotes_init_unchained(tokenAddress);
-     }
-diff --git a/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol b/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol
-index c66ebc16..3bba9501 100644
---- a/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol
-+++ b/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol
-@@ -14,7 +14,6 @@ abstract contract GovernorProposalThresholdUpgradeable is Initializable, Governo
-     function __GovernorProposalThreshold_init() internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __GovernorProposalThreshold_init_unchained();
-     }
-diff --git a/contracts/governance/extensions/GovernorSettingsUpgradeable.sol b/contracts/governance/extensions/GovernorSettingsUpgradeable.sol
-index fbbb5ec1..06e8b9dd 100644
---- a/contracts/governance/extensions/GovernorSettingsUpgradeable.sol
-+++ b/contracts/governance/extensions/GovernorSettingsUpgradeable.sol
-@@ -30,7 +30,6 @@ abstract contract GovernorSettingsUpgradeable is Initializable, GovernorUpgradea
-     ) internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __GovernorSettings_init_unchained(initialVotingDelay, initialVotingPeriod, initialProposalThreshold);
-     }
 diff --git a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
-index df6ccdaf..db9998ed 100644
+index 66662e9e..c53c6479 100644
 --- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
 +++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
-@@ -18,7 +18,7 @@ contract MyGovernor1Upgradeable is
+@@ -16,7 +16,7 @@ contract MyGovernor1Upgradeable is
+     GovernorCountingSimpleUpgradeable
+ {
      function __MyGovernor1_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
-         __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");
+         __GovernorTimelockControl_init_unchained(_timelock);
+         __GovernorVotes_init_unchained(_token);
 diff --git a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
-index b07261a4..4ec9b6ce 100644
+index 63bc024c..0f854226 100644
 --- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
 +++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
-@@ -20,7 +20,7 @@ contract MyGovernor2Upgradeable is
+@@ -18,7 +18,7 @@ contract MyGovernor2Upgradeable is
+     GovernorCountingSimpleUpgradeable
+ {
      function __MyGovernor2_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
-         __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");
+         __GovernorTimelockControl_init_unchained(_timelock);
+         __GovernorVotes_init_unchained(_token);
 diff --git a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
-index 223ccb94..e05b6ce7 100644
+index 27a8411c..2f59b8e5 100644
 --- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
 +++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
-@@ -18,7 +18,7 @@ contract MyGovernorUpgradeable is
+@@ -16,7 +16,7 @@ contract MyGovernorUpgradeable is
+     GovernorVotesQuorumFractionUpgradeable
+ {
      function __MyGovernor_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
-         __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();
-diff --git a/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol b/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
-index 9b48de71..c28f3b50 100644
---- a/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
-+++ b/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
-@@ -38,7 +38,6 @@ abstract contract GovernorPreventLateQuorumUpgradeable is Initializable, Governo
-     function __GovernorPreventLateQuorum_init(uint64 initialVoteExtension) internal onlyInitializing {
-         __Context_init_unchained();
-         __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
-         __IGovernor_init_unchained();
-         __GovernorPreventLateQuorum_init_unchained(initialVoteExtension);
-     }
+         __Governor_init_unchained("MyGovernor");
+         __GovernorTimelockControl_init_unchained(_timelock);
+         __GovernorVotes_init_unchained(_token);