From f34cc1802501eaac9a38b6c1afb25adadb0f3264 Mon Sep 17 00:00:00 2001
From: Sebastian <379651+czarly@users.noreply.github.com>
Date: Thu, 14 Mar 2024 04:57:11 +0100
Subject: [PATCH] blow up

---
 op-lisk-sepolia.yml         |  7 +++++--
 op/Dockerfile               | 21 +++++++++------------
 op/geth-entrypoint          |  2 --
 op/sepolia/lisk/rollup.json |  3 ++-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/op-lisk-sepolia.yml b/op-lisk-sepolia.yml
index 56ab4da8..28d8e716 100644
--- a/op-lisk-sepolia.yml
+++ b/op-lisk-sepolia.yml
@@ -2,7 +2,8 @@ version: '3.1'
 
 services:
   op-lisk-sepolia: # this is Optimism's geth client
-    image: stakesquid/op-lisk-sepolia:v0.1
+    #image: stakesquid/op-lisk-sepolia:v0.1
+    build: ./op
     expose:
       - 8545       # RPC / Websocket      
       - 54521     # P2P TCP (currently unused)
@@ -42,7 +43,8 @@ uDdWRwgiMr"
 
       
   op-lisk-sepolia-node:
-    image: stakesquid/op-lisk-sepolia:v0.1
+    # image: stakesquid/op-lisk-sepolia:v0.1
+    build: ./op
     depends_on:
       - op-lisk-sepolia
     expose:
@@ -79,6 +81,7 @@ uDdWRwgiMr"
       - "OP_NODE_VERIFIER_L1_CONFS=4"
       - "OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_ENDPOINT_KIND:-basic}"
       - "OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPLIA_ENDPOINT_TRUST:-false}"
+      - "OP_NODE_L1_BEACON=${ETHEREUM_SEPOLIA_BEACON_URL}"
     networks:                                                                                         
       - chains
       
diff --git a/op/Dockerfile b/op/Dockerfile
index b86d0d91..728b3cfc 100644
--- a/op/Dockerfile
+++ b/op/Dockerfile
@@ -1,36 +1,33 @@
-FROM golang:1.20 as op
+FROM golang:1.21 as op
 
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism.git
-ENV VERSION=v1.4.2
+ENV VERSION=v1.7.1
 # for verification:
-ENV COMMIT=f2229b8b955e53408be0775a22d7f9f162b0de66
+
 
 RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
-    git switch -c branch-$VERSION && \
-    bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
+    git switch -c branch-$VERSION
+
 
 RUN cd op-node && \
     make op-node
 
-FROM golang:1.20 as geth
+FROM golang:1.21 as geth
 
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/op-geth.git
-ENV VERSION=v1.101304.2
-# for verification:
-ENV COMMIT=c6b416da212fe6713ff40b8092303d0035405a47
+ENV VERSION=v1.101308.2
 
 # avoid depth=1, so the geth build can read tags
 RUN git clone $REPO --branch $VERSION --single-branch . && \
-    git switch -c branch-$VERSION && \
-    bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
+    git switch -c branch-$VERSION
 
 RUN go run build/ci.go install -static ./cmd/geth
 
-FROM golang:1.19
+FROM golang:1.21
 
 RUN apt-get update && \
     apt-get install -y jq curl && \
diff --git a/op/geth-entrypoint b/op/geth-entrypoint
index 9a49646d..fbcb23ca 100755
--- a/op/geth-entrypoint
+++ b/op/geth-entrypoint
@@ -65,9 +65,7 @@ exec ./geth \
 	--maxpeers=100 \
 	--nat=extip:$HOST_IP \
 	--networkid="$CHAIN_ID" \
-	--op-network="$CHAIN_NAME" \
 	--rollup.halt=major \
-	--rollup.sequencerhttp="$OP_GETH_SEQUENCER_HTTP" \
 	--port="$P2P_PORT" \
 	$ADDITIONAL_ARGS # intentionally unquoted
 
diff --git a/op/sepolia/lisk/rollup.json b/op/sepolia/lisk/rollup.json
index 8e57e01a..6c7f285d 100644
--- a/op/sepolia/lisk/rollup.json
+++ b/op/sepolia/lisk/rollup.json
@@ -20,7 +20,8 @@
 	},
 	"block_time": 2,
 	"delta_time": 0,
-	"canyon_time": 0,
+    "canyon_time": 0,
+    "ecotone_time": 1708534800,
 	"l1_chain_id": 11155111,
 	"l2_chain_id": 4202,
 	"regolith_time": 0,