foobar

gballet · Jan 20, 2022 · eff384d · eff384d
1 parent 660ffc9
commit eff384d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/core/chain_makers.go b/core/chain_makers.go
@@ -347,8 +347,8 @@ func GenerateVerkleChain(config *params.ChainConfig, parent *types.Block, engine
  }
  }
  vtr.Hash()
- _, err := vtr.ProveAndSerialize(keys, statedb.Witness().KeyVals())
- //block.SetVerkleProof(p)
+ p, err := vtr.ProveAndSerialize(keys, statedb.Witness().KeyVals())
+ block.SetVerkleProof(p)
  if err != nil {
  panic(err)
  }

diff --git a/trie/verkle.go b/trie/verkle.go
@@ -191,22 +191,8 @@ type verkleproof struct {
 }
 
 func (trie *VerkleTrie) ProveAndSerialize(keys [][]byte, kv map[common.Hash][]byte) ([]byte, error) {
- proof, cis, indices, yis := verkle.MakeVerkleMultiProof(trie.root, keys)
- vp := verkleproof{
- Proof: proof,
- Cis: cis,
- Indices: indices,
- Yis: yis,
- }
- for key, val := range kv {
- var k [32]byte
- copy(k[:], key[:])
- vp.Leaves = append(vp.Leaves, KeyValuePair{
- Key: k[:],
- Value: val,
- })
- }
- return rlp.EncodeToBytes(vp)
+ proof, _, _, _ := verkle.MakeVerkleMultiProof(trie.root, keys)
+ return verkle.SerializeProof(proof)
 }
 
 func DeserializeAndVerifyVerkleProof(serialized []byte) (map[common.Hash]common.Hash, error) {