mirror of
https://github.com/logos-messaging/logos-delivery.git
synced 2026-06-06 14:10:02 +00:00
d8bbef0c5b
Combines five dep-and-build changes that all flow from the libp2p v2.0.0
upgrade and the move to the extracted libp2p_mix / mix-rln plugin stack:
waku.nimble:
* libp2p: ff8d51857 -> c43199378 (release/v2.0.0 tip; sha-pinned until
vacp2p cuts a v2.0.0 tag).
* Drop the bare `zlib < 0.2` cap — no longer needed by the upgraded
libp2p.
* websock: bare ">= 0.4.0" — replaces the d4cd68b URL+SHA workaround
that pinned through a libp2p commit-specific websock SHA.
* nim-json-rpc: switch to chaitanyaprem/nim-json-rpc#f05fad25 — relaxes
websock cap to allow >=0.4.0. TODO: revert to status-im/nim-json-rpc
once status-im/nim-json-rpc#277 merges and a tag is cut.
* lsquic: bare ">= 0.4.1" (drops URL form).
* Add mix-rln-spam-protection-plugin pin (23b278b4) and nim-libp2p-mix
pin (50c4ab4f — PR #14 HEAD); the plugin pins the same libp2p_mix
SHA so the diamond dep collapses to a single source.
waku/factory/waku.nim:
* Explicit HPService.setup(switch) / AutonatService.setup(switch)
calls. libp2p v2.0.0's Service lifecycle refactor (libp2p#2462)
removed switch.start's auto-setup loop, so any caller that assigns
directly to switch.services (we do) is responsible for calling
setup() themselves. Without it, AutonatService.addressMapper stays
nil and peerInfo.expandAddrs SIGSEGVs during start(). Wrapped in
try/except for ServiceSetupError so a setup failure surfaces as a
logged error rather than a crash.
Build / scripts:
* scripts/build_rln_mix.sh removed and Makefile simplified — librln
is now a single shared archive built from zerokit's `stateless`
features (no separate librln_mix archive).
* simulations/mixnet/build_setup.sh + setup_credentials.nim updated
to use librln_v2.0.2.a directly and run RLN keystore setup before
nodes start.
Validated:
* Cold local-cache nimble setup --localdeps -y.
* wakunode2 and chat2mix link cleanly.
* Mixnet roundtrip sim: [PASS] bob received message from alice.
* RLN proof generation + verification on every in-path mix node:
5 gen_called == 5 verified, 0 SPAM_PROOF_* errors.
82 lines
2.8 KiB
Nim
82 lines
2.8 KiB
Nim
import chronicles, chronos, results
|
|
import std/options
|
|
import brokers/broker_context
|
|
import
|
|
waku/common/option_shims,
|
|
waku/node/peer_manager,
|
|
waku/waku_core,
|
|
waku/waku_lightpush/[common, client, rpc]
|
|
|
|
import ./[delivery_task, send_processor]
|
|
|
|
logScope:
|
|
topics = "send service lightpush processor"
|
|
|
|
type LightpushSendProcessor* = ref object of BaseSendProcessor
|
|
peerManager: PeerManager
|
|
lightpushClient: WakuLightPushClient
|
|
|
|
proc new*(
|
|
T: typedesc[LightpushSendProcessor],
|
|
peerManager: PeerManager,
|
|
lightpushClient: WakuLightPushClient,
|
|
brokerCtx: BrokerContext,
|
|
): T =
|
|
return
|
|
T(peerManager: peerManager, lightpushClient: lightpushClient, brokerCtx: brokerCtx)
|
|
|
|
proc isLightpushPeerAvailable(
|
|
self: LightpushSendProcessor, pubsubTopic: PubsubTopic
|
|
): bool =
|
|
return self.peerManager.selectPeer(WakuLightPushCodec, some(pubsubTopic)).isSome()
|
|
|
|
method isValidProcessor*(
|
|
self: LightpushSendProcessor, task: DeliveryTask
|
|
): bool {.gcsafe.} =
|
|
return self.isLightpushPeerAvailable(task.pubsubTopic)
|
|
|
|
method sendImpl*(
|
|
self: LightpushSendProcessor, task: DeliveryTask
|
|
): Future[void] {.async.} =
|
|
task.tryCount.inc()
|
|
info "Trying message delivery via Lightpush",
|
|
requestId = task.requestId,
|
|
msgHash = task.msgHash.to0xHex(),
|
|
tryCount = task.tryCount
|
|
|
|
let peer = self.peerManager.selectPeer(WakuLightPushCodec, some(task.pubsubTopic)).valueOr:
|
|
debug "No peer available for Lightpush, request pushed back for next round",
|
|
requestId = task.requestId
|
|
task.state = DeliveryState.NextRoundRetry
|
|
return
|
|
|
|
let numLightpushServers = (
|
|
await self.lightpushClient.publish(some(task.pubsubTopic), task.msg, peer)
|
|
).valueOr:
|
|
error "LightpushSendProcessor.sendImpl failed", error = error.desc.get($error.code)
|
|
case error.code
|
|
of LightPushErrorCode.NO_PEERS_TO_RELAY, LightPushErrorCode.TOO_MANY_REQUESTS,
|
|
LightPushErrorCode.OUT_OF_RLN_PROOF, LightPushErrorCode.SERVICE_NOT_AVAILABLE,
|
|
LightPushErrorCode.INTERNAL_SERVER_ERROR:
|
|
task.state = DeliveryState.NextRoundRetry
|
|
else:
|
|
# the message is malformed, send error
|
|
task.state = DeliveryState.FailedToDeliver
|
|
task.errorDesc = error.desc.get($error.code)
|
|
task.deliveryTime = Moment.now()
|
|
return
|
|
|
|
if numLightpushServers > 0:
|
|
info "Message propagated via Lightpush",
|
|
requestId = task.requestId, msgHash = task.msgHash.to0xHex()
|
|
task.state = DeliveryState.SuccessfullyPropagated
|
|
task.deliveryTime = Moment.now()
|
|
# TODO: with a simple retry processor it might be more accurate to say `Sent`
|
|
else:
|
|
# Controversial state, publish says ok but no peer. It should not happen.
|
|
debug "Lightpush publish returned zero peers, request pushed back for next round",
|
|
requestId = task.requestId
|
|
task.state = DeliveryState.NextRoundRetry
|
|
|
|
return
|