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

gballet · Nov 28, 2023 · cd0ddad · cd0ddad
1 parent 7f310da
commit cd0ddad
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go
@@ -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
+
 		}
 		if okpre && okpost {
 			if len(keys) > 0 {