core, eth, les, tests, trie: abstract node scheme #25532
Merged
Conversation
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
14 tasks
rjl493456442
force-pushed
the
abstract-node-scheme
branch
3 times, most recently
from
443ca34 to
4b831b6
Compare
rjl493456442
requested review from
zsfelfoldi,
karalabe and
holiman
as code owners
rjl493456442
commented
Aug 17, 2022
| @@ -377,11 +379,11 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par | |||
| var recover bool | |||
|
|
|||
| head := bc.CurrentBlock() | |||
| if layer := rawdb.ReadSnapshotRecoveryNumber(bc.db); layer != nil && *layer > head.NumberU64() { | |||
| if layer := rawdb.ReadSnapshotRecoveryNumber(bc.db); layer != nil && *layer >= head.NumberU64() { | |||
There was a problem hiding this comment.
It was a mistake before. If we rewind the chain state to disk layer, then in this case recovery mode should be enabled.
rjl493456442
commented
Aug 17, 2022
|
|
||
| sz := hexToCompactInPlace(st.key) | ||
| n := rawShortNode{Key: st.key[:sz]} | ||
| n := rawShortNode{Key: hexToCompact(st.key)} |
There was a problem hiding this comment.
hexToCompactInPlace is replaced by hexToCompact for not changing the st.key. Otherwise the path prefix of children will be affected since they are sharing the same byte slice.
rjl493456442
force-pushed
the
abstract-node-scheme
branch
3 times, most recently
from
6eb4c1e to
32791cc
Compare
holiman
reviewed
Aug 24, 2022
|
@holiman for sure, we can have a call for it! |
rjl493456442
force-pushed
the
abstract-node-scheme
branch
2 times, most recently
from
56f9252 to
7065f7e
Compare
rjl493456442
force-pushed
the
abstract-node-scheme
branch
2 times, most recently
from
7cb0c4e to
899d4bd
Compare
rjl493456442
force-pushed
the
abstract-node-scheme
branch
2 times, most recently
from
e952201 to
61f6832
Compare
rjl493456442
force-pushed
the
abstract-node-scheme
branch
from
61f6832 to
b7351bc
Compare
|
Rebased against the latest master |
holiman
reviewed
Oct 17, 2022
rjl493456442
commented
Oct 19, 2022
| for _, name := range []string{"chaindata", "lightchaindata"} { | ||
| chaindb, err := stack.OpenDatabaseWithFreezer(name, 0, 0, ctx.String(utils.AncientFlag.Name), "", false) | ||
| if err != nil { | ||
| utils.Fatalf("Failed to open database: %v", err) | ||
| } | ||
| _, hash, err := core.SetupGenesisBlock(chaindb, genesis) | ||
| triedb := trie.NewDatabaseWithConfig(chaindb, &trie.Config{ | ||
| Preimages: ctx.Bool(utils.CachePreimagesFlag.Name), |
There was a problem hiding this comment.
Should we enable preimage-recording by default? Or just based on the flags passed by users.
rjl493456442
force-pushed
the
abstract-node-scheme
branch
from
620ef60 to
5d88940
Compare
holiman
approved these changes
Nov 10, 2022
|
@holiman Yes.
|
rjl493456442
force-pushed
the
abstract-node-scheme
branch
from
b76217e to
1990893
Compare
Co-authored-by: Martin Holst Swende <[email protected]>
rjl493456442
force-pushed
the
abstract-node-scheme
branch
from
1990893 to
539f809
Compare
shekhirin
pushed a commit
to shekhirin/go-ethereum
that referenced
this pull request
Jun 6, 2023
This PR introduces a node scheme abstraction. The interface is only implemented by `hashScheme` at the moment, but will be extended by `pathScheme` very soon. Apart from that, a few changes are also included which is worth mentioning: - port the changes in the stacktrie, tracking the path prefix of nodes during commit - use ethdb.Database for constructing trie.Database. This is not necessary right now, but it is required for path-based used to open reverse diff freezer
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR mainly introduces a node scheme abstraction. The interface is only implemented by
hashSchemenow and will also be implemented bypathSchemevery soon.Apart from that, a few changes are also included and highlight them here:
ethdb.Databasefor constructingtrie.Database, it's not necessary right now, but it's required for path-based used to open reverse diff freezer