Transpile e64bfd9

Author: github-actions[bot]

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.7.2
+
+ * `LibArbitrumL2`, `CrossChainEnabledArbitrumL2`: Fixed detection of cross-chain calls for EOAs. Previously, calls from EOAs would be classified as cross-chain calls. ([#3578](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3578))
+
 ## 4.7.1 (2022-07-19)
 
  * `SignatureChecker`: Fix an issue that causes `isValidSignatureNow` to revert when the target contract returns ill-encoded data. ([#3552](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3552))

contracts/crosschain/arbitrum/LibArbitrumL2Upgradeable.sol

@@ -21,7 +21,7 @@ library LibArbitrumL2Upgradeable {
     address public constant ARBSYS = 0x0000000000000000000000000000000000000064;
 
     function isCrossChain(address arbsys) internal view returns (bool) {
-        return ArbitrumL2_Bridge(arbsys).isTopLevelCall();
+        return ArbitrumL2_Bridge(arbsys).wasMyCallersAddressAliased();
     }
 
     /**
@@ -35,9 +35,6 @@ library LibArbitrumL2Upgradeable {
     function crossChainSender(address arbsys) internal view returns (address) {
         if (!isCrossChain(arbsys)) revert NotCrossChainCall();
 
-        return
-            ArbitrumL2_Bridge(arbsys).wasMyCallersAddressAliased()
-                ? ArbitrumL2_Bridge(arbsys).myCallersAddressWithoutAliasing()
-                : msg.sender;
+        return ArbitrumL2_Bridge(arbsys).myCallersAddressWithoutAliasing();
     }
 }

contracts/governance/GovernorUpgradeable.sol

@@ -126,7 +126,7 @@ abstract contract GovernorUpgradeable is Initializable, ContextUpgradeable, ERC1
     /**
      * @dev See {IGovernor-hashProposal}.
      *
-     * The proposal id is produced by hashing the RLC encoded `targets` array, the `values` array, the `calldatas` array
+     * The proposal id is produced by hashing the ABI encoded `targets` array, the `values` array, the `calldatas` array
      * and the descriptionHash (bytes32 which itself is the keccak256 hash of the description string). This proposal id
      * can be produced from the proposal data which is part of the {ProposalCreated} event. It can even be computed in
      * advance, before the proposal is submitted.

contracts/governance/IGovernorUpgradeable.sol

@@ -147,7 +147,7 @@ abstract contract IGovernorUpgradeable is Initializable, IERC165Upgradeable {
     /**
      * @notice module:user-config
      * @dev Delay, in number of block, between the proposal is created and the vote starts. This can be increassed to
-     * leave time for users to buy voting power, of delegate it, before the voting of a proposal starts.
+     * leave time for users to buy voting power, or delegate it, before the voting of a proposal starts.
      */
     function votingDelay() public view virtual returns (uint256);
 

contracts/mocks/crosschain/bridgesUpgradeable.sol

@@ -136,14 +136,10 @@ contract BridgeArbitrumL2MockUpgradeable is Initializable, BaseRelayMockUpgradea
 
     function __BridgeArbitrumL2Mock_init_unchained() internal onlyInitializing {
     }
-    function isTopLevelCall() public view returns (bool) {
+    function wasMyCallersAddressAliased() public view returns (bool) {
         return _currentSender != address(0);
     }
 
-    function wasMyCallersAddressAliased() public pure returns (bool) {
-        return true;
-    }
-
     function myCallersAddressWithoutAliasing() public view returns (address) {
         return _currentSender;
     }