Bump optimism deps + misc improvements (#56)

* Bump optimism deps

* Switch OP_NODE_VERIFIER_L1_CONFS to 4

* Enable metrics

* Support pre-155 transactions

Author: Michael de Hoog

Dockerfile

@@ -4,8 +4,8 @@ FROM golang:1.19 as op
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism
-ENV COMMIT=09d23ee8995b7c318a4469a49276f9453535c6a9
-ENV CHECKSUM=593338d48967154182d07920fcaf51d18e8c6adb64485356b059e1a1f82fe941
+ENV COMMIT=a541c8a859d9258ad410598655f189de69adae19
+ENV CHECKSUM=a61e4e921c4ee83650eeff59d73aeae328b38728d54b2f4fd7f9387ef713b8a9
 ADD --checksum=sha256:$CHECKSUM $REPO/archive/$COMMIT.tar.gz ./
 
 RUN tar -xvf ./$COMMIT.tar.gz --strip-components=1 && \
@@ -17,8 +17,8 @@ FROM golang:1.19 as geth
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/op-geth
-ENV COMMIT=a84992a3b7c33f038ccc69e761bafeefcd605fd3
-ENV CHECKSUM=8d97c1292c67afb08c124fc1f6586f92ec127464e04749b80eed709de145df17
+ENV COMMIT=b5fecf58ec77909c70bd15b96b32b593af0b38ff
+ENV CHECKSUM=009ec82e9be9a8a444a4a587ded844c7336ed6c80c9029e9acd912578a477b0f
 ADD --checksum=sha256:$CHECKSUM $REPO/archive/$COMMIT.tar.gz ./
 
 RUN tar -xvf ./$COMMIT.tar.gz --strip-components=1 && \

docker-compose.yml

@@ -5,12 +5,13 @@ services:
       - 8545:8545
       - 8546:8546
       - 30303:30303
+      - 7301:6060 # metrics
     command: [ "sh", "./geth-entrypoint" ]
     volumes:
       - "./geth-data:/data"
     environment:
       - OP_GETH_GENESIS_FILE_PATH=goerli/genesis-l2.json
-      - OP_GETH_SEQUENCER_HTTP=https://goerli.base.org
+      - OP_GETH_SEQUENCER_HTTP=https://goerli-sequencer.base.org
       - OP_NODE_L2_ENGINE_AUTH=/tmp/engine-auth-jwt
       - OP_NODE_L2_ENGINE_AUTH_RAW=688f5d737bad920bdfb2fc2f488d6b6209eebda1dae949a8de91398d932c517a # for localdev only
       # - OP_GETH_ETH_STATS=nodename:secret@host:port # optional
@@ -42,7 +43,7 @@ services:
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
-      - OP_NODE_VERIFIER_L1_CONFS=0
+      - OP_NODE_VERIFIER_L1_CONFS=4
 #     OP_NODE_L1_TRUST_RPC allows for faster syncing, but should be used *only* if your L1 RPC node
 #     is fully trusted.  It also allows op-node to work with clients such as Erigon that do not
 #     support storage proofs.

geth-entrypoint

@@ -9,6 +9,7 @@ CHAIN_ID=$(jq -r .config.chainId < "$OP_GETH_GENESIS_FILE_PATH")
 RPC_PORT="${RPC_PORT:-8545}"
 WS_PORT="${WS_PORT:-8546}"
 AUTHRPC_PORT="${AUTHRPC_PORT:-8551}"
+METRICS_PORT="${METRICS_PORT:-6060}"
 HOST_IP="0.0.0.0"
 ADDITIONAL_ARGS=""
 
@@ -30,6 +31,10 @@ if [ "${OP_GETH_ETH_STATS+x}" = x ]; then
   ADDITIONAL_ARGS="$ADDITIONAL_ARGS --ethstats=$OP_GETH_ETH_STATS"
 fi
 
+if [ "${OP_GETH_ALLOW_UNPROTECTED_TXS+x}" = x ]; then
+	ADDITIONAL_ARGS="$ADDITIONAL_ARGS --rpc.allow-unprotected-txs=$OP_GETH_ALLOW_UNPROTECTED_TXS"
+fi
+
 ./geth \
 	--datadir="$GETH_DATA_DIR" \
 	--verbosity="$VERBOSITY" \
@@ -48,6 +53,9 @@ fi
 	--ws.port="$WS_PORT" \
 	--ws.origins="*" \
 	--ws.api=debug,eth,txpool,net,engine \
+  --metrics \
+  --metrics.addr=0.0.0.0 \
+  --metrics.port="$METRICS_PORT" \
 	--syncmode=full \
 	--gcmode=archive \
 	--nodiscover \