Skip to content

Commit c598bae

Browse files
authored
chore: use troll-turtle image in aztec-spartan (#10856)
also disregard ethereum_host from the host.
1 parent a17d319 commit c598bae

File tree

2 files changed

+36
-3
lines changed

2 files changed

+36
-3
lines changed

spartan/releases/rough-rhino/Earthfile

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,41 @@ test-p2p-key:
123123
echo "✅ P2P private key test passed" || \
124124
(echo "❌ P2P private key test failed" && exit 1)
125125

126+
test-ethereum-host:
127+
FROM +test-setup
128+
RUN echo -e "\n\n" | ./aztec-spartan.sh config \
129+
-n "troll-turtle" \
130+
-e http://foobar:8545 \
131+
-p 8080 \
132+
-p2p 40400 \
133+
-ip 1.2.3.4 \
134+
-k 0x00 \
135+
-pk 00000
136+
RUN test -f .env && \
137+
grep -q "ETHEREUM_HOST=http://foobar:8545" .env && \
138+
echo "✅ Ethereum host cli test passed" || \
139+
(echo "❌ Ethereum host cli test failed" && exit 1)
140+
141+
# We don't respect the env var here
142+
RUN echo -e "\n\n" | ETHEREUM_HOST=http://foobar:8545 ./aztec-spartan.sh config \
143+
-n "troll-turtle" \
144+
-p 8080 \
145+
-p2p 40400 \
146+
-ip 1.2.3.4 \
147+
-k 0x00 \
148+
-pk 00000
149+
RUN test -f .env && \
150+
grep -q "ETHEREUM_HOST=http://34.19.127.9:8545" .env && \
151+
echo "✅ Ethereum host override test passed" || \
152+
(echo "❌ Ethereum host override test failed" && exit 1)
153+
154+
126155
test-all:
127156
BUILD +test-help
128-
BUILD +test-no-config
129157
BUILD +test-install
130158
BUILD +test-docker-check
131159
BUILD +test-start-stop
132160
BUILD +test-update
133161
BUILD +test-data-dir
134162
BUILD +test-p2p-key
135-
163+
BUILD +test-ethereum-host

spartan/releases/rough-rhino/aztec-spartan.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ DEFAULT_KEY="0x0000000000000000000000000000000000000000000000000000000000000001"
1717
DEFAULT_IP=$(curl -s --connect-timeout 5 https://api.ipify.org?format=json | grep -o '"ip":"[^"]*' | cut -d'"' -f4 || echo "")
1818
DEFAULT_BIND_MOUNT_DIR="$HOME/aztec-data"
1919

20+
# unset these to avoid conflicts with the host's environment
21+
ETHEREUM_HOST=
22+
IMAGE=
23+
BOOTNODE_URL=
24+
2025

2126
# Parse command line arguments
2227
parse_args() {
@@ -168,7 +173,7 @@ configure_environment() {
168173
if [ "$NETWORK" = "troll-turtle" ]; then
169174
BOOTNODE_URL="${BOOTNODE_URL:-http://34.82.213.6:8080}"
170175
ETHEREUM_HOST="${ETHEREUM_HOST:-http://34.19.127.9:8545}"
171-
IMAGE="${IMAGE:-aztecprotocol/aztec:0.67.1}"
176+
IMAGE="${IMAGE:-aztecprotocol/aztec:troll-turtle}"
172177
else
173178
# unknown network
174179
echo -e "${RED}Unknown network: $NETWORK${NC}"

0 commit comments

Comments
 (0)