Merge upstream master into patched/master

scripts/upgradeable/patch/02-add-missing-mock-arguments.patch

-diff --git a/contracts/mocks/MulticallTokenMockUpgradeable.sol b/contracts/mocks/MulticallTokenMockUpgradeable.sol
-index 7bd4ae88..7be0c4ff 100644
---- a/contracts/mocks/MulticallTokenMockUpgradeable.sol
-+++ b/contracts/mocks/MulticallTokenMockUpgradeable.sol
-@@ -8,7 +8,7 @@ import "../proxy/utils/Initializable.sol";
- 
- contract MulticallTokenMockUpgradeable is Initializable, ERC20MockUpgradeable, MulticallUpgradeable {
-     function __MulticallTokenMock_init(uint256 initialBalance) internal onlyInitializing {
--        __ERC20_init_unchained(name, symbol);
-+        __ERC20_init_unchained("MulticallToken", "BCT");
-         __ERC20Mock_init_unchained("MulticallToken", "BCT", msg.sender, initialBalance);
-     }
- 

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

-diff --git a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
-index 66662e9e..c53c6479 100644
---- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
-+++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
-@@ -16,7 +16,7 @@ contract MyGovernor1Upgradeable is
-     GovernorCountingSimpleUpgradeable
- {
-     function __MyGovernor1_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
--        __EIP712_init_unchained(name_, version());
-+        __EIP712_init_unchained("MyGovernor", version());
-         __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 63bc024c..0f854226 100644
---- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
-+++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
-@@ -18,7 +18,7 @@ contract MyGovernor2Upgradeable is
-     GovernorCountingSimpleUpgradeable
- {
-     function __MyGovernor2_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
--        __EIP712_init_unchained(name_, version());
-+        __EIP712_init_unchained("MyGovernor", version());
-         __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 27a8411c..2f59b8e5 100644
---- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
-+++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
-@@ -16,7 +16,7 @@ contract MyGovernorUpgradeable is
-     GovernorVotesQuorumFractionUpgradeable
- {
-     function __MyGovernor_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
--        __EIP712_init_unchained(name_, version());
-+        __EIP712_init_unchained("MyGovernor", version());
-         __Governor_init_unchained("MyGovernor");
-         __GovernorTimelockControl_init_unchained(_timelock);
-         __GovernorVotes_init_unchained(_token);

scripts/upgradeable/transpile.sh

@@ -17,6 +17,7 @@ npx @openzeppelin/upgrade-safe-transpiler@latest -D \
   -x '!contracts/proxy/beacon/IBeacon.sol' \
   -p 'contracts/**/presets/**/*'
 
+# this is currently no longer used but could be useful in the future
 for p in scripts/upgradeable/patch/*.patch; do
   git apply "$p"
 done