solana: pick up chain id from environment

Tiltfile: set CHAIN_ID in solana build config

solana: add CHAIN_ID to Dockerfile.client and Dockerfile.wasm

Author: kcsongor

.github/workflows/build.yml

@@ -107,6 +107,7 @@ jobs:
       RUSTFLAGS: -Dwarnings
       EMITTER_ADDRESS: CiByUvEcx7w2HA4VHcPCBUAFQ73Won9kB36zW9VjirSr
       BRIDGE_ADDRESS: Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
+      CHAIN_ID: 1
 
     steps:
       - uses: actions/checkout@v3

Tiltfile

@@ -159,7 +159,7 @@ def command_with_dlv(argv):
     ] + argv[1:]
 
 def generate_bootstrap_peers(num_guardians, port_num):
-    # Improve the chances of the guardians discovering each other in tilt by making them all bootstrap peers. 
+    # Improve the chances of the guardians discovering each other in tilt by making them all bootstrap peers.
     # The devnet guardian uses deterministic P2P peer IDs based on the guardian index. The peer IDs here
     # were generated using `DeterministicP2PPrivKeyByIndex` in `node/pkg/devnet/deterministic_p2p_key.go`.
     peer_ids = [
@@ -181,7 +181,7 @@ def generate_bootstrap_peers(num_guardians, port_num):
         "12D3KooW9yvKfP5HgVaLnNaxWywo3pLAEypk7wjUcpgKwLznk5gQ",
         "12D3KooWRuYVGEsecrJJhZsSoKf1UNdBVYKFCmFLNj9ucZiSQCYj",
         "12D3KooWGEcD5sW5osB6LajkHGqiGc3W8eKfYwnJVVqfujkpLWX2",
-        "12D3KooWQYz2inBsgiBoqNtmEn1qeRBr9B8cdishFuBgiARcfMcY" 
+        "12D3KooWQYz2inBsgiBoqNtmEn1qeRBr9B8cdishFuBgiARcfMcY"
     ]
     bootstrap = ""
     for idx in range(num_guardians):
@@ -216,7 +216,7 @@ def build_node_yaml():
                     bootstrapPeers,
                     "--ccqP2pBootstrap",
                     ccqBootstrapPeers,
-                ]            
+                ]
 
             if aptos:
                 container["command"] += [
@@ -485,7 +485,7 @@ if solana or pythnet:
         dockerfile = "solana/Dockerfile",
         target = "builder",
         ignore = ["./solana/*/target", "./solana/tests"],
-        build_args = {"BRIDGE_ADDRESS": "Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"}
+        build_args = {"BRIDGE_ADDRESS": "Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o", "CHAIN_ID": "1"},
     )
 
     # solana local devnet
@@ -658,7 +658,7 @@ if ci_tests:
                     "BOOTSTRAP_PEERS", str(ccqBootstrapPeers)),
                     "MAX_WORKERS", max_workers))
     )
