Skip to content
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

fix: support a verkle pre-tree at the conversion block #313

Merged
merged 2 commits into from
Jan 29, 2024
Merged

fix: support a verkle pre-tree at the conversion block #313

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd0ddad
fix: support a verkle pre-tree at the conversion block
gballet Nov 28, 2023
cc61f5c
make linter happy
gballet Jan 29, 2024
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
10 changes: 9 additions & 1 deletion consensus/beacon/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,15 @@ func (beacon *Beacon) FinalizeAndAssemble(chain consensus.ChainHeaderReader, hea
vtrpost = post.Overlay()
okpost = true
default:
panic("invalid tree type")
// This should only happen for the first block of the
// conversion, when the previous tree is a merkle tree.
// Logically, the "previous" verkle tree is an empty tree.
okpre = true
vtrpre = trie.NewVerkleTrie(verkle.New(), state.Database().TrieDB(), utils.NewPointCache(), false)
post := state.GetTrie().(*trie.TransitionTrie)
vtrpost = post.Overlay()
okpost = true

gballet marked this conversation as resolved.
Show resolved Hide resolved
}
if okpre && okpost {
if len(keys) > 0 {
Expand Down
Loading