Merge 0cb26c4 into f246d33

synapsecns · Oct 2, 2024 · d19605b · d19605b
2 parents f246d33 + 0cb26c4
commit d19605b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/packages/contracts-rfq/.gitignore b/packages/contracts-rfq/.gitignore
@@ -1,3 +1,5 @@
 flattened
 .deployments
-broadcast
+broadcast
+
+lcov.info
diff --git a/packages/contracts-rfq/contracts/FastBridgeV2.sol b/packages/contracts-rfq/contracts/FastBridgeV2.sol
@@ -28,11 +28,13 @@ contract FastBridgeV2 is Admin, IFastBridgeV2, IFastBridgeV2Errors {
     mapping(bytes32 => BridgeTxDetails) public bridgeTxDetails;
     /// @notice Relay details on destination chain
     mapping(bytes32 => BridgeRelay) public bridgeRelayDetails;
+    /// @notice Unique bridge nonces tracked per originSender
+    mapping(address => uint256) public senderNonces;
 
-    /// @dev to prevent replays
-    uint256 public nonce;
-
-    // @dev the block the contract was deployed at
+    /// @notice This is deprecated and should not be used.
+    /// @dev Replaced by senderNonces
+    uint256 public immutable nonce = 0;
+    /// @notice the block the contract was deployed at
     uint256 public immutable deployBlock;
 
     constructor(address _owner) Admin(_owner) {
@@ -158,7 +160,7 @@ contract FastBridgeV2 is Admin, IFastBridgeV2, IFastBridgeV2Errors {
                 originFeeAmount: originFeeAmount,
                 sendChainGas: params.sendChainGas,
                 deadline: params.deadline,
-                nonce: nonce++, // increment nonce on every bridge
+                nonce: senderNonces[params.sender]++, // increment nonce on every bridge
                 exclusivityRelayer: paramsV2.quoteRelayer,
                 // We checked exclusivityEndTime to be in range (0 .. params.deadline] above, so can safely cast
                 exclusivityEndTime: uint256(exclusivityEndTime)

diff --git a/packages/contracts-rfq/test/FastBridgeV2.Src.Base.t.sol b/packages/contracts-rfq/test/FastBridgeV2.Src.Base.t.sol
@@ -95,6 +95,12 @@ abstract contract FastBridgeV2SrcBaseTest is FastBridgeV2Test {
         fastBridge.refund(abi.encode(bridgeTx));
     }
 
+    function test_nonce() public view {
+        uint256 result = fastBridge.nonce();
+        // deprecated. should always return zero in FbV2.
+        assertEq(result, 0);
+    }
+
     function assertEq(FastBridgeV2.BridgeStatus a, FastBridgeV2.BridgeStatus b) public pure {
         assertEq(uint8(a), uint8(b));
     }

diff --git a/packages/contracts-rfq/test/FastBridgeV2.Src.t.sol b/packages/contracts-rfq/test/FastBridgeV2.Src.t.sol
@@ -103,6 +103,8 @@ contract FastBridgeV2SrcTest is FastBridgeV2SrcBaseTest {
         expectBridgeRequested(tokenTx, txId);
         expectBridgeQuoteDetails(txId, tokenParamsV2.quoteId);
         bridge({caller: userA, msgValue: 0, params: tokenParams});
+        assertEq(fastBridge.senderNonces(userA), 1);
+        assertEq(fastBridge.senderNonces(userB), 0);
         assertEq(fastBridge.bridgeStatuses(txId), IFastBridgeV2.BridgeStatus.REQUESTED);
         checkTokenBalancesAfterBridge(userA);
     }
@@ -112,6 +114,8 @@ contract FastBridgeV2SrcTest is FastBridgeV2SrcBaseTest {
         expectBridgeRequested(tokenTx, txId);
         expectBridgeQuoteDetails(txId, tokenParamsV2.quoteId);
         bridge({caller: userB, msgValue: 0, params: tokenParams});
+        assertEq(fastBridge.senderNonces(userA), 1);
+        assertEq(fastBridge.senderNonces(userB), 0);
         assertEq(fastBridge.bridgeStatuses(txId), IFastBridgeV2.BridgeStatus.REQUESTED);
         assertEq(srcToken.balanceOf(userA), LEFTOVER_BALANCE + tokenParams.originAmount);
         checkTokenBalancesAfterBridge(userB);
@@ -126,29 +130,39 @@ contract FastBridgeV2SrcTest is FastBridgeV2SrcBaseTest {
     function test_bridge_eth() public {
         // bridge token first to match the nonce
         bridge({caller: userA, msgValue: 0, params: tokenParams});
+        assertEq(fastBridge.senderNonces(userA), 1);
+        assertEq(fastBridge.senderNonces(userB), 0);
         bytes32 txId = getTxId(ethTx);
         expectBridgeRequested(ethTx, txId);
         expectBridgeQuoteDetails(txId, ethParamsV2.quoteId);
         bridge({caller: userA, msgValue: ethParams.originAmount, params: ethParams});
+        assertEq(fastBridge.senderNonces(userA), 2);
+        assertEq(fastBridge.senderNonces(userB), 0);
         assertEq(fastBridge.bridgeStatuses(txId), IFastBridgeV2.BridgeStatus.REQUESTED);
         checkEthBalancesAfterBridge(userA);
     }
 
     function test_bridge_eth_diffSender() public {
         // bridge token first to match the nonce
         bridge({caller: userA, msgValue: 0, params: tokenParams});
+        assertEq(fastBridge.senderNonces(userA), 1);
+        assertEq(fastBridge.senderNonces(userB), 0);
         bytes32 txId = getTxId(ethTx);
         expectBridgeRequested(ethTx, txId);
         expectBridgeQuoteDetails(txId, ethParamsV2.quoteId);
+        // bridge for user A as sender, called by userB
         bridge({caller: userB, msgValue: ethParams.originAmount, params: ethParams});
+        assertEq(fastBridge.senderNonces(userA), 2);
+        assertEq(fastBridge.senderNonces(userB), 0);
         assertEq(fastBridge.bridgeStatuses(txId), IFastBridgeV2.BridgeStatus.REQUESTED);
         assertEq(userA.balance, LEFTOVER_BALANCE + ethParams.originAmount);
         checkEthBalancesAfterBridge(userB);
     }
 
     function test_bridge_userSpecificNonce() public {
-        vm.skip(true); // TODO: unskip when implemented
         bridge({caller: userA, msgValue: 0, params: tokenParams});
+        assertEq(fastBridge.senderNonces(userA), 1);
+        assertEq(fastBridge.senderNonces(userB), 0);
         // UserB nonce is 0
         ethTx.nonce = 0;
         ethParams.sender = userB;
@@ -157,6 +171,8 @@ contract FastBridgeV2SrcTest is FastBridgeV2SrcBaseTest {
         expectBridgeRequested(ethTx, txId);
         expectBridgeQuoteDetails(txId, ethParamsV2.quoteId);
         bridge({caller: userB, msgValue: ethParams.originAmount, params: ethParams});
+        assertEq(fastBridge.senderNonces(userA), 1);
+        assertEq(fastBridge.senderNonces(userB), 1);
         assertEq(fastBridge.bridgeStatuses(txId), IFastBridgeV2.BridgeStatus.REQUESTED);
         checkEthBalancesAfterBridge(userB);
     }