Skip to content

Reconcile all SEP-24 pending states #293

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
mergekeeper merged 3 commits into from
Aug 31, 2026
Merged

Reconcile all SEP-24 pending states #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72e0c3f
Reconcile all SEP-24 pending states
princewille277-dotcom Aug 27, 2026
1887832
Merge branch 'main' into fix/sep24-status-reconciliation
princewille277-dotcom Aug 27, 2026
9657e34
Merge branch 'main' into fix/sep24-status-reconciliation
princewille277-dotcom Aug 31, 2026
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
72 changes: 67 additions & 5 deletions src/services/anchor-status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,41 @@ import { Errors } from "../errors";
export type AnchorSessionStatus =
| "incomplete"
| "pending_user_transfer_start"
| "pending_user"
| "pending_transaction_info_update"
| "pending_receiver"
| "pending_sender"
| "pending_stellar"
| "pending_trust"
| "pending_anchor"
| "completed"
| "error"
| "refunded";
| "refunded"
| "expired"
| "no_market"
| "too_small"
| "too_large";

export type AnchorTransitionSource = "user" | "webhook" | "poll";

/** The full set of statuses Mergepay tracks for an anchor session. */
export const ANCHOR_SESSION_STATUSES: readonly AnchorSessionStatus[] = [
"incomplete",
"pending_user_transfer_start",
"pending_user",
"pending_transaction_info_update",
"pending_receiver",
"pending_sender",
"pending_stellar",
"pending_trust",
"pending_anchor",
"completed",
"error",
"refunded",
"expired",
"no_market",
"too_small",
"too_large",
];

/**
Expand All @@ -48,16 +68,58 @@ export const ANCHOR_SESSION_STATUSES: readonly AnchorSessionStatus[] = [
* but never regresses back to a pending state.
*/
const ALLOWED_TRANSITIONS: Record<AnchorSessionStatus, readonly AnchorSessionStatus[]> = {
incomplete: ["pending_user_transfer_start", "pending_anchor", "error"],
pending_user_transfer_start: ["pending_anchor", "error", "refunded", "completed"],
pending_anchor: ["completed", "error", "refunded"],
incomplete: [
"pending_user_transfer_start", "pending_user", "pending_transaction_info_update",
"pending_receiver", "pending_sender", "pending_stellar", "pending_trust", "pending_anchor",
"error", "expired", "no_market", "too_small", "too_large",
],
pending_user_transfer_start: [
"pending_user", "pending_transaction_info_update", "pending_receiver", "pending_sender",
"pending_stellar", "pending_trust", "pending_anchor", "error", "refunded", "completed",
"expired", "no_market", "too_small", "too_large",
],
pending_user: [
"pending_transaction_info_update", "pending_receiver", "pending_sender", "pending_stellar",
"pending_trust", "pending_anchor", "error", "refunded", "completed", "expired", "no_market",
"too_small", "too_large",
],
pending_transaction_info_update: [
"pending_user", "pending_receiver", "pending_sender", "pending_stellar", "pending_trust",
"pending_anchor", "error", "refunded", "completed", "expired", "no_market", "too_small", "too_large",
],
pending_receiver: [
"pending_user", "pending_transaction_info_update", "pending_sender", "pending_stellar", "pending_trust",
"pending_anchor", "error", "refunded", "completed", "expired", "no_market", "too_small", "too_large",
],
pending_sender: [
"pending_user", "pending_transaction_info_update", "pending_receiver", "pending_stellar", "pending_trust",
"pending_anchor", "error", "refunded", "completed", "expired", "no_market", "too_small", "too_large",
],
pending_stellar: [
"pending_user", "pending_transaction_info_update", "pending_receiver", "pending_sender", "pending_trust",
"pending_anchor", "error", "refunded", "completed", "expired", "no_market", "too_small", "too_large",
],
pending_trust: [
"pending_user", "pending_transaction_info_update", "pending_receiver", "pending_sender", "pending_stellar",
"pending_anchor", "error", "refunded", "completed", "expired", "no_market", "too_small", "too_large",
],
pending_anchor: [
"pending_user", "pending_transaction_info_update", "pending_receiver", "pending_sender", "pending_stellar",
"pending_trust", "error", "refunded", "completed", "expired", "no_market", "too_small", "too_large",
],
completed: [],
error: ["refunded"],
refunded: [],
expired: [],
no_market: [],
too_small: [],
too_large: [],
};

export function isTerminalAnchorStatus(status: string): boolean {
return status === "completed" || status === "refunded";
return [
"completed", "error", "refunded", "expired", "no_market", "too_small", "too_large",
].includes(status);
}

export function canTransitionAnchorStatus(
Expand Down
17 changes: 15 additions & 2 deletions src/worker/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ async function scheduleRetry(params: {
}): Promise<void> {
const { job, attempt, category, reason, delayMs, ctx } = params;
const nextAttemptAt = new Date(Date.now() + delayMs);
const leaseExpiresAt = new Date(nextAttemptAt.getTime() + config.WORKER_LEASE_TIMEOUT_MS);

await prisma.settlement.update({
where: { id: job.id },
Expand All @@ -205,7 +206,7 @@ async function scheduleRetry(params: {
nextAttemptAt,
errorCategory: category,
failureReason: reason,
leaseExpiresAt: leaseDeadline(),
leaseExpiresAt,
},
});

Expand Down Expand Up @@ -907,7 +908,19 @@ export async function reconcileAnchors(): Promise<void> {

const sessions = await prisma.anchorSession.findMany({
where: {
status: { in: ["incomplete", "pending_user_transfer_start", "pending_anchor"] },
status: {
in: [
"incomplete",
"pending_user_transfer_start",
"pending_user",
"pending_transaction_info_update",
"pending_receiver",
"pending_sender",
"pending_stellar",
"pending_trust",
"pending_anchor",
],
},
externalTransactionId: { not: null },
AND: [
{ OR: [{ nextAttemptAt: null }, { nextAttemptAt: { lte: now } }] },
Expand Down
Loading