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.

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

zktrie part2: add zktrie; allow switch trie type by config; #113

Merged
merged 25 commits into from
Jun 27, 2022
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f6c03c0
induce zktrie
noel2004 May 29, 2022
7676e9f
refactoring zktrie
noel2004 Jun 8, 2022
f17d42f
fix crash issue in logger
noel2004 Jun 8, 2022
942bfe4
renaming JSON field
noel2004 Jun 8, 2022
9b7c672
unify hash scheme
noel2004 Jun 8, 2022
c958ea1
goimport and mod lint
noel2004 Jun 8, 2022
2f9f3b2
backward compatible with go 1.17
noel2004 Jun 8, 2022
0b6200f
lints
noel2004 Jun 8, 2022
86d287d
add option on genesis file
noel2004 Jun 9, 2022
50ce37a
corrections according to the reviews
noel2004 Jun 16, 2022
d16cf7d
trivial fixes: ValueKey entry, key in prove nodes
noel2004 Jun 17, 2022
5725fa9
fixing for the proof fix ...
noel2004 Jun 17, 2022
9e0f9ec
avoiding panic before loading stateDb in genesis setup
noel2004 Jun 22, 2022
d129b78
Merge remote-tracking branch 'main/zkrollup' into l2witness/zktrie
noel2004 Jun 22, 2022
09ca2a1
Merge remote-tracking branch 'main/zkrollup' into l2witness/zktrie
noel2004 Jun 23, 2022
9293637
Merge branch 'zkrollup' into l2witness/zktrie
0xmountaintop Jun 23, 2022
ae3d7e1
revert ExtraData.StateList json annotation for compatibility
0xmountaintop Jun 23, 2022
091a0a2
fix goimports lint
0xmountaintop Jun 23, 2022
2492b27
fix goimports lint
0xmountaintop Jun 23, 2022
80f4832
better encoding for leaf node
noel2004 Jun 24, 2022
3188709
fix proof's printing issue, add handling on coinbase
noel2004 Jun 24, 2022
77fe488
update genesis, and rule out snapshot in zktrie mode
noel2004 Jun 24, 2022
9f7900d
update readme and lint
noel2004 Jun 24, 2022
9920040
fix an issue
noel2004 Jun 25, 2022
d6156cc
Merge branch 'zkrollup' into l2witness/zktrie
0xmountaintop Jun 27, 2022
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
Prev Previous commit
Next Next commit
renaming JSON field
noel2004 committed Jun 8, 2022

Verified

This commit was signed with the committer’s verified signature. The key has expired.
commit 942bfe49371e5bb9933e0713c66ea8b292e9e1ce
2 changes: 1 addition & 1 deletion core/types/l2trace.go
Original file line number Diff line number Diff line change
@@ -115,7 +115,7 @@ type ExtraData struct {
// callee contract address's account (value updated, before called)]
// STATICCALL: [stack.nth_last(1) (i.e. callee) address’s account,
// callee contract address's account (before called)]
StateList []*AccountWrapper `json:"proofList,omitempty"`
StateList []*AccountWrapper `json:"stateList,omitempty"`
}

type AccountWrapper struct {