Merge pull request #671 from superform-xyz/feat/fixRouterPlusIssue

TamaraRingas · web-flow · commit cd30d0964be7 · 2025-02-03T09:53:07.000+02:00
fix: routerplus issue SUP-10435
diff --git a/Makefile b/Makefile
@@ -121,7 +121,7 @@ build-sizes: ## Builds the project and shows sizes
 
 .PHONY: test-vvv
 test-vvv: ## Runs tests with verbose output
-	forge test --match-test test_superRegistryAddresses --evm-version cancun -vv
+	forge test --match-test test_rebalanceFromSinglePosition_toOneVault_hack --evm-version cancun -vvv
 
 .PHONY: ftest
 ftest: ## Runs tests with cancun evm version
diff --git a/script/deployments/v1_deployment/1/Ethereum-latest.json b/script/deployments/v1_deployment/1/Ethereum-latest.json
@@ -30,5 +30,5 @@
   "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
   "AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
   "ERC7540Form": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"
+  "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"
 }
diff --git a/script/deployments/v1_deployment/10/Optimism-latest.json b/script/deployments/v1_deployment/10/Optimism-latest.json
@@ -30,5 +30,5 @@
   "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
   "AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
   "ERC7540Form": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"
+  "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"
 }
diff --git a/script/deployments/v1_deployment/137/Polygon-latest.json b/script/deployments/v1_deployment/137/Polygon-latest.json
@@ -30,5 +30,5 @@
   "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
   "AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
   "ERC7540Form": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"
+  "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"
 }
diff --git a/script/deployments/v1_deployment/42161/Arbitrum-latest.json b/script/deployments/v1_deployment/42161/Arbitrum-latest.json
@@ -30,5 +30,5 @@
   "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
   "AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
   "ERC7540Form": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"
+  "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"
 }
diff --git a/script/deployments/v1_deployment/43114/Avalanche-latest.json b/script/deployments/v1_deployment/43114/Avalanche-latest.json
@@ -30,5 +30,5 @@
   "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
   "AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
   "ERC7540Form": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"
+  "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"
 }
diff --git a/script/deployments/v1_deployment/56/Binance-latest.json b/script/deployments/v1_deployment/56/Binance-latest.json
@@ -30,5 +30,5 @@
   "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
   "AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
   "ERC7540Form": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"
+  "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"
 }
diff --git a/script/deployments/v1_deployment/59144/Linea-latest.json b/script/deployments/v1_deployment/59144/Linea-latest.json
@@ -30,5 +30,5 @@
   "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
   "AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
   "ERC7540Form": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"
+  "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"
 }
diff --git a/script/deployments/v1_deployment/81457/Blast-latest.json b/script/deployments/v1_deployment/81457/Blast-latest.json
@@ -30,5 +30,5 @@
   "WormholeSRImplementation": "0x2827eFf89affacf9E80D671bca6DeCf7dbdcCaCa",
   "AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
   "ERC7540Form": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"
+  "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"
 }
diff --git a/script/deployments/v1_deployment/8453/Base-latest.json b/script/deployments/v1_deployment/8453/Base-latest.json
@@ -30,5 +30,5 @@
   "DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
   "AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
   "ERC7540Form": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"
+  "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"
 }
diff --git a/script/deployments/v1_staging_deployment/10/Optimism-latest.json b/script/deployments/v1_staging_deployment/10/Optimism-latest.json
@@ -30,6 +30,6 @@
   "ERC5115Form": "0x93f5fD75460aC5F0686eBfE22e556F1129F504B0",
   "OneInchValidator": "0x480140a26c3eb10F0F17e56495CE588320f45Cfe",
   "ERC5115To4626WrapperFactory": "0x14Bc2728DaE89FE7c828833a186DdC5E9AE439C3",
-  "SuperformRouterPlus": "0xA4bf3ab533Bd9dd0cC8C71D273B748E968065249",
+  "SuperformRouterPlus": "0x57bf790F609e35e7C30F35fe53A886A657f8C7d1",
   "SuperformRouterPlusAsync": "0xbc1300e95393cF481b7c2d29d85B54689ef04fc8"
 }
diff --git a/script/deployments/v1_staging_deployment/42161/Arbitrum-latest.json b/script/deployments/v1_staging_deployment/42161/Arbitrum-latest.json
@@ -30,6 +30,6 @@
   "ERC5115Form": "0x93f5fD75460aC5F0686eBfE22e556F1129F504B0",
   "OneInchValidator": "0x480140a26c3eb10F0F17e56495CE588320f45Cfe",
   "ERC5115To4626WrapperFactory": "0x14Bc2728DaE89FE7c828833a186DdC5E9AE439C3",
