diff --git a/op-lisk-sepolia.yml b/op-lisk-sepolia.yml index 4283b274..cb5ad031 100644 --- a/op-lisk-sepolia.yml +++ b/op-lisk-sepolia.yml @@ -2,8 +2,12 @@ version: '3.1' services: op-lisk-sepolia: # this is Optimism's geth client - #image: stakesquid/op-lisk-sepolia:v0.1 - build: ./op + build: + context: ./op + dockerfile: Dockerfile + args: + OP_VERSION: 1.10.0 + GETH_VERSION: v1.101411.2 expose: - 8545 # RPC / Websocket - 54521 # P2P TCP (currently unused) @@ -13,8 +17,6 @@ services: - "54521:54521" - "54521:54521/udp" command: [ "sh", "./geth-entrypoint" ] - #entrypoint: ./geth - #command: --datadir=/data --rollup.sequencerhttp=https://rpc.sepolia-api.lisk.com --verbosity=3 --http --http.corsdomain=* --http.vhosts=* --http.addr=0.0.0.0 --http.port=8545 --http.api=web3,debug,eth,net,engine --authrpc.addr=0.0.0.0 --authrpc.port=8551 --authrpc.vhosts=* --authrpc.jwtsecret=/jwtsecret --ws --ws.addr=0.0.0.0 --ws.port=8545 --ws.origins=* --ws.api=debug,eth,net,engine --bootnodes=enr:-Iu4QI5BdaTmfMhNKXd-vSniNRSCXk-a3m3nQbe9TCV3puGtCr6FvX6-Vr0Uvx4tYVilGCIYdQNf6fK8O2MKxVqjYJ8BgmlkgnY0gmlwhCKN6PiJc2VjcDI1NmsxoQLBQIaRwlvNxrRKcGtxKmh4JS_orkawS44D4KIORICoi4N0Y3CCIyuDdWRwgiMr --override.fjord=1716998400 --override.ecotone=1708534800 --override.canyon=0 --maxpeers=0 restart: always stop_grace_period: 3m volumes: @@ -36,6 +38,7 @@ services: - "GETH_OVERRIDE_ECOTONE=1708534800" - "GETH_OVERRIDE_FJORD=1716998400" - "GETH_OVERRIDE_GRANITE=1723478400" + - "GETH_OVERRIDE_HOLOCENE=1732633200" - "GETH_BOOTNODES=enr:-Iu4QI5BdaTmfMhNKXd-vSniNRSCXk-a3m3nQbe9TCV3puGtCr6FvX6-Vr0Uvx4tYVilGCIYdQNf6fK8O2MKxVqjYJ8BgmlkgnY0gmlwhCKN6PiJc2VjcDI1NmsxoQLBQIaRwlvNxrRKcGtxKmh4JS_orkawS44D4KIORICoi4N0Y3CCIy\ uDdWRwgiMr" labels: @@ -51,8 +54,12 @@ uDdWRwgiMr" op-lisk-sepolia-node: - #image: stakesquid/op-lisk-sepolia:v0.1 - build: ./op + build: + context: ./op + dockerfile: Dockerfile + args: + OP_VERSION: 1.10.0 + GETH_VERSION: v1.101411.2 depends_on: - op-lisk-sepolia expose: @@ -103,6 +110,7 @@ uDdWRwgiMr" - "OP_NODE_OVERRIDE_ECOTONE=1708534800" - "OP_NODE_OVERRIDE_FJORD=1716998400" - "OP_NODE_OVERRIDE_GRANITE=1723478400" + - "OP_NODE_OVERRIDE_HOLOCENE=1732633200" networks: - chains diff --git a/op/Dockerfile b/op/Dockerfile index f96045fd..48c80e59 100644 --- a/op/Dockerfile +++ b/op/Dockerfile @@ -10,6 +10,12 @@ ARG OP_VERSION=v1.9.4 RUN git clone $OP_REPO --branch op-node/$OP_VERSION --single-branch . && \ git switch -c branch-$OP_VERSION +# Apply patch if provided and valid +RUN if [[ -n "$OP_PATCH" && -f "$OP_PATCH" ]]; then \ + git apply "$OP_PATCH"; \ + else \ + echo "No valid patch file found in \$OP_PATCH"; \ + fi RUN cd op-node && \ make op-node diff --git a/op/sepolia/lisk/op-node.patch b/op/sepolia/lisk/op-node.patch new file mode 100644 index 00000000..5f02b0ba --- /dev/null +++ b/op/sepolia/lisk/op-node.patch @@ -0,0 +1,20 @@ +Subject: [PATCH] Lisk Sepolia patch +--- +Index: op-node/rollup/derive/system_config.go +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/op-node/rollup/derive/system_config.go b/op-node/rollup/derive/system_config.go +--- a/op-node/rollup/derive/system_config.go (revision bd0ef87f20bc2575c060571b92de9b4ce249fac5) ++++ b/op-node/rollup/derive/system_config.go (revision 8c0a1fc612c062a61253cb2763796f1bffe95e89) +@@ -142,6 +142,9 @@ + destSysCfg.GasLimit = gasLimit + return nil + case SystemConfigUpdateEIP1559Params: ++ if !rollupCfg.IsHolocene(l1Time) { ++ return nil // ignore event prior to Holocene ++ } + if pointer, err := solabi.ReadUint64(reader); err != nil || pointer != 32 { + return NewCriticalError(errors.New("invalid pointer field")) + } \ No newline at end of file diff --git a/op/sepolia/lisk/rollup.json b/op/sepolia/lisk/rollup.json index 093acb48..e03078de 100644 --- a/op/sepolia/lisk/rollup.json +++ b/op/sepolia/lisk/rollup.json @@ -25,7 +25,8 @@ "ecotone_time": 1708534800, "fjord_time": 1716998400, "granite_time": 1723478400, - "channel_timeout": 50, + "holocene_time": 1732633200, + "channel_timeout": 300b, "seq_window_size": 3600, "batch_inbox_address": "0xff00000000000000000000000000000000004202", "max_sequencer_drift": 600,