From 12c93c86bb835132193e8f5f25064d3f3ffb5f57 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Wed, 10 Jan 2024 15:38:48 -0400 Subject: [PATCH] chore: upgrade go-libp2p-rendezvous --- go.mod | 2 +- go.sum | 4 +-- shell.nix | 27 +++++++++++-------- .../waku-org/go-libp2p-rendezvous/svc.go | 2 +- vendor/modules.txt | 2 +- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index cb78b573b9e..ce2e502c780 100644 --- a/go.mod +++ b/go.mod @@ -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 index ca60e9a445d..a2d107414d0 100644 --- a/go.sum +++ b/go.sum @@ -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 index bcc4c33ffe0..5660b0a6f1f 100644 --- 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/waku-org/go-libp2p-rendezvous/svc.go b/vendor/github.com/waku-org/go-libp2p-rendezvous/svc.go index f2dfa94570c..64a5eed645f 100644 --- a/vendor/github.com/waku-org/go-libp2p-rendezvous/svc.go +++ b/vendor/github.com/waku-org/go-libp2p-rendezvous/svc.go @@ -32,7 +32,7 @@ func (rz *RendezvousService) handleStream(s inet.Stream) { defer s.Reset() pid := s.Conn().RemotePeer() - log.Debugf("New stream from %s", pid.Pretty()) + log.Debugf("New stream from %s", pid.String()) r := pbio.NewDelimitedReader(s, inet.MessageSizeMax) w := pbio.NewDelimitedWriter(s) diff --git a/vendor/modules.txt b/vendor/modules.txt index fa3c15ddc57..b74b491cdd7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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