Merge pull request #625 from superform-xyz/hotFixPaymentHelperFTM

fix: hotfix paymentHelper FTM

Author: 0xTimepunk

script/forge-scripts/EnvironmentUtils.s.sol

@@ -36,8 +36,8 @@ abstract contract EnvironmentUtils is AbstractDeploySingle {
             TARGET_CHAINS.push(OP);
             TARGET_CHAINS.push(BASE);
             TARGET_CHAINS.push(FANTOM);
-            TARGET_CHAINS.push(LINEA);
-            TARGET_CHAINS.push(BLAST);
+            //TARGET_CHAINS.push(LINEA);
+            //TARGET_CHAINS.push(BLAST);
 
             if (useNewSalt) {
                 salt = "SunNeverSetsOnSuperformRealmV2";

script/forge-scripts/misc/Abstract.ConfigureERC5115AndDisableAMBs.s.sol

@@ -263,6 +263,64 @@ abstract contract AbstractConfigure5115FormAndDisableAMB is EnvironmentUtils {
         vm.stopBroadcast();
     }
 
+    function _configurePaymentHelperViaPaymentAdminFantom(
+        uint256 env,
+        uint256 i,
+        uint256 trueIndex,
+        Cycle cycle,
+        uint64[] memory finalDeployedChains
+    )
+        internal
+    {
+        assert(salt.length > 0);
+        UpdateVars memory vars;
+
+        vars.chainId = finalDeployedChains[i];
+        cycle == Cycle.Dev ? vm.startBroadcast(deployerPrivateKey) : vm.startBroadcast();
+
+        uint256[] memory configTypes = new uint256[](12);
+        configTypes[0] = 1;
+        /// config type 2 skipped
+        configTypes[1] = 3;
+        configTypes[2] = 4;
+        configTypes[3] = 5;
+        configTypes[4] = 6;
+        configTypes[5] = 7;
+        configTypes[6] = 8;
+        configTypes[7] = 9;
+        configTypes[8] = 10;
+        configTypes[9] = 11;
+        configTypes[10] = 12;
+        configTypes[11] = 13;
+        vars.paymentHelper = PaymentHelper(_readContractsV1(env, chainNames[trueIndex], vars.chainId, "PaymentHelper"));
+
+        bytes[] memory configs = new bytes[](12);
+        for (uint256 j; j < TARGET_CHAINS.length; j++) {
+            vars.dstChainId = TARGET_CHAINS[j];
+            if (vars.chainId != vars.dstChainId) {
+                vars.dstTrueIndex = _getTrueIndex(vars.dstChainId);
+
+                /// @dev generate payment helper configs
+                configs[0] = abi.encode(PRICE_FEEDS[vars.chainId][vars.dstChainId]);
+                configs[1] = GAS_USED[vars.dstChainId][3];
+                configs[2] = GAS_USED[vars.dstChainId][4];
+                configs[3] = abi.encode(vars.dstChainId == ARBI ? 1_000_000 : 200_000);
+                configs[4] = GAS_USED[vars.dstChainId][6];
+                configs[5] = abi.encode(nativePrices[vars.dstTrueIndex]);
+                configs[6] = abi.encode(gasPrices[vars.dstTrueIndex]);
+                configs[7] = abi.encode(750);
+                configs[8] = abi.encode(2_000_000);
+                configs[9] = abi.encode(10_000);
+                configs[10] = abi.encode(10_000);
+                configs[11] = GAS_USED[vars.dstChainId][13];
+
+                vars.paymentHelper.batchUpdateRemoteChain(vars.dstChainId, configTypes, configs);
+            }
+        }
+
+        vm.stopBroadcast();
+    }
+
     function _configureProd(
         uint256 env,
         uint256 i,

script/forge-scripts/misc/Mainnet.ConfigureERC5115AndDisableAMBs.s.sol

@@ -85,6 +85,27 @@ contract MainnetConfigure5115FormAndDisableAMB is AbstractConfigure5115FormAndDi
         _configurePaymentHelperViaPaymentAdmin(env, selectedChainIndex, trueIndex, Cycle.Prod, TARGET_CHAINS);
     }
 
+    function configureProdPaymentHelperViaPaymentAdminFantom(
+        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;
+            }
+        }
+
+        _configurePaymentHelperViaPaymentAdminFantom(env, selectedChainIndex, trueIndex, Cycle.Prod, TARGET_CHAINS);
+    }
+
     function configure5115AndDisableAMB(uint256 env, uint256 selectedChainIndex, uint256 useNewSalt) external {
         _setEnvironment(env, useNewSalt == 1 ? true : false);
         _preDeploymentSetup();

script/utils/misc/run_script_mainnet_config5115AMB.sh

@@ -206,7 +206,6 @@ wait
 FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.ConfigureERC5115AndDisableAMBs.s.sol --sig "configureProdPayloadHelperv2( uint256,uint256, uint256)" 0 7 1 --rpc-url $FANTOM_RPC_URL --broadcast --slow --sender 0x1985df46791BEBb1e3ed9Ec60417F38CECc1D349
 wait
 comment
-
 echo Configuring payment helper via payment admin: ...
 
 export FIREBLOCKS_API_KEY=$(op read op://zry2qwhqux2w6qtjitg44xb7b4/V1_PAYMASTER_ACTION_KEY/credential)
@@ -215,6 +214,7 @@ export FOUNDRY_PROFILE=production
 export FIREBLOCKS_VAULT_ACCOUNT_IDS=13 #PaymentAdmin Staging
 export FIREBLOCKS_VAULT_ACCOUNT_IDS=5  #PaymentAdmin Prod
 
+<<comment
 export FIREBLOCKS_RPC_URL=$ETHEREUM_RPC_URL
 
 fireblocks-json-rpc --http -- forge script script/forge-scripts/misc/Mainnet.ConfigureERC5115AndDisableAMBs.s.sol --sig "configureProdPaymentHelperViaPaymentAdmin(uint256, uint256, uint256)" 0 0 0 \
@@ -263,3 +263,10 @@ fireblocks-json-rpc --http -- forge script script/forge-scripts/misc/Mainnet.Con
     --rpc-url {} --sender 0xD911673eAF0D3e15fe662D58De15511c5509bAbB --broadcast --unlocked --slow
 
 wait
+comment
+export FIREBLOCKS_RPC_URL=$FANTOM_RPC_URL
+
+fireblocks-json-rpc --http -- forge script script/forge-scripts/misc/Mainnet.ConfigureERC5115AndDisableAMBs.s.sol --sig "configureProdPaymentHelperViaPaymentAdminFantom(uint256, uint256, uint256)" 0 7 1 \
+    --rpc-url {} --sender 0xD911673eAF0D3e15fe662D58De15511c5509bAbB --broadcast --unlocked --slow
+
+wait

test/mainnet/SmokeTest.t.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.23;
 
 import "test/utils/MainnetBaseSetup.sol";
+import "forge-std/console.sol";
 
 contract SmokeTest is MainnetBaseSetup {
     function setUp() public override {
@@ -490,7 +491,7 @@ contract SmokeTest is MainnetBaseSetup {
 
         for (uint256 i; i < TARGET_DEPLOYMENT_CHAINS.length; ++i) {
             uint64 chainId = TARGET_DEPLOYMENT_CHAINS[i];
-
+            console.log("chainId", chainId);
             vm.selectFork(FORKS[chainId]);
             axelar = AxelarImplementation(getContract(chainId, "AxelarImplementation"));