renamed receiver tests

Remove bruce-riley as CODEOWNER of governor module (wormhole-foundation#4166) Node: Update libp2p (wormhole-foundation#4162) * Node: Update libp2p * Node: p2p address discovery change Node/CCQ: Logging changes in watchers (wormhole-foundation#4173) tilt: support latest docker desktop fix clippy::needless-lifetimes warnings by removing the binders for inferrable lifetimes tilt: m1 flag tilt: fix wormchain deploy Queries/SDK: Update Solana SDK (wormhole-foundation#4180) tilt: specify amd64 for cosmwasm containers tilt: sdk-ci-tests default maxWorkers=50%
kakucodes · Dec 10, 2024 · 6f20376 · 6f20376
1 parent a62c1a4
commit 6f20376
Show file tree

Hide file tree

Showing 26 changed files with 544 additions and 771 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -62,7 +62,7 @@
 
 ## Governor
 
-/node/pkg/governor/ @bruce-riley @claudijd @SEJeff @djb15 @johnsaigle
+/node/pkg/governor/ @claudijd @SEJeff @djb15 @johnsaigle
 
 ## Gateway Relayer
 

diff --git a/Tiltfile b/Tiltfile
@@ -36,8 +36,10 @@ update_settings(max_parallel_updates = 10)
 # Runtime configuration
 config.define_bool("ci", False, "We are running in CI")
 config.define_bool("manual", False, "Set TRIGGER_MODE_MANUAL by default")
+config.define_bool("m1", False, "Use this flag for M-series Macs (e.g. use an arm64 solana-test-validator due to AVX requirement)")
 
 config.define_string("num", False, "Number of guardian nodes to run")
+config.define_string("maxWorkers", False, "Maximum number of workers for sdk-ci-tests. See https://jestjs.io/docs/cli#--maxworkersnumstring")
 
 # You do not usually need to set this argument - this argument is for debugging only. If you do use a different
 # namespace, note that the "wormhole" namespace is hardcoded in tests and don't forget specifying the argument
@@ -77,6 +79,7 @@ config.define_bool("query_server", False, "Enable cross-chain query server")
 
 cfg = config.parse()
 num_guardians = int(cfg.get("num", "1"))
+max_workers = cfg.get("maxWorkers", "50%")
 namespace = cfg.get("namespace", "wormhole")
 webHost = cfg.get("webHost", "localhost")
 ci = cfg.get("ci", False)
@@ -100,6 +103,7 @@ btc = cfg.get("btc", False)
 redis = cfg.get('redis', ci)
 generic_relayer = cfg.get("generic_relayer", ci)
 query_server = cfg.get("query_server", ci)
+m1 = cfg.get("m1", False)
 
 if ci:
     guardiand_loglevel = cfg.get("guardiand_loglevel", "warn")
@@ -485,6 +489,17 @@ if solana or pythnet:
 
     # solana local devnet
 
+    build_args = {}
+    if m1:
+        build_args = {"BASE_IMAGE": "ghcr.io/wormholelabs-xyz/solana-test-validator-m1:1.17.29@sha256:c5a43c0762f2dab4873a9e632a389029b6d5f706be7dfb89a42a66cc65a3dd24"}
+
+    docker_build(
+        ref = "solana-test-validator",
+        context = "solana",
+        dockerfile = "solana/Dockerfile.test-validator",
+        build_args = build_args
+    )
+
     k8s_yaml_with_ns("devnet/solana-devnet.yaml")
 
     k8s_resource(
@@ -631,8 +646,10 @@ if ci_tests:
     k8s_yaml_with_ns(
         encode_yaml_stream(
             set_env_in_jobs(
-                set_env_in_jobs(read_yaml_stream("devnet/tests.yaml"), "NUM_GUARDIANS", str(num_guardians)),
-                "BOOTSTRAP_PEERS", str(ccqBootstrapPeers)))
+                set_env_in_jobs(
+                    set_env_in_jobs(read_yaml_stream("devnet/tests.yaml"), "NUM_GUARDIANS", str(num_guardians)),
+                    "BOOTSTRAP_PEERS", str(ccqBootstrapPeers)),
+                    "MAX_WORKERS", max_workers))
     )
 
     # separate resources to parallelize docker builds
@@ -672,12 +689,14 @@ if terra_classic:
         ref = "terra-image",
         context = "./terra/devnet",
         dockerfile = "terra/devnet/Dockerfile",
+        platform = "linux/amd64",
     )
 
     docker_build(
         ref = "terra-contracts",
         context = "./terra",
         dockerfile = "./terra/Dockerfile",
+        platform = "linux/amd64",
     )
 
     k8s_yaml_with_ns("devnet/terra-devnet.yaml")
@@ -698,13 +717,15 @@ if terra2 or wormchain:
         context = ".",
         dockerfile = "./cosmwasm/Dockerfile",
         target = "artifacts",
