From 0348209e0a7322932081ac9c42aec7ffe98d193c Mon Sep 17 00:00:00 2001
From: Evan Gray <battledingo@gmail.com>
Date: Tue, 17 May 2022 20:28:19 -0400
Subject: [PATCH 1/2] tilt: m1 flag

---
 Tiltfile                         | 13 +++++++++++++
 devnet/solana-devnet.yaml        |  4 ++--
 solana/Dockerfile.test-validator |  3 +++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 solana/Dockerfile.test-validator

diff --git a/Tiltfile b/Tiltfile
index 1c9042d02e..c25f7ba2ea 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -36,6 +36,7 @@ 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")
 
@@ -100,6 +101,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 +487,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(
diff --git a/devnet/solana-devnet.yaml b/devnet/solana-devnet.yaml
index 6b467d8347..420bbc3a7a 100644
--- 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/solana/Dockerfile.test-validator b/solana/Dockerfile.test-validator
new file mode 100644
index 0000000000..01f932e450
--- /dev/null
+++ b/solana/Dockerfile.test-validator
@@ -0,0 +1,3 @@
+ARG BASE_IMAGE=solana-contract
+FROM ${BASE_IMAGE}
+COPY --from=solana-contract /opt/solana/deps/ /opt/solana/deps/

From 89fc7edaeec48e0ef2f80c6734f5b86d3b5de711 Mon Sep 17 00:00:00 2001
From: Evan Gray <battledingo@gmail.com>
Date: Sat, 30 Nov 2024 18:03:24 -0500
Subject: [PATCH 2/2] tilt: fix wormchain deploy

---
 wormchain/.dockerignore     | 6 ++++++
 wormchain/Dockerfile.deploy | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 wormchain/.dockerignore

diff --git a/wormchain/.dockerignore b/wormchain/.dockerignore
new file mode 100644
index 0000000000..b21579dcb7
--- /dev/null
+++ b/wormchain/.dockerignore
@@ -0,0 +1,6 @@
+target
+bin
+**/target
+**/node_modules
+
+build/config/gentx/
diff --git a/wormchain/Dockerfile.deploy b/wormchain/Dockerfile.deploy
index f86b232489..2606ed3818 100644
--- a/wormchain/Dockerfile.deploy
+++ b/wormchain/Dockerfile.deploy
@@ -7,7 +7,7 @@ FROM const-gen AS const-export
 FROM cosmwasm_artifacts AS artifacts
 
 # Contract deployment stage
-FROM node:16-buster-slim@sha256:93c9fc3550f5f7d159f282027228e90e3a7f8bf38544758024f005e82607f546
+FROM node:20.13.1-buster-slim@sha256:8916ca78cc94933fdaef715531141c8a658bea61b89d7d88a1b2dcc0a1ae92f6
 
 RUN apt update && apt install netcat curl jq -y