Merge pull request #84 from qianbin/p2p

fix panic in processing discv5 packet
vechain · Aug 1, 2018 · 526e4db · 526e4db
2 parents 601b84a + c320d64
commit 526e4db
Show file tree

Hide file tree

Showing 23 changed files with 7,031 additions and 37 deletions.
diff --git a/cmd/disco/VERSION b/cmd/disco/VERSION
@@ -1 +1 @@
-1.0.0
+1.0.1
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/p2psrv/discv5/README.md b/p2psrv/discv5/README.md
@@ -0,0 +1 @@
+based on github.com/ethereum/go-ethereum/p2p/discv5 v1.8.13 tag