mirror of
https://github.com/ZmnSCPxj/clboss.git
synced 2026-08-14 12:43:19 +02:00
Continuation of the v26.06 migration started in the Dowser commit. Two more getroute call sites: ChannelCandidateMatchmaker.cpp and ActiveProber.cpp. Both use maxparts=1 since each wants a single route, not a flow estimate. ActiveProber probes the local node's own outbound liquidity, so it uses layers=["auto.localchans","auto.sourcefree"] per the standardized recipe. Matchmaker probes from a remote source (a candidate patron) to a remote target, so it passes an empty layers array -- auto.localchans would inject our private local channels into a foreign source, and auto.sourcefree would zero out the source's outgoing fees, either of which could make askrene pick a patron the proposal cannot actually reach via public topology. maxfee_msat is 1% of the probe amount in both cases. Matchmaker is a near-clean swap. The patron id (route[0].id in the old getroute shape) is read from routes[0].path[0] in the new getroutes shape; at the parse site we bridge the v26.06+ name (node_id_out) with its deprecated pre-v26.06 predecessor (next_node_id) via has()/ternary, so the code works on either CLN flavor. ActiveProber is more involved. The previous code stashed res["route"] as a Jsmn::Object and later appended hops from it directly into the sendpay route parameter, relying on the fact that the old getroute hop shape (id/channel/direction/ amount_msat/delay/style) was already sendpay-compatible. The new getroutes path[] shape is NOT directly sendpay-compatible (different field names, short_channel_id_dir encodes scid and direction together), so we now extract path[0] into typed values (id1, chan1, direction1, amount1, delay1) and rebuild the sendpay hop1 explicitly from those. The Jsmn::Object route member is dropped. The hop-field reads in ActiveProber bridge between v26.06+ (node_id_out / amount_out_msat / cltv_out) and the deprecated pre-v26.06 names (next_node_id / amount_msat / delay) via the same has()/ternary pattern. short_channel_id_dir splits on '/' with an explicit npos check; a missing slash throws Jsmn::TypeError so the surrounding parse- error log path catches it cleanly. Without the check, sdir.substr(0, npos) and sdir.substr(npos + 1) would feed malformed input into Ln::Scid (which throws std::invalid_argument, not caught by the Jsmn::TypeError handler) or into std::stoul (silently producing a wrong direction). ActiveProber also drops its vestigial exclude=[self_id] parameter: askrene's source/destination model naturally excludes self when source != self, which is always the case here (the probe always flows from peer outward, never back through us). Three of the four getroute call sites in CLBOSS are now on getroutes; the fourth (FundsMover/Attempter) is deferred to PR2 because its exclude-vector pattern encodes failure feedback from real payment attempts and warrants a redesign around askrene-inform-channel rather than a mechanical port.
212 lines
5.3 KiB
C++
212 lines
5.3 KiB
C++
#include"Boss/Mod/ChannelCandidateMatchmaker.hpp"
|
|
#include"Boss/Mod/Rpc.hpp"
|
|
#include"Boss/Msg/AmountSettings.hpp"
|
|
#include"Boss/Msg/Init.hpp"
|
|
#include"Boss/Msg/PatronizeChannelCandidate.hpp"
|
|
#include"Boss/Msg/PreinvestigateChannelCandidates.hpp"
|
|
#include"Boss/Msg/ProposeChannelCandidates.hpp"
|
|
#include"Boss/concurrent.hpp"
|
|
#include"Boss/log.hpp"
|
|
#include"Ev/Io.hpp"
|
|
#include"Ev/yield.hpp"
|
|
#include"Jsmn/Object.hpp"
|
|
#include"Json/Out.hpp"
|
|
#include"Ln/Amount.hpp"
|
|
#include"Ln/NodeId.hpp"
|
|
#include"S/Bus.hpp"
|
|
#include<memory>
|
|
#include<sstream>
|
|
|
|
namespace Boss { namespace Mod {
|
|
|
|
/* This is effectively a single run of the matchmaker. */
|
|
class ChannelCandidateMatchmaker::Run
|
|
: public std::enable_shared_from_this<Run> {
|
|
private:
|
|
S::Bus& bus;
|
|
Boss::Mod::Rpc& rpc;
|
|
|
|
Ln::NodeId proposal;
|
|
std::queue<Ln::NodeId> guide;
|
|
|
|
Ln::Amount min_channel;
|
|
|
|
explicit
|
|
Run( S::Bus& bus_
|
|
, Boss::Mod::Rpc& rpc_
|
|
, Ln::NodeId proposal_
|
|
, std::queue<Ln::NodeId> guide_
|
|
, Ln::Amount min_channel_
|
|
) : bus(bus_)
|
|
, rpc(rpc_)
|
|
, proposal(std::move(proposal_))
|
|
, guide(std::move(guide_))
|
|
, min_channel(min_channel_)
|
|
{ }
|
|
|
|
public:
|
|
Run() =delete;
|
|
Run(Run&&) =delete;
|
|
Run(Run const&) =delete;
|
|
|
|
static
|
|
std::shared_ptr<Run>
|
|
create( S::Bus& bus
|
|
, Boss::Mod::Rpc& rpc
|
|
, Ln::NodeId proposal
|
|
, std::queue<Ln::NodeId> guide
|
|
, Ln::Amount min_channel
|
|
) {
|
|
return std::shared_ptr<Run>(
|
|
new Run( bus
|
|
, rpc
|
|
, std::move(proposal)
|
|
, std::move(guide)
|
|
, min_channel
|
|
)
|
|
);
|
|
}
|
|
|
|
Ev::Io<void> run() {
|
|
auto self = shared_from_this();
|
|
return self->core_run().then([self]() {
|
|
return Ev::lift();
|
|
});
|
|
}
|
|
private:
|
|
Ev::Io<void> core_run() {
|
|
return Ev::yield().then([this]() {
|
|
if (guide.empty())
|
|
/* Failed. */
|
|
return Boss::log( bus, Debug
|
|
, "ChannelCandidateMatchmaker:"
|
|
" Could not find patron for "
|
|
"%s."
|
|
, std::string(proposal
|
|
).c_str()
|
|
);
|
|
|
|
return step();
|
|
});
|
|
}
|
|
Ev::Io<void> step() {
|
|
auto target = std::move(guide.front());
|
|
guide.pop();
|
|
|
|
auto probe_amount = 2.0 * min_channel;
|
|
auto parms = Json::Out()
|
|
.start_object()
|
|
.field("source", std::string(proposal))
|
|
.field("destination", std::string(target))
|
|
/* 2x min_channel because the dowser will
|
|
* halve the channel capacity of the first
|
|
* hop.
|
|
*/
|
|
.field("amount_msat", probe_amount.to_msat())
|
|
/* No layers: source is a remote node
|
|
* (proposal), not us, so the
|
|
* auto.localchans / auto.sourcefree
|
|
* helpers do not apply -- they would
|
|
* inject our private local channels and
|
|
* zero out the source's outgoing fees,
|
|
* either of which could make askrene
|
|
* pick a patron that the proposal cannot
|
|
* actually reach via public topology.
|
|
*/
|
|
.start_array("layers").end_array()
|
|
/* Generous max-fee tolerance for what is a
|
|
* route-discovery probe, not an actual
|
|
* payment.
|
|
*/
|
|
.field("maxfee_msat",
|
|
(probe_amount * 0.01).to_msat())
|
|
.field("final_cltv", 14)
|
|
.field("maxparts", 1)
|
|
.end_object()
|
|
;
|
|
return rpc.command("getroutes", std::move(parms)
|
|
).then([this](Jsmn::Object res) {
|
|
auto patron = Ln::NodeId();
|
|
try {
|
|
/* getroutes' path[K].node_id_out was added
|
|
* v26.06; the deprecated old name is
|
|
* next_node_id, kept through v27.06 except
|
|
* when developer mode suppresses
|
|
* deprecated outputs. Prefer the new
|
|
* name, fall back to the old. TODO: drop
|
|
* the fallback once v26.04 is no longer
|
|
* supported.
|
|
*/
|
|
auto path0 = res["routes"][0]["path"][0];
|
|
patron = Ln::NodeId(std::string(
|
|
path0.has("node_id_out")
|
|
? path0["node_id_out"]
|
|
: path0["next_node_id"]
|
|
));
|
|
} catch (Jsmn::TypeError const&) {
|
|
auto os = std::ostringstream();
|
|
os << res;
|
|
return Boss::log( bus, Error
|
|
, "ChannelCandidateMatchmaker:"
|
|
" Unexpected result from "
|
|
"getroutes: %s"
|
|
, os.str().c_str()
|
|
).then([]()
|
|
-> Ev::Io<void>{
|
|
throw RpcError( "getroutes"
|
|
, Jsmn::Object()
|
|
);
|
|
});
|
|
}
|
|
auto act = Ev::lift();
|
|
act += Boss::log( bus, Debug
|
|
, "ChannelCandidateMatchmaker: "
|
|
"Matched proposal %s to patron %s."
|
|
, std::string(proposal).c_str()
|
|
, std::string(patron).c_str()
|
|
);
|
|
auto propose = Msg::ProposeChannelCandidates{
|
|
std::move(proposal), std::move(patron)
|
|
};
|
|
auto preinv = Msg::PreinvestigateChannelCandidates{
|
|
{std::move(propose)},
|
|
1
|
|
};
|
|
act += bus.raise(std::move(preinv));
|
|
return act;
|
|
}).catching<RpcError>([this](RpcError const&) {
|
|
/* Try next. */
|
|
return core_run();
|
|
});
|
|
}
|
|
};
|
|
|
|
void ChannelCandidateMatchmaker::start() {
|
|
bus.subscribe<Msg::AmountSettings
|
|
>([this](Msg::AmountSettings const& r) {
|
|
min_channel = r.min_channel;
|
|
return Ev::lift();
|
|
});
|
|
bus.subscribe<Msg::Init
|
|
>([this](Msg::Init const& init) {
|
|
rpc = &init.rpc;
|
|
return Ev::lift();
|
|
});
|
|
bus.subscribe<Msg::PatronizeChannelCandidate
|
|
>([this](Msg::PatronizeChannelCandidate const& m) {
|
|
if (!rpc)
|
|
return Ev::lift();
|
|
|
|
/* Construct queue. */
|
|
auto q = std::queue<Ln::NodeId>();
|
|
for (auto const& n : m.guide)
|
|
q.push(n);
|
|
/* Create run object. */
|
|
auto run = Run::create( bus, *rpc, m.proposal, std::move(q)
|
|
, min_channel
|
|
);
|
|
return Boss::concurrent(run->run());
|
|
});
|
|
}
|
|
|
|
}}
|