mirror of
https://github.com/logos-messaging/logos-delivery.git
synced 2026-06-06 22:19:30 +00:00
fc6af2fdf1
- Integrate ConstantRateCoverTraffic from libp2p mix module with default totalSlots = userMessageLimit (or 2) and 10s epoch - Add --mix-user-message-limit and --mix-disable-spam-protection CLI flags with corresponding MixConfBuilder accessors and MixConf fields - Wrap mixRlnSpamProtection construction so it is skipped when spam protection is disabled, with a nil guard in setupSpamProtectionCallbacks - Add waku/common/option_shims.nim restoring valueOr/withValue templates for std/options (removed upstream by results), and import it across modules that relied on the old behavior - Sink chat2mix logs to textlines (stdout) instead of textlines[file] to work around a chronicles compile-time macro-eval bug under Nim 2.2.4 - Rename ExtendedKademliaDiscoveryParams -> ExtendedServiceDiscoveryParams to match the kad_disco -> service_discovery rename in nim-libp2p - Bump nim-libp2p to e1bbda4f6 (PR #2243 "cover traffic with constant rate") and mix-rln-spam-protection-plugin to 153d0c0 (PR #5 cover traffic epoch change support); both pre-libp2p_mix-extraction - Add simulations/mixnet/check_cover_traffic.sh for monitoring mix_cover_* / mix_slot_* metrics, plus per-node cover-traffic configs
68 lines
2.0 KiB
Nim
68 lines
2.0 KiB
Nim
import chronicles, std/options, results
|
|
import libp2p/crypto/crypto, libp2p/crypto/curve25519, libp2p_mix/curve25519
|
|
import ../waku_conf, waku/waku_mix
|
|
|
|
logScope:
|
|
topics = "waku conf builder mix"
|
|
|
|
##################################
|
|
## Mix Config Builder ##
|
|
##################################
|
|
type MixConfBuilder* = object
|
|
enabled: Option[bool]
|
|
mixKey: Option[string]
|
|
mixNodes: seq[MixNodePubInfo]
|
|
userMessageLimit: Option[int]
|
|
disableSpamProtection: bool
|
|
|
|
proc init*(T: type MixConfBuilder): MixConfBuilder =
|
|
MixConfBuilder()
|
|
|
|
proc withEnabled*(b: var MixConfBuilder, enabled: bool) =
|
|
b.enabled = some(enabled)
|
|
|
|
proc withMixKey*(b: var MixConfBuilder, mixKey: string) =
|
|
b.mixKey = some(mixKey)
|
|
|
|
proc withMixNodes*(b: var MixConfBuilder, mixNodes: seq[MixNodePubInfo]) =
|
|
b.mixNodes = mixNodes
|
|
|
|
proc withUserMessageLimit*(b: var MixConfBuilder, limit: int) =
|
|
b.userMessageLimit = some(limit)
|
|
|
|
proc withDisableSpamProtection*(b: var MixConfBuilder, disable: bool) =
|
|
b.disableSpamProtection = disable
|
|
|
|
proc build*(b: MixConfBuilder): Result[Option[MixConf], string] =
|
|
if not b.enabled.get(false):
|
|
return ok(none[MixConf]())
|
|
else:
|
|
if b.mixKey.isSome():
|
|
let mixPrivKey = intoCurve25519Key(ncrutils.fromHex(b.mixKey.get()))
|
|
let mixPubKey = public(mixPrivKey)
|
|
return ok(
|
|
some(
|
|
MixConf(
|
|
mixKey: mixPrivKey,
|
|
mixPubKey: mixPubKey,
|
|
mixNodes: b.mixNodes,
|
|
userMessageLimit: b.userMessageLimit,
|
|
disableSpamProtection: b.disableSpamProtection,
|
|
)
|
|
)
|
|
)
|
|
else:
|
|
let (mixPrivKey, mixPubKey) = generateKeyPair().valueOr:
|
|
return err("Generate key pair error: " & $error)
|
|
return ok(
|
|
some(
|
|
MixConf(
|
|
mixKey: mixPrivKey,
|
|
mixPubKey: mixPubKey,
|
|
mixNodes: b.mixNodes,
|
|
userMessageLimit: b.userMessageLimit,
|
|
disableSpamProtection: b.disableSpamProtection,
|
|
)
|
|
)
|
|
)
|