refactor: added ref to env variables (#10193)

Co-authored-by: Amin Sammara <amin@Amins-MacBook-Pro.local> Co-authored-by: Mitch <mitchell@aztecprotocol.com>
AztecProtocol · Nov 26, 2024 · b51fc43 · b51fc43
1 parent 195aa3d
commit b51fc43
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 15 deletions.
diff --git a/spartan/releases/rough-rhino/full-node.sh b/spartan/releases/rough-rhino/full-node.sh
@@ -1,10 +1,18 @@
+#!/bin/bash
+
+set -eu
+
+# get host arch
+ARCH=$(uname -m)
+IMAGE="aztecprotocol/aztec:698cd3d62680629a3f1bfc0f82604534cedbccf3-${ARCH}"
+
 docker run --rm --network=host \
-  -e P2P_UDP_ANNOUNCE_ADDR=your.ip.address:40400 \
-  -e P2P_TCP_ANNOUNCE_ADDR=your.ip.address:40400 \
+  -e P2P_UDP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \
+  -e P2P_TCP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \
   -e COINBASE=0xbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
   -e DEBUG="aztec:*,-aztec:avm_simulator*,-aztec:circuits:artifact_hash,-aztec:libp2p_service,-json-rpc*,-aztec:world-state:database,-aztec:l2_block_stream*" \
   -e LOG_LEVEL=debug \
-  -e AZTEC_PORT=8080 \
+  -e AZTEC_PORT=$NODE_PORT \
   -e P2P_ENABLED=true \
   -e VALIDATOR_DISABLED=true \
   -e L1_CHAIN_ID=1337 \
@@ -26,6 +34,6 @@ docker run --rm --network=host \
   -e FEE_JUICE_PORTAL_CONTRACT_ADDRESS=0x0165878a594ca255338adfa4d48449f69242eb8f \
   -e INBOX_CONTRACT_ADDRESS=0xed179b78d5781f93eb169730d8ad1be7313123f4 \
   -e OUTBOX_CONTRACT_ADDRESS=0x1016b5aaa3270a65c315c664ecb238b6db270b64 \
-  -e P2P_UDP_LISTEN_ADDR=0.0.0.0:40400 \
-  -e P2P_TCP_LISTEN_ADDR=0.0.0.0:40400 \
-  aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer --pxe
+  -e P2P_UDP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \
+  -e P2P_TCP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \
+  $IMAGE start --node --archiver --sequencer
diff --git a/spartan/releases/rough-rhino/validator.sh b/spartan/releases/rough-rhino/validator.sh
@@ -1,14 +1,22 @@
+#!/bin/bash
+
+set -eu
+
+# get host arch
+ARCH=$(uname -m)
+IMAGE="aztecprotocol/aztec:698cd3d62680629a3f1bfc0f82604534cedbccf3-${ARCH}"
+
 docker run --rm --network=host \
-  -e P2P_UDP_ANNOUNCE_ADDR=your.ip.address:40400 \
-  -e P2P_TCP_ANNOUNCE_ADDR=your.ip.address:40400 \
+  -e P2P_UDP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \
+  -e P2P_TCP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \
   -e COINBASE=0xbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
   -e VALIDATOR_DISABLED=false \
-  -e VALIDATOR_PRIVATE_KEY=0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6 \
-  -e SEQ_PUBLISHER_PRIVATE_KEY=0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6 \
-  -e L1_PRIVATE_KEY=0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6 \
+  -e VALIDATOR_PRIVATE_KEY=$VALIDATOR_PKEY \
+  -e SEQ_PUBLISHER_PRIVATE_KEY=$VALIDATOR_PKEY \
+  -e L1_PRIVATE_KEY=$VALIDATOR_PKEY \
   -e DEBUG="aztec:*,-aztec:avm_simulator*,-aztec:circuits:artifact_hash,-aztec:libp2p_service,-json-rpc*,-aztec:world-state:database,-aztec:l2_block_stream*" \
   -e LOG_LEVEL=debug \
-  -e AZTEC_PORT=8080 \
+  -e AZTEC_PORT=$NODE_PORT \
   -e P2P_ENABLED=true \
   -e L1_CHAIN_ID=1337 \
   -e PROVER_REAL_PROOFS=true \
@@ -29,6 +37,6 @@ docker run --rm --network=host \
   -e FEE_JUICE_PORTAL_CONTRACT_ADDRESS=0x0165878a594ca255338adfa4d48449f69242eb8f \
   -e INBOX_CONTRACT_ADDRESS=0xed179b78d5781f93eb169730d8ad1be7313123f4 \
   -e OUTBOX_CONTRACT_ADDRESS=0x1016b5aaa3270a65c315c664ecb238b6db270b64 \
-  -e P2P_UDP_LISTEN_ADDR=0.0.0.0:40400 \
-  -e P2P_TCP_LISTEN_ADDR=0.0.0.0:40400 \
-  aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer --pxe
+  -e P2P_UDP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \
+  -e P2P_TCP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \
+  $IMAGE start --node --archiver --sequencer