feat: bump to kubo 16 & libp2p 23

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>

Makefile

@@ -145,7 +145,7 @@ $(IOS_BUILD_DIR_CCP_CORE): $(IOS_CORE) $(MANIFEST_FILE)
 # From https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile#hdr-Build_a_library_for_Android_and_iOS
 # To generate a fat XCFramework that supports iOS, macOS, and macCatalyst for all supportec architectures (amd64 and arm64),
 # specify -target ios,macos,maccatalyst
-
+# we need to use `nowatchdog` tags, see https://github.com/libp2p/go-libp2p-connmgr/issues/98
 $(IOS_CORE): $(IOS_BUILD_DIR_INT_CORE) $(GO_SRC) $(GO_MOD_FILES)
 	@echo '------------------------------------'
 	@echo '     iOS Core: Gomobile binding     '
@@ -154,8 +154,10 @@ $(IOS_CORE): $(IOS_BUILD_DIR_INT_CORE) $(GO_SRC) $(GO_MOD_FILES)
 	cd $(GO_DIR) && go install golang.org/x/mobile/cmd/gobind
 	cd $(GO_DIR) && go run golang.org/x/mobile/cmd/gomobile init
 	mkdir -p $(IOS_GOMOBILE_CACHE) ios/Frameworks
+
 	cd $(GO_DIR) && go run golang.org/x/mobile/cmd/gomobile bind \
 			-o $(IOS_CORE) \
+			-tags 'nowatchdog' \
 			$(GOMOBILE_OPT) \
 			-cache $(IOS_GOMOBILE_CACHE) \
 			-target=$(GOMOBILE_IOS_TARGET)$(GOMOBILE_TARGET) \

deps.go

@@ -0,0 +1,5 @@
+package packages
+
+import (
+	_ "golang.org/x/mobile/cmd/gomobile"
+)

go/bind/core/config.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-	ipfs_config "github.com/ipfs/go-ipfs-config"
-	ipfs_common "github.com/ipfs/go-ipfs/repo/common"
+	ipfs_config "github.com/ipfs/kubo/config"
+	ipfs_common "github.com/ipfs/kubo/repo/common"
 )
 
 type Config struct {

go/bind/core/config_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	ipfs_config "github.com/ipfs/go-ipfs-config"
+	ipfs_config "github.com/ipfs/kubo/config"
 )
 
 const sampleFakeConfig = `

go/bind/core/init.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/ipfs-shipyard/gomobile-ipfs/go/pkg/ble-driver"
-	ipfs_config "github.com/ipfs/go-ipfs-config"
-	libp2p_ci "github.com/libp2p/go-libp2p-core/crypto"
-	libp2p_peer "github.com/libp2p/go-libp2p-core/peer"
+	ipfs_config "github.com/ipfs/kubo/config"
+	libp2p_ci "github.com/libp2p/go-libp2p/core/crypto"
+	libp2p_peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 func initConfig(out io.Writer, nBitsForKeypair int) (*ipfs_config.Config, error) {
@@ -39,8 +39,7 @@ func initConfig(out io.Writer, nBitsForKeypair int) (*ipfs_config.Config, error)
 		Identity:  identity,
 		Discovery: ipfs_config.Discovery{
 			MDNS: ipfs_config.MDNS{
-				Enabled:  true,
-				Interval: 10,
+				Enabled: true,
 			},
 		},
 

go/bind/core/node.go

@@ -24,8 +24,8 @@ import (
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
 
-	ipfs_config "github.com/ipfs/go-ipfs-config"
-	ipfs_bs "github.com/ipfs/go-ipfs/core/bootstrap"
+	ipfs_config "github.com/ipfs/kubo/config"
+	ipfs_bs "github.com/ipfs/kubo/core/bootstrap"
 	libp2p "github.com/libp2p/go-libp2p"
 )
 

go/bind/core/node_test.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	ipfs_files "github.com/ipfs/go-ipfs-files"
-	ipfs_coreapi "github.com/ipfs/go-ipfs/core/coreapi"
+	ipfs_coreapi "github.com/ipfs/kubo/core/coreapi"
 
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"

go/bind/core/proximity.go

@@ -12,10 +12,9 @@ type ProximityTransport interface {
 	proximity.ProximityTransport
 }
 
-func GetProximityTransport(protocolName string) ProximityTransport {
-	t, ok := proximity.TransportMap.Load(protocolName)
-	if ok {
-		return t.(proximity.ProximityTransport)
-	}
-	return nil
+func GetProximityTransport(protocolName string) (t ProximityTransport) {
+	proximity.TransportMapMutex.RLock()
+	t = proximity.TransportMap[protocolName]
+	proximity.TransportMapMutex.RUnlock()
+	return
 }

go/bind/core/repo.go

@@ -5,9 +5,9 @@ import (
 	"sync"
 
 	ipfs_mobile "github.com/ipfs-shipyard/gomobile-ipfs/go/pkg/ipfsmobile"
-	ipfs_loader "github.com/ipfs/go-ipfs/plugin/loader"
-	ipfs_repo "github.com/ipfs/go-ipfs/repo"
-	ipfs_fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
+	ipfs_loader "github.com/ipfs/kubo/plugin/loader"
+	ipfs_repo "github.com/ipfs/kubo/repo"
+	ipfs_fsrepo "github.com/ipfs/kubo/repo/fsrepo"
 )
 
 var (