refactor(storage): common inbound nonce

src/core/BootstrapLzReceiver.sol

@@ -18,7 +18,7 @@ abstract contract BootstrapLzReceiver is PausableUpgradeable, OAppReceiverUpgrad
         if (_origin.srcEid != EXOCORE_CHAIN_ID) {
             revert UnexpectedSourceChain(_origin.srcEid);
         }
-        _consumeInboundNonce(_origin.srcEid, _origin.sender, _origin.nonce);
+        _verifyAndUpdateNonce(_origin.srcEid, _origin.sender, _origin.nonce);
         Action act = Action(uint8(payload[0]));
         require(act != Action.RESPOND, "BootstrapLzReceiver: invalid action");
         bytes4 selector_ = _whiteListFunctionSelectors[act];
@@ -41,11 +41,4 @@ abstract contract BootstrapLzReceiver is PausableUpgradeable, OAppReceiverUpgrad
         return inboundNonce[srcEid][sender] + 1;
     }
 
-    function _consumeInboundNonce(uint32 srcEid, bytes32 sender, uint64 nonce) internal {
-        inboundNonce[srcEid][sender] += 1;
-        if (nonce != inboundNonce[srcEid][sender]) {
-            revert UnexpectedInboundNonce(inboundNonce[srcEid][sender], nonce);
-        }
-    }
-
 }

src/core/ClientGatewayLzReceiver.sol

@@ -26,7 +26,7 @@ abstract contract ClientGatewayLzReceiver is PausableUpgradeable, OAppReceiverUp
             revert UnexpectedSourceChain(_origin.srcEid);
         }
 
-        _consumeInboundNonce(_origin.srcEid, _origin.sender, _origin.nonce);
+        _verifyAndUpdateNonce(_origin.srcEid, _origin.sender, _origin.nonce);
 
         Action act = Action(uint8(payload[0]));
         if (act == Action.RESPOND) {
@@ -75,13 +75,6 @@ abstract contract ClientGatewayLzReceiver is PausableUpgradeable, OAppReceiverUp
         return inboundNonce[srcEid][sender] + 1;
     }
 
-    function _consumeInboundNonce(uint32 srcEid, bytes32 sender, uint64 nonce) internal {
-        inboundNonce[srcEid][sender] += 1;
-        if (nonce != inboundNonce[srcEid][sender]) {
-            revert UnexpectedInboundNonce(inboundNonce[srcEid][sender], nonce);
-        }
-    }
-
     function afterReceiveDepositResponse(bytes memory requestPayload, bytes calldata responsePayload)
         public
         onlyCalledFromThis

src/core/ExocoreGateway.sol

@@ -146,7 +146,7 @@ contract ExocoreGateway is
     }
 
     function _lzReceive(Origin calldata _origin, bytes calldata payload) internal virtual override whenNotPaused {
-        _consumeInboundNonce(_origin.srcEid, _origin.sender, _origin.nonce);
+        _verifyAndUpdateNonce(_origin.srcEid, _origin.sender, _origin.nonce);
 
         Action act = Action(uint8(payload[0]));
         bytes4 selector_ = _whiteListFunctionSelectors[act];
@@ -350,11 +350,4 @@ contract ExocoreGateway is
         return inboundNonce[srcEid][sender] + 1;
     }
 
-    function _consumeInboundNonce(uint32 srcEid, bytes32 sender, uint64 nonce) internal {
-        inboundNonce[srcEid][sender] += 1;
-        if (nonce != inboundNonce[srcEid][sender]) {
-            revert UnexpectedInboundNonce(inboundNonce[srcEid][sender], nonce);
-        }
-    }
-
 }

src/storage/BootstrapStorage.sol

