fix: all paths tested

bgd-labs · Mar 8, 2024 · de9d673 · de9d673
1 parent 8554083
commit de9d673
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -17,8 +17,8 @@ BASE_KEY = --private-key ${PRIVATE_KEY}
 
 
 
-custom_ethereum := --with-gas-price 45000000000 # 53 gwei
-custom_polygon :=  --with-gas-price 260000000000 # 560 gwei
+custom_ethereum := --with-gas-price 55000000000 # 53 gwei
+custom_polygon :=  --with-gas-price 130000000000 # 560 gwei
 custom_avalanche := --with-gas-price 27000000000 # 27 gwei
 custom_metis-testnet := --legacy --verifier-url https://goerli.explorer.metisdevops.link/api/
 custom_metis := --verifier-url  https://api.routescan.io/v2/network/mainnet/evm/1088/etherscan
@@ -241,10 +241,10 @@ remove-bridge-adapters:
 	$(call deploy_fn,helpers/RemoveBridgeAdapters,ethereum)
 
 send-direct-message:
-	$(call deploy_fn,helpers/Send_Direct_CCMessage,ethereum)
+	$(call deploy_fn,helpers/Send_Direct_CCMessage,avalanche)
 
 deploy_mock_destination:
-	$(call deploy_fn,helpers/Deploy_Mock_destination,polygon)
+	$(call deploy_fn,helpers/Deploy_Mock_destination,ethereum)
 
 set-approved-ccf-senders:
 	$(call deploy_fn,helpers/Set_Approved_Senders,ethereum)

diff --git a/deployments/cc/mainnet/pre_prod_eth.json b/deployments/cc/mainnet/pre_prod_eth.json
@@ -13,7 +13,7 @@
   "hlAdapter": "0x834607F5d65451918a8fDD5D22d6eF97f84917ef",
   "lzAdapter": "0xE35B90E1B1eF522dC40a5829c59e3d2d291a9360",
   "metisAdapter": "0x92bce04e8B33c7098AA0bEc7663cA8Eb0930f6a4",
-  "mockDestination": "0x0000000000000000000000000000000000000000",
+  "mockDestination": "0x5eB700Fd6aE49fc9890349E4d90737C1420e7E4f",
   "opAdapter": "0x091A76a70D9E9Ef3eae895D3b72DCD587ae1A460",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x35F0e8e1f349cCA85D0F4A195112De26A57974D6",

diff --git a/scripts/helpers/RemoveBridgeAdapters.s.sol b/scripts/helpers/RemoveBridgeAdapters.s.sol
@@ -28,6 +28,42 @@ abstract contract BaseRemoveBridgeAdapters is BaseScript {
   }
 }
 
+contract Scroll is BaseRemoveBridgeAdapters {
+  function TRANSACTION_NETWORK() public pure override returns (uint256) {
+    return ChainIds.ETHEREUM;
+  }
+
+  function getBridgeAdaptersToDisable()
+    public
+    pure
+    override
+    returns (ICrossChainForwarder.BridgeAdapterToDisable[] memory)
+  {
+    uint256[] memory chainIds = new uint256[](1);
+    chainIds[0] = ChainIds.CELO;
+
+    ICrossChainForwarder.BridgeAdapterToDisable[]
+      memory bridgeAdapters = new ICrossChainForwarder.BridgeAdapterToDisable[](1);
+    bridgeAdapters[0] = ICrossChainForwarder.BridgeAdapterToDisable({
+      bridgeAdapter: 0xFf8C72bE9bE0Fe889e04BBFdA7D83f78dE7A5E64,
+      chainIds: chainIds
+    });
+    return bridgeAdapters;
+  }
+
+  function getReceiverBridgeAdaptersToDisallow()
+    public
+    pure
+    override
+    returns (ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[] memory)
+  {
+    ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[]
+      memory bridgeAdapters = new ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[](0);
+
+    return bridgeAdapters;
+  }
+}
+
 contract Ethereum is BaseRemoveBridgeAdapters {
   function TRANSACTION_NETWORK() public pure override returns (uint256) {
     return ChainIds.ETHEREUM;

diff --git a/scripts/helpers/Send_Direct_CCMessage.s.sol b/scripts/helpers/Send_Direct_CCMessage.s.sol
@@ -37,7 +37,7 @@ contract Ethereum is BaseSendDirectMessage {
   }
 
   function DESTINATION_NETWORK() public pure override returns (uint256) {
-    return ChainIds.POLYGON_ZK_EVM;
+    return ChainIds.METIS;
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ contract Ethereum is BaseSendDirectMessage { @@
       }
       function DESTINATION_NETWORK() public pure override returns (uint256) {
-        return ChainIds.POLYGON_ZK_EVM;
+        return ChainIds.METIS;
       }
     }
@@ Expand Down @@