From 2161a6745cc17f006e23161a89bf6815309d58c2 Mon Sep 17 00:00:00 2001 From: Amin Sammara Date: Mon, 25 Nov 2024 20:34:48 -0500 Subject: [PATCH 1/5] added ref to env variables --- spartan/releases/rough-rhino/validator.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spartan/releases/rough-rhino/validator.sh b/spartan/releases/rough-rhino/validator.sh index ada2bdb3cafd..582d0263fabe 100755 --- a/spartan/releases/rough-rhino/validator.sh +++ b/spartan/releases/rough-rhino/validator.sh @@ -1,14 +1,14 @@ 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 +29,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 \ + -e P2P_UDP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ + -e P2P_TCP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer --pxe \ No newline at end of file From 0a191234428d0c803e13af3e475c352629f3a794 Mon Sep 17 00:00:00 2001 From: Amin Sammara Date: Tue, 26 Nov 2024 15:05:59 +0900 Subject: [PATCH 2/5] corrected 75759 --- spartan/releases/rough-rhino/validator.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spartan/releases/rough-rhino/validator.sh b/spartan/releases/rough-rhino/validator.sh index 582d0263fabe..7163e1d3eb21 100755 --- a/spartan/releases/rough-rhino/validator.sh +++ b/spartan/releases/rough-rhino/validator.sh @@ -3,12 +3,12 @@ docker run --rm --network=host \ -e P2P_TCP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \ -e COINBASE=0xbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ -e VALIDATOR_DISABLED=false \ - -e VALIDATOR_PRIVATE_KEY=$VALIDATOR_PKEY$ \ - -e SEQ_PUBLISHER_PRIVATE_KEY=$VALIDATOR_PKEY$ \ - -e L1_PRIVATE_KEY=$VALIDATOR_PKEY$ \ + -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=$NODE_PORT$ \ + -e AZTEC_PORT=$NODE_PORT \ -e P2P_ENABLED=true \ -e L1_CHAIN_ID=1337 \ -e PROVER_REAL_PROOFS=true \ From 145320b08a3e87327419d327fc2bfaee9e8c3e3e Mon Sep 17 00:00:00 2001 From: Amin Sammara Date: Tue, 26 Nov 2024 06:43:53 -0500 Subject: [PATCH 3/5] added set -eu and removed pxe --- spartan/releases/rough-rhino/validator.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spartan/releases/rough-rhino/validator.sh b/spartan/releases/rough-rhino/validator.sh index 7163e1d3eb21..4160019280bf 100755 --- a/spartan/releases/rough-rhino/validator.sh +++ b/spartan/releases/rough-rhino/validator.sh @@ -1,3 +1,5 @@ +set -eu + docker run --rm --network=host \ -e P2P_UDP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \ -e P2P_TCP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \ @@ -31,4 +33,4 @@ docker run --rm --network=host \ -e OUTBOX_CONTRACT_ADDRESS=0x1016b5aaa3270a65c315c664ecb238b6db270b64 \ -e P2P_UDP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ -e P2P_TCP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ - aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer --pxe \ No newline at end of file + aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer \ No newline at end of file From db69fe788ce6b13c98202ae91029f13657a3ce57 Mon Sep 17 00:00:00 2001 From: Mitch Date: Tue, 26 Nov 2024 08:08:45 -0500 Subject: [PATCH 4/5] update the full-node script --- spartan/releases/rough-rhino/full-node.sh | 16 ++++++++++------ spartan/releases/rough-rhino/validator.sh | 2 ++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/spartan/releases/rough-rhino/full-node.sh b/spartan/releases/rough-rhino/full-node.sh index 1d9aebee70ab..07f9c544b574 100755 --- a/spartan/releases/rough-rhino/full-node.sh +++ b/spartan/releases/rough-rhino/full-node.sh @@ -1,10 +1,14 @@ +#!/bin/bash + +set -eu + 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 +30,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 \ No newline at end of file + -e P2P_UDP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ + -e P2P_TCP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ + aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer diff --git a/spartan/releases/rough-rhino/validator.sh b/spartan/releases/rough-rhino/validator.sh index 4160019280bf..43e824dffd21 100755 --- a/spartan/releases/rough-rhino/validator.sh +++ b/spartan/releases/rough-rhino/validator.sh @@ -1,3 +1,5 @@ +#!/bin/bash + set -eu docker run --rm --network=host \ From 9d2a10f1b7d577da8f56bc16a0488da094dc5e65 Mon Sep 17 00:00:00 2001 From: Mitch Date: Tue, 26 Nov 2024 09:16:10 -0500 Subject: [PATCH 5/5] look at host --- spartan/releases/rough-rhino/full-node.sh | 6 +++++- spartan/releases/rough-rhino/validator.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/spartan/releases/rough-rhino/full-node.sh b/spartan/releases/rough-rhino/full-node.sh index 07f9c544b574..cf13a1d3a459 100755 --- a/spartan/releases/rough-rhino/full-node.sh +++ b/spartan/releases/rough-rhino/full-node.sh @@ -2,6 +2,10 @@ set -eu +# get host arch +ARCH=$(uname -m) +IMAGE="aztecprotocol/aztec:698cd3d62680629a3f1bfc0f82604534cedbccf3-${ARCH}" + docker run --rm --network=host \ -e P2P_UDP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \ -e P2P_TCP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \ @@ -32,4 +36,4 @@ docker run --rm --network=host \ -e OUTBOX_CONTRACT_ADDRESS=0x1016b5aaa3270a65c315c664ecb238b6db270b64 \ -e P2P_UDP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ -e P2P_TCP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ - aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer + $IMAGE start --node --archiver --sequencer diff --git a/spartan/releases/rough-rhino/validator.sh b/spartan/releases/rough-rhino/validator.sh index 43e824dffd21..98e81124227d 100755 --- a/spartan/releases/rough-rhino/validator.sh +++ b/spartan/releases/rough-rhino/validator.sh @@ -2,6 +2,10 @@ set -eu +# get host arch +ARCH=$(uname -m) +IMAGE="aztecprotocol/aztec:698cd3d62680629a3f1bfc0f82604534cedbccf3-${ARCH}" + docker run --rm --network=host \ -e P2P_UDP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \ -e P2P_TCP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_PORT \ @@ -35,4 +39,4 @@ docker run --rm --network=host \ -e OUTBOX_CONTRACT_ADDRESS=0x1016b5aaa3270a65c315c664ecb238b6db270b64 \ -e P2P_UDP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ -e P2P_TCP_LISTEN_ADDR=0.0.0.0:$P2P_PORT \ - aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer \ No newline at end of file + $IMAGE start --node --archiver --sequencer