mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-06-26 19:40:14 +00:00
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).
157 lines
4.5 KiB
Nim
157 lines
4.5 KiB
Nim
import
|
|
std/options,
|
|
results,
|
|
chronos,
|
|
libp2p/switch,
|
|
libp2p/builders,
|
|
libp2p/nameresolving/nameresolver,
|
|
libp2p/crypto/crypto as libp2p_keys,
|
|
eth/keys as eth_keys
|
|
import
|
|
logos_delivery/waku/[
|
|
waku_node,
|
|
net/net_config,
|
|
waku_core/topics,
|
|
node/peer_manager,
|
|
waku_enr,
|
|
discovery/waku_discv5,
|
|
factory/internal_config,
|
|
factory/waku_conf,
|
|
factory/conf_builder/conf_builder,
|
|
factory/builder,
|
|
common/logging,
|
|
],
|
|
./common
|
|
|
|
# Waku node
|
|
|
|
# TODO: migrate to usage of a test cluster conf
|
|
proc defaultTestWakuConfBuilder*(): WakuConfBuilder =
|
|
var builder = WakuConfBuilder.init()
|
|
builder.withP2pListenAddress(parseIpAddress("0.0.0.0"))
|
|
builder.restServerConf.withListenAddress(parseIpAddress("127.0.0.1"))
|
|
builder.withDnsAddrsNameServers(
|
|
@[parseIpAddress("1.1.1.1"), parseIpAddress("1.0.0.1")]
|
|
)
|
|
builder.withNatStrategy("any")
|
|
builder.withMaxConnections(150)
|
|
builder.withRelayServiceRatio("50:50")
|
|
builder.withMaxMessageSize("1024 KiB")
|
|
builder.withClusterId(DefaultClusterId)
|
|
builder.withSubscribeShards(@[DefaultShardId])
|
|
builder.withRelay(true)
|
|
builder.withRendezvous(true)
|
|
builder.storeServiceConf.withDbMigration(false)
|
|
return builder
|
|
|
|
proc defaultTestWakuConf*(): WakuConf =
|
|
var builder = defaultTestWakuConfBuilder()
|
|
return builder.build().value
|
|
|
|
proc newTestWakuNode*(
|
|
nodeKey: crypto.PrivateKey,
|
|
bindIp: IpAddress,
|
|
bindPort: Port,
|
|
extIp = none(IpAddress),
|
|
extPort = none(Port),
|
|
extMultiAddrs = newSeq[MultiAddress](),
|
|
peerStorage: PeerStorage = nil,
|
|
maxConnections = DefaultMaxConnections,
|
|
wsBindPort: Port = (Port) 8000,
|
|
wsEnabled: bool = false,
|
|
wssEnabled: bool = false,
|
|
secureKey: string = "",
|
|
secureCert: string = "",
|
|
wakuFlags = none(CapabilitiesBitfield),
|
|
nameResolver: NameResolver = nil,
|
|
sendSignedPeerRecord = false,
|
|
dns4DomainName = none(string),
|
|
discv5UdpPort = none(Port),
|
|
agentString = none(string),
|
|
peerStoreCapacity = none(int),
|
|
clusterId = DefaultClusterId,
|
|
subscribeShards = @[DefaultShardId],
|
|
): WakuNode =
|
|
logging.setupLog(logging.LogLevel.DEBUG, logging.LogFormat.TEXT)
|
|
|
|
var resolvedExtIp = extIp
|
|
|
|
# Update extPort to default value if it's missing and there's an extIp or a DNS domain
|
|
let extPort =
|
|
if (extIp.isSome() or dns4DomainName.isSome()) and extPort.isNone():
|
|
some(Port(0))
|
|
else:
|
|
extPort
|
|
|
|
var conf = defaultTestWakuConf()
|
|
|
|
conf.clusterId = clusterId
|
|
conf.subscribeShards = subscribeShards
|
|
|
|
if dns4DomainName.isSome() and extIp.isNone():
|
|
# If there's an error resolving the IP, an exception is thrown and test fails
|
|
let dns = (waitFor dnsResolve(dns4DomainName.get(), conf.dnsAddrsNameServers)).valueOr:
|
|
raise newException(Defect, error)
|
|
|
|
resolvedExtIp = some(parseIpAddress(dns))
|
|
|
|
let netConf = NetConfig.init(
|
|
clusterId = conf.clusterId,
|
|
bindIp = bindIp,
|
|
bindPort = bindPort,
|
|
extIp = resolvedExtIp,
|
|
extPort = extPort,
|
|
extMultiAddrs = extMultiAddrs,
|
|
wsBindPort = some(wsBindPort),
|
|
wsEnabled = wsEnabled,
|
|
wssEnabled = wssEnabled,
|
|
dns4DomainName = dns4DomainName,
|
|
discv5UdpPort = discv5UdpPort,
|
|
wakuFlags = wakuFlags,
|
|
).valueOr:
|
|
raise newException(Defect, "Invalid network configuration: " & error)
|
|
|
|
var enrBuilder = EnrBuilder.init(nodeKey)
|
|
|
|
enrBuilder.withWakuRelaySharding(
|
|
RelayShards(clusterId: conf.clusterId, shardIds: conf.subscribeShards)
|
|
).isOkOr:
|
|
raise newException(Defect, "Invalid record: " & $error)
|
|
|
|
enrBuilder.withIpAddressAndPorts(
|
|
ipAddr = netConf.enrIp, tcpPort = netConf.enrPort, udpPort = netConf.discv5UdpPort
|
|
)
|
|
|
|
enrBuilder.withMultiaddrs(netConf.enrMultiaddrs)
|
|
|
|
if netConf.wakuFlags.isSome():
|
|
enrBuilder.withWakuCapabilities(netConf.wakuFlags.get())
|
|
|
|
let record = enrBuilder.build().valueOr:
|
|
raise newException(Defect, "Invalid record: " & $error)
|
|
|
|
var builder = WakuNodeBuilder.init()
|
|
builder.withRng(rng())
|
|
builder.withNodeKey(nodeKey)
|
|
builder.withRecord(record)
|
|
builder.withNetworkConfiguration(netConf)
|
|
builder.withPeerStorage(peerStorage, capacity = peerStoreCapacity)
|
|
builder.withSwitchConfiguration(
|
|
maxConnections = some(maxConnections),
|
|
nameResolver = nameResolver,
|
|
sendSignedPeerRecord = sendSignedPeerRecord,
|
|
secureKey =
|
|
if secureKey != "":
|
|
some(secureKey)
|
|
else:
|
|
none(string),
|
|
secureCert =
|
|
if secureCert != "":
|
|
some(secureCert)
|
|
else:
|
|
none(string),
|
|
agentString = agentString,
|
|
)
|
|
|
|
return builder.build().get()
|