[R4R] Resolve conflicts between fastnode and develop branch #848
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
realuncle
reviewed
Apr 8, 2022
| @@ -1096,6 +1098,15 @@ func (bc *BlockChain) HasFastBlock(hash common.Hash, number uint64) bool { | |||
|
|
|||
| // HasState checks if state trie is fully present in the database or not. | |||
| func (bc *BlockChain) HasState(hash common.Hash) bool { | |||
| if bc.stateCache.NoTries() { | |||
| if bc.pipeCommit && bc.snaps != nil { | |||
There was a problem hiding this comment.
This is not true here. And try disable pipeCommit when it is a fast node
realuncle
reviewed
Apr 8, 2022
| db Database | ||
| prefetcher *triePrefetcher | ||
| originalRoot common.Hash // The pre-state root, before any changes were made | ||
| currentRoot common.Hash // only used when noTrie is true |
There was a problem hiding this comment.
expectedRoot and currentRoot can be merged
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.
Description
Resolve conflicts between fastnode and develop branch
#640
Rationale
conflicts in files both modified:
cmd/geth/snapshot.go
core/blockchain.go
core/state/pruner/pruner.go
core/state/statedb.go
eth/backend.go
Example
N/A
Changes
Notable changes:
snaptree, err := snap.New(..., false), add a paramfalseat the end of param listchaindb := utils.MakeChainDatabase(..., false), add a paramfalseat the end of param listfunc newStateDB(...)...setsdb.noTrieafter error check fromdevelopbranchfunc(s *StateDB) Commit(...) (...)keepdevelopstructure refactorcommitFuncswithcommitTrieandcommitFuncs, addnoTriecheck incommitTire