mirror of
https://github.com/logos-messaging/logos-delivery.git
synced 2026-07-26 06:23:14 +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).
118 lines
3.6 KiB
Nim
118 lines
3.6 KiB
Nim
{.used.}
|
|
|
|
import
|
|
std/[sequtils, tables],
|
|
results,
|
|
stew/base32,
|
|
testutils/unittests,
|
|
chronicles,
|
|
chronos,
|
|
libp2p/crypto/crypto,
|
|
eth/keys,
|
|
dnsdisc/builder
|
|
import
|
|
logos_delivery/waku/node/peer_manager,
|
|
logos_delivery/waku/waku_node,
|
|
logos_delivery/waku/discovery/waku_dnsdisc,
|
|
./testlib/common,
|
|
./testlib/wakucore,
|
|
./testlib/wakunode
|
|
|
|
suite "Waku DNS Discovery":
|
|
asyncTest "Waku DNS Discovery end-to-end":
|
|
## Tests integrated DNS discovery, from building
|
|
## the tree to connecting to discovered nodes
|
|
|
|
# Create nodes and ENR. These will be added to the discoverable list
|
|
let
|
|
bindIp = parseIpAddress("0.0.0.0")
|
|
nodeKey1 = generateSecp256k1Key()
|
|
node1 = newTestWakuNode(nodeKey1, bindIp, Port(63500))
|
|
enr1 = node1.enr
|
|
nodeKey2 = generateSecp256k1Key()
|
|
node2 = newTestWakuNode(nodeKey2, bindIp, Port(63502))
|
|
enr2 = node2.enr
|
|
nodeKey3 = generateSecp256k1Key()
|
|
node3 = newTestWakuNode(nodeKey3, bindIp, Port(63503))
|
|
enr3 = node3.enr
|
|
|
|
(await node1.mountRelay()).isOkOr:
|
|
assert false, "Failed to mount relay"
|
|
(await node2.mountRelay()).isOkOr:
|
|
assert false, "Failed to mount relay"
|
|
(await node3.mountRelay()).isOkOr:
|
|
assert false, "Failed to mount relay"
|
|
await allFutures([node1.start(), node2.start(), node3.start()])
|
|
|
|
# Build and sign tree
|
|
var tree = buildTree(
|
|
1, # Seq no
|
|
@[enr1, enr2, enr3], # ENR entries
|
|
@[],
|
|
)
|
|
.get() # No link entries
|
|
|
|
let treeKeys = keys.KeyPair.random(common.rng()[])
|
|
|
|
# Sign tree
|
|
check:
|
|
tree.signTree(treeKeys.seckey()).isOk()
|
|
|
|
# Create TXT records at domain
|
|
let
|
|
domain = "testnodes.aq"
|
|
zoneTxts = tree.buildTXT(domain).get()
|
|
username = Base32.encode(treeKeys.pubkey().toRawCompressed())
|
|
location = LinkPrefix & username & "@" & domain
|
|
# See EIP-1459: https://eips.ethereum.org/EIPS/eip-1459
|
|
|
|
# Create a resolver for the domain
|
|
|
|
proc resolver(domain: string): Future[string] {.async, gcsafe.} =
|
|
return zoneTxts[domain]
|
|
|
|
# Create Waku DNS discovery client on a new Waku v2 node using the resolver
|
|
|
|
let
|
|
nodeKey4 = generateSecp256k1Key()
|
|
node4 = newTestWakuNode(nodeKey4, bindIp, Port(63504))
|
|
|
|
(await node4.mountRelay()).isOkOr:
|
|
assert false, "Failed to mount relay"
|
|
await node4.start()
|
|
|
|
var wakuDnsDisc = WakuDnsDiscovery.init(location, resolver).get()
|
|
|
|
let res = await wakuDnsDisc.findPeers()
|
|
|
|
check:
|
|
# We have discovered all three nodes
|
|
res.isOk()
|
|
res[].len == 3
|
|
res[].mapIt(it.peerId).contains(node1.switch.peerInfo.peerId)
|
|
res[].mapIt(it.peerId).contains(node2.switch.peerInfo.peerId)
|
|
res[].mapIt(it.peerId).contains(node3.switch.peerInfo.peerId)
|
|
|
|
# Connect to discovered nodes
|
|
await node4.connectToNodes(res[])
|
|
|
|
check:
|
|
# We have successfully connected to all discovered nodes
|
|
node4.peerManager.switch.peerStore.peers().anyIt(
|
|
it.peerId == node1.switch.peerInfo.peerId
|
|
)
|
|
node4.peerManager.switch.peerStore.connectedness(node1.switch.peerInfo.peerId) ==
|
|
Connected
|
|
node4.peerManager.switch.peerStore.peers().anyIt(
|
|
it.peerId == node2.switch.peerInfo.peerId
|
|
)
|
|
node4.peerManager.switch.peerStore.connectedness(node2.switch.peerInfo.peerId) ==
|
|
Connected
|
|
node4.peerManager.switch.peerStore.peers().anyIt(
|
|
it.peerId == node3.switch.peerInfo.peerId
|
|
)
|
|
node4.peerManager.switch.peerStore.connectedness(node3.switch.peerInfo.peerId) ==
|
|
Connected
|
|
|
|
await allFutures([node1.stop(), node2.stop(), node3.stop(), node4.stop()])
|