use the keys passed with the proof in AddPostValuesToProof

Signed-off-by: Guillaume Ballet <[email protected]>

Author: gballet

cmd/evm/internal/t8ntool/execution.go

@@ -349,14 +349,14 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 	var (
 		verkleProof    *verkle.Proof
 		statelessProof *verkle.VerkleProof
-		keys           = statedb.Witness().Keys()
 		proofTrie      *trie.VerkleTrie
 	)
 	if chainConfig.IsVerkle(big.NewInt(int64(pre.Env.Number)), pre.Env.Timestamp) {
 		if err := overlay.OverlayVerkleTransition(statedb, common.Hash{}, chainConfig.OverlayStride); err != nil {
 			return nil, nil, fmt.Errorf("error performing the transition, err=%w", err)
 		}
 
+		keys := statedb.Witness().Keys()
 		if len(keys) > 0 && vtrpre != nil {
 			switch tr := statedb.GetTrie().(type) {
 			case *trie.VerkleTrie:
@@ -382,7 +382,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 	// Add the witness to the execution result
 	var statelessDiff verkle.StateDiff
 	if chainConfig.IsVerkle(big.NewInt(int64(pre.Env.Number)), pre.Env.Timestamp) && verkleProof != nil {
-		err = trie.AddPostValuesToProof(keys, proofTrie, verkleProof)
+		err = trie.AddPostValuesToProof(proofTrie, verkleProof)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error adding post values to proof: %w", err)
 		}

consensus/beacon/consensus.go

@@ -421,7 +421,7 @@ func (beacon *Beacon) FinalizeAndAssemble(chain consensus.ChainHeaderReader, hea
 	// Assemble and return the final block.
 	block := types.NewBlockWithWithdrawals(header, txs, uncles, receipts, withdrawals, trie.NewStackTrie(nil))
 	if chain.Config().IsVerkle(header.Number, header.Time) && chain.Config().ProofInBlocks {
-		err := trie.AddPostValuesToProof(keys, state.GetTrie().(*trie.VerkleTrie), proof)
+		err := trie.AddPostValuesToProof(state.GetTrie().(*trie.VerkleTrie), proof)
 		if err != nil {
 			return nil, fmt.Errorf("error adding post values to proof: %w", err)
 		}

core/block_validator.go

@@ -153,7 +153,7 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
 		return fmt.Errorf("invalid merkle root (remote: %x local: %x) dberr: %w", header.Root, root, statedb.Error())
 	}
 	if blockEw := block.ExecutionWitness(); blockEw != nil {
-		err := trie.AddPostValuesToProof(keys, statedb.GetTrie().(*trie.VerkleTrie), proof)
+		err := trie.AddPostValuesToProof(statedb.GetTrie().(*trie.VerkleTrie), proof)
 		if err != nil {
 			return fmt.Errorf("error adding post values to proof: %w", err)
 		}

trie/verkle.go

@@ -290,15 +290,14 @@ func (trie *VerkleTrie) IsVerkle() bool {
 	return true
 }
 
-func AddPostValuesToProof(keys [][]byte, postroot *VerkleTrie, proof *verkle.Proof) error {
-	proof.PostValues = make([][]byte, len(keys))
+func AddPostValuesToProof(postroot *VerkleTrie, proof *verkle.Proof) error {
+	proof.PostValues = make([][]byte, len(proof.Keys))
 	if postroot != nil {
-		// keys were sorted already in the above GetcommitmentsForMultiproof.
 		// Set the post values, if they are untouched, leave them `nil`
-		for i := range keys {
-			val, err := postroot.root.Get(keys[i], nil)
+		for i := range proof.Keys {
+			val, err := postroot.root.Get(proof.Keys[i], nil)
 			if err != nil {
-				return fmt.Errorf("error getting post-state value for key %x: %w", keys[i], err)
+				return fmt.Errorf("error getting post-state value for key %x: %w", proof.Keys[i], err)
 			}
 			if !bytes.Equal(proof.PreValues[i], val) {
 				proof.PostValues[i] = val