Merge 7599cbe984 into 74e11b17ba

NOTE: Commit a59d8a4482 was accidentally squashed
among other commits.

.github/workflows/ci.yml

@@ -23,7 +23,9 @@ jobs:
         uses: "foundry-rs/foundry-toolchain@v1"
 
       - name: "Run the tests"
-        run: "cd evm && make test"
+        env:
+          CI_FORK_RPC: ${{ secrets.POLYGON_MUMBAI_RPC }}
+        run: "cd evm && make ci"
 
       - name: "Add test summary"
         run: |

evm/Makefile

@@ -1,6 +1,6 @@
 include env/testing.env
 
-.PHONY: dependencies test clean all
+.PHONY: dependencies test clean all ci
 
 all: build
 
@@ -28,6 +28,10 @@ build: dependencies
 test: dependencies
 	forge test --fork-url ${TESTING_FORK_RPC} -vv
 
+.PHONY: ci
+ci: dependencies
+	forge test --fork-url ${CI_FORK_RPC} -vv --fail-fast
+
 .PHONY: gas-report
 gas-report: dependencies
 	forge test --fork-url ${TESTING_FORK_RPC} --match-path forge/tests/gas/* --fuzz-runs 512 --gas-report

evm/forge/tests/ForkSlots.t.sol

@@ -98,7 +98,7 @@ contract ForkSlots is Test {
         assertFalse(isVaaConsumed, "VAA already consumed");
 
         // Before upgrading, fetch some expected values.
-        uint16 expectedRegisteredChainId = 2;
+        uint16 expectedRegisteredChainId = 6; // Avalanche (Fuji)
         bytes32 expectedEmitter = forked.getRegisteredEmitter(expectedRegisteredChainId);
         uint32 expectedCctpDomain = forked.getDomainFromChainId(expectedRegisteredChainId);