Skip to content

Commit 8a7aa21

Browse files
update mainnet compose + localnet (#406)
update mainnet localnode compose + localnet to the latest op-geth and op-node added needed flags, files, etc. for hvm phase 0 NOTE: this breaks localnet at op-geth+tbc startup on blank directory
1 parent 1fa8b6c commit 8a7aa21

6 files changed

+15360
-9
lines changed

e2e/optimism-stack.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /git
99
ARG OP_GETH_CACHE_BREAK=12F2
1010
RUN git clone https://github.com/hemilabs/op-geth
1111
WORKDIR /git/op-geth
12-
RUN git checkout b531783
12+
RUN git checkout a5a12ae
1313

1414
WORKDIR /git/op-geth
1515

@@ -42,7 +42,7 @@ COPY --from=build_1 /git/op-geth /git/op-geth
4242
WORKDIR /git
4343
RUN git clone https://github.com/hemilabs/optimism
4444
WORKDIR /git/optimism
45-
RUN git checkout 4ab38c7
45+
RUN git checkout 3a56733
4646
RUN git submodule update --init --recursive
4747
RUN pnpm install
4848
RUN pnpm install:abigen

localnode/.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
mainnet-genesis.json
2-
mainnet-rollup.json

localnode/docker-compose_mainnet.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ services:
151151

152152
# Hemi L2 node
153153
op-geth-l2:
154-
image: "ghcr.io/hemilabs/op-geth@sha256:43860fcb691c85e344bd17a660a19e254924953b2ccebe03f2d87d425eeaecbb" # 337407d
154+
image: "ghcr.io/hemilabs/op-geth:a5a12ae@sha256:6e21d631b073a363ff859f4e82bbbcbde339801b5f5e5b9e42a5eb34081e054e"
155155
depends_on:
156156
geth-l1:
157157
condition: "service_started"
@@ -210,7 +210,7 @@ services:
210210

211211
# Hemi op-node
212212
op-node:
213-
image: "ghcr.io/hemilabs/op-node@sha256:8a190294b5ee6acc200e9cdfbef95143e604be2ba37b60e42e419118edc1f376" # 6b46f50
213+
image: "ghcr.io/hemilabs/op-node:3a56733@sha256:99f692bd734f8fac8f6f2a531641cfdab11220c2aefa31a25525d916c96668c1"
214214
depends_on:
215215
geth-l1:
216216
condition: "service_started"

localnode/mainnet-entrypointl2.sh

+14-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@
55

66
set -xe
77

8-
geth init --datadir /tmp/datadir/geth /tmp/genesis.json
8+
if [ -d "/tmp/datadir/geth" ]; then
9+
echo "geth data dir exists, skipping genesis."
10+
else
11+
geth init --datadir /tmp/datadir/geth /tmp/genesis.json
12+
fi
13+
14+
915

1016
geth \
17+
--verbosity=5 \
1118
--config=/tmp/l2-config.toml \
1219
--http \
1320
--http.corsdomain=* \
@@ -34,6 +41,10 @@ geth \
3441
--override.ecotone=1725868497 \
3542
--override.canyon=1725868497 \
3643
--override.cancun=1725868497 \
37-
--tbc.initheight=0 \
38-
--tbc.leveldbhome=/tbcdata \
44+
--tbc.leveldbhome=/tbcdata/data \
45+
--hvm.headerdatadir=/tbcdata/headers \
46+
--override.hvm0=1739286001 \
47+
--tbc.network=mainnet \
48+
--hvm.genesisheader=0000003efaaa2ba65de684c512bb67ef115298d1d16bcb49b16c02000000000000000000ed31a56788c4488afc4ee69e0791ad6aeeb9ea05f069e0fdde6159068765ad3f4128a96726770217e7f41c86 \
49+
--hvm.genesisheight=883092 \
3950
--bootnodes=enode://f591af0f0c25b794f008254262da082df23282f946c397128f4ca13f53842a09867cff8d8b68a39fddcfee885abc5b60ba21b98f88dcf7983a834c3ebc5b0254@34.13.162.152:30303,enode://e7970a29d89f8b158371a8d4aca909ee8c1c759e711547b797a6a6f01513c1e7c85121dd2600397ca20cebf3cea21025001be7c0f577b496caf32ea0433a1cfd@34.90.21.246:30303,enode://8eedf09af5bd8bb14479dfeabf522e6d80ac624d272d5ea87779121960c3f8fe4f16e6f1d344e92369a7e855e9e96bc003c8a31f82b73305b74684edc72ac90e@34.13.171.139:30303,enode://ebb5c1de8e66c27e57ddafbf9ef8d9da81e25dc68a5ff9d901a45e970671dd93f46d7b19b33624c23813281c924d27b4f8865d2c2daec858561a69706b04be7e@34.91.216.121:30303,enode://0a9d3aaadbc403d9034fc587836969ae14ca096a86bef7330f9c4da7a68113f07e70b9bc543b966ff545f0a4c5408d498b6105d0f37fd1f173599d6ac2baefd8@34.141.148.19:30303

0 commit comments

Comments
 (0)