diff --git a/script/deployments/v1_deployment/10/Optimism-latest.json b/script/deployments/v1_deployment/10/Optimism-latest.json index e0b6da653..b4609c439 100644 --- a/script/deployments/v1_deployment/10/Optimism-latest.json +++ b/script/deployments/v1_deployment/10/Optimism-latest.json @@ -29,5 +29,6 @@ "DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60", "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d", "AsyncStateRegistry": "0x0000000000000000000000000000000000000000", - "ERC7540Form": "0x0000000000000000000000000000000000000000" + "ERC7540Form": "0x0000000000000000000000000000000000000000", + "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9" } \ No newline at end of file diff --git a/script/deployments/v1_deployment/137/Polygon-latest.json b/script/deployments/v1_deployment/137/Polygon-latest.json index e0b6da653..b4609c439 100644 --- a/script/deployments/v1_deployment/137/Polygon-latest.json +++ b/script/deployments/v1_deployment/137/Polygon-latest.json @@ -29,5 +29,6 @@ "DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60", "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d", "AsyncStateRegistry": "0x0000000000000000000000000000000000000000", - "ERC7540Form": "0x0000000000000000000000000000000000000000" + "ERC7540Form": "0x0000000000000000000000000000000000000000", + "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9" } \ No newline at end of file diff --git a/script/deployments/v1_deployment/42161/Arbitrum-latest.json b/script/deployments/v1_deployment/42161/Arbitrum-latest.json index e0b6da653..b4609c439 100644 --- a/script/deployments/v1_deployment/42161/Arbitrum-latest.json +++ b/script/deployments/v1_deployment/42161/Arbitrum-latest.json @@ -29,5 +29,6 @@ "DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60", "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d", "AsyncStateRegistry": "0x0000000000000000000000000000000000000000", - "ERC7540Form": "0x0000000000000000000000000000000000000000" + "ERC7540Form": "0x0000000000000000000000000000000000000000", + "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9" } \ No newline at end of file diff --git a/script/deployments/v1_deployment/43114/Avalanche-latest.json b/script/deployments/v1_deployment/43114/Avalanche-latest.json index e0b6da653..b4609c439 100644 --- a/script/deployments/v1_deployment/43114/Avalanche-latest.json +++ b/script/deployments/v1_deployment/43114/Avalanche-latest.json @@ -29,5 +29,6 @@ "DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60", "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d", "AsyncStateRegistry": "0x0000000000000000000000000000000000000000", - "ERC7540Form": "0x0000000000000000000000000000000000000000" + "ERC7540Form": "0x0000000000000000000000000000000000000000", + "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9" } \ No newline at end of file diff --git a/script/deployments/v1_deployment/56/Binance-latest.json b/script/deployments/v1_deployment/56/Binance-latest.json index e0b6da653..b4609c439 100644 --- a/script/deployments/v1_deployment/56/Binance-latest.json +++ b/script/deployments/v1_deployment/56/Binance-latest.json @@ -29,5 +29,6 @@ "DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60", "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d", "AsyncStateRegistry": "0x0000000000000000000000000000000000000000", - "ERC7540Form": "0x0000000000000000000000000000000000000000" + "ERC7540Form": "0x0000000000000000000000000000000000000000", + "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9" } \ No newline at end of file diff --git a/script/deployments/v1_deployment/59144/Linea-latest.json b/script/deployments/v1_deployment/59144/Linea-latest.json index 82ba5f674..04e6b263f 100644 --- a/script/deployments/v1_deployment/59144/Linea-latest.json +++ b/script/deployments/v1_deployment/59144/Linea-latest.json @@ -29,5 +29,6 @@ "WormholeARImplementation": "0x0000000000000000000000000000000000000000", "WormholeSRImplementation": "0x0000000000000000000000000000000000000000", "AsyncStateRegistry": "0x0000000000000000000000000000000000000000", - "ERC7540Form": "0x0000000000000000000000000000000000000000" + "ERC7540Form": "0x0000000000000000000000000000000000000000", + "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9" } \ No newline at end of file diff --git a/script/deployments/v1_deployment/81457/Blast-latest.json b/script/deployments/v1_deployment/81457/Blast-latest.json index b4975c3f5..e0675b096 100644 --- a/script/deployments/v1_deployment/81457/Blast-latest.json +++ b/script/deployments/v1_deployment/81457/Blast-latest.json @@ -29,5 +29,6 @@ "WormholeARImplementation": "0xbe296d633E91BD3E72f52732d80F7b28F18cDB54", "WormholeSRImplementation": "0x2827eFf89affacf9E80D671bca6DeCf7dbdcCaCa", "AsyncStateRegistry": "0x0000000000000000000000000000000000000000", - "ERC7540Form": "0x0000000000000000000000000000000000000000" + "ERC7540Form": "0x0000000000000000000000000000000000000000", + "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9" } \ No newline at end of file diff --git a/script/deployments/v1_deployment/8453/Base-latest.json b/script/deployments/v1_deployment/8453/Base-latest.json index 00a4c5c4b..82d6d24bf 100644 --- a/script/deployments/v1_deployment/8453/Base-latest.json +++ b/script/deployments/v1_deployment/8453/Base-latest.json @@ -29,5 +29,6 @@ "DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60", "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d", "AsyncStateRegistry": "0x0000000000000000000000000000000000000000", - "ERC7540Form": "0x0000000000000000000000000000000000000000" + "ERC7540Form": "0x0000000000000000000000000000000000000000", + "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9" } \ No newline at end of file diff --git a/script/forge-scripts/Abstract.Deploy.Single.s.sol b/script/forge-scripts/Abstract.Deploy.Single.s.sol index 8cae31102..7caad0871 100644 --- a/script/forge-scripts/Abstract.Deploy.Single.s.sol +++ b/script/forge-scripts/Abstract.Deploy.Single.s.sol @@ -363,7 +363,7 @@ abstract contract AbstractDeploySingle is BatchScript { uint64 public constant BLAST = 81_457; uint64 public constant BARTIO = 80_084; - uint256[] public manualNonces = [23, 22, 22, 22, 21, 21, 20, 9, 3, 2, 0]; + uint256[] public manualNonces = [23, 23, 23, 23, 22, 22, 21, 10, 4, 3, 0]; uint64[] public chainIds = [1, 56, 43_114, 137, 42_161, 10, 8453, 250, 59_144, 81_457, 80_084]; string[] public chainNames = [ "Ethereum", diff --git a/script/forge-scripts/misc/Abstract.Deploy.RouterPlus.s.sol b/script/forge-scripts/misc/Abstract.Deploy.RouterPlus.s.sol index 93f1edb43..b2c850ac6 100644 --- a/script/forge-scripts/misc/Abstract.Deploy.RouterPlus.s.sol +++ b/script/forge-scripts/misc/Abstract.Deploy.RouterPlus.s.sol @@ -165,4 +165,42 @@ abstract contract AbstractDeployRouterPlus is EnvironmentUtils { executeBatch(vars.chainId, PROTOCOL_ADMINS[trueIndex], manualNonces[trueIndex], true); } + + function _disableFTMCrossChain( + uint256 env, + uint256 i, + uint256 trueIndex, + Cycle cycle, + uint64[] memory finalDeployedChains + ) + internal + setEnvDeploy(cycle) + { + assert(salt.length > 0); + UpdateVars memory vars; + + vars.chainId = finalDeployedChains[i]; + + address superRegistry = _readContractsV1(env, chainNames[trueIndex], vars.chainId, "SuperRegistry"); + address expectedSr; + + if (env == 0) { + expectedSr = vars.chainId == 250 + ? 0x7feB31d18E43E2faeC718EEd2D7f34402c3e27b4 + : 0x17A332dC7B40aE701485023b219E9D6f493a2514; + } else { + expectedSr = vars.chainId == 250 + ? 0x7B8d68f90dAaC67C577936d3Ce451801864EF189 + : 0xB2C097ac459aFAc892ae5b35f6bd6a9Dd3071F47; + } + + assert(superRegistry == expectedSr); + + bytes memory txn = abi.encodeWithSelector( + SuperRegistry.setAddress.selector, keccak256("CORE_REGISTRY_PROCESSOR"), address(0), vars.chainId + ); + addToBatch(superRegistry, 0, txn); + + executeBatch(vars.chainId, PROTOCOL_ADMINS[trueIndex], manualNonces[trueIndex], true); + } } diff --git a/script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol b/script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol index 18af44436..c006d6057 100644 --- a/script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol +++ b/script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol @@ -2,6 +2,7 @@ pragma solidity ^0.8.23; import { AbstractDeployRouterPlus } from "./Abstract.Deploy.RouterPlus.s.sol"; +import { console } from "forge-std/console.sol"; contract MainnetDeployRouterPlus is AbstractDeployRouterPlus { function deployRouterPlusStaging(uint256 env, uint256 selectedChainIndex, uint256 useNewSalt) external { @@ -31,6 +32,8 @@ contract MainnetDeployRouterPlus is AbstractDeployRouterPlus { break; } } + + console.log("Deploying router plus on chain %s", chainIds[trueIndex]); if (env == 0) { _deployRouterPlus(env, selectedChainIndex, trueIndex, Cycle.Prod, TARGET_CHAINS); } @@ -51,4 +54,17 @@ contract MainnetDeployRouterPlus is AbstractDeployRouterPlus { _configureRouterPlusProd(env, selectedChainIndex, trueIndex, Cycle.Prod, TARGET_CHAINS); } } + + function disableFTMCrossChain(uint256 env, uint256 selectedChainIndex, uint256 useNewSalt) external { + _setEnvironment(env, useNewSalt == 1 ? true : false); + _preDeploymentSetup(); + uint256 trueIndex; + for (uint256 i = 0; i < chainIds.length; i++) { + if (TARGET_CHAINS[selectedChainIndex] == chainIds[i]) { + trueIndex = i; + break; + } + } + _disableFTMCrossChain(env, selectedChainIndex, trueIndex, Cycle.Prod, TARGET_CHAINS); + } } diff --git a/script/utils/misc/run_script_mainnet_routerplus.sh b/script/utils/misc/run_script_mainnet_routerplus.sh index 024da59c4..10c881c62 100644 --- a/script/utils/misc/run_script_mainnet_routerplus.sh +++ b/script/utils/misc/run_script_mainnet_routerplus.sh @@ -15,31 +15,68 @@ export BLAST_RPC_URL=$(op read op://5ylebqljbh3x6zomdxi3qd7tsa/BLAST_RPC_URL/cre # Run the script echo Deploying Router Plus on prod: ... -# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 0 0 --rpc-url $ETHEREUM_RPC_URL --slow --account default --broadcast --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy -# wait - -FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 0 0 --rpc-url $ETHEREUM_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 -wait +# # FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 0 0 --rpc-url $ETHEREUM_RPC_URL --slow --account default --broadcast --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy +# # wait -# echo Deploying Router Plus and Router Plus Async on staging: ... +# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 1 0 --rpc-url $BSC_RPC_URL --broadcast --slow --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy +# wait -# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlus(uint256,uint256,uint256)" 1 0 0 --rpc-url $BSC_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy +# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 2 0 --rpc-url $AVALANCHE_RPC_URL --broadcast --slow --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy # wait -# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlus(uint256,uint256,uint256)" 1 1 0 --rpc-url $ARBITRUM_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 +# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 3 0 --rpc-url $POLYGON_RPC_URL --broadcast --slow --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy # wait -# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlus(uint256,uint256,uint256)" 1 2 0 --rpc-url $OPTIMISM_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy +# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 4 0 --rpc-url $ARBITRUM_RPC_URL --broadcast --slow --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 # wait -# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlus(uint256,uint256,uint256)" 1 3 0 --rpc-url $BASE_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy +# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 5 0 --rpc-url $OPTIMISM_RPC_URL --broadcast --slow --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy # wait -# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlus(uint256,uint256,uint256)" 1 4 0 --rpc-url $FANTOM_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy +# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 6 0 --rpc-url $BASE_RPC_URL --broadcast --slow --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy # wait -# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlus(uint256,uint256,uint256)" 1 5 0 --rpc-url $LINEA_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy --with-gas-price 600000000 +# # FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 7 0 --rpc-url $FANTOM_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy +# # wait + +# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 8 0 --rpc-url $LINEA_RPC_URL --broadcast --slow --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy # wait -# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlus(uint256,uint256,uint256)" 1 6 0 --rpc-url $BLAST_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy +# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusProd(uint256,uint256,uint256)" 0 9 0 --rpc-url $BLAST_RPC_URL --broadcast --slow --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy # wait + +echo Configuring Router Plus on prod: ... + +# # //FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 0 0 --rpc-url $ETHEREUM_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +# # // wait + +FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 1 0 --rpc-url $BSC_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +wait + +FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 2 0 --rpc-url $AVALANCHE_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +wait + +FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 3 0 --rpc-url $POLYGON_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +wait + +FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 4 0 --rpc-url $ARBITRUM_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +wait + +FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 5 0 --rpc-url $OPTIMISM_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +wait + +FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 6 0 --rpc-url $BASE_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +wait + +# // FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 7 0 --rpc-url $FANTOM_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy +# // wait + +FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 8 0 --rpc-url $LINEA_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +wait + +FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProd(uint256,uint256,uint256)" 0 9 0 --rpc-url $BLAST_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +wait + +echo disable ftm cross chain +FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "disableFTMCrossChain(uint256,uint256,uint256)" 0 7 1 --rpc-url $FANTOM_RPC_URL --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349 +wait diff --git a/script/utils/verify_contracts.sh b/script/utils/verify_contracts.sh index a557e442d..73e17c785 100644 --- a/script/utils/verify_contracts.sh +++ b/script/utils/verify_contracts.sh @@ -117,6 +117,7 @@ file_name_blast=( "script/forge-scripts/misc/blast/forms/BlastERC5115Form.sol" "src/forms/wrappers/ERC5115To4626WrapperFactory.sol" "src/crosschain-data/adapters/layerzero/LayerzeroImplementation.sol" + "src/router-plus/SuperformRouterPlus.sol" # Add more file names here if needed ) @@ -251,6 +252,7 @@ contract_addresses_linea=( 0x35E3057FF29ebC5b8dEF18EC66FEde16f1B237F5 0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2 0xc100592b40eeb4CBC7524092A00400917421ab64 + 0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9 # Add more addresses here if needed ) @@ -284,6 +286,7 @@ contract_addresses_blast=( 0x5266958cb4b8E6A1534c6Ac19f4220909cf3F7FA 0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2 0xc100592b40eeb4CBC7524092A00400917421ab64 + 0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9 # Add more addresses here if needed ) @@ -317,6 +320,7 @@ constructor_args=( $super_constructor_arg $super_constructor_arg $super_constructor_arg + $super_constructor_arg ) constructor_args_ftm=( diff --git a/test/mainnet/SmokeTest.t.sol b/test/mainnet/SmokeTest.t.sol index 936651b93..cdcf0fb0a 100644 --- a/test/mainnet/SmokeTest.t.sol +++ b/test/mainnet/SmokeTest.t.sol @@ -111,7 +111,7 @@ contract SmokeTest is MainnetBaseSetup { sr = SuperRegistry(getContract(TARGET_DEPLOYMENT_CHAINS[i], "SuperRegistry")); for (uint256 j = 0; j < len; ++j) { - if (j == 10 && TARGET_DEPLOYMENT_CHAINS[i] != ETH) { + if ((j == 1 || j == 10) && TARGET_DEPLOYMENT_CHAINS[i] == FANTOM) { continue; } assertEq(sr.getAddress(ids[j]), newAddresses[j]);