Skip to content

fix(orders): set subscription on kickstart and skip GC of own pubkeys #2597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shamardy merged 1 commit into from
Aug 18, 2025
Merged

fix(orders): set subscription on kickstart and skip GC of own pubkeys #2597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions mm2src/mm2_main/src/lp_ordermatch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3744,7 +3744,9 @@ pub async fn lp_ordermatch_loop(ctx: MmArc) {
let mut uuids_to_remove = vec![];
let mut pubkeys_to_remove = vec![];
for (pubkey, state) in orderbook.pubkeys_state.iter() {
let to_keep = pubkey == &my_pubsecp || state.last_keep_alive + maker_order_timeout > now_sec();
let is_ours = orderbook.my_p2p_pubkeys.contains(pubkey);
Comment thread
shamardy marked this conversation as resolved.
let to_keep =
pubkey == &my_pubsecp || is_ours || state.last_keep_alive + maker_order_timeout > now_sec();
Comment thread
shamardy marked this conversation as resolved.
if !to_keep {
for (uuid, _) in &state.orders_uuids {
uuids_to_remove.push(*uuid);
Expand Down Expand Up @@ -3816,8 +3818,31 @@ pub async fn lp_ordermatch_loop(ctx: MmArc) {

// notify other nodes only if maker order is still there keeping maker_orders locked during the operation
if maker_orders.contains_key(&uuid) {
let topic = order.orderbook_topic();
subscribe_to_topic(&ctx, topic);
if let Err(err) = subscribe_to_orderbook_topic(
&ctx,
order.base_orderbook_ticker(),
order.rel_orderbook_ticker(),
false,
)
.await
{
// TODO: centralized-P2P-failure-policy
// Introduce a single, centralized handler for P2P/network failures that affect a specific (base, rel) pair.
// The handler should, on critical/persistent failures, cancel local maker orders for that pair and clear
// in-memory pair state to avoid stale/half-synced state. Apply this consistently across all call sites,
// including but not limited to:
// - subscribe_to_orderbook_topic
// - maker_order_created_p2p_notify
// - re-subscribe on reconnect if needed
// - keep-alive initiated sync requests
// - background refresh / re-announce paths
warn!(
"Failed to subscribe to orderbook topic {}:{}: {}",
order.base_orderbook_ticker(),
order.rel_orderbook_ticker(),
err
);
}
maker_order_created_p2p_notify(
ctx.clone(),
&order,
Expand Down
Loading