feat: upgrade libp2p to 0.23.4

crypto/crypto.go

@@ -16,9 +16,9 @@ import (
 
 	eth "github.com/ethereum/go-ethereum/crypto"
 	"github.com/gogo/protobuf/proto"
-	ic "github.com/libp2p/go-libp2p-core/crypto"
-	pb "github.com/libp2p/go-libp2p-core/crypto/pb"
-	"github.com/libp2p/go-libp2p-core/peer"
+	ic "github.com/libp2p/go-libp2p/core/crypto"
+	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 func Sign(key ic.PrivKey, channelMessage proto.Message) ([]byte, error) {
@@ -176,7 +176,7 @@ func Decrypt(key, text []byte) ([]byte, error) {
 }
 
 func GetPubKeyFromPeerId(pid string) (ic.PubKey, error) {
-	peerId, err := peer.IDB58Decode(pid)
+	peerId, err := peer.Decode(pid)
 	if err != nil {
 		return nil, err
 	}

crypto/keys.go

@@ -9,7 +9,7 @@ import (
 	"github.com/btcsuite/btcutil/base58"
 	ethCommon "github.com/ethereum/go-ethereum/common"
 	eth "github.com/ethereum/go-ethereum/crypto"
-	ic "github.com/libp2p/go-libp2p-core/crypto"
+	ic "github.com/libp2p/go-libp2p/core/crypto"
 )
 
 const (
@@ -36,7 +36,7 @@ func FromIcPrivateKey(privKey ic.PrivKey) (*Keys, error) {
 		return nil, err
 	}
 
-	pubKeyRaw, err := ic.RawFull(pubKey)
+	pubKeyRaw, err := Secp256k1PublicKeyRaw(pubKey)
 	if err != nil {
 		return nil, err
 	}
@@ -167,7 +167,7 @@ func Encode58Check(input []byte) (string, error) {
 	return base58.Encode(inputCheck), nil
 }
 
-//Package goLang sha256 hash algorithm.
+// Package goLang sha256 hash algorithm.
 func Hash(s []byte) ([]byte, error) {
 	h := sha256.New()
 	_, err := h.Write(s)

crypto/tron_address.go

@@ -4,13 +4,15 @@ import (
 	"crypto/ecdsa"
 	"crypto/sha256"
 	"encoding/hex"
+	"fmt"
 
+	"github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/tron-us/go-common/v2/crypto"
 	"github.com/tron-us/protobuf/proto"
 
 	eth "github.com/ethereum/go-ethereum/crypto"
-	ic "github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-core/peer"
+	ic "github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 func GetTronPubKeyFromPubkey(pubkeyS string) (*string, error) {
@@ -19,7 +21,7 @@ func GetTronPubKeyFromPubkey(pubkeyS string) (*string, error) {
 		return nil, err
 	}
 
-	pubkeyRaw, err := ic.RawFull(pubkey)
+	pubkeyRaw, err := ic.MarshalPublicKey(pubkey)
 	if err != nil {
 		return nil, err
 	}
@@ -41,7 +43,7 @@ func GetTronPubKeyFromPubkey(pubkeyS string) (*string, error) {
 }
 
 func GetTronPubKeyFromPeerIdPretty(peerId string) (*string, error) {
-	pid, err := peer.IDB58Decode(peerId)
+	pid, err := peer.Decode(peerId)
 	if err != nil {
 		return nil, err
 	}
@@ -80,12 +82,11 @@ func TronSignRaw(privKey ic.PrivKey, data []byte) ([]byte, error) {
 }
 
 func GetTronPubKeyFromIcPubKey(pubkey ic.PubKey) (*string, error) {
-	pubkeyRaw, err := ic.RawFull(pubkey)
+	rawPubKey, err := Secp256k1PublicKeyRaw(pubkey)
 	if err != nil {
 		return nil, err
 	}
-
-	ethPubkey, err := eth.UnmarshalPubkey(pubkeyRaw)
+	ethPubkey, err := eth.UnmarshalPubkey(rawPubKey)
 	if err != nil {
 		return nil, err
 	}
@@ -117,7 +118,7 @@ func EcdsaPublicKeyToAddress(p ecdsa.PublicKey) (Address, error) {
 }
 
 func GetRawFullFromPeerIdPretty(peerid string) ([]byte, error) {
-	peerId, err := peer.IDB58Decode(peerid)
+	peerId, err := peer.Decode(peerid)
 	if err != nil {
 		return nil, err
 	}
@@ -127,3 +128,17 @@ func GetRawFullFromPeerIdPretty(peerid string) ([]byte, error) {
 	}
 	return pubkey.Raw()
 }
+
+// Raw returns the bytes of the key
+func Secp256k1PublicKeyRaw(pk ic.PubKey) (res []byte, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			err = fmt.Errorf("secp256k1 public key marshaling error: %v", r)
+		}
+	}()
+	k, ok := pk.(*ic.Secp256k1PublicKey)
+	if !ok {
+		return nil, fmt.Errorf("only secp256k1 keys support full public key bytes")
+	}
+	return (*secp256k1.PublicKey)(k).SerializeUncompressed(), nil
+}

go.mod

@@ -1,23 +1,72 @@
 module github.com/tron-us/go-btfs-common
 
-go 1.13
+go 1.18
 
 require (
-	github.com/btcsuite/btcutil v1.0.2
+	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
 	github.com/ethereum/go-ethereum v1.9.24
-	github.com/gogo/protobuf v1.3.1
-	github.com/golang/protobuf v1.4.3
+	github.com/gogo/protobuf v1.3.2
+	github.com/golang/protobuf v1.5.2
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/hypnoglow/go-pg-monitor v0.1.0
 	github.com/hypnoglow/go-pg-monitor/gopgv9 v0.1.0
-	github.com/libp2p/go-libp2p-core v0.0.6
-	github.com/prometheus/client_golang v1.8.0
-	github.com/stretchr/testify v1.6.1
+	github.com/libp2p/go-libp2p v0.23.4
+	github.com/prometheus/client_golang v1.13.0
+	github.com/stretchr/testify v1.8.0
 	github.com/tron-us/go-common/v2 v2.3.0
 	github.com/tron-us/protobuf v1.3.4
-	go.uber.org/zap v1.16.0
-	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
+	go.uber.org/zap v1.23.0
+	google.golang.org/genproto v0.0.0-20200825200019-8632dd797987
 	google.golang.org/grpc v1.34.0
 )
 
-replace github.com/libp2p/go-libp2p-core => github.com/TRON-US/go-libp2p-core v0.4.1
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/btcsuite/btcd v0.20.1-beta // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/codemodus/kace v0.5.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+	github.com/go-pg/migrations/v7 v7.1.11 // indirect
+	github.com/go-pg/pg/v9 v9.2.0 // indirect
+	github.com/go-pg/zerochecker v0.2.0 // indirect
+	github.com/go-redis/redis/v7 v7.4.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 // indirect
+	github.com/ipfs/go-cid v0.3.2 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.1.1 // indirect
+	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/libp2p/go-openssl v0.1.0 // indirect
+	github.com/mattn/go-pointer v0.0.1 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/minio/sha256-simd v1.0.0 // indirect
+	github.com/mr-tron/base58 v1.2.0 // indirect
+	github.com/multiformats/go-base32 v0.1.0 // indirect
+	github.com/multiformats/go-base36 v0.1.0 // indirect
+	github.com/multiformats/go-multiaddr v0.7.0 // indirect
+	github.com/multiformats/go-multibase v0.1.1 // indirect
+	github.com/multiformats/go-multicodec v0.6.0 // indirect
+	github.com/multiformats/go-multihash v0.2.1 // indirect
+	github.com/multiformats/go-varint v0.0.6 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/segmentio/encoding v0.1.15 // indirect
+	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/vmihailenco/bufpool v0.1.11 // indirect
+	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
+	github.com/vmihailenco/tagparser v0.1.1 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/net v0.0.0-20220920183852-bf014ff85ad5 // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	lukechampine.com/blake3 v1.1.7 // indirect
+	mellium.im/sasl v0.2.1 // indirect
+)