update libp2p version

.gitignore

@@ -28,6 +28,9 @@ logs/
 # Go test binaries
 *.test
 
+kernel/mock/data/tmp/
+kernel/mock/p2pv2/node1/data/blockchain/
+
 # idea
 .idea
 

bcs/network/p2pv2/client.go

@@ -16,7 +16,7 @@ import (
 	pb "github.com/xuperchain/xupercore/protos"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	prom "github.com/prometheus/client_golang/prometheus"
 )
 

bcs/network/p2pv2/filter.go

@@ -3,8 +3,8 @@ package p2pv2
 import (
 	"math/rand"
 
-	"github.com/libp2p/go-libp2p-core/peer"
 	kbucket "github.com/libp2p/go-libp2p-kbucket"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 // PeerFilter the interface for filter peers

bcs/network/p2pv2/server.go

@@ -9,17 +9,16 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
-	ipfsAddr "github.com/ipfs/go-ipfs-addr"
 	"github.com/libp2p/go-libp2p"
-	circuit "github.com/libp2p/go-libp2p-circuit"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/protocol"
-	"github.com/libp2p/go-libp2p-core/routing"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	record "github.com/libp2p/go-libp2p-record"
-	secIO "github.com/libp2p/go-libp2p-secio"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/protocol"
+	"github.com/libp2p/go-libp2p/core/routing"
+	noise "github.com/libp2p/go-libp2p/p2p/security/noise"
+	tls "github.com/libp2p/go-libp2p/p2p/security/tls"
 	"github.com/multiformats/go-multiaddr"
 	"github.com/patrickmn/go-cache"
 	prom "github.com/prometheus/client_golang/prometheus"
@@ -118,7 +117,7 @@ func (p *P2PServerV2) Init(ctx *netCtx.NetCtx) error {
 		return ErrGenerateOpts
 	}
 
-	ho, err := libp2p.New(ctx, opts...)
+	ho, err := libp2p.New(opts...)
 	if err != nil {
 		p.log.Error("Create p2p host error", "error", err)
 		if strings.Contains(err.Error(), "bind: cannot assign requested address") {
@@ -191,7 +190,8 @@ func genHostOption(ctx *netCtx.NetCtx) ([]libp2p.Option, error) {
 
 	opts := []libp2p.Option{
 		libp2p.ListenAddrs(muAddr),
-		libp2p.EnableRelay(circuit.OptHop),
+		// libp2p.EnableRelay(circuit.OptHop),
+		libp2p.EnableRelay(),
 	}
 
 	if cfg.IsNat {
@@ -204,14 +204,14 @@ func genHostOption(ctx *netCtx.NetCtx) ([]libp2p.Option, error) {
 			return nil, err
 		}
 		opts = append(opts, libp2p.Identity(priv))
-		opts = append(opts, libp2p.Security(ID, NewTLS(cfg.KeyPath, cfg.ServiceName)))
+		opts = append(opts, libp2p.Security(tls.ID, tls.New))
 	} else {
 		priv, err := p2p.GetKeyPairFromPath(cfg.KeyPath)
 		if err != nil {
 			return nil, err
 		}
 		opts = append(opts, libp2p.Identity(priv))
-		opts = append(opts, libp2p.Security(secIO.ID, secIO.New))
+		opts = append(opts, libp2p.Security(noise.ID, noise.New))
 	}
 
 	return opts, nil
@@ -428,15 +428,9 @@ func (p *P2PServerV2) connectPeerByAddress(addresses []string) int {
 func (p *P2PServerV2) getAddrInfos(addresses []string) []peer.AddrInfo {
 	addrInfos := make([]peer.AddrInfo, 0, len(addresses))
 	for _, addr := range addresses {
-		peerAddr, err := ipfsAddr.ParseString(addr)
+		addrInfo, err := peer.AddrInfoFromString(addr)
 		if err != nil {
-			p.log.Error("p2p: parse peer address error", "peerAddr", peerAddr, "error", err)
-			continue
-		}
-
-		addrInfo, err := peer.AddrInfoFromP2pAddr(peerAddr.Multiaddr())
-		if err != nil {
-			p.log.Error("p2p: get peer node info error", "peerAddr", peerAddr, "error", err)
+			p.log.Error("p2p: get peer node info error", "peerAddr", addr, "error", err)
 			continue
 		}
 

bcs/network/p2pv2/stream.go

@@ -16,8 +16,8 @@ import (
 	pb "github.com/xuperchain/xupercore/protos"
 
 	ggio "github.com/gogo/protobuf/io"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
 	ma "github.com/multiformats/go-multiaddr"
 )
 

bcs/network/p2pv2/stream_limit.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 
 	nctx "github.com/xuperchain/xupercore/kernel/network/context"
 	"github.com/xuperchain/xupercore/lib/logs"

bcs/network/p2pv2/stream_pool.go

@@ -4,10 +4,10 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/protocol"
-	swarm "github.com/libp2p/go-libp2p-swarm"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/protocol"
+	swarm "github.com/libp2p/go-libp2p/p2p/net/swarm"
 
 	xctx "github.com/xuperchain/xupercore/kernel/common/xcontext"
 	nctx "github.com/xuperchain/xupercore/kernel/network/context"

bcs/network/p2pv2/tls.go

@@ -9,9 +9,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/sec"
+	"github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/protocol"
+	"github.com/libp2p/go-libp2p/core/sec"
 )
 
 // ID is the protocol ID (used when negotiating with multistream)
@@ -64,8 +66,12 @@ func NewTLS(path, serviceName string) func(key crypto.PrivKey) (*Transport, erro
 	}
 }
 
+func (t *Transport) ID() protocol.ID {
+	return ID
+}
+
 // SecureInbound runs the TLS handshake as a server.
-func (t *Transport) SecureInbound(ctx context.Context, insecure net.Conn) (sec.SecureConn, error) {
+func (t *Transport) SecureInbound(ctx context.Context, insecure net.Conn, p peer.ID) (sec.SecureConn, error) {
 	conn := tls.Server(insecure, t.config.Clone())
 	if err := conn.Handshake(); err != nil {
 		insecure.Close()
@@ -115,7 +121,6 @@ func (t *Transport) setupConn(tlsConn *tls.Conn, remotePubKey crypto.PubKey) (se
 	if err != nil {
 		return nil, err
 	}
-
 	return &conn{
 		Conn:         tlsConn,
 		localPeer:    t.localPeer,
@@ -132,8 +137,9 @@ type conn struct {
 	localPeer peer.ID
 	privKey   crypto.PrivKey
 
-	remotePeer   peer.ID
-	remotePubKey crypto.PubKey
+	remotePeer      peer.ID
+	remotePubKey    crypto.PubKey
+	connectionState network.ConnectionState
 }
 
 var _ sec.SecureConn = &conn{}
@@ -153,3 +159,7 @@ func (c *conn) RemotePeer() peer.ID {
 func (c *conn) RemotePublicKey() crypto.PubKey {
 	return c.remotePubKey
 }
+
+func (c *conn) ConnState() network.ConnectionState {
+	return c.connectionState
+}

bcs/network/p2pv2/util.go

@@ -3,7 +3,7 @@ package p2pv2
 import (
 	"fmt"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 type blankValidator struct{}