From 44aceb8598d65ce9e34776430b03e2915ff23219 Mon Sep 17 00:00:00 2001 From: Ignacio Hagopian Date: Fri, 19 Jan 2024 10:41:53 -0300 Subject: [PATCH] mod: move from gballet/go-verkle to ethereum/go-verkle Signed-off-by: Ignacio Hagopian --- cmd/geth/verkle.go | 2 +- consensus/beacon/consensus.go | 2 +- core/chain_makers.go | 2 +- core/state/database.go | 2 +- core/state_processor.go | 2 +- core/types/block.go | 2 +- go.mod | 1 + go.sum | 2 ++ trie/transition.go | 2 +- trie/utils/verkle.go | 2 +- trie/utils/verkle_test.go | 2 +- trie/verkle.go | 2 +- trie/verkle_iterator.go | 2 +- trie/verkle_iterator_test.go | 2 +- trie/verkle_test.go | 2 +- 15 files changed, 16 insertions(+), 13 deletions(-) diff --git a/cmd/geth/verkle.go b/cmd/geth/verkle.go index 2f65a5c29554..ea424ebaf138 100644 --- a/cmd/geth/verkle.go +++ b/cmd/geth/verkle.go @@ -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" ) diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go index 2ca701c42f56..b09ece674804 100644 --- a/consensus/beacon/consensus.go +++ b/consensus/beacon/consensus.go @@ -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" ) diff --git a/core/chain_makers.go b/core/chain_makers.go index 5d8ade8a0fb0..d43e9126a2b6 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -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. diff --git a/core/state/database.go b/core/state/database.go index af8cc1a36e30..5707e2c88b60 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -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 ( diff --git a/core/state_processor.go b/core/state_processor.go index 5d10bceb1817..84c2f6429a30 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -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" ) diff --git a/core/types/block.go b/core/types/block.go index 90cb5df40863..64c9fe80ff22 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -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 diff --git a/go.mod b/go.mod index 76a42d440d42..81367549719c 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index e7222885c1bf..bf0e786ed54b 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/trie/transition.go b/trie/transition.go index 51fa7c373ced..24daf436ed8a 100644 --- a/trie/transition.go +++ b/trie/transition.go @@ -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 { diff --git a/trie/utils/verkle.go b/trie/utils/verkle.go index bf9872e0f347..16c707c13acb 100644 --- a/trie/utils/verkle.go +++ b/trie/utils/verkle.go @@ -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" ) diff --git a/trie/utils/verkle_test.go b/trie/utils/verkle_test.go index f0a0ed7d2894..66f1cc473ea6 100644 --- a/trie/utils/verkle_test.go +++ b/trie/utils/verkle_test.go @@ -23,7 +23,7 @@ import ( "math/rand" "testing" - "github.com/gballet/go-verkle" + "github.com/ethereum/go-verkle" "github.com/holiman/uint256" ) diff --git a/trie/verkle.go b/trie/verkle.go index f5abe124ed73..3a402bebe5b6 100644 --- a/trie/verkle.go +++ b/trie/verkle.go @@ -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" ) diff --git a/trie/verkle_iterator.go b/trie/verkle_iterator.go index c5f59a0f5937..5f5fc725ed46 100644 --- a/trie/verkle_iterator.go +++ b/trie/verkle_iterator.go @@ -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 { diff --git a/trie/verkle_iterator_test.go b/trie/verkle_iterator_test.go index 1fd3fd76a6d9..d1611feee32c 100644 --- a/trie/verkle_iterator_test.go +++ b/trie/verkle_iterator_test.go @@ -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) { diff --git a/trie/verkle_test.go b/trie/verkle_test.go index df7a68ccee80..aef2eef76ed6 100644 --- a/trie/verkle_test.go +++ b/trie/verkle_test.go @@ -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) {