fix the patch thingy

This commit is contained in:
Sebastian
2024-11-30 13:16:30 +01:00
parent dcbd9d2e81
commit 4abbf293f8
3 changed files with 14 additions and 17 deletions

View File

@@ -11,10 +11,13 @@ 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"; \
COPY ${OP_PATCH:-empty.patch} /tmp/my-patch.patch
RUN if [ -n "$OP_PATCH" ]; then \
echo "Using patch file: $OP_PATCH"; \
cd op-node && git apply --verbose /tmp/my-patch.patch || \
(echo "Patch failed to apply!" && exit 1); \
else \
echo "No valid patch file found in \$OP_PATCH"; \
echo "No patch file provided. Skipping."; \
fi
RUN cd op-node && \

0
op/empty.patch Normal file
View File

View File

@@ -1,19 +1,13 @@
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 @@
index 72c4e713c..f63157e29 100644
--- a/op-node/rollup/derive/system_config.go
+++ b/op-node/rollup/derive/system_config.go
@@ -142,6 +142,9 @@ func ProcessSystemConfigUpdateLogEvent(destSysCfg *eth.SystemConfig, ev *types.L
destSysCfg.GasLimit = gasLimit
return nil
case SystemConfigUpdateEIP1559Params:
+ if !rollupCfg.IsHolocene(l1Time) {
+ return nil // ignore event prior to Holocene
+ 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"))