Transpile a83918df

Author: github-actions[bot]

.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]