From 2d3587c54d32465a01586a401007349d59be6b9b Mon Sep 17 00:00:00 2001 From: Oskar Thoren Date: Mon, 1 Jun 2020 11:15:37 +0800 Subject: [PATCH] Update nim-libp2p and other submodules Need to use latest libp2p for GossipSub bug fix, safer to update all Use MultiAddr.tryGet() per resultification upstream --- tests/v2/standard_setup.nim | 2 +- vendor/nim-faststreams | 2 +- vendor/nim-json-serialization | 2 +- vendor/nim-libp2p | 2 +- vendor/nim-serialization | 2 +- waku/node/v2/start_network.nim | 2 +- waku/node/v2/wakunode.nim | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/v2/standard_setup.nim b/tests/v2/standard_setup.nim index fcdff52b9..c99588ced 100644 --- a/tests/v2/standard_setup.nim +++ b/tests/v2/standard_setup.nim @@ -22,7 +22,7 @@ export switch, peer, peerinfo, connection, multiaddress, crypto proc newStandardSwitch*(privKey = none(PrivateKey), - address = MultiAddress.init("/ip4/127.0.0.1/tcp/0"), + address = MultiAddress.init("/ip4/127.0.0.1/tcp/0").tryGet(), triggerSelf = false, gossip = false, verifySignature = libp2p_pubsub_verify, diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams index 5d7cad792..81c24860e 160000 --- a/vendor/nim-faststreams +++ b/vendor/nim-faststreams @@ -1 +1 @@ -Subproject commit 5d7cad792ff782672cc46a84cfcae341b55e2437 +Subproject commit 81c24860e2622a15e05c81d15e3d1cc02c460870 diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization index aa51f6fed..8d4c31f7c 160000 --- a/vendor/nim-json-serialization +++ b/vendor/nim-json-serialization @@ -1 +1 @@ -Subproject commit aa51f6fed1715a91fd8b58072a1915422a133d4a +Subproject commit 8d4c31f7c2f56e17ec3325ec054fe15ccf4e89d4 diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p index 7b6e1c068..6affcda93 160000 --- a/vendor/nim-libp2p +++ b/vendor/nim-libp2p @@ -1 +1 @@ -Subproject commit 7b6e1c06888a831d61d7019a07d2d59d5bd079ea +Subproject commit 6affcda9378593f96e9d2b75f9d9ac5e6e33c526 diff --git a/vendor/nim-serialization b/vendor/nim-serialization index 16e6bcd16..d8ca3daf3 160000 --- a/vendor/nim-serialization +++ b/vendor/nim-serialization @@ -1 +1 @@ -Subproject commit 16e6bcd16d71eba932978ebc22908da414f52db7 +Subproject commit d8ca3daf3a788f357bf96b8e61b3ffce9a018ea2 diff --git a/waku/node/v2/start_network.nim b/waku/node/v2/start_network.nim index 2664a07cc..392dfdc69 100644 --- a/waku/node/v2/start_network.nim +++ b/waku/node/v2/start_network.nim @@ -39,7 +39,7 @@ proc initNodeCmd(shift: int, staticNodes: seq[string] = @[], master = false, lab port = 60000 + shift #DefaultAddr = "/ip4/127.0.0.1/tcp/55505" address = "/ip4/127.0.0.1/tcp/" & $port - hostAddress = MultiAddress.init(address) + hostAddress = MultiAddress.init(address).tryGet() info "Address", address # TODO: Need to port shift diff --git a/waku/node/v2/wakunode.nim b/waku/node/v2/wakunode.nim index 9ad791ae5..47c2b0333 100644 --- a/waku/node/v2/wakunode.nim +++ b/waku/node/v2/wakunode.nim @@ -30,11 +30,11 @@ proc setBootNodes(nodes: openArray[string]): seq[ENode] = result.add(ENode.fromString(nodeId).expect("correct node")) proc initAddress(T: type MultiAddress, str: string): T = - let address = MultiAddress.init(str) + let address = MultiAddress.init(str).tryGet() if IPFS.match(address) and matchPartial(multiaddress.TCP, address): result = address else: - raise newException(MultiAddressError, + raise newException(ValueError, "Invalid bootstrap node multi-address") proc dialPeer(p: WakuProto, address: string) {.async.} = @@ -123,7 +123,7 @@ proc run(config: WakuNodeConf) = #port = 60000 + tcpPort #DefaultAddr = "/ip4/127.0.0.1/tcp/55505" address = "/ip4/127.0.0.1/tcp/" & $tcpPort - hostAddress = MultiAddress.init(address) + hostAddress = MultiAddress.init(address).tryGet() # XXX: Address and hostAddress usage needs more clarity # Difference between announced and host address relevant for running behind NAT, however doesn't seem like nim-libp2p supports this. GHI? @@ -137,7 +137,7 @@ proc run(config: WakuNodeConf) = #INF 2020-05-28 11:15:50+08:00 Initializing networking (host address and announced same) tid=15555 address=192.168.1.101:30305:30305 info "Initializing networking (nat address unused)", nat_address, address - peerInfo.addrs.add(Multiaddress.init(address)) + peerInfo.addrs.add(Multiaddress.init(address).tryGet()) # switch.pubsub = wakusub, plus all the peer info etc # And it has wakuProto lets use wakuProto maybe, cause it has switch