Transpile a83918df

.github/actions/setup/action.yml

@@ -5,7 +5,7 @@ runs:
   steps:
     - uses: actions/setup-node@v3
       with:
-        node-version: 14.x
+        node-version: 16.x
     - uses: actions/cache@v3
       id: cache
       with:

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 
+## 4.9.4 (2023-12-07)
+
+- `ERC2771Context` and `Context`: Introduce a `_contextPrefixLength()` getter, used to trim extra information appended to `msg.data`.
+- `Multicall`: Make aware of non-canonical context (i.e. `msg.sender` is not `_msgSender()`), allowing compatibility with `ERC2771Context`.
+
 ## 4.9.3 (2023-07-28)
 
 - `ERC2771Context`: Return the forwarder address whenever the `msg.data` of a call originating from a trusted forwarder is not long enough to contain the request signer address (i.e. `msg.data.length` is less than 20 bytes), as specified by ERC-2771. ([#4481](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4481))

contracts/access/AccessControlCrossChainUpgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.4;
 
 import "./AccessControlUpgradeable.sol";
 import "../crosschain/CrossChainEnabledUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev An extension to {AccessControl} with support for cross-chain access management.

contracts/access/AccessControlDefaultAdminRulesUpgradeable.sol

@@ -7,7 +7,7 @@ import "./AccessControlUpgradeable.sol";
 import "./IAccessControlDefaultAdminRulesUpgradeable.sol";
 import "../utils/math/SafeCastUpgradeable.sol";
 import "../interfaces/IERC5313Upgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {AccessControl} that allows specifying special rules to manage

contracts/access/AccessControlEnumerableUpgradeable.sol

@@ -6,7 +6,7 @@ pragma solidity ^0.8.0;
 import "./IAccessControlEnumerableUpgradeable.sol";
 import "./AccessControlUpgradeable.sol";
 import "../utils/structs/EnumerableSetUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {AccessControl} that allows enumerating the members of each role.

contracts/access/AccessControlUpgradeable.sol

@@ -7,7 +7,7 @@ import "./IAccessControlUpgradeable.sol";
 import "../utils/ContextUpgradeable.sol";
 import "../utils/StringsUpgradeable.sol";
 import "../utils/introspection/ERC165Upgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Contract module that allows children to implement role-based access

contracts/access/Ownable2StepUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "./OwnableUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Contract module which provides access control mechanism, where

contracts/access/OwnableUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "../utils/ContextUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Contract module which provides a basic access control mechanism, where

contracts/crosschain/CrossChainEnabledUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.4;
 
 import "./errorsUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Provides information for building cross-chain aware contracts. This

contracts/crosschain/amb/CrossChainEnabledAMBUpgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.4;
 
 import "../CrossChainEnabledUpgradeable.sol";
 import "./LibAMBUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev https://docs.tokenbridge.net/amb-bridge/about-amb-bridge[AMB]

contracts/crosschain/amb/LibAMBUpgradeable.sol

@@ -3,7 +3,7 @@
 
 pragma solidity ^0.8.4;
 
-import { IAMBUpgradeable as AMB_Bridge } from "../../vendor/amb/IAMBUpgradeable.sol";
+import {IAMBUpgradeable as AMB_Bridge} from "../../vendor/amb/IAMBUpgradeable.sol";
 import "../errorsUpgradeable.sol";
 
 /**

contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL1Upgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.4;
 
 import "../CrossChainEnabledUpgradeable.sol";
 import "./LibArbitrumL1Upgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev https://arbitrum.io/[Arbitrum] specialization or the

contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL2Upgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.4;
 
 import "../CrossChainEnabledUpgradeable.sol";
 import "./LibArbitrumL2Upgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev https://arbitrum.io/[Arbitrum] specialization or the

contracts/crosschain/arbitrum/LibArbitrumL1Upgradeable.sol

@@ -3,8 +3,8 @@
 
 pragma solidity ^0.8.4;
 
-import { IBridgeUpgradeable as ArbitrumL1_Bridge } from "../../vendor/arbitrum/IBridgeUpgradeable.sol";
-import { IOutboxUpgradeable as ArbitrumL1_Outbox } from "../../vendor/arbitrum/IOutboxUpgradeable.sol";
+import {IBridgeUpgradeable as ArbitrumL1_Bridge} from "../../vendor/arbitrum/IBridgeUpgradeable.sol";
+import {IOutboxUpgradeable as ArbitrumL1_Outbox} from "../../vendor/arbitrum/IOutboxUpgradeable.sol";
 import "../errorsUpgradeable.sol";
 
 /**

contracts/crosschain/arbitrum/LibArbitrumL2Upgradeable.sol

@@ -3,7 +3,7 @@
 
 pragma solidity ^0.8.4;
 
-import { IArbSysUpgradeable as ArbitrumL2_Bridge } from "../../vendor/arbitrum/IArbSysUpgradeable.sol";
+import {IArbSysUpgradeable as ArbitrumL2_Bridge} from "../../vendor/arbitrum/IArbSysUpgradeable.sol";
 import "../errorsUpgradeable.sol";
 
 /**

contracts/crosschain/optimism/CrossChainEnabledOptimismUpgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.4;
 
 import "../CrossChainEnabledUpgradeable.sol";
 import "./LibOptimismUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev https://www.optimism.io/[Optimism] specialization or the

contracts/crosschain/optimism/LibOptimismUpgradeable.sol

@@ -3,7 +3,7 @@
 
 pragma solidity ^0.8.4;
 
-import { ICrossDomainMessengerUpgradeable as Optimism_Bridge } from "../../vendor/optimism/ICrossDomainMessengerUpgradeable.sol";
+import {ICrossDomainMessengerUpgradeable as Optimism_Bridge} from "../../vendor/optimism/ICrossDomainMessengerUpgradeable.sol";
 import "../errorsUpgradeable.sol";
 
 /**

contracts/crosschain/polygon/CrossChainEnabledPolygonChildUpgradeable.sol

@@ -7,7 +7,7 @@ import "../CrossChainEnabledUpgradeable.sol";
 import "../../security/ReentrancyGuardUpgradeable.sol";
 import "../../utils/AddressUpgradeable.sol";
 import "../../vendor/polygon/IFxMessageProcessorUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 address constant DEFAULT_SENDER = 0x000000000000000000000000000000000000dEaD;
 

contracts/finance/PaymentSplitterUpgradeable.sol

@@ -6,7 +6,7 @@ pragma solidity ^0.8.0;
 import "../token/ERC20/utils/SafeERC20Upgradeable.sol";
 import "../utils/AddressUpgradeable.sol";
 import "../utils/ContextUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @title PaymentSplitter

contracts/finance/VestingWalletUpgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 import "../token/ERC20/utils/SafeERC20Upgradeable.sol";
 import "../utils/AddressUpgradeable.sol";
 import "../utils/ContextUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @title VestingWallet

contracts/governance/GovernorUpgradeable.sol

@@ -13,7 +13,7 @@ import "../utils/structs/DoubleEndedQueueUpgradeable.sol";
 import "../utils/AddressUpgradeable.sol";
 import "../utils/ContextUpgradeable.sol";
 import "./IGovernorUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Core of the governance system, designed to be extended though various modules.

contracts/governance/IGovernorUpgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 
 import "../interfaces/IERC165Upgradeable.sol";
 import "../interfaces/IERC6372Upgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Interface of the {Governor} core.

contracts/governance/TimelockControllerUpgradeable.sol

@@ -6,7 +6,7 @@ pragma solidity ^0.8.0;
 import "../access/AccessControlUpgradeable.sol";
 import "../token/ERC721/IERC721ReceiverUpgradeable.sol";
 import "../token/ERC1155/IERC1155ReceiverUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Contract module which acts as a timelocked controller. When set as the

contracts/governance/TimelockControllerWith46MigrationUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "./TimelockControllerUpgradeable.sol";
-import "../proxy/utils/Initializable.sol";
+import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of the TimelockController that includes an additional

contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol

@@ -7,7 +7,7 @@ import "../../utils/math/SafeCastUpgradeable.sol";
 import "../extensions/IGovernorTimelockUpgradeable.sol";
 import "../GovernorUpgradeable.sol";
 import "./IGovernorCompatibilityBravoUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Compatibility layer that implements GovernorBravo compatibility on top of {Governor}.

contracts/governance/compatibility/IGovernorCompatibilityBravoUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "../IGovernorUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Interface extension that adds missing functions to the {Governor} core to provide `GovernorBravo` compatibility.

contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "../GovernorUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {Governor} for simple, 3 options, vote counting.

contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 
 import "../GovernorUpgradeable.sol";
 import "../../utils/math/MathUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev A module that ensures there is a minimum voting period after quorum is reached. This prevents a large voter from

contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "../GovernorUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {Governor} for proposal restriction to token holders with a minimum balance.

contracts/governance/extensions/GovernorSettingsUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "../GovernorUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {Governor} for settings updatable through governance.

contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol

@@ -7,7 +7,7 @@ import "./IGovernorTimelockUpgradeable.sol";
 import "../GovernorUpgradeable.sol";
 import "../../utils/math/SafeCastUpgradeable.sol";
 import "../../vendor/compound/ICompoundTimelockUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {Governor} that binds the execution process to a Compound Timelock. This adds a delay, enforced by

contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol

@@ -6,7 +6,7 @@ pragma solidity ^0.8.0;
 import "./IGovernorTimelockUpgradeable.sol";
 import "../GovernorUpgradeable.sol";
 import "../TimelockControllerUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {Governor} that binds the execution process to an instance of {TimelockController}. This adds a

contracts/governance/extensions/GovernorVotesCompUpgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 
 import "../GovernorUpgradeable.sol";
 import "../../token/ERC20/extensions/ERC20VotesCompUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {Governor} for voting weight extraction from a Comp token.

contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol

@@ -6,7 +6,7 @@ pragma solidity ^0.8.0;
 import "./GovernorVotesUpgradeable.sol";
 import "../../utils/CheckpointsUpgradeable.sol";
 import "../../utils/math/SafeCastUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {Governor} for voting weight extraction from an {ERC20Votes} token and a quorum expressed as a

contracts/governance/extensions/GovernorVotesUpgradeable.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 
 import "../GovernorUpgradeable.sol";
 import "../../interfaces/IERC5805Upgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of {Governor} for voting weight extraction from an {ERC20Votes} token, or since v4.5 an {ERC721Votes} token.

contracts/governance/extensions/IGovernorTimelockUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "../IGovernorUpgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev Extension of the {IGovernor} for timelock supporting modules.

contracts/governance/utils/VotesUpgradeable.sol

@@ -7,7 +7,7 @@ import "../../utils/ContextUpgradeable.sol";
 import "../../utils/CountersUpgradeable.sol";
 import "../../utils/CheckpointsUpgradeable.sol";
 import "../../utils/cryptography/EIP712Upgradeable.sol";
-import "../../proxy/utils/Initializable.sol";
+import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
  * @dev This is a base abstract contract that tracks voting units, which are a measure of voting power that can be