Skip to content

Commit e5229c1

Browse files
yrongLederstrumpf
andauthored
Use nix geth (#1563)
* flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c6e957d81b96751a3d5967a0fd73694f303cc914?narHash=sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg%3D' (2025-02-03) → 'github:NixOS/nixpkgs/fc02ee70efb805d3b2865908a13ddd4474557ecf?narHash=sha256-i%2BCQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s%3D' (2025-07-23) * use upstream geth nixpkgs version is 1.16.1-stable now, so sufficiently up-to-date. * add smoketest dependencies * add dev convenience deps * add back typescript dep --------- Co-authored-by: Robert Hambrock <[email protected]>
1 parent bac8c95 commit e5229c1

File tree

4 files changed

+19
-31
lines changed

4 files changed

+19
-31
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@
3636
tree
3737
# ps for zombienet, required in pure shells on Linux
3838
ps
39+
# convenience for developing relayer
40+
killall
3941

40-
# typescript
42+
typescript
4143
python311
4244
nodePackages.pnpm
4345
nodejs_22
@@ -53,6 +55,7 @@
5355
go
5456
gotools
5557
gopls
58+
go-ethereum
5659
go-outline
5760
gopkgs
5861
godef
@@ -69,8 +72,14 @@
6972
# NOTE: when upgrading rustup, check for a command to install the version in the toolchain file:
7073
# https://github.com/rust-lang/rustup/issues/2686
7174
rustup
75+
# convenience for clearing unused build outputs
76+
cargo-sweep
7277

7378
cowsay
79+
80+
# smoketest
81+
openssl.dev
82+
pkg-config
7483
];
7584

7685
shellHook = ''

web/packages/test/scripts/deploy-ethereum.sh

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,13 @@ source scripts/set-env.sh
66
start_geth() {
77
pushd "$root_dir/.."
88

9-
GETH_PATH="go-ethereum/build/bin/geth"
10-
11-
# Install Electra geth binary
12-
if [ ! -f "$GETH_PATH" ]; then
13-
echo "Local geth binary not found at $GETH_PATH."
14-
echo "Cloning and building go-ethereum..."
15-
16-
git clone https://github.com/ethereum/go-ethereum/ go-ethereum
17-
pushd go-ethereum
18-
git checkout $GETH_VERSION
19-
make geth
20-
popd
21-
else
22-
echo "Local geth binary already exists at $GETH_PATH. Skipping clone and build."
23-
fi
24-
25-
pushd go-ethereum
26-
279
echo "Starting geth local node"
28-
./build/bin/geth version
29-
./build/bin/geth \
10+
geth version
11+
geth \
3012
--datadir "$output_dir/ethereum" \
3113
--state.scheme=hash \
3214
init "$config_dir/genesis.json"
33-
./build/bin/geth \
15+
geth \
3416
--networkid 11155111 \
3517
--vmdebug \
3618
--datadir "$output_dir/ethereum" \
@@ -57,8 +39,6 @@ start_geth() {
5739
--state.scheme=hash \
5840
> "$output_dir/geth.log" 2>&1 &
5941

60-
popd
61-
6242
popd
6343
}
6444

web/packages/test/scripts/set-env.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ zombienet_data_dir="$output_dir/zombienet"
1414
export PATH="$output_bin_dir:$PATH"
1515
polkadot_sdk_dir="${POLKADOT_SDK_DIR:-../polkadot-sdk}"
1616

17-
export GETH_VERSION=v1.15.11
1817
export LODESTAR_VERSION=v1.31.0
1918
export snowbridge_v1="${BUILD_V1:-false}"
2019
v1_root_dir="$root_dir/../snowbridge-v1"

0 commit comments

Comments
 (0)