fix: smoke tests

Author: 0xTimepunk

.github/workflows/CI.yml

@@ -56,6 +56,11 @@ jobs:
       - name: "Install Foundry"
         uses: "foundry-rs/foundry-toolchain@v1"
 
+
+      - name: "Show the Foundry version"
+        run: "forge --version"
+
+
       - name: "Show the Foundry config"
         run: "forge config"
 
@@ -171,7 +176,7 @@ jobs:
         run: "make coverage"
 
       - name: "Upload coverage report to Codecov"
-        uses: "codecov/codecov-action@v4"
+        uses: "codecov/codecov-action@v5"
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

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_rewardsDistributor --evm-version cancun -vvv
+	forge test --match-test test_lzConfig --evm-version cancun -vvv
 
 .PHONY: ftest
 ftest: ## Runs tests with cancun evm version
@@ -141,7 +141,7 @@ coverage-t:	## Runs coverage for a specific contract
 
 .PHONY: smoke-test
 smoke-test: ## Runs smoke tests
-	forge test --match-test test_deBridgeValidators -vvv
+	forge test --match-contract SmokeTest -vvv
 
 .PHONY: invariant
 invariant: ## Runs invariant tests

lib/pigeon

@@ -438,9 +438,9 @@ abstract contract AbstractDeploySingle is BatchScript {
         0xe6ca8aC2D27A1bAd2Ab6b136Eab87488c3c98Fd1,
         /// @dev FANTOM https://safe.fantom.network/home?safe=ftm:0xe6ca8aC2D27A1bAd2Ab6b136Eab87488c3c98Fd1
         0x62Bbfe3ef3faAb7045d29bC388E5A0c5033D8b77,
-        /// @dev LINEA https://safe.linea.build/home?safe=linea:0x62Bbfe3ef3faAb7045d29bC388E5A0c5033D8b77
+        /// @dev LINEA https://app.safe.global/home?safe=linea:0x62Bbfe3ef3faAb7045d29bC388E5A0c5033D8b77
         0x95B5837CF46E6ab340fFf3844ca5e7d8ead5B8AF,
-        /// @dev BLAST https://blast-safe.io/home?safe=blastmainnet:0x95B5837CF46E6ab340fFf3844ca5e7d8ead5B8AF
+        /// @dev BLAST https://app.safe.global/home?safe=blast:0x95B5837CF46E6ab340fFf3844ca5e7d8ead5B8AF
         address(0)
         /// @dev BERA
     ];

script/forge-scripts/Abstract.Deploy.Single.s.sol

@@ -0,0 +1,69 @@
+/// SPDX-License-Identifier: BUSL-1.1
+
+pragma solidity ^0.8.23;
+
+import "../EnvironmentUtils.s.sol";
+
+struct UpdateVars {
+    uint64 chainId;
+    SuperRegistry superRegistryC;
+}
+
+abstract contract FixPostPreBeraStuff is EnvironmentUtils {
+    function _configure(
+        uint256 env,
+        uint256 srcChainIndex,
+        Cycle cycle,
+        uint64[] memory finalDeployedChains
+    )
+        internal
+        setEnvDeploy(cycle)
+    {
+        assert(salt.length > 0);
+        UpdateVars memory vars;
+
+        vars.chainId = finalDeployedChains[srcChainIndex];
+
+        vars.superRegistryC =
+            SuperRegistry(_readContractsV1(env, chainNames[srcChainIndex], vars.chainId, "SuperRegistry"));
+        assert(address(vars.superRegistryC) != address(0));
+
+        bytes memory txn;
+
+        address[] memory rescuerAddress = new address[](2);
+        bytes32[] memory ids = new bytes32[](2);
+        uint64[] memory targetChains = new uint64[](2);
+        targetChains[0] = LINEA;
+        targetChains[1] = BLAST;
+
+        for (uint256 j; j < finalDeployedChains.length; j++) {
+            if (finalDeployedChains[j] == vars.chainId) {
+                continue;
+            }
+
+            // disable Axelar's other chain info on LINEA and BLAST
+            if (vars.chainId == LINEA || vars.chainId == BLAST) { } else {
+                for (uint256 i; i < rescuerAddress.length; i++) {
+                    ids[i] = keccak256("CORE_STATE_REGISTRY_RESCUER_ROLE");
+                    rescuerAddress[i] = CSR_RESCUER;
+                }
+                txn = abi.encodeWithSelector(
+                    vars.superRegistryC.batchSetAddress.selector, ids, rescuerAddress, targetChains
+                );
+                addToBatch(address(vars.superRegistryC), 0, txn);
+            }
+        }
+
+        // Send the batch
+        executeBatch(vars.chainId, PROTOCOL_ADMINS[srcChainIndex], manualNonces[srcChainIndex], true);
+    }
+
+    function _getTrueIndex(uint256 chainId) public view returns (uint256 index) {
+        for (uint256 i; i < chainIds.length; i++) {
+            if (chainId == chainIds[i]) {
+                index = i;
+                break;
+            }
+        }
+    }
+}

