mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-06-29 04:49:32 +00:00
6a954bdec0
Squash of 13 commits from feat/mix-dos-protection-libp2p-v2.0.0 onto the logos_delivery/ folder-restructure base from #3935 (build-messaging-folder). Original commit history (squashed): - d8e6dcef feat(mix): integrate mix protocol with extended kademlia + RLN spam protection - fb72f18d refactor(mix): split DoS-protection self-registration into background retry - d8bbef0c feat(mix): bump libp2p stack to v2.0.0 + adopt stateless RLN spam protection - 2f24448a fix(tests): use HmacDrbgContext.new() instead of crypto.newRng() - 5a21455c fix(ci): regen nimble.lock for v2.0.0 + disambiguate rng in wakucore - 03ef02a2 fix(tests): wrap HmacDrbgContext via newBearSslRng for libp2p v2.0.0 - 167ab1df fix(nix): regenerate deps.nix from updated nimble.lock - 97a27222 fix(tests): wrap or pass Rng correctly for 3-arg PrivateKey.random - 5561fcb5 fix(tests): replace removed newStandardSwitch with SwitchBuilder - ba39ee4a fix(tests): libp2p v2.0.0 API migrations across test suite - 328e11df fix: gitignore test binaries + remove accidentally-committed binary - cc712444 fix(tests): more v2.0.0 API migrations (rng template, PeerId.random, etc.) - 412d97a9 fix(tests): unblock CI — nph, excise orphan waku_noise, complete v2.0.0 Rng migration Conflict resolutions (#3935 → ours): - 11 import-path migrations: waku/X → logos_delivery/waku/X - waku_node/waku_node/relay.nim: dropped our `registerRelayHandler` proc (relocated to subscription_manager.nim by #3935; see cascade fix below) - factory/builder.nim: combined both sides' new imports (net_config + waku_switch) - factory/conf_builder/mix_conf_builder.nim: libp2p_mix package (not libp2p/protocols/mix) - waku_mix/protocol.nim: combined paths + our mix_rln_spam_protection/relay/nimchronos imports - 3 test files: dropped noise_utils import (replicates noise excision from original PR) - 2 UA file moves: option_shims.nim and waku_mix_coordination.nim added at new paths Cascade fixes (#3935 lost our work, restored): - subscription_manager.nim: added `mixHandler` to #3935's `registerRelayHandler`, and added `waku_mix` to its imports. Without this, mix messages were silently dropped from the relay handler chain. - config.nims: option_shims auto-import path migrated to logos_delivery/... Validation: - nph check on all 82 staged .nim files: clean (0 reformats needed) - wakunode2 build: exit 0, 38 MB binary - (sim PASS confirmed in earlier identical-state run: 5/5 mix init, 5 RLN proofs gen/verify, 0 errors) Backup tag at original tip: backup/3931-pre-3935-rebase (412d97a9).
116 lines
3.4 KiB
Nim
116 lines
3.4 KiB
Nim
{.used.}
|
|
|
|
import
|
|
testutils/unittests,
|
|
chronos,
|
|
libp2p/builders,
|
|
libp2p/crypto/crypto,
|
|
libp2p/protocols/connectivity/autonat/client,
|
|
libp2p/protocols/connectivity/relay/relay,
|
|
libp2p/protocols/connectivity/relay/client,
|
|
stew/byteutils
|
|
import logos_delivery/waku/node/waku_switch, ./testlib/common, ./testlib/wakucore
|
|
|
|
proc newCircuitRelayClientSwitch(relayClient: RelayClient): Switch =
|
|
SwitchBuilder
|
|
.new()
|
|
.withRng(crypto.newRng())
|
|
.withAddresses(@[MultiAddress.init("/ip4/0.0.0.0/tcp/0").tryGet()])
|
|
.withTcpTransport()
|
|
.withMplex()
|
|
.withNoise()
|
|
.withCircuitRelay(relayClient)
|
|
.build()
|
|
|
|
suite "Waku Switch":
|
|
asyncTest "Waku Switch works with AutoNat":
|
|
## Given
|
|
let
|
|
sourceSwitch = newTestSwitch()
|
|
wakuSwitch = newWakuSwitch(rng = crypto.newRng(), circuitRelay = Relay.new())
|
|
await sourceSwitch.start()
|
|
await wakuSwitch.start()
|
|
|
|
## When
|
|
await sourceSwitch.connect(wakuSwitch.peerInfo.peerId, wakuSwitch.peerInfo.addrs)
|
|
let ma = await AutonatClient.new().dialMe(
|
|
sourceSwitch, wakuSwitch.peerInfo.peerId, wakuSwitch.peerInfo.addrs
|
|
)
|
|
|
|
## Then
|
|
check:
|
|
ma == sourceSwitch.peerInfo.addrs[0]
|
|
|
|
## Teardown
|
|
await allFutures(sourceSwitch.stop(), wakuSwitch.stop())
|
|
|
|
asyncTest "Waku Switch acts as circuit relayer":
|
|
## Setup
|
|
let
|
|
wakuSwitch = newWakuSwitch(rng = crypto.newRng(), circuitRelay = Relay.new())
|
|
sourceClient = RelayClient.new()
|
|
destClient = RelayClient.new()
|
|
sourceSwitch = newCircuitRelayClientSwitch(sourceClient)
|
|
destSwitch = newCircuitRelayClientSwitch(destClient)
|
|
|
|
# Setup client relays
|
|
sourceClient.setup(sourceSwitch)
|
|
destClient.setup(destSwitch)
|
|
|
|
await allFutures(wakuSwitch.start(), sourceSwitch.start(), destSwitch.start())
|
|
|
|
## Given
|
|
let
|
|
# Create a relay address to destSwitch using wakuSwitch as the relay
|
|
addrs = MultiAddress
|
|
.init(
|
|
$wakuSwitch.peerInfo.addrs[0] & "/p2p/" & $wakuSwitch.peerInfo.peerId &
|
|
"/p2p-circuit"
|
|
)
|
|
.get()
|
|
msg = "Just one relay away..."
|
|
|
|
# Create a custom protocol
|
|
let customProtoCodec = "/vac/waku/test/1.0.0"
|
|
var
|
|
completionFut = newFuture[bool]()
|
|
proto = new LPProtocol
|
|
proto.codec = customProtoCodec
|
|
proto.handler = proc(
|
|
conn: Connection, proto: string
|
|
) {.async: (raises: [CancelledError]).} =
|
|
try:
|
|
assert (await conn.readLp(1024)) == msg.toBytes()
|
|
except LPStreamError:
|
|
error "Connection read error", error = getCurrentExceptionMsg()
|
|
assert false, getCurrentExceptionMsg()
|
|
|
|
completionFut.complete(true)
|
|
|
|
await proto.start()
|
|
destSwitch.mount(proto)
|
|
|
|
## When
|
|
# Connect destSwitch to the relay
|
|
await destSwitch.connect(wakuSwitch.peerInfo.peerId, wakuSwitch.peerInfo.addrs)
|
|
|
|
# Connect sourceSwitch to the relay
|
|
await sourceSwitch.connect(wakuSwitch.peerInfo.peerId, wakuSwitch.peerInfo.addrs)
|
|
|
|
# destClient reserves a slot on the relay.
|
|
let rsvp =
|
|
await destClient.reserve(wakuSwitch.peerInfo.peerId, wakuSwitch.peerInfo.addrs)
|
|
|
|
# sourceSwitch dial destSwitch using the relay
|
|
let conn =
|
|
await sourceSwitch.dial(destSwitch.peerInfo.peerId, @[addrs], customProtoCodec)
|
|
|
|
await conn.writeLp(msg)
|
|
|
|
## Then
|
|
check:
|
|
await completionFut.withTimeout(3.seconds)
|
|
|
|
## Teardown
|
|
await allFutures(wakuSwitch.stop(), sourceSwitch.stop(), destSwitch.stop())
|