Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
2f3a4863
Unverified
Commit
2f3a4863
authored
Nov 15, 2023
by
Adrian Sutton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-geth: Update with new StackTrieOptions API
parent
af165de7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
go.mod
go.mod
+1
-1
go.sum
go.sum
+2
-2
trie.go
op-program/client/mpt/trie.go
+4
-3
No files found.
go.mod
View file @
2f3a4863
...
@@ -210,7 +210,7 @@ require (
...
@@ -210,7 +210,7 @@ require (
rsc.io/tmplfunc v0.0.3 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)
)
replace github.com/ethereum/go-ethereum v1.13.5 => github.com/ethereum-optimism/op-geth v1.101304.2-0.202311142
05524-09003e1b128b
replace github.com/ethereum/go-ethereum v1.13.5 => github.com/ethereum-optimism/op-geth v1.101304.2-0.202311142
15743-0289fd0504a0
//replace github.com/ethereum-optimism/superchain-registry/superchain => ../superchain-registry/superchain
//replace github.com/ethereum-optimism/superchain-registry/superchain => ../superchain-registry/superchain
//replace github.com/ethereum/go-ethereum v1.13.5 => ../go-ethereum
//replace github.com/ethereum/go-ethereum v1.13.5 => ../go-ethereum
go.sum
View file @
2f3a4863
...
@@ -149,8 +149,8 @@ github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/
...
@@ -149,8 +149,8 @@ github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/
github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z8veEq5ZO3DfIhZ7xgRP9WTc=
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z8veEq5ZO3DfIhZ7xgRP9WTc=
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
github.com/ethereum-optimism/op-geth v1.101304.2-0.202311142
05524-09003e1b128b h1:IBbVHROvYYVhy5CcgX5g3koNGoCPOdXHXxh613SYRmo
=
github.com/ethereum-optimism/op-geth v1.101304.2-0.202311142
15743-0289fd0504a0 h1:PhfpKRafNR8X6Wj51U+0wd/G8qxovnkNN7fmzCHpiOs
=
github.com/ethereum-optimism/op-geth v1.101304.2-0.202311142
05524-09003e1b128b
/go.mod h1:KyXcYdAJTSm8tvOmd+KPeOygiA+FEE5VX3vs2WwjwQ4=
github.com/ethereum-optimism/op-geth v1.101304.2-0.202311142
15743-0289fd0504a0
/go.mod h1:KyXcYdAJTSm8tvOmd+KPeOygiA+FEE5VX3vs2WwjwQ4=
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20231030223232-e16eae11e492 h1:FyzLzMLKMc9zcDYcSxbrLDglIRrGQJE9juFzIO35RmE=
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20231030223232-e16eae11e492 h1:FyzLzMLKMc9zcDYcSxbrLDglIRrGQJE9juFzIO35RmE=
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20231030223232-e16eae11e492/go.mod h1:/70H/KqrtKcvWvNGVj6S3rAcLC+kUPr3t2aDmYIS+Xk=
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20231030223232-e16eae11e492/go.mod h1:/70H/KqrtKcvWvNGVj6S3rAcLC+kUPr3t2aDmYIS+Xk=
github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=
github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=
...
...
op-program/client/mpt/trie.go
View file @
2f3a4863
...
@@ -116,9 +116,10 @@ func (n noResetHasher) Reset() {}
...
@@ -116,9 +116,10 @@ func (n noResetHasher) Reset() {}
func
WriteTrie
(
values
[]
hexutil
.
Bytes
)
(
common
.
Hash
,
[]
hexutil
.
Bytes
)
{
func
WriteTrie
(
values
[]
hexutil
.
Bytes
)
(
common
.
Hash
,
[]
hexutil
.
Bytes
)
{
var
out
[]
hexutil
.
Bytes
var
out
[]
hexutil
.
Bytes
st
:=
noResetHasher
{
trie
.
NewStackTrie
(
st
:=
noResetHasher
{
trie
.
NewStackTrie
(
func
(
path
[]
byte
,
hash
common
.
Hash
,
blob
[]
byte
)
{
trie
.
NewStackTrieOptions
()
.
WithWriter
(
out
=
append
(
out
,
common
.
CopyBytes
(
blob
))
// the stack hasher may mutate the blob bytes, so copy them.
func
(
path
[]
byte
,
hash
common
.
Hash
,
blob
[]
byte
)
{
})}
out
=
append
(
out
,
common
.
CopyBytes
(
blob
))
// the stack hasher may mutate the blob bytes, so copy them.
}))}
root
:=
types
.
DeriveSha
(
rawList
(
values
),
st
)
root
:=
types
.
DeriveSha
(
rawList
(
values
),
st
)
return
root
,
out
return
root
,
out
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment