Merge pull request #6 from crosschain-alliance/feat/hashi-integration…

…-xdai-bridge-resend-hashi-message feat: add possibility to resend an hashi message [xDAI]
crosschain-alliance · Jun 20, 2024 · e796b47 · e796b47
2 parents 3724780 + cb741dd
commit e796b47
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/contracts/upgradeable_contracts/BasicBridge.sol b/contracts/upgradeable_contracts/BasicBridge.sol
@@ -1,5 +1,4 @@
 pragma solidity 0.4.24;
-
 import "./Upgradeable.sol";
 import "./InitializableBridge.sol";
 import "openzeppelin-solidity/contracts/AddressUtils.sol";
@@ -80,20 +79,30 @@ contract BasicBridge is
         boolStorage[keccak256(abi.encodePacked("messagesApprovedByHashi", msgId))] = status;
     }
 
-    function _maybeRelayDataWithHashi(bytes data) internal {
+    function resendDataWithHashi(bytes data) external {
+        require(boolStorage[keccak256(data)]);
+        _dispatchMessageWithHashi(data);
+    }
+
+    function _maybeSendDataWithHashi(bytes data) internal {
         if (HASHI_IS_ENABLED) {
-            IHashiManager manager = hashiManager();
-            IYaho(manager.yaho()).dispatchMessage(
-                manager.targetChainId(),
-                manager.threshold(),
-                manager.targetAddress(),
-                data,
-                manager.reporters(),
-                manager.adapters()
-            );
+            boolStorage[keccak256(data)] = true;
+            _dispatchMessageWithHashi(data);
         }
     }
 
+    function _dispatchMessageWithHashi(bytes data) internal {
+        IHashiManager manager = hashiManager();
+        IYaho(manager.yaho()).dispatchMessage(
+            manager.targetChainId(),
+            manager.threshold(),
+            manager.targetAddress(),
+            data,
+            manager.reporters(),
+            manager.adapters()
+        );
+    }
+
     function _validateHashiMessage(uint256 chainId, uint256 threshold, address sender, address[] adapters) internal {
         IHashiManager manager = hashiManager();
         require(

diff --git a/contracts/upgradeable_contracts/BasicForeignBridge.sol b/contracts/upgradeable_contracts/BasicForeignBridge.sol
@@ -52,6 +52,7 @@ contract BasicForeignBridge is EternalStorage, Validatable, BasicBridge, BasicTo
     ) external returns (bytes) {
         _validateHashiMessage(chainId, threshold, sender, adapters);
         bytes32 msgId = keccak256(data);
+        require(!isApprovedByHashi(msgId));
         _setHashiApprovalForMessage(msgId, true);
     }
 
@@ -61,7 +62,7 @@ contract BasicForeignBridge is EternalStorage, Validatable, BasicBridge, BasicTo
         uint256 currentNonce = nonce();
         setNonce(currentNonce + 1);
         emit UserRequestForAffirmation(_receiver, _amount, bytes32(currentNonce));
-        _maybeRelayDataWithHashi(abi.encodePacked(_receiver, _amount, bytes32(currentNonce)));
+        _maybeSendDataWithHashi(abi.encodePacked(_receiver, _amount, bytes32(currentNonce)));
     }
 
     /**

diff --git a/contracts/upgradeable_contracts/BasicHomeBridge.sol b/contracts/upgradeable_contracts/BasicHomeBridge.sol
@@ -76,6 +76,7 @@ contract BasicHomeBridge is EternalStorage, Validatable, BasicBridge, BasicToken
     ) external returns (bytes) {
         _validateHashiMessage(chainId, threshold, sender, adapters);
         bytes32 msgId = keccak256(data);
+        require(!isApprovedByHashi(msgId));
         _setHashiApprovalForMessage(msgId, true);
     }
 
@@ -121,7 +122,7 @@ contract BasicHomeBridge is EternalStorage, Validatable, BasicBridge, BasicToken
         uint256 currentNonce = nonce();
         setNonce(currentNonce + 1);
         emit UserRequestForSignature(_receiver, _amount, bytes32(currentNonce));
-        _maybeRelayDataWithHashi(abi.encodePacked(_receiver, _amount, bytes32(currentNonce)));
+        _maybeSendDataWithHashi(abi.encodePacked(_receiver, _amount, bytes32(currentNonce)));
     }
 
     function setMessagesSigned(bytes32 _hash, bool _status) internal {