Merge pull request #650 from superform-xyz/deployRouterPlusStaging

0xTimepunk · web-flow · commit 616c993b267f · 2024-11-04T09:56:53.000Z
feat: deploy router plus staging
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": "0x12DCd933886D2Dd2436DDF3E52506872f90f2793",
-  "SuperformRouterPlusAsync": "0xE3b345E14d063ec58f2A196fa2554a325464F65E"
+  "SuperformRouterPlus": "0x82D3EF5e1005559fc6D577a730Bb201De1F7Cc6d",
+  "SuperformRouterPlusAsync": "0x47aa92F7bb7c018046079BDaA94E5618cbCe151f"
 }
diff --git a/script/deployments/v1_staging_deployment/250/Fantom-latest.json b/script/deployments/v1_staging_deployment/250/Fantom-latest.json
@@ -30,6 +30,6 @@
   "ERC5115Form": "0x6aA92De361938B0A062E74e068a2028778F17852",
   "OneInchValidator": "0x16e9f8549c2b6a026dc2706d746beA76CeFF4098",
   "ERC5115To4626WrapperFactory": "0x0df3d7D6daE058667e49C6b85F7b92458Ab06836",
-  "SuperformRouterPlus": "0x08a3D4F3113D449Bdea59C95cb5F7093175EaFfe",
-  "SuperformRouterPlusAsync": "0x43C3540828510C0f9A9BEf96F3ac810d7640FEC7"
+  "SuperformRouterPlus": "0x5223a22BB4EecE74ac4f258cf0a4977eaEB0166A",
+  "SuperformRouterPlusAsync": "0x4A4a0042e485CBE61ac4BC495Fab5Ca516040e18"
 }
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": "0x12DCd933886D2Dd2436DDF3E52506872f90f2793",
-  "SuperformRouterPlusAsync": "0xE3b345E14d063ec58f2A196fa2554a325464F65E"
+  "SuperformRouterPlus": "0x82D3EF5e1005559fc6D577a730Bb201De1F7Cc6d",
+  "SuperformRouterPlusAsync": "0x47aa92F7bb7c018046079BDaA94E5618cbCe151f"
 }
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": "0x12DCd933886D2Dd2436DDF3E52506872f90f2793",
-  "SuperformRouterPlusAsync": "0xE3b345E14d063ec58f2A196fa2554a325464F65E"
+  "SuperformRouterPlus": "0x82D3EF5e1005559fc6D577a730Bb201De1F7Cc6d",
+  "SuperformRouterPlusAsync": "0x47aa92F7bb7c018046079BDaA94E5618cbCe151f"
 }
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": "0x12DCd933886D2Dd2436DDF3E52506872f90f2793",
-  "SuperformRouterPlusAsync": "0xE3b345E14d063ec58f2A196fa2554a325464F65E"
+  "SuperformRouterPlus": "0x82D3EF5e1005559fc6D577a730Bb201De1F7Cc6d",
+  "SuperformRouterPlusAsync": "0x47aa92F7bb7c018046079BDaA94E5618cbCe151f"
 }
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": "0x12DCd933886D2Dd2436DDF3E52506872f90f2793",
-  "SuperformRouterPlusAsync": "0xE3b345E14d063ec58f2A196fa2554a325464F65E"
+  "SuperformRouterPlus": "0x82D3EF5e1005559fc6D577a730Bb201De1F7Cc6d",
+  "SuperformRouterPlusAsync": "0x47aa92F7bb7c018046079BDaA94E5618cbCe151f"
 }
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": "0x12DCd933886D2Dd2436DDF3E52506872f90f2793",
-  "SuperformRouterPlusAsync": "0xE3b345E14d063ec58f2A196fa2554a325464F65E"
+  "SuperformRouterPlus": "0x82D3EF5e1005559fc6D577a730Bb201De1F7Cc6d",
+  "SuperformRouterPlusAsync": "0x47aa92F7bb7c018046079BDaA94E5618cbCe151f"
 }
diff --git a/script/forge-scripts/misc/Abstract.Deploy.RouterPlus.s.sol b/script/forge-scripts/misc/Abstract.Deploy.RouterPlus.s.sol
@@ -55,6 +55,9 @@ abstract contract AbstractDeployRouterPlus is EnvironmentUtils {
         SuperRegistry(superRegistry).setAddress(
             keccak256("SUPERFORM_ROUTER_PLUS_ASYNC"), superformRouterPlusAsync, vars.chainId
         );
+
+        /// @dev below part is already done
+        /*
         SuperRegistry(superRegistry).setAddress(
             keccak256("ROUTER_PLUS_PROCESSOR_ROLE"), ROUTER_PLUS_PROCESSOR, vars.chainId
         );
@@ -63,6 +66,7 @@ abstract contract AbstractDeployRouterPlus is EnvironmentUtils {
 
         vars.superRBACC.setRoleAdmin(keccak256("ROUTER_PLUS_PROCESSOR_ROLE"), vars.superRBACC.PROTOCOL_ADMIN_ROLE());
         vars.superRBACC.grantRole(keccak256("ROUTER_PLUS_PROCESSOR_ROLE"), ROUTER_PLUS_PROCESSOR);
+        */
 
         vm.stopBroadcast();
 
diff --git a/script/utils/misc/run_script_mainnet_staging_routerplus.sh b/script/utils/misc/run_script_mainnet_staging_routerplus.sh
@@ -14,6 +14,7 @@ export BLAST_RPC_URL=$(op read op://5ylebqljbh3x6zomdxi3qd7tsa/BLAST_RPC_URL/cre
 
 # Run the script
 echo Deploying Router Plus and Router Plus Async: ...
+<<c
 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
 wait
 
@@ -31,10 +32,10 @@ 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
 wait
-
+c
 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
 wait
-
+<<c
 FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProcessor(uint256,uint256,uint256)" 1 0 0 --rpc-url $BSC_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92
 wait
 
@@ -55,3 +56,4 @@ wait
 
 FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.SuperformRouterPlus.s.sol:MainnetDeployRouterPlus --sig "configureRouterPlusProcessor(uint256,uint256,uint256)" 1 6 0 --rpc-url $BLAST_RPC_URL --slow --broadcast --account default --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92
 wait
+c

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@`
`30`	`30`	`"ERC5115Form": "0x93f5fD75460aC5F0686eBfE22e556F1129F504B0",`
`31`	`31`	`"OneInchValidator": "0x480140a26c3eb10F0F17e56495CE588320f45Cfe",`
`32`	`32`	`"ERC5115To4626WrapperFactory": "0x14Bc2728DaE89FE7c828833a186DdC5E9AE439C3",`
`33`		`- "SuperformRouterPlus": "0x12DCd933886D2Dd2436DDF3E52506872f90f2793",`
`34`		`- "SuperformRouterPlusAsync": "0xE3b345E14d063ec58f2A196fa2554a325464F65E"`
	`33`	`+ "SuperformRouterPlus": "0x82D3EF5e1005559fc6D577a730Bb201De1F7Cc6d",`
	`34`	`+ "SuperformRouterPlusAsync": "0x47aa92F7bb7c018046079BDaA94E5618cbCe151f"`
`35`	`35`	`}`