forked from base-org/node
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade op node to v1.9.5 and op geth to v1.101411.1 (#46)
* ⬆️ Bump op-node to v1.9.5 and op-geth to v1.101411.1 * 🐳 Do not include Lisk Sepolia hotfix by default in the Docker images * 🔧 Add support to run nodes on Lisk Sepolia
- Loading branch information
1 parent
d6583fc
commit 6c69752
Showing
7 changed files
with
64 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
CLIENT=${CLIENT:-geth} | ||
HOST_DATA_DIR=./${CLIENT}-data | ||
HOST_DATA_DIR=./${CLIENT}-data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,4 +36,4 @@ services: | |
env_file: | ||
# select your network here: | ||
# - .env.sepolia | ||
- .env.mainnet | ||
- .env.mainnet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
diff --git a/geth/Dockerfile b/geth/Dockerfile | ||
index 7316271..86e9a33 100644 | ||
--- a/geth/Dockerfile | ||
+++ b/geth/Dockerfile | ||
@@ -9,7 +9,11 @@ RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \ | ||
git switch -c branch-$VERSION && \ | ||
bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' | ||
|
||
-RUN cd op-node && \ | ||
+# Patch to handle the legacy ConfigUpdate event GAS_CONFIG_ECOTONE that shouldn't be used anymore | ||
+# Emitted only on Lisk Sepolia from the SystemConfig contract | ||
+COPY op-node-lisk-hotfix.patch . | ||
+RUN git apply op-node-lisk-hotfix.patch && \ | ||
+ cd op-node && \ | ||
make VERSION=$VERSION op-node | ||
|
||
FROM golang:1.22 AS geth | ||
diff --git a/reth/Dockerfile b/reth/Dockerfile | ||
index 0144140..bbb833f 100644 | ||
--- a/reth/Dockerfile | ||
+++ b/reth/Dockerfile | ||
@@ -9,7 +9,11 @@ RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \ | ||
git switch -c branch-$VERSION && \ | ||
bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' | ||
|
||
-RUN cd op-node && \ | ||
+# Patch to handle the legacy ConfigUpdate event GAS_CONFIG_ECOTONE that shouldn't be used anymore | ||
+# Emitted only on Lisk Sepolia from the SystemConfig contract | ||
+COPY op-node-lisk-hotfix.patch . | ||
+RUN git apply op-node-lisk-hotfix.patch && \ | ||
+ cd op-node && \ | ||
make VERSION=$VERSION op-node | ||
|
||
FROM rust:1.82 AS reth |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,24 @@ | ||
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 7283eb987be7b4413ae5b3088f83aa6a7b83c119) | ||
+++ b/op-node/rollup/derive/system_config.go (revision 9720ac43f8564a80866c12c7c6fd1e60986ff98e) | ||
@@ -21,6 +21,7 @@ | ||
SystemConfigUpdateGasConfig = common.Hash{31: 1} | ||
index 72c4e713c..c8141d514 100644 | ||
--- a/op-node/rollup/derive/system_config.go | ||
+++ b/op-node/rollup/derive/system_config.go | ||
@@ -21,7 +21,8 @@ var ( | ||
SystemConfigUpdateFeeScalars = common.Hash{31: 1} | ||
SystemConfigUpdateGasLimit = common.Hash{31: 2} | ||
SystemConfigUpdateUnsafeBlockSigner = common.Hash{31: 3} | ||
- SystemConfigUpdateEIP1559Params = common.Hash{31: 4} | ||
+ SystemConfigUpdateGasConfigEcotone = common.Hash{31: 4} | ||
+ SystemConfigUpdateEIP1559Params = common.Hash{31: 5} | ||
) | ||
|
||
var ( | ||
@@ -142,6 +143,9 @@ | ||
return nil | ||
@@ -160,6 +161,9 @@ func ProcessSystemConfigUpdateLogEvent(destSysCfg *eth.SystemConfig, ev *types.L | ||
case SystemConfigUpdateUnsafeBlockSigner: | ||
// Ignored in derivation. This configurable applies to runtime configuration outside of the derivation. | ||
+ return nil | ||
return nil | ||
+ case SystemConfigUpdateGasConfigEcotone: | ||
+ // HOTFIX: Ignore legacy ConfigUpdate event GAS_CONFIG_ECOTONE that shouldn't be used anymore | ||
return nil | ||
+ return nil | ||
default: | ||
return fmt.Errorf("unrecognized L1 sysCfg update type: %s", updateType) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters