Skip to content

Commit b9adceb

Browse files
authored
ParseNode with commitment parameter (#95)
1 parent ca661be commit b9adceb

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

core/state/database.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func (db *VerkleDB) OpenTrie(root common.Hash) (Trie, error) {
231231
return nil, err
232232
}
233233

234-
r, err := verkle.ParseNode(payload, 0)
234+
r, err := verkle.ParseNode(payload, 0, root[:])
235235
if err != nil {
236236
panic(err)
237237
}

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/fatih/color v1.7.0
2727
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5
2828
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff
29-
github.com/gballet/go-verkle v0.0.0-20220401072859-0ae88725b839
29+
github.com/gballet/go-verkle v0.0.0-20220404153453-8feceddf771f
3030
github.com/go-ole/go-ole v1.2.1 // indirect
3131
github.com/go-stack/stack v1.8.0
3232
github.com/golang/protobuf v1.4.3
@@ -66,7 +66,7 @@ require (
6666
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
6767
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
6868
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
69-
golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f
69+
golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb
7070
golang.org/x/text v0.3.6
7171
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
7272
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ github.com/gballet/go-verkle v0.0.0-20220330063001-d9fddb499b7a h1:WDnnkoIpO6lqo
183183
github.com/gballet/go-verkle v0.0.0-20220330063001-d9fddb499b7a/go.mod h1:S2TbrZxLyGqCqwtl2IA09xxun6oretK6byC1lHY+sAk=
184184
github.com/gballet/go-verkle v0.0.0-20220401072859-0ae88725b839 h1:Dmwdz0Db5n3PwCu+xvrnyIohV7PMfsfaFFuUDULMJyU=
185185
github.com/gballet/go-verkle v0.0.0-20220401072859-0ae88725b839/go.mod h1:S2TbrZxLyGqCqwtl2IA09xxun6oretK6byC1lHY+sAk=
186+
github.com/gballet/go-verkle v0.0.0-20220404153453-8feceddf771f h1:IYcgobnDr8q19efp7YcJlD6+Q9+mvJOMIK1I7OyZABE=
187+
github.com/gballet/go-verkle v0.0.0-20220404153453-8feceddf771f/go.mod h1:S2TbrZxLyGqCqwtl2IA09xxun6oretK6byC1lHY+sAk=
186188
github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
187189
github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
188190
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -596,6 +598,8 @@ golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40W
596598
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
597599
golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY=
598600
golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
601+
golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb h1:PVGECzEo9Y3uOidtkHGdd347NjLtITfJFO9BxFpmRoo=
602+
golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
599603
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
600604
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
601605
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

trie/verkle_iterator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (it *verkleNodeIterator) Next(descend bool) bool {
104104
if err != nil {
105105
panic(err)
106106
}
107-
it.current, err = verkle.ParseNode(data, byte(len(it.stack)-1))
107+
it.current, err = verkle.ParseNode(data, byte(len(it.stack)-1), nodeToDBKey(node))
108108
if err != nil {
109109
panic(err)
110110
}

0 commit comments

Comments
 (0)