refactor(upgradeable_contracts): rn _emitUserRequestForAffirmationMay…

…beRelayDataWithHashiAndIncreaseNonce into _emitUserRequestForAffirmationIncreaseNonceAndMaybeSendDataWithHashi and mv setNonce after having read it
crosschain-alliance · Jun 19, 2024 · 1cf3f8b · 1cf3f8b
1 parent f6fdd26
commit 1cf3f8b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/contracts/upgradeable_contracts/BasicForeignBridge.sol b/contracts/upgradeable_contracts/BasicForeignBridge.sol
@@ -55,13 +55,13 @@ contract BasicForeignBridge is EternalStorage, Validatable, BasicBridge, BasicTo
         _setHashiApprovalForMessage(msgId, true);
     }
 
-    function _emitUserRequestForAffirmationMaybeRelayDataWithHashiAndIncreaseNonce(address _receiver, uint256 _amount)
+    function _emitUserRequestForAffirmationIncreaseNonceAndMaybeSendDataWithHashi(address _receiver, uint256 _amount)
         internal
     {
         uint256 currentNonce = nonce();
+        setNonce(currentNonce + 1);
         emit UserRequestForAffirmation(_receiver, _amount, bytes32(currentNonce));
         _maybeRelayDataWithHashi(abi.encodePacked(_receiver, _amount, bytes32(currentNonce)));
-        setNonce(currentNonce + 1);
     }
 
     /**

diff --git a/contracts/upgradeable_contracts/ERC20Bridge.sol b/contracts/upgradeable_contracts/ERC20Bridge.sol
@@ -23,7 +23,7 @@ contract ERC20Bridge is BasicForeignBridge {
         require(withinLimit(_amount), "Relayed above limit");
         addTotalSpentPerDay(getCurrentDay(), _amount);
         erc20token().transferFrom(msg.sender, address(this), _amount);
-        _emitUserRequestForAffirmationMaybeRelayDataWithHashiAndIncreaseNonce(_receiver, _amount);
+        _emitUserRequestForAffirmationIncreaseNonceAndMaybeSendDataWithHashi(_receiver, _amount);
     }
 
     function _relayInterest(address _receiver, uint256 _amount) internal {
@@ -32,6 +32,6 @@ contract ERC20Bridge is BasicForeignBridge {
         require(_amount > 0, "Relayed zero tokens");
         require(withinLimit(_amount), "Relayed above limit");
         addTotalSpentPerDay(getCurrentDay(), _amount);
-        _emitUserRequestForAffirmationMaybeRelayDataWithHashiAndIncreaseNonce(_receiver, _amount);
+        _emitUserRequestForAffirmationIncreaseNonceAndMaybeSendDataWithHashi(_receiver, _amount);
     }
 }
diff --git a/contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol b/contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol
@@ -69,6 +69,6 @@ contract ForeignBridgeErcToNative is ERC20Bridge, OtherSideBridgeStorage {
         require(withinLimit(_amount), "Exceeds bridge daily limit");
         addTotalSpentPerDay(getCurrentDay(), _amount);
         erc20token().transferFrom(msg.sender, address(this), _amount);
-        _emitUserRequestForAffirmationMaybeRelayDataWithHashiAndIncreaseNonce(_receiver, _amount);
+        _emitUserRequestForAffirmationIncreaseNonceAndMaybeSendDataWithHashi(_receiver, _amount);
     }
 }