mirror of
https://github.com/ZmnSCPxj/clboss.git
synced 2026-08-13 12:33:20 +02:00
cbc661457b
Completed rebalances were correlated back to their (source, destination) through an in-memory map keyed only by the RequestMoveFunds requester pointer. When one rebalancer issues several moves at once they share a single requester (EarningsRebalancer uses its module pointer; JitRebalancer uses nullptr), so each request overwrote the previous map entry. As the moves completed, the first response consumed and erased the shared entry -- booking against whatever pair happened to be written last -- and every later response, including the actually-successful one, hit the not-in-our-table path and was silently dropped. Effect: rebalance spend and volume were under-counted and sometimes mis-attributed to the wrong peer. That also starved the EarningsRebalancer refusing-to-throw-good-money-after-bad guard of accurate expenditure data. JIT-dominated periods looked fine only because those moves complete one at a time and rarely overlap; an EarningsRebalancer-dominated period booked almost nothing. Fix: ResponseMoveFunds now carries source and destination directly. FundsMover/Runner populates them and EarningsTracker books the move straight from the response. The requester-keyed pendings map, the RequestMoveFunds subscription, and request_move_funds are removed. This mirrors the existing XRebalanceAttribution path, which already passes source/destination in its message. Tests: ResponseMoveFunds constructions updated across the rebalancer and earnings tests; test_earningstracker now issues two moves under the same requester and asserts both are booked and correctly attributed -- a regression guard for the collision. Full suite 85/85.
267 lines
7.7 KiB
C++
267 lines
7.7 KiB
C++
#undef NDEBUG
|
|
|
|
#include"Boss/Mod/EarningsTracker.hpp"
|
|
#include"Boss/Msg/DbResource.hpp"
|
|
#include"Boss/Msg/ForwardFee.hpp"
|
|
#include"Boss/Msg/ProvideStatus.hpp"
|
|
#include"Boss/Msg/RequestEarningsInfo.hpp"
|
|
#include"Boss/Msg/ResponseEarningsInfo.hpp"
|
|
#include"Boss/Msg/ResponseMoveFunds.hpp"
|
|
#include"Boss/Msg/SolicitStatus.hpp"
|
|
#include"Ev/start.hpp"
|
|
#include"Jsmn/Object.hpp"
|
|
#include"Jsmn/Parser.hpp"
|
|
#include"Json/Out.hpp"
|
|
#include"Ln/NodeId.hpp"
|
|
#include"S/Bus.hpp"
|
|
#include"Sqlite3.hpp"
|
|
|
|
#include <cassert>
|
|
#include<iostream>
|
|
#include<sstream>
|
|
|
|
namespace {
|
|
auto const A = Ln::NodeId("020000000000000000000000000000000000000000000000000000000000000001");
|
|
auto const B = Ln::NodeId("020000000000000000000000000000000000000000000000000000000000000002");
|
|
auto const C = Ln::NodeId("020000000000000000000000000000000000000000000000000000000000000003");
|
|
}
|
|
|
|
double mock_now = 0.0;
|
|
double mock_get_now() {
|
|
return mock_now;
|
|
}
|
|
|
|
int main() {
|
|
// check the UTC quantitization boundaries
|
|
assert(Boss::Mod::EarningsTracker::bucket_time(1722902400 - 1) == 1722816000);
|
|
assert(Boss::Mod::EarningsTracker::bucket_time(1722902400) == 1722902400);
|
|
assert(Boss::Mod::EarningsTracker::bucket_time(1722902400 + 86400 - 1) == 1722902400);
|
|
assert(Boss::Mod::EarningsTracker::bucket_time(1722902400 + 86400) == 1722988800);
|
|
|
|
auto bus = S::Bus();
|
|
|
|
/* Module under test */
|
|
Boss::Mod::EarningsTracker mut(bus, &mock_get_now);
|
|
|
|
auto db = Sqlite3::Db(":memory:");
|
|
|
|
Boss::Msg::ProvideStatus lastStatus;
|
|
Boss::Msg::ResponseEarningsInfo lastEarningsInfo;
|
|
|
|
bus.subscribe<Boss::Msg::ProvideStatus>([&](Boss::Msg::ProvideStatus const& st) {
|
|
lastStatus = st;
|
|
return Ev::lift();
|
|
});
|
|
|
|
bus.subscribe<Boss::Msg::ResponseEarningsInfo>([&](Boss::Msg::ResponseEarningsInfo const& ei) {
|
|
lastEarningsInfo = ei;
|
|
return Ev::lift();
|
|
});
|
|
|
|
auto code = Ev::lift().then([&]() {
|
|
return bus.raise(Boss::Msg::DbResource{ db });
|
|
}).then([&]() {
|
|
mock_now = 1000.0;
|
|
return bus.raise(
|
|
Boss::Msg::ForwardFee{
|
|
A, // in_id
|
|
B, // out_id
|
|
Ln::Amount::sat(1), // fee
|
|
1.0, // resolution_time
|
|
Ln::Amount::sat(1000), // amount forwarded
|
|
});
|
|
}).then([&]() {
|
|
mock_now = 2000.0;
|
|
return bus.raise(Boss::Msg::SolicitStatus{});
|
|
}).then([&]() {
|
|
// std::cerr << lastStatus.value.output() << std::endl;
|
|
assert(lastStatus.key == "offchain_earnings_tracker");
|
|
assert(
|
|
Jsmn::Object::parse_json(lastStatus.value.output().c_str()) ==
|
|
Jsmn::Object::parse_json(R"JSON(
|
|
{
|
|
"020000000000000000000000000000000000000000000000000000000000000001": {
|
|
"in_earnings": 1000,
|
|
"in_expenditures": 0,
|
|
"out_earnings": 0,
|
|
"out_expenditures": 0,
|
|
"in_forwarded": 1000000,
|
|
"in_rebalanced": 0,
|
|
"out_forwarded": 0,
|
|
"out_rebalanced": 0
|
|
},
|
|
"020000000000000000000000000000000000000000000000000000000000000002": {
|
|
"in_earnings": 0,
|
|
"in_expenditures": 0,
|
|
"out_earnings": 1000,
|
|
"out_expenditures": 0,
|
|
"in_forwarded": 0,
|
|
"in_rebalanced": 0,
|
|
"out_forwarded": 1000000,
|
|
"out_rebalanced": 0
|
|
},
|
|
"total": {
|
|
"in_earnings": 1000,
|
|
"in_expenditures": 0,
|
|
"out_earnings": 1000,
|
|
"out_expenditures": 0,
|
|
"in_forwarded": 1000000,
|
|
"in_rebalanced": 0,
|
|
"out_forwarded": 1000000,
|
|
"out_rebalanced": 0
|
|
}
|
|
}
|
|
)JSON"));
|
|
return Ev::lift();
|
|
}).then([&]() {
|
|
mock_now = 3000.0;
|
|
return bus.raise(
|
|
Boss::Msg::ForwardFee{
|
|
A, // in_id
|
|
B, // out_id
|
|
Ln::Amount::sat(1), // fee
|
|
1.0, // resolution_time
|
|
Ln::Amount::sat(2000), // amount forwarded
|
|
});
|
|
}).then([&]() {
|
|
return bus.raise(Boss::Msg::SolicitStatus{});
|
|
}).then([&]() {
|
|
// std::cerr << lastStatus.value.output() << std::endl;
|
|
assert(lastStatus.key == "offchain_earnings_tracker");
|
|
assert(
|
|
Jsmn::Object::parse_json(lastStatus.value.output().c_str()) ==
|
|
Jsmn::Object::parse_json(R"JSON(
|
|
{
|
|
"020000000000000000000000000000000000000000000000000000000000000001": {
|
|
"in_earnings": 2000,
|
|
"in_expenditures": 0,
|
|
"out_earnings": 0,
|
|
"out_expenditures": 0,
|
|
"in_forwarded": 3000000,
|
|
"in_rebalanced": 0,
|
|
"out_forwarded": 0,
|
|
"out_rebalanced": 0
|
|
},
|
|
"020000000000000000000000000000000000000000000000000000000000000002": {
|
|
"in_earnings": 0,
|
|
"in_expenditures": 0,
|
|
"out_earnings": 2000,
|
|
"out_expenditures": 0,
|
|
"in_forwarded": 0,
|
|
"in_rebalanced": 0,
|
|
"out_forwarded": 3000000,
|
|
"out_rebalanced": 0
|
|
},
|
|
"total": {
|
|
"in_earnings": 2000,
|
|
"in_expenditures": 0,
|
|
"out_earnings": 2000,
|
|
"out_expenditures": 0,
|
|
"in_forwarded": 3000000,
|
|
"in_rebalanced": 0,
|
|
"out_forwarded": 3000000,
|
|
"out_rebalanced": 0
|
|
}
|
|
}
|
|
)JSON"));
|
|
return Ev::lift();
|
|
}).then([&]() {
|
|
/* Two rebalance moves reported under the SAME requester.
|
|
* The response carries its own source/destination, so both
|
|
* are booked and attributed correctly. The tracker used to
|
|
* correlate moves back to requests by `requester`, so every
|
|
* move after the first of a same-requester batch was
|
|
* silently dropped -- regression guard for that bug. */
|
|
mock_now = 4000.0;
|
|
return bus.raise(
|
|
Boss::Msg::ResponseMoveFunds{
|
|
NULL, // requester (shared)
|
|
Ln::Amount::sat(1000), // amount_moved
|
|
Ln::Amount::sat(2), // fee_spent
|
|
C, // source
|
|
A // destination
|
|
});
|
|
}).then([&]() {
|
|
mock_now = 5000.0;
|
|
return bus.raise(
|
|
Boss::Msg::ResponseMoveFunds{
|
|
NULL, // requester (same as above)
|
|
Ln::Amount::sat(1000), // amount_moved
|
|
Ln::Amount::sat(2), // fee_spent
|
|
C, // source
|
|
B // destination
|
|
});
|
|
}).then([&]() {
|
|
return bus.raise(Boss::Msg::SolicitStatus{});
|
|
}).then([&]() {
|
|
// std::cerr << lastStatus.value.output() << std::endl;
|
|
assert(lastStatus.key == "offchain_earnings_tracker");
|
|
assert(
|
|
Jsmn::Object::parse_json(lastStatus.value.output().c_str()) ==
|
|
Jsmn::Object::parse_json(R"JSON(
|
|
{
|
|
"020000000000000000000000000000000000000000000000000000000000000001": {
|
|
"in_earnings": 2000,
|
|
"in_expenditures": 0,
|
|
"out_earnings": 0,
|
|
"out_expenditures": 2000,
|
|
"in_forwarded": 3000000,
|
|
"in_rebalanced": 0,
|
|
"out_forwarded": 0,
|
|
"out_rebalanced": 1000000
|
|
},
|
|
"020000000000000000000000000000000000000000000000000000000000000002": {
|
|
"in_earnings": 0,
|
|
"in_expenditures": 0,
|
|
"out_earnings": 2000,
|
|
"out_expenditures": 2000,
|
|
"in_forwarded": 0,
|
|
"in_rebalanced": 0,
|
|
"out_forwarded": 3000000,
|
|
"out_rebalanced": 1000000
|
|
},
|
|
"020000000000000000000000000000000000000000000000000000000000000003": {
|
|
"in_earnings": 0,
|
|
"in_expenditures": 4000,
|
|
"out_earnings": 0,
|
|
"out_expenditures": 0,
|
|
"in_forwarded": 0,
|
|
"in_rebalanced": 2000000,
|
|
"out_forwarded": 0,
|
|
"out_rebalanced": 0
|
|
},
|
|
"total": {
|
|
"in_earnings": 2000,
|
|
"in_expenditures": 4000,
|
|
"out_earnings": 2000,
|
|
"out_expenditures": 4000,
|
|
"in_forwarded": 3000000,
|
|
"in_rebalanced": 2000000,
|
|
"out_forwarded": 3000000,
|
|
"out_rebalanced": 2000000
|
|
}
|
|
}
|
|
)JSON"));
|
|
return Ev::lift();
|
|
}).then([&]() {
|
|
mock_now = 4000.0;
|
|
return bus.raise(
|
|
Boss::Msg::RequestEarningsInfo{
|
|
NULL, // requester (match ResponseEarningsInfo)
|
|
A // node
|
|
});
|
|
}).then([&]() {
|
|
return Ev::yield(42);
|
|
}).then([&]() {
|
|
assert(lastEarningsInfo.node == A);
|
|
assert(lastEarningsInfo.in_earnings == Ln::Amount::msat(2000));
|
|
assert(lastEarningsInfo.in_expenditures == Ln::Amount::msat(0));
|
|
assert(lastEarningsInfo.out_earnings == Ln::Amount::msat(0));
|
|
assert(lastEarningsInfo.out_expenditures == Ln::Amount::msat(2000));
|
|
return Ev::lift();
|
|
}).then([&]() {
|
|
return Ev::lift(0);
|
|
});
|
|
|
|
return Ev::start(std::move(code));
|
|
}
|