script/forge-scripts/misc/Abstract.Configure.FixPostPreBera.s.sol

@@ -108,6 +108,10 @@ abstract contract AbstractPreBeraLaunch is EnvironmentUtils {
         vars.srcLzImpl = _readContractsV1(env, chainNames[srcChainIndex], vars.chainId, "LayerzeroImplementation");
         assert(vars.srcLzImpl != address(0));
 
+        vars.superRegistryC =
+            SuperRegistry(_readContractsV1(env, chainNames[srcChainIndex], vars.chainId, "SuperRegistry"));
+        assert(address(vars.superRegistryC) != address(0));
+
         bytes memory txn;
 
         console.log("Setting config");

script/forge-scripts/misc/Abstract.Configure.PreBeraLaunch.s.sol

@@ -34,27 +34,25 @@ abstract contract AbstractUpdatePriceFeeds is EnvironmentUtils {
 
         address paymentHelper = _readContractsV1(env, chainNames[trueIndex], vars.chainId, "PaymentHelper");
         address expectedPaymentHelper =
-            env == 0 ? 0x69c531E5bdf2458FFb4f5E0dB3DE41745151b2Bd : 0xb69929AC813125EdFaCFad366643c3787C0d1500;
+            env == 0 ? 0x69c531E5bdf2458FFb4f5E0dB3DE41745151b2Bd : 0xe14BCe82D4a72e4C95402a83fEF3C2299a61fD8C;
         assert(paymentHelper == expectedPaymentHelper);
         uint256 countFeeds;
         for (uint256 j = 0; j < s_superFormChainIds.length; j++) {
-            if (j != i) {
-                vars.dstChainId = s_superFormChainIds[j];
+            vars.dstChainId = s_superFormChainIds[j];
 
-                for (uint256 k = 0; k < chainIds.length; k++) {
-                    if (vars.dstChainId == chainIds[k]) {
-                        vars.dstTrueIndex = k;
+            for (uint256 k = 0; k < chainIds.length; k++) {
+                if (vars.dstChainId == chainIds[k]) {
+                    vars.dstTrueIndex = k;
 
-                        break;
-                    }
-                }
-                if (PRICE_FEEDS[vars.chainId][vars.dstChainId] != address(0)) {
-                    IPaymentHelper(payable(paymentHelper)).updateRemoteChain(
-                        vars.dstChainId, 1, abi.encode(PRICE_FEEDS[vars.chainId][vars.dstChainId])
-                    );
-                    countFeeds++;
+                    break;
                 }
             }
+            if (PRICE_FEEDS[vars.chainId][vars.dstChainId] != address(0)) {
+                IPaymentHelper(payable(paymentHelper)).updateRemoteChain(
+                    vars.dstChainId, 1, abi.encode(PRICE_FEEDS[vars.chainId][vars.dstChainId])
+                );
+                countFeeds++;
+            }
         }
         console.log("Updated %d feeds", countFeeds);
         vm.stopBroadcast();

script/forge-scripts/misc/Abstract.Update.PriceFeeds.s.sol

@@ -498,13 +498,7 @@ contract SmokeTestStaging is MainnetBaseSetup {
 
             for (uint256 j; j < TARGET_DEPLOYMENT_CHAINS.length; ++j) {
                 /// @dev eoracle is not added in blast & linea
-                if (
-                    chainId != BLAST
-                        && (
-                            chainId == LINEA
-                                && (TARGET_DEPLOYMENT_CHAINS[j] != FANTOM && TARGET_DEPLOYMENT_CHAINS[j] != BSC)
-                        )
-                ) {
+                if (!(chainId == BLAST || chainId == LINEA) && (chainId != TARGET_DEPLOYMENT_CHAINS[j])) {
                     assertEq(
                         address(paymentHelper.nativeFeedOracle(TARGET_DEPLOYMENT_CHAINS[j])),
                         PRICE_FEEDS[chainId][TARGET_DEPLOYMENT_CHAINS[j]]

test/mainnet/SmokeTest.Staging.t.sol

@@ -54,14 +54,19 @@ contract SmokeTest is MainnetBaseSetup {
             for (uint256 j = 0; j < TARGET_DEPLOYMENT_CHAINS.length; ++j) {
                 uint64 dstChain = TARGET_DEPLOYMENT_CHAINS[j];
                 if (chain != dstChain && !(dstChain == LINEA || dstChain == BLAST)) {
-                    console.log("send chain", chain);
-                    console.log("dst chain", dstChain);
-
                     config = endpoint.getConfig(oapp, lzV2SendLib[i], lz_v2_chainIds[j], 2);
                     UlnConfig memory ulnConfig = abi.decode(config, (UlnConfig));
-
-                    console.log("confirmations", ulnConfig.confirmations);
-                    console.log("--");
+                    assert(ulnConfig.confirmations == CONFIRMATIONS[chain][dstChain]);
+                    for (uint256 k = 0; k < ulnConfig.requiredDVNs.length; k++) {
+                        // Validate DVNs are properly ordered (ascending)
+                        if (SuperformDVNs[i] < LzDVNs[i]) {
+                            assert(ulnConfig.requiredDVNs[0] == SuperformDVNs[i]);
+                            assert(ulnConfig.requiredDVNs[1] == LzDVNs[i]);
+                        } else {
+                            assert(ulnConfig.requiredDVNs[0] == LzDVNs[i]);
+                            assert(ulnConfig.requiredDVNs[1] == SuperformDVNs[i]);
+                        }
+                    }
                 }
             }
         }
@@ -572,9 +577,17 @@ contract SmokeTest is MainnetBaseSetup {
             for (uint256 j; j < TARGET_DEPLOYMENT_CHAINS.length; ++j) {
                 if (chainId != TARGET_DEPLOYMENT_CHAINS[j]) {
                     if (TARGET_DEPLOYMENT_CHAINS[j] == LINEA || TARGET_DEPLOYMENT_CHAINS[j] == BLAST) {
-                        assertEq(axelar.authorizedImpl(ambIds_[j]), address(0));
-                        assertEq(axelar.ambChainId(TARGET_DEPLOYMENT_CHAINS[j]), "");
-                        assertEq(axelar.superChainId(ambIds_[j]), 0);
+                        assertEq(
+                            axelar.authorizedImpl(ambIds_[j]),
+                            chainId == LINEA || chainId == BLAST ? address(0xDEAD) : address(0)
+                        );
+                        assertEq(
+                            axelar.ambChainId(TARGET_DEPLOYMENT_CHAINS[j]),
+                            chainId == LINEA ? "blast" : chainId == BLAST ? "linea" : ""
+                        );
+                        assertEq(
+                            axelar.superChainId(ambIds_[j]), chainId == LINEA ? 81_457 : chainId == BLAST ? 59_144 : 0
+                        );
                     } else {
                         assertEq(axelar.authorizedImpl(ambIds_[j]), address(0xDEAD));
                         assertEq(axelar.ambChainId(TARGET_DEPLOYMENT_CHAINS[j]), ambIds_[j]);
@@ -593,7 +606,7 @@ contract SmokeTest is MainnetBaseSetup {
 
         for (uint256 i; i < TARGET_DEPLOYMENT_CHAINS.length; ++i) {
             uint64 chainId = TARGET_DEPLOYMENT_CHAINS[i];
-            if (chainId == FANTOM) continue;
+            if (chainId == FANTOM || chainId == BLAST) continue;
 
             vm.selectFork(FORKS[chainId]);
             superRegistry = SuperRegistry(getContract(chainId, "SuperRegistry"));
@@ -606,6 +619,9 @@ contract SmokeTest is MainnetBaseSetup {
 
             for (uint256 j; j < TARGET_DEPLOYMENT_CHAINS.length; ++j) {
                 /// RESCUER role not set on other chains based on linea or blast as we're not using broadcaster
+                if (TARGET_DEPLOYMENT_CHAINS[j] == LINEA || TARGET_DEPLOYMENT_CHAINS[j] == BLAST) {
+                    continue;
+                }
                 assertEq(
                     superRegistry.getAddressByChainId(
                         keccak256("CORE_STATE_REGISTRY_RESCUER_ROLE"), TARGET_DEPLOYMENT_CHAINS[j]