Transpile 8702a099

contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol

@@ -18,6 +18,12 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGovernorTimelockUpgradeable, IGovernorCompatibilityBravoUpgradeable, GovernorUpgradeable {
+    function __GovernorCompatibilityBravo_init() internal initializer {
+        __Context_init_unchained();
+        __ERC165_init_unchained();
+        __GovernorCompatibilityBravo_init_unchained();
+    }
+
     function __GovernorCompatibilityBravo_init_unchained() internal initializer {
     }
     using CountersUpgradeable for CountersUpgradeable.Counter;

contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol

@@ -14,7 +14,6 @@ abstract contract GovernorCountingSimpleUpgradeable is Initializable, GovernorUp
     function __GovernorCountingSimple_init() internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();
-        __EIP712_init_unchained(name_, version());
         __GovernorCountingSimple_init_unchained();
     }
 

contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol

@@ -96,7 +96,6 @@ abstract contract GovernorTimelockCompoundUpgradeable is Initializable, IGoverno
     function __GovernorTimelockCompound_init(ICompoundTimelockUpgradeable timelockAddress) internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();
-        __EIP712_init_unchained(name_, version());
         __GovernorTimelockCompound_init_unchained(timelockAddress);
     }
 

contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol

@@ -33,7 +33,6 @@ abstract contract GovernorTimelockControlUpgradeable is Initializable, IGovernor
     function __GovernorTimelockControl_init(TimelockControllerUpgradeable timelockAddress) internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();
-        __EIP712_init_unchained(name_, version());
         __GovernorTimelockControl_init_unchained(timelockAddress);
     }
 

contracts/governance/extensions/GovernorVotesCompUpgradeable.sol

@@ -17,7 +17,6 @@ abstract contract GovernorVotesCompUpgradeable is Initializable, GovernorUpgrade
     function __GovernorVotesComp_init(ERC20VotesCompUpgradeable token_) internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();
-        __EIP712_init_unchained(name_, version());
         __GovernorVotesComp_init_unchained(token_);
     }
 

contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol

@@ -19,7 +19,6 @@ abstract contract GovernorVotesQuorumFractionUpgradeable is Initializable, Gover
     function __GovernorVotesQuorumFraction_init(uint256 quorumNumeratorValue) internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();
-        __EIP712_init_unchained(name_, version());
         __GovernorVotesQuorumFraction_init_unchained(quorumNumeratorValue);
     }
 

contracts/governance/extensions/GovernorVotesUpgradeable.sol

@@ -18,7 +18,6 @@ abstract contract GovernorVotesUpgradeable is Initializable, GovernorUpgradeable
     function __GovernorVotes_init(ERC20VotesUpgradeable tokenAddress) internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();
-        __EIP712_init_unchained(name_, version());
         __GovernorVotes_init_unchained(tokenAddress);
     }
 

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

+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 initializer {
+         __Context_init_unchained();
+         __ERC165_init_unchained();
+-        __EIP712_init_unchained(name_, version());
+         __GovernorCompatibilityBravo_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 initializer {
+         __Context_init_unchained();
+         __ERC165_init_unchained();
+-        __EIP712_init_unchained(name_, version());
+         __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 initializer {
+         __Context_init_unchained();
+         __ERC165_init_unchained();
+-        __EIP712_init_unchained(name_, version());
+         __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 initializer {
+         __Context_init_unchained();
+         __ERC165_init_unchained();
+-        __EIP712_init_unchained(name_, version());
+         __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 initializer {
+         __Context_init_unchained();
+         __ERC165_init_unchained();
+-        __EIP712_init_unchained(name_, version());
+         __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 initializer {
+         __Context_init_unchained();
+         __ERC165_init_unchained();
+-        __EIP712_init_unchained(name_, version());
+         __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(ERC20VotesUpgradeable tokenAddress) internal initializer {
+         __Context_init_unchained();
+         __ERC165_init_unchained();
+-        __EIP712_init_unchained(name_, version());
+         __GovernorVotes_init_unchained(tokenAddress);
+     }
+ 

scripts/upgradeable/patch/05-remove-gov-compat-bravo-chained-init.patch

-diff --git a/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol b/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
-index 1f6895a6..edb38d13 100644
---- a/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
-+++ b/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
-@@ -18,13 +18,6 @@ import "../../proxy/utils/Initializable.sol";
-  * _Available since v4.3._
-  */
- abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGovernorTimelockUpgradeable, IGovernorCompatibilityBravoUpgradeable, GovernorUpgradeable {
--    function __GovernorCompatibilityBravo_init() internal initializer {
--        __Context_init_unchained();
--        __ERC165_init_unchained();
--        __EIP712_init_unchained(name_, version());
--        __GovernorCompatibilityBravo_init_unchained();
--    }
--
-     function __GovernorCompatibilityBravo_init_unchained() internal initializer {
-     }
-     using CountersUpgradeable for CountersUpgradeable.Counter;