+        platform = "linux/amd64",
     )
 
 if terra2:
     docker_build(
         ref = "terra2-image",
         context = "./cosmwasm/deployment/terra2/devnet",
         dockerfile = "./cosmwasm/deployment/terra2/devnet/Dockerfile",
+        platform = "linux/amd64",
     )
 
     docker_build(
@@ -812,6 +833,7 @@ if wormchain:
         ref = "wormchaind-image",
         context = ".",
         dockerfile = "./wormchain/Dockerfile",
+        platform = "linux/amd64",
         build_args = {"num_guardians": str(num_guardians)},
         only = [],
         ignore = ["./wormchain/testing", "./wormchain/ts-sdk", "./wormchain/design", "./wormchain/vue", "./wormchain/build/wormchaind"],

diff --git a/clients/js/src/consts/networks.ts b/clients/js/src/consts/networks.ts
@@ -556,7 +556,7 @@ const Testnet = {
 
 const Devnet = {
   Solana: {
-    rpc: "http://localhost:8899",
+    rpc: "http://127.0.0.1:8899",
     key: "J2D4pwDred8P9ioyPEZVLPht885AeYpifsFGUyuzVmiKQosAvmZP4EegaKFrSprBC5vVP1xTvu61vYDWsxBNsYx",
   },
   Terra: {

diff --git a/cosmwasm/packages/accountant/src/state/account.rs b/cosmwasm/packages/accountant/src/state/account.rs
@@ -81,7 +81,7 @@ impl KeyDeserialize for Key {
     }
 }
 
-impl<'a> PrimaryKey<'a> for Key {
+impl PrimaryKey<'_> for Key {
     type Prefix = (u16, u16);
     type SubPrefix = u16;
     type Suffix = TokenAddress;

diff --git a/cosmwasm/packages/accountant/src/state/addr.rs b/cosmwasm/packages/accountant/src/state/addr.rs
@@ -110,7 +110,7 @@ impl KeyDeserialize for TokenAddress {
     }
 }
 
-impl<'a> PrimaryKey<'a> for TokenAddress {
+impl PrimaryKey<'_> for TokenAddress {
     type Prefix = ();
     type SubPrefix = ();
     type Suffix = Self;
@@ -121,7 +121,7 @@ impl<'a> PrimaryKey<'a> for TokenAddress {
     }
 }
 
-impl<'a> Prefixer<'a> for TokenAddress {
+impl Prefixer<'_> for TokenAddress {
     fn prefix(&self) -> Vec<Key> {
         vec![Key::Ref(&**self)]
     }

diff --git a/cosmwasm/packages/accountant/src/state/transfer.rs b/cosmwasm/packages/accountant/src/state/transfer.rs
@@ -109,7 +109,7 @@ impl KeyDeserialize for Key {
     }
 }
 
-impl<'a> PrimaryKey<'a> for Key {
+impl PrimaryKey<'_> for Key {
     type Prefix = (u16, TokenAddress);
     type SubPrefix = u16;
     type Suffix = u64;

diff --git a/cosmwasm/packages/cw_transcode/src/ser.rs b/cosmwasm/packages/cw_transcode/src/ser.rs
@@ -266,7 +266,7 @@ pub struct Transcoder<'a> {
     event: Event,
 }
 
-impl<'a> Transcoder<'a> {
+impl Transcoder<'_> {
     fn serialize_field<T>(&mut self, k: &'static str, v: &T) -> Result<(), Error>
     where
         T: ?Sized + Serialize,
@@ -285,7 +285,7 @@ impl<'a> Transcoder<'a> {
     }
 }
 
-impl<'a> SerializeStruct for Transcoder<'a> {
+impl SerializeStruct for Transcoder<'_> {
     type Ok = ();
     type Error = Error;
 
@@ -303,7 +303,7 @@ impl<'a> SerializeStruct for Transcoder<'a> {
     }
 }
 
-impl<'a> SerializeStructVariant for Transcoder<'a> {
+impl SerializeStructVariant for Transcoder<'_> {
     type Ok = ();
     type Error = Error;
 

diff --git a/devnet/solana-devnet.yaml b/devnet/solana-devnet.yaml
@@ -35,9 +35,9 @@ spec:
       terminationGracePeriodSeconds: 1
       containers:
         - name: devnet
-          image: solana-contract
+          image: solana-test-validator
           command:
-            - /root/.local/share/solana/install/active_release/bin/solana-test-validator
+            - solana-test-validator
             - --bpf-program
             - Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
             - /opt/solana/deps/bridge.so

diff --git a/ethereum/Dockerfile b/ethereum/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
 FROM const-gen AS const-export
-FROM ghcr.io/foundry-rs/foundry:nightly-55bf41564f605cae3ca4c95ac5d468b1f14447f9@sha256:8c15d322da81a6deaf827222e173f3f81c653136a3518d5eeb41250a0f2e17ea as foundry
+FROM --platform=linux/amd64 ghcr.io/foundry-rs/foundry:nightly-55bf41564f605cae3ca4c95ac5d468b1f14447f9@sha256:8c15d322da81a6deaf827222e173f3f81c653136a3518d5eeb41250a0f2e17ea as foundry
 FROM node:19.6.1-slim@sha256:a1ba21bf0c92931d02a8416f0a54daad66cb36a85d2b73af9d73b044f5f57cfc
 
 # npm wants to clone random Git repositories - lovely.