remove integrated discv5 package

vechain · Dec 1, 2023 · 3fdd8c6 · 3fdd8c6
1 parent bd440f2
commit 3fdd8c6
Show file tree

Hide file tree

Showing 26 changed files with 8 additions and 6,952 deletions.
diff --git a/cmd/disco/main.go b/cmd/disco/main.go
@@ -14,10 +14,10 @@ import (
 
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/p2p/discv5"
 	"github.com/ethereum/go-ethereum/p2p/nat"
 	"github.com/ethereum/go-ethereum/p2p/netutil"
 	"github.com/pkg/errors"
-	"github.com/vechain/thor/p2psrv/discv5"
 	cli "gopkg.in/urfave/cli.v1"
 )
 

diff --git a/comm/communicator.go b/comm/communicator.go
@@ -15,12 +15,12 @@ import (
 
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/ethereum/go-ethereum/p2p/discv5"
 	"github.com/inconshreveable/log15"
 	"github.com/vechain/thor/block"
 	"github.com/vechain/thor/chain"
 	"github.com/vechain/thor/co"
 	"github.com/vechain/thor/comm/proto"
-	"github.com/vechain/thor/p2psrv/discv5"
 	"github.com/vechain/thor/thor"
 	"github.com/vechain/thor/tx"
 	"github.com/vechain/thor/txpool"

diff --git a/go.mod b/go.mod
@@ -59,4 +59,4 @@ require (
 
 replace github.com/syndtr/goleveldb => github.com/vechain/goleveldb v1.0.1-0.20220809091043-51eb019c8655
 
-replace github.com/ethereum/go-ethereum => github.com/vechain/go-ethereum v1.8.15-0.20220606031836-4784dac628d7
+replace github.com/ethereum/go-ethereum => github.com/vechain/go-ethereum v1.8.15-0.20231201045034-e7f453ab60bc
diff --git a/go.sum b/go.sum
@@ -136,8 +136,8 @@ github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/vechain/go-ecvrf v0.0.0-20220525125849-96fa0442e765 h1:jvr+TSivjObZmOKVdqlgeLtRhaDG27gE39PMuE2IJ24=
 github.com/vechain/go-ecvrf v0.0.0-20220525125849-96fa0442e765/go.mod h1:cwnTMgAVzMb30xMKnGI1LdU1NjMiPllYb7i3ibj/fzE=
-github.com/vechain/go-ethereum v1.8.15-0.20220606031836-4784dac628d7 h1:2ffYPbwwp9I0QEfgKrzIqzc6lD0MFQxgurYCXRNp8dQ=
-github.com/vechain/go-ethereum v1.8.15-0.20220606031836-4784dac628d7/go.mod h1:EhX+lSkpNdEIxu1zOXtiFZu5nv1i8MX1mQA/qhUE+gw=
+github.com/vechain/go-ethereum v1.8.15-0.20231201045034-e7f453ab60bc h1:ozDvptqz3H2NYARFDoUobU5sE0mVLIQJqq5KK5+521E=
+github.com/vechain/go-ethereum v1.8.15-0.20231201045034-e7f453ab60bc/go.mod h1:EhX+lSkpNdEIxu1zOXtiFZu5nv1i8MX1mQA/qhUE+gw=
 github.com/vechain/goleveldb v1.0.1-0.20220809091043-51eb019c8655 h1:CbHcWpCi7wOYfpoErRABh3Slyq9vO0Ay/EHN5GuJSXQ=
 github.com/vechain/goleveldb v1.0.1-0.20220809091043-51eb019c8655/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/p2psrv/bootstrap_nodes.go b/p2psrv/bootstrap_nodes.go
@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/vechain/thor/p2psrv/discv5"
+	"github.com/ethereum/go-ethereum/p2p/discv5"
 )
 
 func fetchRemoteBootstrapNodes(ctx context.Context, remoteURL string) ([]*discv5.Node, error) {

diff --git a/p2psrv/discv5/README.md b/p2psrv/discv5/README.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,4 +59,4 @@ require (

		replace github.com/syndtr/goleveldb => github.com/vechain/goleveldb v1.0.1-0.20220809091043-51eb019c8655

		replace github.com/ethereum/go-ethereum => github.com/vechain/go-ethereum v1.8.15-0.20220606031836-4784dac628d7
		replace github.com/ethereum/go-ethereum => github.com/vechain/go-ethereum v1.8.15-0.20231201045034-e7f453ab60bc