Merge upstream master into patched/master

scripts/upgradeable/patch/03-remove-erc20votes-chained-init.patch

@@ -5,7 +5,7 @@ index a7a9af54..0b7f838d 100644
 @@ -24,12 +24,6 @@ import "../../../proxy/utils/Initializable.sol";
   * _Available since v4.2._
   */
- abstract contract ERC20VotesUpgradeable is Initializable, ERC20PermitUpgradeable {
+ abstract contract ERC20VotesUpgradeable is Initializable, IVotesUpgradeable, ERC20PermitUpgradeable {
 -    function __ERC20Votes_init() internal onlyInitializing {
 -        __Context_init_unchained();
 -        __EIP712_init_unchained(name, "1");

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

@@ -75,7 +75,7 @@ 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 onlyInitializing {
+     function __GovernorVotes_init(IVotesUpgradeable tokenAddress) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -111,7 +111,7 @@ index df6ccdaf..db9998ed 100644
 --- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
 +++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
 @@ -18,7 +18,7 @@ contract MyGovernor1Upgradeable is
-     function __MyGovernor1_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
+     function __MyGovernor1_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -124,7 +124,7 @@ index b07261a4..4ec9b6ce 100644
 --- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
 +++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
 @@ -20,7 +20,7 @@ contract MyGovernor2Upgradeable is
-     function __MyGovernor2_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
+     function __MyGovernor2_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -137,7 +137,7 @@ index 223ccb94..e05b6ce7 100644
 --- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
 +++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
 @@ -18,7 +18,7 @@ contract MyGovernorUpgradeable is
-     function __MyGovernor_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
+     function __MyGovernor_init(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());