update go-libp2p to v0.22.0, release v0.2.0

examples/embed.go

@@ -5,8 +5,8 @@ import (
 
 	pb "github.com/ipfs/go-ipns/pb"
 
-	ipns "github.com/ipfs/go-ipns"
-	crypto "github.com/libp2p/go-libp2p-core/crypto"
+	"github.com/ipfs/go-ipns"
+	"github.com/libp2p/go-libp2p/core/crypto"
 )
 
 // CreateEntryWithEmbed shows how you can create an IPNS entry

examples/examples_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-ipns/examples"
-	crypto "github.com/libp2p/go-libp2p-core/crypto"
+	"github.com/libp2p/go-libp2p/core/crypto"
 )
 
 var testPath = "/ipfs/Qme1knMqwt1hKZbc1BmQFmnm9f36nyQGwXxPGVpVJ9rMK5"

examples/key.go

@@ -1,7 +1,7 @@
 package examples
 
 import (
-	crypto "github.com/libp2p/go-libp2p-core/crypto"
+	"github.com/libp2p/go-libp2p/core/crypto"
 )
 
 // GenerateRSAKeyPair is used to generate an RSA key pair

go.mod

@@ -2,41 +2,41 @@ module github.com/ipfs/go-ipns
 
 require (
 	github.com/gogo/protobuf v1.3.2
-	github.com/ipfs/go-ipfs-util v0.0.1
-	github.com/ipfs/go-log v1.0.5
+	github.com/ipfs/go-ipfs-util v0.0.2
+	github.com/ipfs/go-log/v2 v2.5.1
 	github.com/ipld/go-ipld-prime v0.9.0
-	github.com/libp2p/go-libp2p-core v0.8.6
-	github.com/libp2p/go-libp2p-peerstore v0.2.8
-	github.com/libp2p/go-libp2p-record v0.1.2
-	github.com/multiformats/go-multicodec v0.2.0
-	github.com/pkg/errors v0.8.1
+	github.com/libp2p/go-libp2p v0.22.0
+	github.com/libp2p/go-libp2p-record v0.2.0
+	github.com/multiformats/go-multicodec v0.5.0
+	github.com/pkg/errors v0.9.1
 )
 
 require (
-	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/ipfs/go-cid v0.0.7 // indirect
-	github.com/ipfs/go-log/v2 v2.1.3 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.4 // indirect
-	github.com/libp2p/go-buffer-pool v0.0.2 // indirect
-	github.com/libp2p/go-openssl v0.0.7 // indirect
-	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+	github.com/ipfs/go-cid v0.2.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.1.0 // indirect
+	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/libp2p/go-openssl v0.1.0 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-pointer v0.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.0.3 // indirect
+	github.com/multiformats/go-base32 v0.0.4 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
-	github.com/multiformats/go-multiaddr v0.3.3 // indirect
+	github.com/multiformats/go-multiaddr v0.6.0 // indirect
 	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
-	github.com/multiformats/go-multibase v0.0.3 // indirect
-	github.com/multiformats/go-multihash v0.0.15 // indirect
+	github.com/multiformats/go-multibase v0.1.1 // indirect
+	github.com/multiformats/go-multihash v0.2.1 // indirect
 	github.com/multiformats/go-varint v0.0.6 // indirect
-	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1 // indirect
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.16.0 // indirect
-	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
-	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/zap v1.22.0 // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
+	lukechampine.com/blake3 v1.1.7 // indirect
 )
 
 go 1.17

ipns.go