-  "SuperformRouterPlus": "0xA4bf3ab533Bd9dd0cC8C71D273B748E968065249",
+  "SuperformRouterPlus": "0x57bf790F609e35e7C30F35fe53A886A657f8C7d1",
   "SuperformRouterPlusAsync": "0xbc1300e95393cF481b7c2d29d85B54689ef04fc8"
 }
diff --git a/script/deployments/v1_staging_deployment/56/Binance-latest.json b/script/deployments/v1_staging_deployment/56/Binance-latest.json
@@ -30,6 +30,6 @@
   "ERC5115Form": "0x93f5fD75460aC5F0686eBfE22e556F1129F504B0",
   "OneInchValidator": "0x480140a26c3eb10F0F17e56495CE588320f45Cfe",
   "ERC5115To4626WrapperFactory": "0x14Bc2728DaE89FE7c828833a186DdC5E9AE439C3",
-  "SuperformRouterPlus": "0xA4bf3ab533Bd9dd0cC8C71D273B748E968065249",
+  "SuperformRouterPlus": "0x57bf790F609e35e7C30F35fe53A886A657f8C7d1",
   "SuperformRouterPlusAsync": "0xbc1300e95393cF481b7c2d29d85B54689ef04fc8"
 }
diff --git a/script/deployments/v1_staging_deployment/59144/Linea-latest.json b/script/deployments/v1_staging_deployment/59144/Linea-latest.json
@@ -30,6 +30,6 @@
   "VaultClaimer": "0xf1930eD240cF9c4F1840aDB689E5d231687922C5",
   "WormholeARImplementation": "0x0000000000000000000000000000000000000000",
   "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
-  "SuperformRouterPlus": "0xA4bf3ab533Bd9dd0cC8C71D273B748E968065249",
+  "SuperformRouterPlus": "0x57bf790F609e35e7C30F35fe53A886A657f8C7d1",
   "SuperformRouterPlusAsync": "0xbc1300e95393cF481b7c2d29d85B54689ef04fc8"
 }
diff --git a/script/deployments/v1_staging_deployment/81457/Blast-latest.json b/script/deployments/v1_staging_deployment/81457/Blast-latest.json
@@ -30,6 +30,6 @@
   "VaultClaimer": "0xf1930eD240cF9c4F1840aDB689E5d231687922C5",
   "WormholeARImplementation": "0x71ec658F19AcF74D258c55A025ADC534c34EcaDA",
   "WormholeSRImplementation": "0x44b451Ca87267a62A0C853ECFbaaC1C3E528a82C",
-  "SuperformRouterPlus": "0xA4bf3ab533Bd9dd0cC8C71D273B748E968065249",
+  "SuperformRouterPlus": "0x57bf790F609e35e7C30F35fe53A886A657f8C7d1",
   "SuperformRouterPlusAsync": "0xbc1300e95393cF481b7c2d29d85B54689ef04fc8"
 }
diff --git a/script/deployments/v1_staging_deployment/8453/Base-latest.json b/script/deployments/v1_staging_deployment/8453/Base-latest.json
@@ -30,6 +30,6 @@
   "ERC5115Form": "0x93f5fD75460aC5F0686eBfE22e556F1129F504B0",
   "OneInchValidator": "0x480140a26c3eb10F0F17e56495CE588320f45Cfe",
   "ERC5115To4626WrapperFactory": "0x14Bc2728DaE89FE7c828833a186DdC5E9AE439C3",
-  "SuperformRouterPlus": "0xA4bf3ab533Bd9dd0cC8C71D273B748E968065249",
+  "SuperformRouterPlus": "0x57bf790F609e35e7C30F35fe53A886A657f8C7d1",
   "SuperformRouterPlusAsync": "0xbc1300e95393cF481b7c2d29d85B54689ef04fc8"
 }
