chore: upgrade ipfs deps

Signed-off-by: Norman Meier <[email protected]>

account_export.go

@@ -9,9 +9,9 @@ import (
 	"io"
 	"strings"
 
+	ipfs_interface "github.com/ipfs/boxo/coreiface"
 	"github.com/ipfs/go-cid"
 	cbornode "github.com/ipfs/go-ipld-cbor"
-	ipfs_interface "github.com/ipfs/interface-go-ipfs-core"
 	mh "github.com/multiformats/go-multihash"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"

api_client.go

@@ -91,7 +91,7 @@ func (s *service) ServiceGetConfiguration(ctx context.Context, req *protocoltype
 		AccountPK:      member,
 		DevicePK:       device,
 		AccountGroupPK: accountGroup.Group().PublicKey,
-		PeerID:         key.ID().Pretty(),
+		PeerID:         key.ID().String(),
 		Listeners:      listeners,
 	}, nil
 }

api_contact.go

@@ -101,7 +101,7 @@ func (s *service) RefreshContactRequest(ctx context.Context, req *protocoltypes.
 		}
 
 		res.PeersFound = append(res.PeersFound, &protocoltypes.RefreshContactRequest_Peer{
-			ID:    p.ID.Pretty(),
+			ID:    p.ID.String(),
 			Addrs: addrs,
 		})
 	}

api_debug.go

