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: use tracer when generating storage proofs #1093

Merged
merged 3 commits into from
Nov 26, 2024
Merged

fix: use tracer when generating storage proofs #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34efc6c
fix: possible deadlock in proof tracer
omerfirmak Nov 25, 2024
6574c16
fix: use correct tracer instance
omerfirmak Nov 25, 2024
351b978
fix(ProofTracer): add magicSMTBytes (#1094)
colinlyguo Nov 26, 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
20 changes: 13 additions & 7 deletions rollup/tracing/proof.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ import (
"github.com/scroll-tech/go-ethereum/trie"
)

var (
magicHash = []byte("THIS IS THE MAGIC INDEX FOR ZKTRIE")
magicSMTBytes = []byte("THIS IS SOME MAGIC BYTES FOR SMT m1rRXgP2xpDI")
)

type ProofTracer struct {
trie *trie.ZkTrie
deletionTracer map[trie.Hash]struct{}
Expand Down Expand Up @@ -124,7 +129,7 @@ func (t *ProofTracer) MarkDeletion(key []byte) error {
func (t *ProofTracer) Prove(key []byte, proofDb ethdb.KeyValueWriter) error {
fromLevel := uint(0)
var mptPath []*trie.Node
return t.trie.ProveWithDeletion(key, fromLevel,
if err := t.trie.ProveWithDeletion(key, fromLevel,
func(n *trie.Node) error {
nodeHash, err := n.NodeHash()
if err != nil {
Expand All @@ -133,11 +138,6 @@ func (t *ProofTracer) Prove(key []byte, proofDb ethdb.KeyValueWriter) error {

switch n.Type {
case trie.NodeTypeLeaf_New:
preImage := t.trie.GetKey(n.NodeKey.Bytes())
if len(preImage) > 0 {
n.KeyPreimage = &trie.Byte32{}
copy(n.KeyPreimage[:], preImage)
}
case trie.NodeTypeBranch_0, trie.NodeTypeBranch_1,
trie.NodeTypeBranch_2, trie.NodeTypeBranch_3:
mptPath = append(mptPath, n)
Expand All @@ -158,5 +158,11 @@ func (t *ProofTracer) Prove(key []byte, proofDb ethdb.KeyValueWriter) error {
mptPath = append(mptPath, n)
t.rawPaths[string(key)] = mptPath
},
)
); err != nil {
return err
}

// we put this special kv pair in db so we can distinguish the type and
// make suitable Proof
return proofDb.Put(magicHash, magicSMTBytes)
}
2 changes: 1 addition & 1 deletion rollup/tracing/tracing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ func (env *TraceEnv) getTxResult(state *state.StateDB, index int, block *types.B
env.sMu.Unlock()

var proof zkproof.ProofList
if err = env.ZkTrieTracer[addrStr].Prove(key.Bytes(), &proof); err != nil {
if err = zktrieTracer.Prove(key.Bytes(), &proof); err != nil {
log.Error("Storage proof not available", "error", err, "address", addrStr, "key", keyStr)
// but we still mark the proofs map with nil array
}
Expand Down
5 changes: 5 additions & 0 deletions trie/zk_trie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,11 @@ func (mt *ZkTrie) prove(kHash *Hash, fromLevel uint, writeNode func(*Node) error
case NodeTypeLeaf_New:
// notice even we found a leaf whose entry didn't match the expected k,
// we still include it as the proof of absence
preImage := mt.getKey(n.NodeKey.Bytes())
if len(preImage) > 0 {
n.KeyPreimage = &Byte32{}
copy(n.KeyPreimage[:], preImage)
}
case NodeTypeBranch_0, NodeTypeBranch_1, NodeTypeBranch_2, NodeTypeBranch_3:
finished = false
if path[i] {
Expand Down
Loading