chore: upgrade go-libp2p-rendezvous

status-im · Jan 10, 2024 · 716c0da · 716c0da
1 parent ada8eb3
commit 716c0da
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 23 deletions.
diff --git a/go.mod b/go.mod
@@ -38,7 +38,7 @@ require (
 	github.com/status-im/doubleratchet v3.0.0+incompatible
 	github.com/status-im/markdown v0.0.0-20231114210825-6c2d15b5dc57
 	github.com/status-im/migrate/v4 v4.6.2-status.3
-	github.com/status-im/rendezvous v1.3.7
+	github.com/status-im/rendezvous v1.3.8-0.20240110194857-cc5be22bf83e
 	github.com/status-im/status-go/extkeys v1.1.2
 	github.com/status-im/tcp-shaker v1.1.1-status
 	github.com/status-im/zxcvbn-go v0.0.0-20220311183720-5e8676676857
@@ -265,7 +265,7 @@ require (
 	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
 	github.com/urfave/cli/v2 v2.24.4 // indirect
 	github.com/waku-org/go-discover v0.0.0-20221209174356-61c833f34d98 // indirect
-	github.com/waku-org/go-libp2p-rendezvous v0.0.0-20230628220917-7b4e5ae4c0e7 // indirect
+	github.com/waku-org/go-libp2p-rendezvous v0.0.0-20240110193335-a67d1cc760a0 // indirect
 	github.com/waku-org/go-zerokit-rln v0.1.14-0.20240102145250-fa738c0bdf59 // indirect
 	github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230916172309-ee0ee61dde2b // indirect
 	github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230916171929-1dd9494ff065 // indirect

diff --git a/go.sum b/go.sum
@@ -1840,8 +1840,8 @@ github.com/status-im/migrate/v4 v4.6.2-status.3 h1:Khwjb59NzniloUr5i9s9AtkEyqBbQ
 github.com/status-im/migrate/v4 v4.6.2-status.3/go.mod h1:c/kc90n47GZu/58nnz1OMLTf7uE4Da4gZP5qmU+A/v8=
 github.com/status-im/notify v1.0.2-status h1:x8wev0Sh8H8KAf4bVcv+L0dVHldBESOKUlqRqRY7uL8=
 github.com/status-im/notify v1.0.2-status/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc=
-github.com/status-im/rendezvous v1.3.7 h1:rZGWsFCjPV3MWeUkLkZSOGTAvyRf+rxx5hnEGLE4OHg=
-github.com/status-im/rendezvous v1.3.7/go.mod h1:r0vCbQJByTteMajN0f+Mcet/Vd7uAXxFPfewNpI2iXQ=
+github.com/status-im/rendezvous v1.3.8-0.20240110194857-cc5be22bf83e h1:pCOHeAYmYttXQBCn+6u01bs5d/W3XslxmplFhru4X1Y=
+github.com/status-im/rendezvous v1.3.8-0.20240110194857-cc5be22bf83e/go.mod h1:LEPENTHDBGCxXVZx6FEKNKN+tfPaIK+lmiGv1DxkJW4=
 github.com/status-im/resize v0.0.0-20201215164250-7c6d9f0d3088 h1:ClCAP2FPCvl8hGMhbUx/tq/sOu2wibztAa5jAvQEe4Q=
 github.com/status-im/resize v0.0.0-20201215164250-7c6d9f0d3088/go.mod h1:+92j1tN27DypDeBFxkg0uzkqfh1bNHTZe3Bv2PjvxpM=
 github.com/status-im/status-go/extkeys v1.1.2 h1:FSjARgDathJ3rIapJt851LsIXP9Oyuu2M2jPJKuzloU=
@@ -1937,8 +1937,8 @@ github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/waku-org/go-discover v0.0.0-20221209174356-61c833f34d98 h1:xwY0kW5XZFimdqfZb9cZwT1S3VJP9j3AE6bdNd9boXM=
 github.com/waku-org/go-discover v0.0.0-20221209174356-61c833f34d98/go.mod h1:eBHgM6T4EG0RZzxpxKy+rGz/6Dw2Nd8DWxS0lm9ESDw=
-github.com/waku-org/go-libp2p-rendezvous v0.0.0-20230628220917-7b4e5ae4c0e7 h1:0e1h+p84yBp0IN7AqgbZlV7lgFBjm214lgSOE7CeJmE=
-github.com/waku-org/go-libp2p-rendezvous v0.0.0-20230628220917-7b4e5ae4c0e7/go.mod h1:pFvOZ9YTFsW0o5zJW7a0B5tr1owAijRWJctXJ2toL04=
+github.com/waku-org/go-libp2p-rendezvous v0.0.0-20240110193335-a67d1cc760a0 h1:R4YYx2QamhBRl/moIxkDCNW+OP7AHbyWLBygDc/xIMo=
+github.com/waku-org/go-libp2p-rendezvous v0.0.0-20240110193335-a67d1cc760a0/go.mod h1:EhZP9fee0DYjKH/IOQvoNSy1tSHp2iZadsHGphcAJgY=
 github.com/waku-org/go-waku v0.8.1-0.20240103095929-0dec3201773a h1:SGgdeFGSytDYpLmAJX/xlDsnUvi5aP096R1aroWJhkM=
 github.com/waku-org/go-waku v0.8.1-0.20240103095929-0dec3201773a/go.mod h1:aT3Fx2CyP6NP7lDUqNDg6dwCGumkbIksu/xMq3ue4GI=
 github.com/waku-org/go-zerokit-rln v0.1.14-0.20240102145250-fa738c0bdf59 h1:jisj+OCI6QydLtFq3Pyhu49wl9ytPN7oAHjMfepHDrA=

diff --git a/shell.nix b/shell.nix
@@ -10,8 +10,8 @@
       android_sdk.accept_license = true;
     };
     overlays = [
-      (self: super: {
-        androidPkgs = pkgs.androidenv.composeAndroidPackages {
+      (final: prev: {
+        androidPkgs = prev.androidenv.composeAndroidPackages {
           toolsVersion = "26.1.1";
           platformToolsVersion = "33.0.3";
           buildToolsVersions = [ "31.0.0" ];
@@ -24,6 +24,19 @@
             "extras;google;m2repository"
           ];
         };
+        # https://github.com/golang/go/issues/58426
+        gomobile = prev.gomobile.override {
+          buildGoModule = args: prev.buildGo121Module ( args // rec {
+            version = "unstable-2023-11-27";
+            src = prev.fetchgit {
+              rev = "76ac6878050a2eef81867f2c6c21108e59919e8f";
+              name = "gomobile";
+              url = "https://go.googlesource.com/mobile";
+              sha256 = "sha256-mq7gKccvI7VCBEiQTueWxMPOCgg/MGE8y2+BlwWx5pw=";
+            };
+            vendorHash = "sha256-8OBLVd4zs89hoJXzC8BPRgrYjjR7DiA39+7tTaSYUFI=";
+          });
+        };
       })
     ];
   }
@@ -40,18 +53,10 @@ let
     allowHigher = true;
   };
   /* Gomobile also needs the Xcode wrapper. */
