ci: install specific foundry release

wormhole-foundation · May 31, 2024 · 4f20d17 · 4f20d17
1 parent a939350
commit 4f20d17
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 22 deletions.
diff --git a/ethereum/Dockerfile b/ethereum/Dockerfile
@@ -1,5 +1,6 @@
 # syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
 FROM const-gen AS const-export
+FROM ghcr.io/foundry-rs/foundry:nightly-ea2eff95b5c17edd3ffbdfc6daab5ce5cc80afc0@sha256:2a774f86765258a0d176366fc46f92bc14f5040faae7a3c3ba59b1c24c5fa7cb as foundry
 FROM node:19.6.1-slim@sha256:a1ba21bf0c92931d02a8416f0a54daad66cb36a85d2b73af9d73b044f5f57cfc
 
 # npm wants to clone random Git repositories - lovely.
@@ -9,15 +10,12 @@ RUN apt-get update && apt-get -y install \
   git python make curl netcat vim
 
 RUN npm i typescript -g
-RUN curl -L https://foundry.paradigm.xyz | bash 
-RUN $HOME/.foundry/bin/foundryup
-RUN ls $HOME/.foundry/bin
-
 RUN apt-get -y install jq
 
+COPY --from=foundry /usr/local/bin/anvil /bin/anvil
+COPY --from=foundry /usr/local/bin/forge /bin/forge
+
 # Run as user, otherwise, npx explodes.
-RUN mv /root/.foundry/bin/anvil /bin/anvil
-RUN mv /root/.foundry/bin/forge /bin/forge
 USER 1000
 
 

diff --git a/relayer/ethereum/ts-scripts/relayer/config/ci/contracts.json b/relayer/ethereum/ts-scripts/relayer/config/ci/contracts.json
@@ -14,11 +14,11 @@
   "wormholeRelayers": [
     {
       "chainId": 2,
-      "address": "0xE66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"
+      "address": "0xb98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"
     },
     {
       "chainId": 4,
-      "address": "0xE66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"
+      "address": "0xb98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"
     }
   ],
   "mockIntegrations": [

diff --git a/relayer/ethereum/ts-scripts/relayer/config/kubernetes/contracts.json b/relayer/ethereum/ts-scripts/relayer/config/kubernetes/contracts.json
@@ -14,11 +14,11 @@
   "wormholeRelayers": [
     {
       "chainId": 2,
-      "address": "0xE66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"
+      "address": "0xb98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"
     },
     {
       "chainId": 4,
-      "address": "0xE66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"
+      "address": "0xb98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"
     }
   ],
   "wormholeRelayersDev": [

diff --git a/relayer/ethereum/ts-scripts/relayer/config/tilt/contracts.json b/relayer/ethereum/ts-scripts/relayer/config/tilt/contracts.json
@@ -14,11 +14,11 @@
   "wormholeRelayers": [
     {
       "chainId": 2,
-      "address": "0xE66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"
+      "address": "0xb98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"
     },
     {
       "chainId": 4,
-      "address": "0xE66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"
+      "address": "0xb98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"
     }
   ],
   "wormholeRelayersDev": [

diff --git a/sdk/devnet_consts.go b/sdk/devnet_consts.go
@@ -34,8 +34,8 @@ var KnownDevnetAutomaticRelayerEmitters = []struct {
 	ChainId vaa.ChainID
 	Addr    string
 }{
-	{ChainId: vaa.ChainIDEthereum, Addr: "000000000000000000000000E66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"},
-	{ChainId: vaa.ChainIDBSC, Addr: "000000000000000000000000E66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"},
+	{ChainId: vaa.ChainIDEthereum, Addr: "000000000000000000000000b98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"},
+	{ChainId: vaa.ChainIDBSC, Addr: "000000000000000000000000b98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"},
 
 	// NTT end to end testing uses special emitters in local dev and CI.
 	{ChainId: vaa.ChainIDEthereum, Addr: "00000000000000000000000053855d4b64e9a3cf59a84bc768ada716b5536bc5"},

diff --git a/sdk/js/src/relayer/consts.ts b/sdk/js/src/relayer/consts.ts
@@ -81,12 +81,12 @@ const TESTNET: { [K in ChainName]?: AddressInfo } = {
 
 const DEVNET: { [K in ChainName]?: AddressInfo } = {
   ethereum: {
-    wormholeRelayerAddress: "0xE66C1Bc1b369EF4F376b84373E3Aa004E8F4C083",
+    wormholeRelayerAddress: "0xb98F46E96cb1F519C333FdFB5CCe0B13E0300ED4",
     mockDeliveryProviderAddress: "0x1ef9e15c3bbf0555860b5009B51722027134d53a",
     mockIntegrationAddress: "0x0eb0dD3aa41bD15C706BC09bC03C002b7B85aeAC",
   },
   bsc: {
-    wormholeRelayerAddress: "0xE66C1Bc1b369EF4F376b84373E3Aa004E8F4C083",
+    wormholeRelayerAddress: "0xb98F46E96cb1F519C333FdFB5CCe0B13E0300ED4",
     mockDeliveryProviderAddress: "0x1ef9e15c3bbf0555860b5009B51722027134d53a",
     mockIntegrationAddress: "0x0eb0dD3aa41bD15C706BC09bC03C002b7B85aeAC",
   },

diff --git a/testing/Dockerfile.sdk.test b/testing/Dockerfile.sdk.test
@@ -1,13 +1,11 @@
+FROM ghcr.io/foundry-rs/foundry:nightly-ea2eff95b5c17edd3ffbdfc6daab5ce5cc80afc0@sha256:2a774f86765258a0d176366fc46f92bc14f5040faae7a3c3ba59b1c24c5fa7cb as foundry
 FROM node:19.6.1-slim@sha256:a1ba21bf0c92931d02a8416f0a54daad66cb36a85d2b73af9d73b044f5f57cfc
 
 RUN apt-get update && apt-get -y install \
   git python3 make curl netcat vim
 
 RUN npm i typescript -g
-RUN curl -L https://foundry.paradigm.xyz | bash 
-RUN $HOME/.foundry/bin/foundryup
-RUN ls $HOME/.foundry/bin
-RUN mv /root/.foundry/bin/forge /bin/forge
+COPY --from=foundry /usr/local/bin/forge /bin/forge
 
 RUN mkdir -p /app
 WORKDIR /app

diff --git a/wormchain/contracts/tools/__tests__/test_ntt_accountant.ts b/wormchain/contracts/tools/__tests__/test_ntt_accountant.ts
@@ -124,10 +124,10 @@ const UNKNOWN_SPOKE_CHAIN = 404;
 const UNKNOWN_SPOKE_TRANSCEIVER =
   "beeffacebeeffacebeeffacebeeffacebeeffacebeeffacebeeffacebeefface";
 const RELAYER_ADDRESS = ci
-  ? "0xE66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"
+  ? "0xb98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"
   : "0x53855d4b64E9A3CF59A84bc768adA716B5536BC5";
 const RELAYER_EMITTER = ci
-  ? "000000000000000000000000E66C1Bc1b369EF4F376b84373E3Aa004E8F4C083"
+  ? "000000000000000000000000b98F46E96cb1F519C333FdFB5CCe0B13E0300ED4"
   : "00000000000000000000000053855d4b64e9a3cf59a84bc768ada716b5536bc5";
 const dummy32 = `0000000000000000000000000000000000000000000000000000000000001234`;