From e8acd2de92cdd3363d8f305d2819ab4d876e872a Mon Sep 17 00:00:00 2001 From: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:14:51 +0100 Subject: [PATCH 1/3] check import fixes from 454 Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> --- go.mod | 2 ++ go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index d60b14757397..38ec8c5045b9 100644 --- a/go.mod +++ b/go.mod @@ -133,3 +133,5 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect ) + +replace github.com/ethereum/go-verkle => github.com/ethereum/go-verkle v0.2.2-0.20241030101114-539c5577e1e3 diff --git a/go.sum b/go.sum index 66474aea8df4..2794bc8bdf1c 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,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.2.1 h1:FYWEByFT19jT/ym/dy++E+f1SSw899uXGNrhCkwjYJw= -github.com/ethereum/go-verkle v0.2.1/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= +github.com/ethereum/go-verkle v0.2.2-0.20241030101114-539c5577e1e3 h1:2PRzsVKkWGCYg4J6wA/qhPeHtqwhG+rrpjiYazjMCfQ= +github.com/ethereum/go-verkle v0.2.2-0.20241030101114-539c5577e1e3/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= 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= From cee0c5ce0077bbf2d8033970bb86d836d7acd657 Mon Sep 17 00:00:00 2001 From: Ignacio Hagopian Date: Wed, 30 Oct 2024 09:25:31 -0300 Subject: [PATCH 2/3] update go-verkle with fix Signed-off-by: Ignacio Hagopian --- go.mod | 4 +--- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 38ec8c5045b9..ff1bd22115c8 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/docker/docker v1.6.2 github.com/dop251/goja v0.0.0-20230605162241-28ee0ee714f3 github.com/ethereum/c-kzg-4844 v0.3.0 - github.com/ethereum/go-verkle v0.2.1 + github.com/ethereum/go-verkle v0.2.2-0.20241030122254-093a5e78c865 github.com/fatih/color v1.7.0 github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e github.com/fsnotify/fsnotify v1.6.0 @@ -133,5 +133,3 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect ) - -replace github.com/ethereum/go-verkle => github.com/ethereum/go-verkle v0.2.2-0.20241030101114-539c5577e1e3 diff --git a/go.sum b/go.sum index 2794bc8bdf1c..f498ce096f9a 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,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.2.2-0.20241030101114-539c5577e1e3 h1:2PRzsVKkWGCYg4J6wA/qhPeHtqwhG+rrpjiYazjMCfQ= -github.com/ethereum/go-verkle v0.2.2-0.20241030101114-539c5577e1e3/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= +github.com/ethereum/go-verkle v0.2.2-0.20241030122254-093a5e78c865 h1:aVm5UHaT3fXwsGUr+Ew+CrPBk7gngMCaauh6P0Ht1io= +github.com/ethereum/go-verkle v0.2.2-0.20241030122254-093a5e78c865/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= 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= From fd26a79a293aaa5307b14cd77c309001b728e058 Mon Sep 17 00:00:00 2001 From: Ignacio Hagopian Date: Wed, 30 Oct 2024 11:29:14 -0300 Subject: [PATCH 3/3] mod: update to latest go-verkle release Signed-off-by: Ignacio Hagopian --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ff1bd22115c8..d2f5ce408aa1 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/docker/docker v1.6.2 github.com/dop251/goja v0.0.0-20230605162241-28ee0ee714f3 github.com/ethereum/c-kzg-4844 v0.3.0 - github.com/ethereum/go-verkle v0.2.2-0.20241030122254-093a5e78c865 + github.com/ethereum/go-verkle v0.2.2 github.com/fatih/color v1.7.0 github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e github.com/fsnotify/fsnotify v1.6.0 diff --git a/go.sum b/go.sum index f498ce096f9a..28f4b42a991a 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,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.2.2-0.20241030122254-093a5e78c865 h1:aVm5UHaT3fXwsGUr+Ew+CrPBk7gngMCaauh6P0Ht1io= -github.com/ethereum/go-verkle v0.2.2-0.20241030122254-093a5e78c865/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= +github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8= +github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= 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=