forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 22:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[FIX]: zkproof writer handle reading non-existed address (#197)

Browse source 
zkproof writer: fix issue in reading unexist address
This commit is contained in:
Ho 2023-01-10 19:48:53 +08:00 committed by GitHub
parent 5ca70bf3a2
commit 81aafb09f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
trie/zkproof/writer.go
View file

@ -406,13 +406,12 @@ func (w *zktrieProofWriter) traceAccountUpdate(addr common.Address, updateAccDat
return nil, fmt.Errorf("update zktrie account state fail: %s", err) return nil, fmt.Errorf("update zktrie account state fail: %s", err)
} }
w.tracingAccounts[addr] = accData w.tracingAccounts[addr] = accData
} else { } else if accDataBefore != nil {
if err := w.tracingZktrie.TryDelete(addr.Bytes32()); err != nil { if err := w.tracingZktrie.TryDelete(addr.Bytes32()); err != nil {
return nil, fmt.Errorf("delete zktrie account state fail: %s", err) return nil, fmt.Errorf("delete zktrie account state fail: %s", err)
} }
w.tracingAccounts[addr] = nil w.tracingAccounts[addr] = nil
} // notice if both before/after is nil, we do not touch zktrie
}
proof = proofList{} proof = proofList{}
if err := w.tracingZktrie.Prove(s_key.Bytes(), 0, &proof); err != nil { if err := w.tracingZktrie.Prove(s_key.Bytes(), 0, &proof); err != nil {
@ -459,6 +458,7 @@ func (w *zktrieProofWriter) traceStorageUpdate(addr common.Address, key, value [
storeKey := zkt.NewByte32FromBytesPaddingZero(common.BytesToHash(key).Bytes()) storeKey := zkt.NewByte32FromBytesPaddingZero(common.BytesToHash(key).Bytes())
storeValueBefore := trie.Get(storeKey[:]) storeValueBefore := trie.Get(storeKey[:])
storeValue := zkt.NewByte32FromBytes(value) storeValue := zkt.NewByte32FromBytes(value)
valZero := zkt.Byte32{}
if storeValueBefore != nil && !bytes.Equal(storeValueBefore[:], common.Hash{}.Bytes()) { if storeValueBefore != nil && !bytes.Equal(storeValueBefore[:], common.Hash{}.Bytes()) {
stateUpdate[0] = &StateStorage{ stateUpdate[0] = &StateStorage{
@ -503,7 +503,11 @@ func (w *zktrieProofWriter) traceStorageUpdate(addr common.Address, key, value [
out, err := w.traceAccountUpdate(addr, out, err := w.traceAccountUpdate(addr,
func(acc *types.StateAccount) *types.StateAccount { func(acc *types.StateAccount) *types.StateAccount {
if acc == nil { if acc == nil {
panic("unexpected") // in case we read an unexist account
if !bytes.Equal(valZero.Bytes(), value) {
panic(fmt.Errorf("write to an unexist account [%s] which is not allowed", addr))
}
return nil
} }
//sanity check //sanity check
@ -533,6 +537,11 @@ func (w *zktrieProofWriter) traceStorageUpdate(addr common.Address, key, value [
} else { } else {
out.StateKey = zkt.NewHashFromBigInt(h)[:] out.StateKey = zkt.NewHashFromBigInt(h)[:]
} }
stateUpdate[1] = &StateStorage{
Key: storeKey.Bytes(),
Value: valZero.Bytes(),
}
stateUpdate[0] = stateUpdate[1]
} }
out.StatePath = statePath out.StatePath = statePath