use bridge address instead of inbox for arbitrumL1

contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL1.sol

@@ -12,32 +12,32 @@ import "./LibArbitrumL1.sol";
  * This version should only be deployed on L1 to process cross-chain messages
  * originating from L2. For the other side, use {CrossChainEnabledArbitrumL2}.
  *
- * The inbox contract is provided and maintained by the arbitrum team. You can
+ * The bridge contract is provided and maintained by the arbitrum team. You can
  * find the address of this contract on the rinkeby testnet in
- * [Arbitrum's developer documentation](https://developer.offchainlabs.com/docs/public_testnet#l1).
+ * [Arbitrum's developer documentation](https://developer.offchainlabs.com/docs/useful_addresses).
  *
  * _Available since v4.6._
  */
 abstract contract CrossChainEnabledArbitrumL1 is CrossChainEnabled {
     /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
-    address private immutable _inbox;
+    address private immutable _bridge;
 
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor(address inbox) {
-        _inbox = inbox;
+    constructor(address bridge) {
+        _bridge = bridge;
     }
 
     /**
      * @dev see {CrossChainEnabled-_isCrossChain}
      */
     function _isCrossChain() internal view virtual override returns (bool) {
-        return LibArbitrumL1.isCrossChain(_inbox);
+        return LibArbitrumL1.isCrossChain(_bridge);
     }
 
     /**
      * @dev see {CrossChainEnabled-_crossChainSender}
      */
     function _crossChainSender() internal view virtual override onlyCrossChain returns (address) {
-        return LibArbitrumL1.crossChainSender(_inbox);
+        return LibArbitrumL1.crossChainSender(_bridge);
     }
 }

contracts/crosschain/arbitrum/LibArbitrumL1.sol

@@ -17,25 +17,24 @@ import "../errors.sol";
 library LibArbitrumL1 {
     /**
      * @dev Returns whether the current function call is the result of a
-     * cross-chain message relayed by the bridge attached to `inbox`.
+     * cross-chain message relayed by the `bridge`.
      */
-    function isCrossChain(address inbox) internal view returns (bool) {
-        return msg.sender == ArbitrumL1_Inbox(inbox).bridge();
+    function isCrossChain(address bridge) internal view returns (bool) {
+        return msg.sender == bridge;
     }
 
     /**
      * @dev Returns the address of the sender that triggered the current
-     * cross-chain message through the bridge attached to `inbox`.
+     * cross-chain message through the `bridge`.
      *
      * NOTE: {isCrossChain} should be checked before trying to recover the
      * sender, as it will revert with `NotCrossChainCall` if the current
      * function call is not the result of a cross-chain message.
      */
-    function crossChainSender(address inbox) internal view returns (address) {
-        if (!isCrossChain(inbox)) revert NotCrossChainCall();
+    function crossChainSender(address bridge) internal view returns (address) {
+        if (!isCrossChain(bridge)) revert NotCrossChainCall();
 
-        address sender = ArbitrumL1_Outbox(ArbitrumL1_Bridge(ArbitrumL1_Inbox(inbox).bridge()).activeOutbox())
-            .l2ToL1Sender();
+        address sender = ArbitrumL1_Outbox(ArbitrumL1_Bridge(bridge).activeOutbox()).l2ToL1Sender();
         require(sender != address(0), "LibArbitrumL1: system messages without sender");
 
         return sender;

test/crosschain/CrossChainEnabled.test.js

@@ -53,7 +53,7 @@ contract('CrossChainEnabled', function () {
     CrossChainHelper.before('Arbitrum-L1');
 
     beforeEach(async function () {
-      this.receiver = await CrossChainEnabledArbitrumL1Mock.new(await CrossChainHelper.bridge.inbox());
+      this.receiver = await CrossChainEnabledArbitrumL1Mock.new(CrossChainHelper.bridge.address);
     });
 
     shouldBehaveLikeReceiver();