forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-10 08:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

review feedback: fix rebase errors

Browse source
This commit is contained in:
Guillaume Ballet 2026-04-24 17:56:13 +02:00
parent 351a1e4d35
commit 73b2cde717
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/utils/flags.go
View file

@ -1821,7 +1821,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
cfg.TrienodeHistory = ctx.Int64(TrienodeHistoryFlag.Name) cfg.TrienodeHistory = ctx.Int64(TrienodeHistoryFlag.Name)
} }
if ctx.IsSet(TrienodeHistoryFullValueCheckpointFlag.Name) { if ctx.IsSet(TrienodeHistoryFullValueCheckpointFlag.Name) {
cfg.TrienodeHistory = ctx.Int64(TrienodeHistoryFullValueCheckpointFlag.Name) cfg.NodeFullValueCheckpoint = uint32(ctx.Uint(TrienodeHistoryFullValueCheckpointFlag.Name))
} }
if ctx.IsSet(BinTrieGroupDepthFlag.Name) { if ctx.IsSet(BinTrieGroupDepthFlag.Name) {
cfg.BinTrieGroupDepth = ctx.Int(BinTrieGroupDepthFlag.Name) cfg.BinTrieGroupDepth = ctx.Int(BinTrieGroupDepthFlag.Name)

4
core/blockchain.go
View file

@ -259,10 +259,10 @@ func (cfg BlockChainConfig) WithNoAsyncFlush(on bool) *BlockChainConfig {
} }
// triedbConfig derives the configures for trie database. // triedbConfig derives the configures for trie database.
func (cfg *BlockChainConfig) triedbConfig(isVerkle bool) *triedb.Config { func (cfg *BlockChainConfig) triedbConfig(isUBT bool) *triedb.Config {
config := &triedb.Config{ config := &triedb.Config{
Preimages: cfg.Preimages, Preimages: cfg.Preimages,
IsUBT: isVerkle, IsUBT: isUBT,
BinTrieGroupDepth: cfg.BinTrieGroupDepth, BinTrieGroupDepth: cfg.BinTrieGroupDepth,
} }
if cfg.StateScheme == rawdb.HashScheme { if cfg.StateScheme == rawdb.HashScheme {