Skip to content
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.

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

feat: abandon swaps that trigger MC reset loop #740

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions lib/swap/PaymentHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class PaymentHandler {
private static readonly errCltvTooSmall = 'CLTV limit too small';

private lastResetMissionControl: number | undefined = undefined;
private missionControlResetTriggers: Map<string, boolean> = new Map();

constructor(
private readonly logger: Logger,
Expand Down Expand Up @@ -256,10 +257,18 @@ class PaymentHandler {
Date.now() - this.lastResetMissionControl >=
PaymentHandler.resetMissionControlInterval
) {
if (this.hasPreviouslyTriggeredMissionControlReset(swap.preimageHash)) {
this.logger.debug(
`Canceling swap ${swap.id} because it has already triggered mission control reset`,
);
await this.abandonSwap(swap, errorMessage);
return undefined;
}
this.logger.debug(
`Resetting ${lndClient.symbol} ${LndClient.serviceName} mission control`,
);
this.lastResetMissionControl = Date.now();
this.missionControlResetTriggers.set(swap.preimageHash, true);
await lndClient.resetMissionControl();
} else {
this.logger.debug(
Expand Down Expand Up @@ -346,6 +355,17 @@ class PaymentHandler {
`Could not pay invoice of Swap ${swap.id} because: ${errorMessage}`,
);
};

private hasPreviouslyTriggeredMissionControlReset(
preimageHash: string,
): boolean {
const previouslyTriggered =
this.missionControlResetTriggers.has(preimageHash);
if (previouslyTriggered) {
this.missionControlResetTriggers.delete(preimageHash);
}
return previouslyTriggered;
}
}

export default PaymentHandler;
Expand Down
23 changes: 22 additions & 1 deletion test/unit/swap/PaymentHandler.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import TimeoutDeltaProvider from '../../../lib/service/TimeoutDeltaProvider';
import { InvoiceType } from '../../../lib/sidecar/DecodedInvoice';
import Sidecar from '../../../lib/sidecar/Sidecar';
import ChannelNursery from '../../../lib/swap/ChannelNursery';
import swapErrors from '../../../lib/swap/Errors';
import NodeSwitch from '../../../lib/swap/NodeSwitch';
import PaymentHandler from '../../../lib/swap/PaymentHandler';
import { Currency } from '../../../lib/wallet/WalletManager';
Expand Down Expand Up @@ -211,14 +212,34 @@ describe('PaymentHandler', () => {
expect(btcCurrency.lndClient!.resetMissionControl).toHaveBeenCalledTimes(1);
expect(handler['lastResetMissionControl']).toEqual(lastCallBefore);

// After interval, it is called again
// After interval, it is not called again for the same swap
jest.useFakeTimers();
jest.advanceTimersByTime(PaymentHandler['resetMissionControlInterval'] + 1);

await expect(handler.payInvoice(swap, null, undefined)).resolves.toEqual(
undefined,
);
expect(btcCurrency.lndClient!.resetMissionControl).toHaveBeenCalledTimes(1);
expect(handler['lastResetMissionControl']! - Date.now()).toBeLessThan(1000);
expect(swap.update).toHaveBeenCalledTimes(1);
expect(swap.update).toHaveBeenCalledWith({
failureReason: swapErrors.INVOICE_COULD_NOT_BE_PAID().message,
status: SwapUpdateEvent.InvoiceFailedToPay,
});

// After interval, it is called again for different swap
const newSwap = {
...swap,
id: 'newTest',
preimageHash: 'newPreimageHash',
} as any as Swap;

await expect(handler.payInvoice(newSwap, null, undefined)).resolves.toEqual(
undefined,
);

expect(btcCurrency.lndClient!.resetMissionControl).toHaveBeenCalledTimes(2);
expect(handler['lastResetMissionControl']! - Date.now()).toBeLessThan(1000);
expect(swap.update).toHaveBeenCalledTimes(1);
});
});
Loading