Skip to content

chore: drop stale zkTrie comment + flip sample genesis useZktrie=false #1000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
curryxbo wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: drop stale zkTrie comment + flip sample genesis useZktrie=false #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion node/core/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion node/ops-morph/genesis-l2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"arrowGlacierBlock": 0,
"terminalTotalDifficulty": 0,
"scroll": {
"useZktrie": true,
"useZktrie": false,
"maxTxPerBlock": 1000,
"feeVaultAddress": "0xfabb0ac9d68b0b445fb7357272ff202c5651694a"
}
Expand Down
2 changes: 1 addition & 1 deletion node/ops-morph/genesis_geth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"enableEIP2718": false,
"enableEIP1559": false,
"maxTxPerBlock": 1000,
"useZktrie": true,
"useZktrie": false,
"feeVaultAddress": "0x0e87cd091e091562F25CB1cf4641065dA2C049F5"
}
},
Expand Down
Loading