add nonce to incomingBridgeTransferIds

Author: Primata

protocol-units/bridge/contracts/src/NativeBridge.sol

@@ -17,8 +17,7 @@ contract NativeBridge is AccessControlUpgradeable, PausableUpgradeable, INativeB
         uint256 nonce;
     }
     mapping(bytes32 bridgeTransferId => OutgoingBridgeTransfer) public outgoingBridgeTransfers;
-    mapping(bytes32 bridgeTransferId => bool completed) public incomingBridgeTransfers;
-    mapping(uint256 nonce => bytes32 bridgeTransferId) public noncesToBridgeTransferIds;
+    mapping(uint256 nonce => bytes32 incomingBridgeTransferId) public noncesToIncomingBridgeTransferIds;
 
     IERC20 public moveToken;
     bytes32 public constant RELAYER_ROLE = keccak256(abi.encodePacked("RELAYER_ROLE"));
@@ -108,13 +107,10 @@ contract NativeBridge is AccessControlUpgradeable, PausableUpgradeable, INativeB
             InvalidBridgeTransferId()
         );
         // Ensure the bridge transfer has not already been completed
-        require(!incomingBridgeTransfers[bridgeTransferId], CompletedBridgeTransferId());
+        require(noncesToIncomingBridgeTransferIds[nonce] == bytes32(0x0), CompletedBridgeTransferId());
 
-        // Mark the bridge transfer as completed
-        incomingBridgeTransfers[bridgeTransferId] = true;
-
-        // Store the nonce to bridge transfer ID mapping for future reference
-        noncesToBridgeTransferIds[nonce] = bridgeTransferId;
+        // Store the nonce to bridge transfer ID
+        noncesToIncomingBridgeTransferIds[nonce] = bridgeTransferId;
 
         // Transfer the MOVE tokens to the recipient
         if (!moveToken.transfer(recipient, amount)) revert MOVETransferFailed();

protocol-units/bridge/contracts/test/NativeBridge.t.sol

@@ -111,10 +111,10 @@ contract NativeBridgeTest is Test {
         console.log("Testing correct values");
         nativeBridge.completeBridgeTransfer(bridgeTransferId, _originator, _recipient, _amount, _nonce);
 
-        bool completed =
-            nativeBridge.incomingBridgeTransfers(bridgeTransferId);
+        bytes32 _bridgeTransferId =
+            nativeBridge.noncesToIncomingBridgeTransferIds(_nonce);
 
-        assertTrue(completed);
+        assertEq(_bridgeTransferId, bridgeTransferId);
         vm.stopPrank();
     }
 
@@ -143,10 +143,10 @@ contract NativeBridgeTest is Test {
         nativeBridge.batchCompleteBridgeTransfer(bridgeTransferIds, originators, recipients, amounts, nonces);
 
         for (uint256 i; i < length; i++) {
-            bool completed =
-                nativeBridge.incomingBridgeTransfers(bridgeTransferIds[i]);
+            bytes32 bridgeTransferId =
+                nativeBridge.noncesToIncomingBridgeTransferIds(nonces[i]);
 
-            assertTrue(completed);
+            assertEq(bridgeTransferId, bridgeTransferIds[i]);
         }
 
         vm.expectRevert(INativeBridge.CompletedBridgeTransferId.selector);