From c5e2d23978eb1f9a025c4c72128c5dd8608644e4 Mon Sep 17 00:00:00 2001 From: corey Date: Thu, 18 Jun 2026 17:29:06 +0800 Subject: [PATCH] =?UTF-8?q?chore(zktrie-cleanup):=20PR-A=20draft=20?= =?UTF-8?q?=E2=80=94=20monorepo=20zkTrie=20cleanup=20(node=20side)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of PR-A (zkTrie state cleanup + post-Jade trusted-prefix). MPT is the confirmed terminal state; pre-Jade history is a trusted prefix. Changes: - node/core/executor.go: drop stale "until Geth enables snapshot with zkTrie" reference in the full-sync comment. - node/ops-morph/genesis-l2.json, genesis_geth.json: set scroll.useZktrie false (MPT terminal state). NOT touched (deliberate): go.mod indirect go-ethereum dependency — must wait for the go-ethereum PR-A to merge before bumping; running `go mod tidy` now would pull it back. Submodule pointer left as-is. go build ./... passes in node/. Draft PR-A. Do not push. Co-Authored-By: Claude Opus 4.8 (1M context) --- node/core/executor.go | 2 +- node/ops-morph/genesis-l2.json | 2 +- node/ops-morph/genesis_geth.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/node/core/executor.go b/node/core/executor.go index 086703e1b..cdcb1f4e2 100644 --- a/node/core/executor.go +++ b/node/core/executor.go @@ -269,7 +269,7 @@ func (e *Executor) DeliverBlock(txs [][]byte, metaData []byte, consensusData l2n } // We only accept the continuous blocks for now. - // It acts like full sync. Snap sync is not enabled until the Geth enables snapshot with zkTrie + // It acts like full sync; snap sync is not enabled. if wrappedBlock.Number > height+1 { e.logger.Error("geth is behind", "consensus_block", wrappedBlock.Number, diff --git a/node/ops-morph/genesis-l2.json b/node/ops-morph/genesis-l2.json index f14c5cdb5..89bcf7898 100755 --- a/node/ops-morph/genesis-l2.json +++ b/node/ops-morph/genesis-l2.json @@ -16,7 +16,7 @@ "arrowGlacierBlock": 0, "terminalTotalDifficulty": 0, "scroll": { - "useZktrie": true, + "useZktrie": false, "maxTxPerBlock": 1000, "feeVaultAddress": "0xfabb0ac9d68b0b445fb7357272ff202c5651694a" } diff --git a/node/ops-morph/genesis_geth.json b/node/ops-morph/genesis_geth.json index 96ea32df3..9eb91078d 100644 --- a/node/ops-morph/genesis_geth.json +++ b/node/ops-morph/genesis_geth.json @@ -17,7 +17,7 @@ "enableEIP2718": false, "enableEIP1559": false, "maxTxPerBlock": 1000, - "useZktrie": true, + "useZktrie": false, "feeVaultAddress": "0x0e87cd091e091562F25CB1cf4641065dA2C049F5" } },