Transpile 92fbf5bb

contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol

@@ -14,7 +14,6 @@ abstract contract GovernorProposalThresholdUpgradeable is Initializable, Governo
     function __GovernorProposalThreshold_init() internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();
-        __EIP712_init_unchained(name_, version());
         __IGovernor_init_unchained();
         __GovernorProposalThreshold_init_unchained();
     }

scripts/upgradeable/merge-upstream.sh

@@ -8,8 +8,7 @@ if [[ "$REF" != refs/heads/* ]]; then
   echo "$REF is not a branch" >&2
   exit 1
 elif [[ "$REF" == refs/heads/patches ]]; then
-  echo "Run on a different branch" >&2
-  exit 1
+  REF=refs/heads/master
 fi
 
 set -x

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

@@ -82,3 +82,15 @@ index cdfd0ae7..48408d9c 100644
          __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 initializer {
+         __Context_init_unchained();
+         __ERC165_init_unchained();
+-        __EIP712_init_unchained(name_, version());
+         __IGovernor_init_unchained();
+         __GovernorProposalThreshold_init_unchained();
+     }