mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-06-26 11:29:28 +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).
46 lines
1.7 KiB
Nim
46 lines
1.7 KiB
Nim
import std/[times, random], bearssl/rand, libp2p/crypto/crypto
|
|
|
|
## Randomization
|
|
|
|
proc randomize*() =
|
|
## Initializes the default random number generator with the given seed.
|
|
## From: https://nim-lang.org/docs/random.html#randomize,int64
|
|
let now = getTime()
|
|
randomize(now.toUnix() * 1_000_000_000 + now.nanosecond)
|
|
|
|
## RNG
|
|
# Copied from here: https://github.com/status-im/nim-libp2p/blob/d522537b19a532bc4af94fcd146f779c1f23bad0/tests/helpers.nim#L28
|
|
|
|
type Rng = object
|
|
rng: ref HmacDrbgContext
|
|
|
|
# Typically having a module variable is considered bad design. This case should
|
|
# be considered as an exception and it should be used only in the tests.
|
|
var rngVar: Rng
|
|
|
|
proc getRng(): ref HmacDrbgContext =
|
|
# TODO: if `rngVar` is a threadvar like it should be, there are random and
|
|
# spurious compile failures on mac - this is not gcsafe but for the
|
|
# purpose of the tests, it's ok as long as we only use a single thread
|
|
{.gcsafe.}:
|
|
if rngVar.rng.isNil():
|
|
# libp2p v2.0.0: crypto.newRng() returns the new `Rng` wrapper type;
|
|
# construct an HmacDrbgContext directly so the field type stays as
|
|
# `ref HmacDrbgContext` (what bearssl-style consumers expect).
|
|
rngVar.rng = HmacDrbgContext.new()
|
|
|
|
rngVar.rng
|
|
|
|
template rng*(): ref HmacDrbgContext =
|
|
getRng()
|
|
|
|
## Random byte sequences
|
|
# Copied from waku/waku_noise/noise_utils.randomSeqByte to break the test
|
|
# build's dependency on waku_noise (orphan code that is not part of any
|
|
# production code path; only the keystore + relay-RLN tests reused this
|
|
# helper for generating random secrets).
|
|
proc randomSeqByte*(rng: var HmacDrbgContext, size: int): seq[byte] =
|
|
var output = newSeq[byte](size.uint32)
|
|
hmacDrbgGenerate(rng, output)
|
|
return output
|