Merge commit 'a1bd8866ad7156cf83202b993aee543f389558a7' into debug

catalystdao · Jun 17, 2024 · 3ee462e · 3ee462e
2 parents 697f1f8 + a1bd886
commit 3ee462e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/script/BaseMultiChainDeployer.s.sol b/script/BaseMultiChainDeployer.s.sol
@@ -21,12 +21,15 @@ contract BaseMultiChainDeployer is Script {
         Base,
         Blast,
         Optimism,
+        SEI,
+        XAI,
         // Testnets
         Sepolia,
         BaseSepolia,
         ArbitrumSepolia,
         OptimismSepolia,
-        BlastTestnet
+        BlastTestnet,
+        SEIDevnet
     }
 
     mapping(Chains => string) public chainKey;
@@ -49,6 +52,12 @@ contract BaseMultiChainDeployer is Script {
         chainKey[Chains.Optimism] = "optimism";
         chain_list.push(Chains.Optimism);
 
+        chainKey[Chains.SEI] = "sei";
+        chain_list.push(Chains.SEI);
+
+        chainKey[Chains.XAI] = "xai";
+        chain_list.push(Chains.XAI);
+
         chainKey[Chains.Sepolia] = "sepolia";
         chain_list_testnet.push(Chains.Sepolia);
 
@@ -64,6 +73,9 @@ contract BaseMultiChainDeployer is Script {
         chainKey[Chains.BlastTestnet] = "blasttestnet";
         chain_list_testnet.push(Chains.BlastTestnet);
 
+        chainKey[Chains.SEIDevnet] = "seidevnet";
+        chain_list_testnet.push(Chains.SEIDevnet);
+
         // ADD: To deploy Generalised Incentives to a new chain, add 2 lines above this comment:
         // chainKey[Chains.OptimismSepolia] = "optimismsepolia"; // What is the external key used to identify this chain? Please add it to .env.example for an RPC key.
         // chain_list.push(Chains.OptimismSepolia); // Is the chain legacy, please specify by pushing to the correct list?

diff --git a/script/bridge_contracts.json b/script/bridge_contracts.json
@@ -50,11 +50,15 @@
   "LayerZero": {
     "basesepolia": {
       "bridge": "0x6EDCE65403992e310A62460808c4b910D972f10f",
-      "escrow": "0xDb93559e30F5A3845438DDcf7Ca8A2D6D9005d30"
+      "escrow": "0xbA6f62a6539e4Bc11d2A8B1C760b5a1097c6cF6B"
     },
     "optimismsepolia": {
       "bridge": "0x6EDCE65403992e310A62460808c4b910D972f10f",
-      "escrow": "0xDb93559e30F5A3845438DDcf7Ca8A2D6D9005d30"
+      "escrow": "0xbA6f62a6539e4Bc11d2A8B1C760b5a1097c6cF6B"
+    },
+    "seidevnet": {
+      "bridge": "0x6EDCE65403992e310A62460808c4b910D972f10f",
+      "escrow": "0xbA6f62a6539e4Bc11d2A8B1C760b5a1097c6cF6B"
     }
   }
 }
diff --git a/src/interfaces/IIncentivizedMessageEscrow.sol b/src/interfaces/IIncentivizedMessageEscrow.sol
@@ -29,14 +29,13 @@ interface IIncentivizedMessageEscrow is IMessageEscrowStructs, IMessageEscrowErr
     function processPacket(bytes calldata messagingProtocolContext, bytes calldata message, bytes32 feeRecipient) payable external;
 
     function setRemoteImplementation(bytes32 chainIdentifier, bytes calldata implementation) external;
-    
+
     /**
      * @notice Estimates the additional cost to the messaging router to validate the message
-     * @param destinationChainIdentifier Destination chain. Some messaging protocols have chain based costs.
      * @return asset The asset the token is in. If native token, returns address(0);
      * @return amount The number of assets to pay.
      */
-    function estimateAdditionalCost(bytes32 destinationChainIdentifier) external view returns(address asset, uint256 amount);
+    function estimateAdditionalCost() external view returns(address asset, uint256 amount);
 
     function timeoutMessage(
         bytes32 sourceIdentifier,