diff --git 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, 23, 23, 23, 22, 22, 21, 10, 4, 3, 0];
+    uint256[] public manualNonces = [24, 24, 24, 24, 23, 23, 22, 10, 6, 5, 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
@@ -49,12 +49,12 @@ abstract contract AbstractDeployRouterPlus is EnvironmentUtils {
 
         SuperRegistry(superRegistry).setAddress(keccak256("SUPERFORM_ROUTER_PLUS"), superformRouterPlus, vars.chainId);
 
-        address superformRouterPlusAsync = address(new SuperformRouterPlusAsync{ salt: salt }(superRegistry));
-        contracts[vars.chainId][bytes32(bytes("SuperformRouterPlusAsync"))] = superformRouterPlusAsync;
+        // address superformRouterPlusAsync = address(new SuperformRouterPlusAsync{ salt: salt }(superRegistry));
+        // contracts[vars.chainId][bytes32(bytes("SuperformRouterPlusAsync"))] = superformRouterPlusAsync;
 
-        SuperRegistry(superRegistry).setAddress(
-            keccak256("SUPERFORM_ROUTER_PLUS_ASYNC"), superformRouterPlusAsync, vars.chainId
-        );
+        // SuperRegistry(superRegistry).setAddress(
+        //     keccak256("SUPERFORM_ROUTER_PLUS_ASYNC"), superformRouterPlusAsync, vars.chainId
+        // );
 
         vm.stopBroadcast();
 
diff --git a/script/utils/misc/run_script_mainnet_routerplus.sh b/script/utils/misc/run_script_mainnet_routerplus.sh
@@ -12,43 +12,62 @@ export FANTOM_RPC_URL=$(op read op://5ylebqljbh3x6zomdxi3qd7tsa/FANTOM_RPC_URL/c
 export LINEA_RPC_URL=$(op read op://5ylebqljbh3x6zomdxi3qd7tsa/LINEA_RPC_URL/credential)
 export BLAST_RPC_URL=$(op read op://5ylebqljbh3x6zomdxi3qd7tsa/BLAST_RPC_URL/credential)
 
-# 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
+# echo Deploying Router Plus on staging: ...
+
+# FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "deployRouterPlusStaging(uint256,uint256,uint256)" 1 0 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 "deployRouterPlusStaging(uint256,uint256,uint256)" 1 1 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 "deployRouterPlusStaging(uint256,uint256,uint256)" 1 2 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 "deployRouterPlusStaging(uint256,uint256,uint256)" 1 3 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 "deployRouterPlusStaging(uint256,uint256,uint256)" 1 5 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 "deployRouterPlusStaging(uint256,uint256,uint256)" 1 6 0 --rpc-url $BLAST_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 "deployRouterPlusProd(uint256,uint256,uint256)" 0 1 0 --rpc-url $BSC_RPC_URL --broadcast --slow --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92  --legacy
+# 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 --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 2 0 --rpc-url $AVALANCHE_RPC_URL --broadcast --slow --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 1 0 --rpc-url $BSC_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 3 0 --rpc-url $POLYGON_RPC_URL --broadcast --slow --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 --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 4 0 --rpc-url $ARBITRUM_RPC_URL --broadcast --slow --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 --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 5 0 --rpc-url $OPTIMISM_RPC_URL --broadcast --slow --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  --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92
 # wait
 
-# 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
+# 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 --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 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 6 0 --rpc-url $BASE_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
+# 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 --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 9 0 --rpc-url $BLAST_RPC_URL --broadcast --slow --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 --slow --broadcast --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 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
@@ -68,15 +87,8 @@ 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
+wait
diff --git a/script/utils/verify_contracts.sh b/script/utils/verify_contracts.sh
@@ -185,7 +185,7 @@ contract_addresses=(
     0x35E3057FF29ebC5b8dEF18EC66FEde16f1B237F5
     0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2
     0xc100592b40eeb4CBC7524092A00400917421ab64
-    0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9
+    0xC417496D46eD390514cEABE2297ec6d65Df214a4
     # Add more addresses here if needed
 )
 
@@ -252,7 +252,7 @@ contract_addresses_linea=(
     0x35E3057FF29ebC5b8dEF18EC66FEde16f1B237F5
     0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2
     0xc100592b40eeb4CBC7524092A00400917421ab64
-    0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9
+    0xC417496D46eD390514cEABE2297ec6d65Df214a4
     # Add more addresses here if needed
 )
 
@@ -286,7 +286,7 @@ contract_addresses_blast=(
     0x5266958cb4b8E6A1534c6Ac19f4220909cf3F7FA
     0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2
     0xc100592b40eeb4CBC7524092A00400917421ab64
-    0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9
+    0xC417496D46eD390514cEABE2297ec6d65Df214a4
     # Add more addresses here if needed
 )
 
diff --git a/script/utils/verify_contracts_staging.sh b/script/utils/verify_contracts_staging.sh
diff --git a/script/utils/verify_safe_txs/verify_all_networks.sh b/script/utils/verify_safe_txs/verify_all_networks.sh
diff --git a/script/utils/verify_safe_txs/verify_network.sh b/script/utils/verify_safe_txs/verify_network.sh
diff --git a/src/router-plus/SuperformRouterPlus.sol b/src/router-plus/SuperformRouterPlus.sol
diff --git a/test/unit/router-plus/SuperformRouterPlus.t.sol b/test/unit/router-plus/SuperformRouterPlus.t.sol

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@`
`30`	`30`	`"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",`
`31`	`31`	`"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",`
`32`	`32`	`"ERC7540Form": "0x0000000000000000000000000000000000000000",`
`33`		`- "SuperformRouterPlus": "0x4393C2a521ef115cd32C1d45897E7ce33aDa7aa9"`
	`33`	`+ "SuperformRouterPlus": "0xC417496D46eD390514cEABE2297ec6d65Df214a4"`
`34`	`34`	`}`