Skip to content

Commit

Permalink
mod: move from gballet/go-verkle to ethereum/go-verkle
Browse files Browse the repository at this point in the history
Signed-off-by: Ignacio Hagopian <[email protected]>
jsign committed Jan 19, 2024
1 parent 0191752 commit 44aceb8
Showing 15 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion cmd/geth/verkle.go
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ import (
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/trie"
tutils "github.com/ethereum/go-ethereum/trie/utils"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
"github.com/holiman/uint256"
cli "github.com/urfave/cli/v2"
)
2 changes: 1 addition & 1 deletion consensus/beacon/consensus.go
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ import (
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/trie"
"github.com/ethereum/go-ethereum/trie/utils"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
"github.com/holiman/uint256"
)

2 changes: 1 addition & 1 deletion core/chain_makers.go
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ import (
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/trie"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
)

// BlockGen creates blocks for testing.
2 changes: 1 addition & 1 deletion core/state/database.go
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ import (
"github.com/ethereum/go-ethereum/trie"
"github.com/ethereum/go-ethereum/trie/trienode"
"github.com/ethereum/go-ethereum/trie/utils"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
)

const (
2 changes: 1 addition & 1 deletion core/state_processor.go
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ import (
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/trie"
tutils "github.com/ethereum/go-ethereum/trie/utils"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
"github.com/holiman/uint256"
)

2 changes: 1 addition & 1 deletion core/types/block.go
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/rlp"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
)

// A BlockNonce is a 64-bit hash which proves (combined with the
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -96,6 +96,7 @@ require (
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/deepmap/oapi-codegen v1.8.2 // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/ethereum/go-verkle v0.1.1-0.20240119133216-f8289fc59149 // indirect
github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61 // indirect
github.com/getsentry/sentry-go v0.18.0 // indirect
github.com/go-ole/go-ole v1.2.1 // indirect
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -127,6 +127,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
github.com/ethereum/c-kzg-4844 v0.3.0 h1:3Y3hD6l5i0dEYsBL50C+Om644kve3pNqoAcvE26o9zI=
github.com/ethereum/c-kzg-4844 v0.3.0/go.mod h1:WI2Nd82DMZAAZI1wV2neKGost9EKjvbpQR9OqE5Qqa8=
github.com/ethereum/go-verkle v0.1.1-0.20240119133216-f8289fc59149 h1:7gbu2YdLL8SicVklig4nyizkWkw367BP+5eEivNPy04=
github.com/ethereum/go-verkle v0.1.1-0.20240119133216-f8289fc59149/go.mod h1:cZmLDzTyZPwUygE2ksQEcxOLZ8YpfRghnVtfxRnhgJM=
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
2 changes: 1 addition & 1 deletion trie/transition.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/trie/trienode"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
)

type TransitionTrie struct {
2 changes: 1 addition & 1 deletion trie/utils/verkle.go
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import (
"sync"

"github.com/crate-crypto/go-ipa/bandersnatch/fr"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
"github.com/holiman/uint256"
)

2 changes: 1 addition & 1 deletion trie/utils/verkle_test.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import (
"math/rand"
"testing"

"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
"github.com/holiman/uint256"
)

2 changes: 1 addition & 1 deletion trie/verkle.go
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ import (
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/trie/trienode"
"github.com/ethereum/go-ethereum/trie/utils"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
"github.com/holiman/uint256"
)

2 changes: 1 addition & 1 deletion trie/verkle_iterator.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ package trie
import (
"github.com/ethereum/go-ethereum/common"

"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
)

type verkleNodeIteratorState struct {
2 changes: 1 addition & 1 deletion trie/verkle_iterator_test.go
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import (
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/trie/utils"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
)

func TestVerkleIterator(t *testing.T) {
2 changes: 1 addition & 1 deletion trie/verkle_test.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/trie/utils"
"github.com/gballet/go-verkle"
"github.com/ethereum/go-verkle"
)

func TestReproduceTree(t *testing.T) {

0 comments on commit 44aceb8

Please sign in to comment.