@@ -6,22 +6,21 @@ import (
 	"sort"
 	"time"
 
+	"github.com/multiformats/go-multicodec"
 	"github.com/pkg/errors"
 
 	"github.com/ipld/go-ipld-prime"
 	_ "github.com/ipld/go-ipld-prime/codec/dagcbor" // used to import the DagCbor encoder/decoder
 	ipldcodec "github.com/ipld/go-ipld-prime/multicodec"
-	"github.com/ipld/go-ipld-prime/node/basic"
-
-	"github.com/multiformats/go-multicodec"
+	basicnode "github.com/ipld/go-ipld-prime/node/basic"
 
 	"github.com/gogo/protobuf/proto"
 
 	pb "github.com/ipfs/go-ipns/pb"
 
 	u "github.com/ipfs/go-ipfs-util"
-	ic "github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	ic "github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 const (

ipns_test.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	u "github.com/ipfs/go-ipfs-util"
-	ci "github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	ci "github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 func TestEmbedPublicKey(t *testing.T) {

record.go

@@ -7,11 +7,11 @@ import (
 	pb "github.com/ipfs/go-ipns/pb"
 
 	"github.com/gogo/protobuf/proto"
-	logging "github.com/ipfs/go-log"
-	ic "github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-core/peer"
-	pstore "github.com/libp2p/go-libp2p-core/peerstore"
+	logging "github.com/ipfs/go-log/v2"
 	record "github.com/libp2p/go-libp2p-record"
+	ic "github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/peer"
+	pstore "github.com/libp2p/go-libp2p/core/peerstore"
 )
 
 var log = logging.Logger("ipns")

select_test.go

@@ -8,9 +8,9 @@ import (
 
 	pb "github.com/ipfs/go-ipns/pb"
 
-	proto "github.com/gogo/protobuf/proto"
+	"github.com/gogo/protobuf/proto"
 	u "github.com/ipfs/go-ipfs-util"
-	ci "github.com/libp2p/go-libp2p-core/crypto"
+	ci "github.com/libp2p/go-libp2p/core/crypto"
 )
 
 func shuffle(a []*pb.IpnsEntry) {

validate_test.go

@@ -9,18 +9,16 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gogo/protobuf/proto"
+	u "github.com/ipfs/go-ipfs-util"
 	pb "github.com/ipfs/go-ipns/pb"
-
 	ipldcodec "github.com/ipld/go-ipld-prime/multicodec"
 	basicnode "github.com/ipld/go-ipld-prime/node/basic"
+	"github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/peer"
+	pstore "github.com/libp2p/go-libp2p/core/peerstore"
+	"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
 	"github.com/multiformats/go-multicodec"
-
-	proto "github.com/gogo/protobuf/proto"
-	u "github.com/ipfs/go-ipfs-util"
-	"github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
-	pstore "github.com/libp2p/go-libp2p-core/peerstore"
-	pstoremem "github.com/libp2p/go-libp2p-peerstore/pstoremem"
 )
 
 func testValidatorCase(t *testing.T, priv crypto.PrivKey, kbook pstore.KeyBook, key string, val []byte, eol time.Time, exp error) {
@@ -69,11 +67,17 @@ func TestValidator(t *testing.T) {
 
 	priv, id, _ := genKeys(t)
 	priv2, id2, _ := genKeys(t)
-	kbook := pstoremem.NewPeerstore()
+	kbook, err := pstoremem.NewPeerstore()
+	if err != nil {
+		t.Fatal(err)
+	}
 	if err := kbook.AddPubKey(id, priv.GetPublic()); err != nil {
 		t.Fatal(err)
 	}
-	emptyKbook := pstoremem.NewPeerstore()
+	emptyKbook, err := pstoremem.NewPeerstore()
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	testValidatorCase(t, priv, kbook, "/ipns/"+string(id), nil, ts.Add(time.Hour), nil)
 	testValidatorCase(t, priv, kbook, "/ipns/"+string(id), nil, ts.Add(time.Hour*-1), ErrExpiredRecord)
@@ -97,7 +101,10 @@ func mustMarshal(t *testing.T, entry *pb.IpnsEntry) []byte {
 
 func TestEmbeddedPubKeyValidate(t *testing.T) {
 	goodeol := time.Now().Add(time.Hour)
-	kbook := pstoremem.NewPeerstore()
+	kbook, err := pstoremem.NewPeerstore()
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	pth := []byte("/ipfs/QmfM2r8seH2GiRaC4esTjeraXEachRt8ZsSeGaWTPLyMoG")
 
@@ -139,7 +146,10 @@ func TestPeerIDPubKeyValidate(t *testing.T) {
 	t.Skip("disabled until libp2p/go-libp2p-crypto#51 is fixed")
 
 	goodeol := time.Now().Add(time.Hour)
-	kbook := pstoremem.NewPeerstore()
+	kbook, err := pstoremem.NewPeerstore()
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	pth := []byte("/ipfs/QmfM2r8seH2GiRaC4esTjeraXEachRt8ZsSeGaWTPLyMoG")
 

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "v0.1.2"
+  "version": "v0.2.0"
 }