@@ -238,7 +238,7 @@ func (s *service) PeerList(ctx context.Context, request *protocoltypes.PeerList_
 	if api == nil {
 		return nil, errcode.TODO.Wrap(fmt.Errorf("IPFS Core API is not available"))
 	}
-	swarmPeers, err := api.Swarm().Peers(ctx) // https://pkg.go.dev/github.com/ipfs/interface-go-ipfs-core#ConnectionInfo
+	swarmPeers, err := api.Swarm().Peers(ctx) // https://pkg.go.dev/github.com/ipfs/boxo/coreiface#ConnectionInfo
 	if err != nil {
 		return nil, errcode.TODO.Wrap(err)
 	}
@@ -248,7 +248,7 @@ func (s *service) PeerList(ctx context.Context, request *protocoltypes.PeerList_
 	// each peer in the swarm should be visible
 	for _, swarmPeer := range swarmPeers {
 		peers[swarmPeer.ID()] = &protocoltypes.PeerList_Peer{
-			ID:     swarmPeer.ID().Pretty(),
+			ID:     swarmPeer.ID().String(),
 			Errors: []string{},
 			Routes: []*protocoltypes.PeerList_Route{},
 		}
@@ -270,7 +270,7 @@ func (s *service) PeerList(ctx context.Context, request *protocoltypes.PeerList_
 		peer, ok := peers[swarmPeer.ID()]
 		if !ok {
 			peer = &protocoltypes.PeerList_Peer{
-				ID:     swarmPeer.ID().Pretty(),
+				ID:     swarmPeer.ID().String(),
 				Errors: []string{},
 				Routes: []*protocoltypes.PeerList_Route{},
 			}

api_group.go

@@ -172,7 +172,7 @@ func (s *service) craftPeerConnectedMessage(peer peer.ID) (*protocoltypes.GroupD
 	}
 
 	connected := protocoltypes.GroupDeviceStatus_Reply_PeerConnected{
-		PeerID:   peer.Pretty(),
+		PeerID:   peer.String(),
 		DevicePK: devicePKRaw,
 	}
 
@@ -207,12 +207,12 @@ CONN_LOOP:
 
 func (s *service) craftDeviceDisconnectedMessage(peer peer.ID) *protocoltypes.GroupDeviceStatus_Reply_PeerDisconnected {
 	return &protocoltypes.GroupDeviceStatus_Reply_PeerDisconnected{
-		PeerID: peer.Pretty(),
+		PeerID: peer.String(),
 	}
 }
 
 func (s *service) craftDeviceReconnectedMessage(peer peer.ID) *protocoltypes.GroupDeviceStatus_Reply_PeerReconnecting {
 	return &protocoltypes.GroupDeviceStatus_Reply_PeerReconnecting{
-		PeerID: peer.Pretty(),
+		PeerID: peer.String(),
 	}
 }

orbitdb.go

@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
+	coreapi "github.com/ipfs/boxo/coreiface"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
 	ds_sync "github.com/ipfs/go-datastore/sync"
-	coreapi "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"

pkg/ipfsutil/conn_logger.go

@@ -69,7 +69,7 @@ func (cl *connLogger) Connected(net network.Network, c network.Conn) {
 		<-time.After(10 * time.Millisecond)
 		if tags := cl.getPeerTags(c.RemotePeer()); tags != nil {
 			cl.logger.Info("Connected",
-				logutil.PrivateString("peer", c.RemotePeer().Pretty()),
+				logutil.PrivateString("peer", c.RemotePeer().String()),
 				logutil.PrivateString("to", c.LocalMultiaddr().String()),
 				logutil.PrivateString("from", c.RemoteMultiaddr().String()),
 				logutil.PrivateStrings("tags", tags),
@@ -81,7 +81,7 @@ func (cl *connLogger) Connected(net network.Network, c network.Conn) {
 func (cl *connLogger) Disconnected(n network.Network, c network.Conn) {
 	if tags := cl.getPeerTags(c.RemotePeer()); tags != nil {
 		cl.logger.Info("Disconnected",
-			logutil.PrivateString("peer", c.RemotePeer().Pretty()),
+			logutil.PrivateString("peer", c.RemotePeer().String()),
 			logutil.PrivateString("to", c.LocalMultiaddr().String()),
 			logutil.PrivateString("from", c.RemoteMultiaddr().String()),
 			logutil.PrivateStrings("tags", tags),
@@ -92,7 +92,7 @@ func (cl *connLogger) Disconnected(n network.Network, c network.Conn) {
 func (cl *connLogger) OpenedStream(n network.Network, s network.Stream) {
 	if tags := cl.getPeerTags(s.Conn().RemotePeer()); tags != nil {
 		cl.logger.Debug("Stream opened",
-			logutil.PrivateString("peer", s.Conn().RemotePeer().Pretty()),
+			logutil.PrivateString("peer", s.Conn().RemotePeer().String()),
 			logutil.PrivateString("to", s.Conn().LocalMultiaddr().String()),
 			logutil.PrivateString("from", s.Conn().RemoteMultiaddr().String()),
 			logutil.PrivateString("protocol", string(s.Protocol())),
@@ -104,7 +104,7 @@ func (cl *connLogger) OpenedStream(n network.Network, s network.Stream) {
 func (cl *connLogger) ClosedStream(n network.Network, s network.Stream) {
 	if tags := cl.getPeerTags(s.Conn().RemotePeer()); tags != nil {
 		cl.logger.Debug("Stream closed",
-			logutil.PrivateString("peer", s.Conn().RemotePeer().Pretty()),
+			logutil.PrivateString("peer", s.Conn().RemotePeer().String()),
 			logutil.PrivateString("to", s.Conn().LocalMultiaddr().String()),
 			logutil.PrivateString("from", s.Conn().RemoteMultiaddr().String()),
 			logutil.PrivateString("protocol", string(s.Protocol())),

pkg/ipfsutil/extended_core_api.go

@@ -1,7 +1,7 @@
 package ipfsutil
 
 import (
-	ipfs_interface "github.com/ipfs/interface-go-ipfs-core"
+	ipfs_interface "github.com/ipfs/boxo/coreiface"
 	ipfs_core "github.com/ipfs/kubo/core"
 	ipfs_coreapi "github.com/ipfs/kubo/core/coreapi"
 	"github.com/libp2p/go-libp2p/core/connmgr"

pkg/ipfsutil/helpers.go

@@ -87,7 +87,7 @@ func ParseAndResolveMaddrs(ctx context.Context, logger *zap.Logger, addrs []stri
 			}
 			logger.Debug("rdvp peer resolved addrs",
 				logutil.PrivateString("input", addr),
-				// logutil.PrivateString("ID", rdvpeer.ID.Pretty()),
+				// logutil.PrivateString("ID", rdvpeer.ID.String()),
 				logutil.PrivateStrings("addrs", addrStrings),
 			)
 			outPeersUnmatched[j] = rdvpeer

pkg/ipfsutil/localrecord.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	ipfs_interface "github.com/ipfs/interface-go-ipfs-core"
+	ipfs_interface "github.com/ipfs/boxo/coreiface"
 	ipfs_core "github.com/ipfs/kubo/core"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/network"

pkg/ipfsutil/mobile.go

@@ -4,17 +4,13 @@ import (
 	"context"
 	"fmt"
 
-	ds "github.com/ipfs/go-datastore"
 	ipfs_config "github.com/ipfs/kubo/config"
 	ipfs_p2p "github.com/ipfs/kubo/core/node/libp2p"
 	p2p "github.com/libp2p/go-libp2p"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	p2p_dht "github.com/libp2p/go-libp2p-kad-dht"
 	"github.com/libp2p/go-libp2p-kad-dht/dual"
-	p2p_record "github.com/libp2p/go-libp2p-record"
 	host "github.com/libp2p/go-libp2p/core/host"
-	p2p_host "github.com/libp2p/go-libp2p/core/host"
-	p2p_peer "github.com/libp2p/go-libp2p/core/peer"
 	p2p_routing "github.com/libp2p/go-libp2p/core/routing"
 
 	ipfs_mobile "berty.tech/weshnet/pkg/ipfsutil/mobile"
@@ -117,27 +113,19 @@ func NewIPFSMobile(ctx context.Context, repo *ipfs_mobile.RepoMobile, opts *Mobi
 }
 
 func CustomRoutingOption(mode p2p_dht.ModeOpt, net DHTNetworkMode, opts ...p2p_dht.Option) func(
-	ctx context.Context,
-	host p2p_host.Host,
-	dstore ds.Batching,
-	validator p2p_record.Validator,
-	bootstrapPeers ...p2p_peer.AddrInfo,
+	args ipfs_p2p.RoutingOptionArgs,
 ) (p2p_routing.Routing, error) {
 	return func(
-		ctx context.Context,
-		host p2p_host.Host,
-		dstore ds.Batching,
-		validator p2p_record.Validator,
-		bootstrapPeers ...p2p_peer.AddrInfo,
+		args ipfs_p2p.RoutingOptionArgs,
 	) (p2p_routing.Routing, error) {
 		opts = append(opts,
 			p2p_dht.Mode(mode),
-			p2p_dht.Datastore(dstore),
-			p2p_dht.Validator(validator),
-			p2p_dht.BootstrapPeers(bootstrapPeers...),
+			p2p_dht.Datastore(args.Datastore),
+			p2p_dht.Validator(args.Validator),
+			p2p_dht.BootstrapPeers(args.BootstrapPeers...),
 		)
 
-		return newDualDHT(ctx, host, net, opts...)
+		return newDualDHT(args.Ctx, args.Host, net, opts...)
 	}
 }
 

pkg/ipfsutil/mobile/node.go

@@ -68,7 +68,7 @@ func (im *IpfsMobile) Close() error {
 }
 
 func (im *IpfsMobile) ServeCoreHTTP(l net.Listener, opts ...ipfs_corehttp.ServeOption) error {
-	gatewayOpt := ipfs_corehttp.GatewayOption(false, ipfs_corehttp.WebUIPaths...)
+	gatewayOpt := ipfs_corehttp.GatewayOption(ipfs_corehttp.WebUIPaths...)
 	opts = append(opts,
 		ipfs_corehttp.WebUIOption,
 		gatewayOpt,
@@ -79,9 +79,11 @@ func (im *IpfsMobile) ServeCoreHTTP(l net.Listener, opts ...ipfs_corehttp.ServeO
 }
 
 func (im *IpfsMobile) ServeGateway(l net.Listener, writable bool, opts ...ipfs_corehttp.ServeOption) error {
+	// TODO: do we need to pass writable another way?
+
 	opts = append(opts,
 		ipfs_corehttp.HostnameOption(),
-		ipfs_corehttp.GatewayOption(writable, "/ipfs", "/ipns"),
+		ipfs_corehttp.GatewayOption("/ipfs", "/ipns"),
 		ipfs_corehttp.VersionOption(),
 		ipfs_corehttp.CheckVersionOption(),
 		ipfs_corehttp.CommandsROOption(im.commandCtx),

pkg/ipfsutil/mobile/routing.go

@@ -1,14 +1,10 @@
 package node
 
 import (
-	"context"
 	"fmt"
 
-	ds "github.com/ipfs/go-datastore"
 	ipfs_p2p "github.com/ipfs/kubo/core/node/libp2p"
-	p2p_record "github.com/libp2p/go-libp2p-record"
 	p2p_host "github.com/libp2p/go-libp2p/core/host"
-	p2p_peer "github.com/libp2p/go-libp2p/core/peer"
 	p2p_routing "github.com/libp2p/go-libp2p/core/routing"
 )
 
@@ -19,20 +15,14 @@ type RoutingConfig struct {
 }
 
 func NewRoutingConfigOption(ro ipfs_p2p.RoutingOption, rc *RoutingConfig) ipfs_p2p.RoutingOption {
-	return func(
-		ctx context.Context,
-		host p2p_host.Host,
-		dstore ds.Batching,
-		validator p2p_record.Validator,
-		bootstrapPeers ...p2p_peer.AddrInfo,
-	) (p2p_routing.Routing, error) {
-		routing, err := ro(ctx, host, dstore, validator, bootstrapPeers...)
+	return func(args ipfs_p2p.RoutingOptionArgs) (p2p_routing.Routing, error) {
+		routing, err := ro(args)
 		if err != nil {
 			return nil, err
 		}
 
 		if rc.ConfigFunc != nil {
-			if err := rc.ConfigFunc(host, routing); err != nil {
+			if err := rc.ConfigFunc(args.Host, routing); err != nil {
 				return nil, fmt.Errorf("failed to config routing: %w", err)
 			}
 		}

pkg/ipfsutil/pubsub_adaptater.go

@@ -1,7 +1,7 @@
 package ipfsutil
 
 import (
-	ipfs_interface "github.com/ipfs/interface-go-ipfs-core"
+	ipfs_interface "github.com/ipfs/boxo/coreiface"
 )
 
 type pubsubCoreAPIAdapter struct {

pkg/ipfsutil/pubsub_api.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"sync"
 
-	ipfs_interface "github.com/ipfs/interface-go-ipfs-core"
-	ipfs_iopts "github.com/ipfs/interface-go-ipfs-core/options"
+	ipfs_interface "github.com/ipfs/boxo/coreiface"
+	ipfs_iopts "github.com/ipfs/boxo/coreiface/options"
 	p2p_pubsub "github.com/libp2p/go-libp2p-pubsub"
 	p2p_peer "github.com/libp2p/go-libp2p/core/peer"
 	"go.uber.org/zap"

pkg/ipfsutil/repo.go

@@ -141,7 +141,7 @@ func ResetRepoIdentity(c *ipfs_cfg.Config) error {
 	}
 
 	// Identity
-	c.Identity.PeerID = pid.Pretty()
+	c.Identity.PeerID = pid.String()
 	c.Identity.PrivKey = base64.StdEncoding.EncodeToString(privkeyb)
 
 	return nil

pkg/ipfsutil/testing.go

@@ -92,7 +92,7 @@ func TestingRepo(t testing.TB, ctx context.Context, datastore ds.Datastore) ipfs
 
 	c.Bootstrap = []string{}
 	c.Addresses.Swarm = []string{"/ip6/::/tcp/0"}
-	c.Identity.PeerID = pid.Pretty()
+	c.Identity.PeerID = pid.String()
 	c.Identity.PrivKey = base64.StdEncoding.EncodeToString(privkeyb)
 	c.Swarm.ResourceMgr.Enabled = ipfs_cfg.False
 

pkg/proximitytransport/listener.go

@@ -48,7 +48,7 @@ func newListener(ctx context.Context, localMa ma.Multiaddr, t *proximityTranspor
 	// Starts the native driver.
 	// If it failed, don't return a error because no other transport
 	// on the libp2p node will be created.
-	t.driver.Start(t.host.ID().Pretty())
+	t.driver.Start(t.host.ID().String())
 
 	return listener
 }

pkg/proximitytransport/transport.go

@@ -107,7 +107,7 @@ func (t *proximityTransport) Dial(ctx context.Context, remoteMa ma.Multiaddr, re
 	// remoteAddr is supposed to be equal to remotePID since with proximity transports:
 	// multiaddr = /<protocol>/<peerID>
 	remoteAddr, err := remoteMa.ValueForProtocol(t.driver.ProtocolCode())
-	if err != nil || remoteAddr != remotePID.Pretty() {
+	if err != nil || remoteAddr != remotePID.String() {
 		return nil, errors.Wrap(err, "error: proximityTransport.Dial: wrong multiaddr")
 	}
 
@@ -141,7 +141,7 @@ func (t *proximityTransport) CanDial(remoteMa ma.Multiaddr) bool {
 func (t *proximityTransport) Listen(localMa ma.Multiaddr) (tpt.Listener, error) {
 	// localAddr is supposed to be equal to the localPID
 	// or to DefaultAddr since multiaddr == /<protocol>/<peerID>
-	localPID := t.host.ID().Pretty()
+	localPID := t.host.ID().String()
 	localAddr, err := localMa.ValueForProtocol(t.driver.ProtocolCode())
 	if err != nil || (localMa.String() != t.driver.DefaultAddr() && localAddr != localPID) {
 		return nil, errors.Wrap(err, "error: proximityTransport.Listen: wrong multiaddr")

service.go

@@ -12,10 +12,10 @@ import (
 
 	pubsub_fix "github.com/berty/go-libp2p-pubsub"
 	"github.com/dgraph-io/badger/v2/options"
+	ipfs_interface "github.com/ipfs/boxo/coreiface"
 	ds "github.com/ipfs/go-datastore"
 	ds_sync "github.com/ipfs/go-datastore/sync"
 	badger "github.com/ipfs/go-ds-badger2"
-	ipfs_interface "github.com/ipfs/interface-go-ipfs-core"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/event"

service_outofstoremessage.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"time"
 
+	ipfs_interface "github.com/ipfs/boxo/coreiface"
 	ds "github.com/ipfs/go-datastore"
 	ds_sync "github.com/ipfs/go-datastore/sync"
-	ipfs_interface "github.com/ipfs/interface-go-ipfs-core"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 

store_message.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"sync"
 
+	coreapi "github.com/ipfs/boxo/coreiface"
 	"github.com/ipfs/go-cid"
-	coreapi "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/event"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"

store_metadata.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/gogo/protobuf/proto"
-	coreapi "github.com/ipfs/interface-go-ipfs-core"
+	coreapi "github.com/ipfs/boxo/coreiface"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/event"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"

tool/bench-cellular/client.go

@@ -189,7 +189,7 @@ func runClient(ctx context.Context, gOpts *globalOpts, cOpts *clientOpts) error
 		return fmt.Errorf("client host creation failed: %v", err)
 	}
 
-	log.Println("Local peerID:", h.ID().Pretty())
+	log.Println("Local peerID:", h.ID())
 
 	peerid, err := addDestToPeerstore(h, cOpts.dest)
 	if err != nil {