@@ -206,22 +206,6 @@ contract BootstrapStorage is GatewayStorage {
      */
     uint32 public immutable EXOCORE_CHAIN_ID;
 
-    /**
-     * @dev A mapping of source chain id to source sender to the nonce of the last inbound
-     * message processed from that sender, over LayerZero.
-     * @notice This mapping is used to track the last message processed from each sender on
-     * each source chain to prevent replay attacks.
-     */
-    mapping(uint32 eid => mapping(bytes32 sender => uint64 nonce)) public inboundNonce;
-
-    // TSS information.
-    /**
-     * @dev The message nonce from the last TSS message processed by the contract.
-     * @notice This nonce is used to track the last message processed by the contract to
-     * prevent replay attacks.
-     */
-    uint256 public lastMessageNonce;
-
     // the beacon that stores the Vault implementation contract address for proxy
     /**
      * @notice this stores the Vault implementation contract address for proxy, and it is

src/storage/ClientChainGatewayStorage.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.19;
 import {IETHPOSDeposit} from "../interfaces/IETHPOSDeposit.sol";
 import {IExoCapsule} from "../interfaces/IExoCapsule.sol";
 import {BootstrapStorage} from "../storage/BootstrapStorage.sol";
-import {BootstrapStorage} from "./BootstrapStorage.sol";
 
 import {IBeacon} from "@openzeppelin-contracts/contracts/proxy/beacon/IBeacon.sol";
 
@@ -13,7 +12,7 @@ contract ClientChainGatewayStorage is BootstrapStorage {
     /*       state variables exclusively owned by ClientChainGateway              */
     /* -------------------------------------------------------------------------- */
 
-    uint64 public outboundNonce;
+    uint64 public outboundNonce; // the only contract that has outgoing messages
     mapping(address => IExoCapsule) public ownerToCapsule;
     mapping(uint64 => bytes) internal _registeredRequests;
     mapping(uint64 => Action) internal _registeredRequestActions;

src/storage/ExocoreGatewayStorage.sol

@@ -21,7 +21,6 @@ contract ExocoreGatewayStorage is GatewayStorage {
     uint128 internal constant DESTINATION_GAS_LIMIT = 500_000;
     uint128 internal constant DESTINATION_MSG_VALUE = 0;
 
-    mapping(uint32 eid => mapping(bytes32 sender => uint64 nonce)) public inboundNonce;
     mapping(uint32 id => bool) public chainToBootstrapped;
 
     event ExocorePrecompileError(address indexed precompile, uint64 nonce);

src/storage/GatewayStorage.sol

@@ -17,6 +17,8 @@ contract GatewayStorage {
     mapping(Action => bytes4) internal _whiteListFunctionSelectors;
     address payable public exocoreValidatorSetAddress;
 
+    mapping(uint32 eid => mapping(bytes32 sender => uint64 nonce)) public inboundNonce;
+
     event MessageSent(Action indexed act, bytes32 packetId, uint64 nonce, uint256 nativeFee);
 
     error UnsupportedRequest(Action act);
@@ -25,4 +27,12 @@ contract GatewayStorage {
 
     uint256[40] private __gap;
 
+    function _verifyAndUpdateNonce(uint32 srcChainId, bytes32 srcAddress, uint64 nonce) internal {
+        uint64 expectedNonce = inboundNonce[srcChainId][srcAddress] + 1;
+        if (nonce != expectedNonce) {
+            revert UnexpectedInboundNonce(expectedNonce, nonce);
+        }
+        inboundNonce[srcChainId][srcAddress] = nonce;
+    }
+
 }

test/mocks/ExocoreGatewayMock.sol

@@ -167,7 +167,7 @@ contract ExocoreGatewayMock is
     }
 
     function _lzReceive(Origin calldata _origin, bytes calldata payload) internal virtual override whenNotPaused {
-        _consumeInboundNonce(_origin.srcEid, _origin.sender, _origin.nonce);
+        _verifyAndUpdateNonce(_origin.srcEid, _origin.sender, _origin.nonce);
 
         Action act = Action(uint8(payload[0]));
         bytes4 selector_ = _whiteListFunctionSelectors[act];
@@ -341,11 +341,4 @@ contract ExocoreGatewayMock is
         return inboundNonce[srcEid][sender] + 1;
     }
 
-    function _consumeInboundNonce(uint32 srcEid, bytes32 sender, uint64 nonce) internal {
-        inboundNonce[srcEid][sender] += 1;
-        if (nonce != inboundNonce[srcEid][sender]) {
-            revert UnexpectedInboundNonce(inboundNonce[srcEid][sender], nonce);
-        }
-    }
-
 }