-  gomobileMod = (pkgs.gomobile.overrideAttrs (old: {
-    patches = self.fetchurl {
-      url = "https://github.com/golang/mobile/commit/76ac6878050a2eef81867f2c6c21108e59919e8f";
-      sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
-    };
-  })).override {
-    /* Gomobile also needs the Xcode wrapper. */
+  gomobileMod = pkgs.gomobile.override {
     inherit xcodeWrapper;
     withAndroidPkgs = !isMacM1;
   };
-
-
 in pkgs.mkShell {
   name = "status-go-shell";
 

diff --git a/vendor/github.com/status-im/rendezvous/server/server.go b/vendor/github.com/status-im/rendezvous/server/server.go
diff --git a/vendor/github.com/waku-org/go-libp2p-rendezvous/svc.go b/vendor/github.com/waku-org/go-libp2p-rendezvous/svc.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -966,7 +966,7 @@ github.com/status-im/migrate/v4/database/postgres
 github.com/status-im/migrate/v4/database/sqlcipher
 github.com/status-im/migrate/v4/internal/url
 github.com/status-im/migrate/v4/source/go_bindata
-# github.com/status-im/rendezvous v1.3.7
+# github.com/status-im/rendezvous v1.3.8-0.20240110194857-cc5be22bf83e
 ## explicit; go 1.18
 github.com/status-im/rendezvous
 github.com/status-im/rendezvous/protocol
@@ -1048,7 +1048,7 @@ github.com/vacp2p/mvds/transport
 github.com/waku-org/go-discover/discover
 github.com/waku-org/go-discover/discover/v4wire
 github.com/waku-org/go-discover/discover/v5wire
-# github.com/waku-org/go-libp2p-rendezvous v0.0.0-20230628220917-7b4e5ae4c0e7
+# github.com/waku-org/go-libp2p-rendezvous v0.0.0-20240110193335-a67d1cc760a0
 ## explicit; go 1.19
 github.com/waku-org/go-libp2p-rendezvous
 github.com/waku-org/go-libp2p-rendezvous/db

diff --git a/wakuv2/waku.go b/wakuv2/waku.go
@@ -1806,11 +1806,11 @@ func FormatPeerStats(wakuNode *node.WakuNode, peers node.PeerStats) map[string]t
 		peerInfo := wakuNode.Host().Peerstore().PeerInfo(k)
 		wakuV2Peer := types.WakuV2Peer{}
 		wakuV2Peer.Protocols = v
-		hostInfo, _ := multiaddr.NewMultiaddr(fmt.Sprintf("/p2p/%s", k.Pretty()))
+		hostInfo, _ := multiaddr.NewMultiaddr(fmt.Sprintf("/p2p/%s", k.String()))
 		for _, addr := range peerInfo.Addrs {
 			wakuV2Peer.Addresses = append(wakuV2Peer.Addresses, addr.Encapsulate(hostInfo).String())
 		}
-		p[k.Pretty()] = wakuV2Peer
+		p[k.String()] = wakuV2Peer
 	}
 	return p
 }