-    
+
     # separate resources to parallelize docker builds
     k8s_resource(
         "sdk-ci-tests",

solana/Dockerfile

@@ -21,7 +21,9 @@ RUN mkdir -p /opt/solana/deps
 
 ARG EMITTER_ADDRESS="11111111111111111111111111111115"
 ARG BRIDGE_ADDRESS
+ARG CHAIN_ID
 RUN [ -n "${BRIDGE_ADDRESS}" ]
+RUN [ -n "${CHAIN_ID}" ]
 
 # Build Wormhole Solana programs
 RUN --mount=type=cache,target=target,id=build \

solana/Dockerfile.client

@@ -30,6 +30,7 @@ RUN solana config set --url "http://solana-devnet:8899"
 
 ENV EMITTER_ADDRESS="11111111111111111111111111111115"
 ENV BRIDGE_ADDRESS="Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"
+ENV CHAIN_ID=1
 
 RUN --mount=type=cache,target=/root/.cache \
     --mount=type=cache,target=target \

solana/Dockerfile.wasm

@@ -11,6 +11,7 @@ RUN cargo install wasm-pack --vers 0.9.1
 ENV RUST_LOG="solana_runtime::system_instruction_processor=trace,solana_runtime::message_processor=trace,solana_bpf_loader=debug,solana_rbpf=debug"
 ENV EMITTER_ADDRESS="11111111111111111111111111111115"
 ENV BRIDGE_ADDRESS="Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"
+ENV CHAIN_ID=1
 
 COPY rust-toolchain .
 COPY bridge bridge

solana/Makefile

@@ -1,3 +1,8 @@
+# Chain ids
+# ---------
+CHAIN_ID_solana=1
+CHAIN_ID_fogo=51
+
 # Solana addresses
 # ----------------
 
@@ -72,7 +77,7 @@ check-svmchain-name:
 artifacts-$(SVM)-$(NETWORK): $(SOURCE_FILES)
 	echo $@
 	@echo "Building artifacts for ${SVM} ${NETWORK} (${bridge_ADDRESS_$${SVM}_${NETWORK}})"
-	DOCKER_BUILDKIT=1 docker build -f Dockerfile --build-arg BRIDGE_ADDRESS=${bridge_ADDRESS_${SVM}_${NETWORK}} -o $@ .
+	DOCKER_BUILDKIT=1 docker build -f Dockerfile --build-arg BRIDGE_ADDRESS=${bridge_ADDRESS_${SVM}_${NETWORK}} --build-arg CHAIN_ID=${CHAIN_ID_${SVM}} -o $@ .
 	cd $@ && ls | xargs sha256sum > checksums.txt
 
 payer-$(SVM)-$(NETWORK).json:
@@ -123,6 +128,7 @@ clippy: $(SOURCE_FILES)
 
 test: $(SOURCE_FILES) check-svmchain-name
 	DOCKER_BUILDKIT=1 docker build -f Dockerfile --build-arg BRIDGE_ADDRESS=${bridge_ADDRESS_${SVM}_devnet} \
+		--build-arg CHAIN_ID=${CHAIN_ID_${SVM}} \
 		--build-arg EMITTER_ADDRESS=CiByUvEcx7w2HA4VHcPCBUAFQ73Won9kB36zW9VjirSr -o target/deploy .
 	BPF_OUT_DIR=$(realpath $(dir $(firstword $(MAKEFILE_LIST))))/target/deploy \
 		cargo test --workspace \
@@ -131,6 +137,7 @@ test: $(SOURCE_FILES) check-svmchain-name
 .PHONY: build
 # Build for local use (not for deployment)
 build: check-network check-svmchain-name
+	CHAIN_ID=${CHAIN_ID_${SVM}} \
 	BRIDGE_ADDRESS=${bridge_ADDRESS_${SVM}_${NETWORK}} \
 	EMITTER_ADDRESS=11111111111111111111111111111115 \
 	cargo build

solana/bridge/program/src/lib.rs

@@ -5,9 +5,41 @@
 use solitaire::*;
 
 pub const MAX_LEN_GUARDIAN_KEYS: usize = 19;
-pub const OUR_CHAIN_ID: u16 = 1;
+pub const OUR_CHAIN_ID: u16 = parse_u16_const(env!("CHAIN_ID"));
 pub const CHAIN_ID_GOVERNANCE: u16 = 1;
 
+/// A const fn to parse a u16 from a string at compile time.
+/// A newer version of std includes a const parser function, but we depend on an
+/// old version, which doesn't.
+/// For good measure, we include a couple of static asserts below to make sure it works.
+pub const fn parse_u16_const(s: &str) -> u16 {
+    let b = s.as_bytes();
+    let mut i = 0;
+
+    let mut acc: u16 = 0;
+    while i < b.len() {
+        let c = b[i];
+        if c >= b'0' && c <= b'9' {
+            let d = (c - b'0') as u16;
+            acc = acc * 10 + d;
+            i += 1;
+        } else {
+            break;
+        }
+    }
+
+    if acc == 0 {
+        panic!("Invalid chain id");
+    }
+
+    acc
+}
+
+const _: () = {
+    assert!(parse_u16_const("1") == 1);
+    assert!(parse_u16_const("65535") == 65535);
+};
+
 #[cfg(feature = "instructions")]
 pub mod instructions;
 

solana/modules/token_bridge/program/tests/integration.rs

@@ -5,6 +5,7 @@ use bridge::{
         PostedVAADerivationData,
     },
     SerializePayload,
+    OUR_CHAIN_ID,
 };
 use libsecp256k1::SecretKey;
 use primitive_types::U256;
@@ -54,7 +55,6 @@ const GOVERNANCE_KEY: [u8; 64] = [
     88, 97, 199,
 ];
 
-const OUR_CHAIN_ID: u16 = 1;
 const CHAIN_ID_ETH: u16 = 2;
 
 struct Context {