@atomiqlabs/lp-lib 14.0.0-dev.6 → 14.0.0-dev.7

package/dist/swaps/escrow/frombtcln_autoinit/FromBtcLnAutoInitSwap.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FromBtcLnAutoInitSwap = exports.FromBtcLnAutoInitSwapState = void 0;
+const index_1 = require("../../../index");
+const FromBtcBaseSwap_1 = require("../FromBtcBaseSwap");
+const Utils_1 = require("../../../utils/Utils");
+var FromBtcLnAutoInitSwapState;
+(function (FromBtcLnAutoInitSwapState) {
+    FromBtcLnAutoInitSwapState[FromBtcLnAutoInitSwapState["REFUNDED"] = -2] = "REFUNDED";
+    FromBtcLnAutoInitSwapState[FromBtcLnAutoInitSwapState["CANCELED"] = -1] = "CANCELED";
+    FromBtcLnAutoInitSwapState[FromBtcLnAutoInitSwapState["CREATED"] = 0] = "CREATED";
+    FromBtcLnAutoInitSwapState[FromBtcLnAutoInitSwapState["RECEIVED"] = 1] = "RECEIVED";
+    FromBtcLnAutoInitSwapState[FromBtcLnAutoInitSwapState["TXS_SENT"] = 2] = "TXS_SENT";
+    FromBtcLnAutoInitSwapState[FromBtcLnAutoInitSwapState["COMMITED"] = 3] = "COMMITED";
+    FromBtcLnAutoInitSwapState[FromBtcLnAutoInitSwapState["CLAIMED"] = 4] = "CLAIMED";
+    FromBtcLnAutoInitSwapState[FromBtcLnAutoInitSwapState["SETTLED"] = 5] = "SETTLED";
+})(FromBtcLnAutoInitSwapState = exports.FromBtcLnAutoInitSwapState || (exports.FromBtcLnAutoInitSwapState = {}));
+class FromBtcLnAutoInitSwap extends FromBtcBaseSwap_1.FromBtcBaseSwap {
+    constructor(chainIdOrObj, pr, lnPaymentHash, claimHash, amountMtokens, claimer, token, gasToken, amountToken, amountGasToken, tokenSwapFee, tokenSwapFeeInToken, gasSwapFee, gasSwapFeeInToken, claimerBounty) {
+        if (typeof (chainIdOrObj) === "string") {
+            super(chainIdOrObj, (amountMtokens + 999n) / 1000n, tokenSwapFee + gasSwapFee, tokenSwapFeeInToken);
+            this.state = FromBtcLnAutoInitSwapState.CREATED;
+            this.pr = pr;
+            this.lnPaymentHash = lnPaymentHash;
+            this.claimHash = claimHash;
+            this.claimer = claimer;
+            this.token = token;
+            this.gasToken = gasToken;
+            this.amountToken = amountToken;
+            this.amountGasToken = amountGasToken;
+            this.tokenSwapFee = tokenSwapFee;
+            this.tokenSwapFeeInToken = tokenSwapFeeInToken;
+            this.gasSwapFee = gasSwapFee;
+            this.gasSwapFeeInToken = gasSwapFeeInToken;
+            this.claimerBounty = claimerBounty;
+        }
+        else {
+            super(chainIdOrObj);
+            this.pr = chainIdOrObj.pr;
+            this.lnPaymentHash = chainIdOrObj.lnPaymentHash;
+            this.claimHash = chainIdOrObj.claimHash;
+            this.claimer = chainIdOrObj.claimer;
+            this.token = chainIdOrObj.token;
+            this.gasToken = chainIdOrObj.gasToken;
+            this.amountToken = (0, Utils_1.deserializeBN)(chainIdOrObj.amountToken);
+            this.amountGasToken = (0, Utils_1.deserializeBN)(chainIdOrObj.amountGasToken);
+            this.tokenSwapFee = (0, Utils_1.deserializeBN)(chainIdOrObj.tokenSwapFee);
+            this.tokenSwapFeeInToken = (0, Utils_1.deserializeBN)(chainIdOrObj.tokenSwapFeeInToken);
+            this.gasSwapFee = (0, Utils_1.deserializeBN)(chainIdOrObj.gasSwapFee);
+            this.gasSwapFeeInToken = (0, Utils_1.deserializeBN)(chainIdOrObj.gasSwapFeeInToken);
+            this.claimerBounty = (0, Utils_1.deserializeBN)(chainIdOrObj.claimerBounty);
+            this.secret = chainIdOrObj.secret;
+        }
+        this.type = index_1.SwapHandlerType.FROM_BTCLN;
+    }
+    serialize() {
+        const partialSerialized = super.serialize();
+        partialSerialized.pr = this.pr;
+        partialSerialized.secret = this.secret;
+        partialSerialized.lnPaymentHash = this.lnPaymentHash;
+        partialSerialized.claimHash = this.claimHash;
+        partialSerialized.claimer = this.claimer;
+        partialSerialized.token = this.token;
+        partialSerialized.gasToken = this.gasToken;
+        partialSerialized.amountToken = (0, Utils_1.serializeBN)(this.amountToken);
+        partialSerialized.amountGasToken = (0, Utils_1.serializeBN)(this.amountGasToken);
+        partialSerialized.tokenSwapFee = (0, Utils_1.serializeBN)(this.tokenSwapFee);
+        partialSerialized.tokenSwapFeeInToken = (0, Utils_1.serializeBN)(this.tokenSwapFeeInToken);
+        partialSerialized.gasSwapFee = (0, Utils_1.serializeBN)(this.gasSwapFee);
+        partialSerialized.gasSwapFeeInToken = (0, Utils_1.serializeBN)(this.gasSwapFeeInToken);
+        partialSerialized.claimerBounty = (0, Utils_1.serializeBN)(this.claimerBounty);
+        return partialSerialized;
+    }
+    getIdentifierHash() {
+        return this.lnPaymentHash;
+    }
+    getOutputGasAmount() {
+        return this.amountGasToken;
+    }
+    getOutputAmount() {
+        return this.amountToken;
+    }
+    getTotalOutputAmount() {
+        return this.amountToken;
+    }
+    getTotalOutputGasAmount() {
+        return this.amountGasToken + this.claimerBounty;
+    }
+    getSequence() {
+        return 0n;
+    }
+    getSwapFee() {
+        return { inInputToken: this.swapFee, inOutputToken: this.swapFeeInToken };
+    }
+    getTokenSwapFee() {
+        return { inInputToken: this.tokenSwapFee, inOutputToken: this.tokenSwapFeeInToken };
+    }
+    getGasSwapFee() {
+        return { inInputToken: this.gasSwapFee, inOutputToken: this.gasSwapFeeInToken };
+    }
+    getToken() {
+        return this.token;
+    }
+    getGasToken() {
+        return this.gasToken;
+    }
+    isInitiated() {
+        return this.state !== FromBtcLnAutoInitSwapState.CREATED;
+    }
+    isFailed() {
+        return this.state === FromBtcLnAutoInitSwapState.CANCELED || this.state === FromBtcLnAutoInitSwapState.REFUNDED;
+    }
+    isSuccess() {
+        return this.state === FromBtcLnAutoInitSwapState.SETTLED;
+    }
+}
+exports.FromBtcLnAutoInitSwap = FromBtcLnAutoInitSwap;

package/dist/swaps/escrow/frombtcln_autoinit/FromBtcLnAutoSwap.d.ts

@@ -0,0 +1,54 @@
+import { SwapData } from "@atomiqlabs/base";
+import { FromBtcBaseSwap } from "../FromBtcBaseSwap";
+export declare enum FromBtcLnAutoSwapState {
+    REFUNDED = -2,
+    CANCELED = -1,
+    CREATED = 0,
+    RECEIVED = 1,
+    TXS_SENT = 2,
+    COMMITED = 3,
+    CLAIMED = 4,
+    SETTLED = 5
+}
+export declare class FromBtcLnAutoSwap<T extends SwapData = SwapData> extends FromBtcBaseSwap<T, FromBtcLnAutoSwapState> {
+    readonly pr: string;
+    readonly lnPaymentHash: string;
+    readonly claimHash: string;
+    readonly claimer: string;
+    readonly token: string;
+    readonly gasToken: string;
+    readonly amountToken: bigint;
+    readonly amountGasToken: bigint;
+    readonly tokenSwapFee: bigint;
+    readonly tokenSwapFeeInToken: bigint;
+    readonly gasSwapFee: bigint;
+    readonly gasSwapFeeInToken: bigint;
+    readonly claimerBounty: bigint;
+    secret: string;
+    constructor(chainIdentifier: string, pr: string, lnPaymentHash: string, claimHash: string, amountMtokens: bigint, claimer: string, token: string, gasToken: string, amountToken: bigint, amountGasToken: bigint, tokenSwapFee: bigint, tokenSwapFeeInToken: bigint, gasSwapFee: bigint, gasSwapFeeInToken: bigint, claimerBounty: bigint);
+    constructor(obj: any);
+    serialize(): any;
+    getIdentifierHash(): string;
+    getOutputGasAmount(): bigint;
+    getOutputAmount(): bigint;
+    getTotalOutputAmount(): bigint;
+    getTotalOutputGasAmount(): bigint;
+    getSequence(): bigint;
+    getSwapFee(): {
+        inInputToken: bigint;
+        inOutputToken: bigint;
+    };
+    getTokenSwapFee(): {
+        inInputToken: bigint;
+        inOutputToken: bigint;
+    };
+    getGasSwapFee(): {
+        inInputToken: bigint;
+        inOutputToken: bigint;
+    };
+    getToken(): string;
+    getGasToken(): string;
+    isInitiated(): boolean;
+    isFailed(): boolean;
+    isSuccess(): boolean;
+}

package/dist/swaps/escrow/frombtcln_autoinit/FromBtcLnAutoSwap.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FromBtcLnAutoSwap = exports.FromBtcLnAutoSwapState = void 0;
+const index_1 = require("../../../index");
+const FromBtcBaseSwap_1 = require("../FromBtcBaseSwap");
+const Utils_1 = require("../../../utils/Utils");
+var FromBtcLnAutoSwapState;
+(function (FromBtcLnAutoSwapState) {
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["REFUNDED"] = -2] = "REFUNDED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["CANCELED"] = -1] = "CANCELED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["CREATED"] = 0] = "CREATED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["RECEIVED"] = 1] = "RECEIVED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["TXS_SENT"] = 2] = "TXS_SENT";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["COMMITED"] = 3] = "COMMITED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["CLAIMED"] = 4] = "CLAIMED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["SETTLED"] = 5] = "SETTLED";
+})(FromBtcLnAutoSwapState = exports.FromBtcLnAutoSwapState || (exports.FromBtcLnAutoSwapState = {}));
+class FromBtcLnAutoSwap extends FromBtcBaseSwap_1.FromBtcBaseSwap {
+    constructor(chainIdOrObj, pr, lnPaymentHash, claimHash, amountMtokens, claimer, token, gasToken, amountToken, amountGasToken, tokenSwapFee, tokenSwapFeeInToken, gasSwapFee, gasSwapFeeInToken, claimerBounty) {
+        if (typeof (chainIdOrObj) === "string") {
+            super(chainIdOrObj, (amountMtokens + 999n) / 1000n, tokenSwapFee + gasSwapFee, tokenSwapFeeInToken);
+            this.state = FromBtcLnAutoSwapState.CREATED;
+            this.pr = pr;
+            this.lnPaymentHash = lnPaymentHash;
+            this.claimHash = claimHash;
+            this.claimer = claimer;
+            this.token = token;
+            this.gasToken = gasToken;
+            this.amountToken = amountToken;
+            this.amountGasToken = amountGasToken;
+            this.tokenSwapFee = tokenSwapFee;
+            this.tokenSwapFeeInToken = tokenSwapFeeInToken;
+            this.gasSwapFee = gasSwapFee;
+            this.gasSwapFeeInToken = gasSwapFeeInToken;
+            this.claimerBounty = claimerBounty;
+        }
+        else {
+            super(chainIdOrObj);
+            this.pr = chainIdOrObj.pr;
+            this.lnPaymentHash = chainIdOrObj.lnPaymentHash;
+            this.claimHash = chainIdOrObj.claimHash;
+            this.claimer = chainIdOrObj.claimer;
+            this.token = chainIdOrObj.token;
+            this.gasToken = chainIdOrObj.gasToken;
+            this.amountToken = (0, Utils_1.deserializeBN)(chainIdOrObj.amountToken);
+            this.amountGasToken = (0, Utils_1.deserializeBN)(chainIdOrObj.amountGasToken);
+            this.tokenSwapFee = (0, Utils_1.deserializeBN)(chainIdOrObj.tokenSwapFee);
+            this.tokenSwapFeeInToken = (0, Utils_1.deserializeBN)(chainIdOrObj.tokenSwapFeeInToken);
+            this.gasSwapFee = (0, Utils_1.deserializeBN)(chainIdOrObj.gasSwapFee);
+            this.gasSwapFeeInToken = (0, Utils_1.deserializeBN)(chainIdOrObj.gasSwapFeeInToken);
+            this.claimerBounty = (0, Utils_1.deserializeBN)(chainIdOrObj.claimerBounty);
+            this.secret = chainIdOrObj.secret;
+        }
+        this.type = index_1.SwapHandlerType.FROM_BTCLN;
+    }
+    serialize() {
+        const partialSerialized = super.serialize();
+        partialSerialized.pr = this.pr;
+        partialSerialized.secret = this.secret;
+        partialSerialized.lnPaymentHash = this.lnPaymentHash;
+        partialSerialized.claimHash = this.claimHash;
+        partialSerialized.claimer = this.claimer;
+        partialSerialized.token = this.token;
+        partialSerialized.gasToken = this.gasToken;
+        partialSerialized.amountToken = (0, Utils_1.serializeBN)(this.amountToken);
+        partialSerialized.amountGasToken = (0, Utils_1.serializeBN)(this.amountGasToken);
+        partialSerialized.tokenSwapFee = (0, Utils_1.serializeBN)(this.tokenSwapFee);
+        partialSerialized.tokenSwapFeeInToken = (0, Utils_1.serializeBN)(this.tokenSwapFeeInToken);
+        partialSerialized.gasSwapFee = (0, Utils_1.serializeBN)(this.gasSwapFee);
+        partialSerialized.gasSwapFeeInToken = (0, Utils_1.serializeBN)(this.gasSwapFeeInToken);
+        partialSerialized.claimerBounty = (0, Utils_1.serializeBN)(this.claimerBounty);
+        return partialSerialized;
+    }
+    getIdentifierHash() {
+        return this.lnPaymentHash;
+    }
+    getOutputGasAmount() {
+        return this.amountGasToken;
+    }
+    getOutputAmount() {
+        return this.amountToken;
+    }
+    getTotalOutputAmount() {
+        return this.amountToken;
+    }
+    getTotalOutputGasAmount() {
+        return this.amountGasToken + this.claimerBounty;
+    }
+    getSequence() {
+        return 0n;
+    }
+    getSwapFee() {
+        return { inInputToken: this.swapFee, inOutputToken: this.swapFeeInToken };
+    }
+    getTokenSwapFee() {
+        return { inInputToken: this.tokenSwapFee, inOutputToken: this.tokenSwapFeeInToken };
+    }
+    getGasSwapFee() {
+        return { inInputToken: this.gasSwapFee, inOutputToken: this.gasSwapFeeInToken };
+    }
+    getToken() {
+        return this.token;
+    }
+    getGasToken() {
+        return this.gasToken;
+    }
+    isInitiated() {
+        return this.state !== FromBtcLnAutoSwapState.CREATED;
+    }
+    isFailed() {
+        return this.state === FromBtcLnAutoSwapState.CANCELED || this.state === FromBtcLnAutoSwapState.REFUNDED;
+    }
+    isSuccess() {
+        return this.state === FromBtcLnAutoSwapState.SETTLED;
+    }
+}
+exports.FromBtcLnAutoSwap = FromBtcLnAutoSwap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "14.0.0-dev.6",
+  "version": "14.0.0-dev.7",
   "description": "Main functionality implementation for atomiq LP node",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^10.0.0-dev.2",
+    "@atomiqlabs/base": "^10.0.0-dev.7",
     "@atomiqlabs/server-base": "2.0.0",
     "@scure/btc-signer": "1.6.0",
     "express": "4.21.1",

package/src/index.ts

@@ -13,6 +13,8 @@ export * from "./swaps/escrow/frombtc_abstract/FromBtcAbs";
 export * from "./swaps/escrow/frombtc_abstract/FromBtcSwapAbs";
 export * from "./swaps/escrow/frombtcln_abstract/FromBtcLnAbs";
 export * from "./swaps/escrow/frombtcln_abstract/FromBtcLnSwapAbs";
+export * from "./swaps/escrow/frombtcln_autoinit/FromBtcLnAuto";
+export * from "./swaps/escrow/frombtcln_autoinit/FromBtcLnAutoSwap";
 export * from "./swaps/escrow/tobtc_abstract/ToBtcAbs";
 export * from "./swaps/escrow/tobtc_abstract/ToBtcSwapAbs";
 export * from "./swaps/escrow/tobtcln_abstract/ToBtcLnAbs";

package/src/plugins/IPlugin.ts

@@ -116,7 +116,7 @@ export interface IPlugin {
     onSwapRemove?(swap: SwapHandlerSwap): Promise<void>;
 
     onHandlePreFromBtcQuote?(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string},
         chainIdentifier: string,
@@ -125,7 +125,7 @@ export interface IPlugin {
         gasTokenAmount?: {input: false, amount: bigint, token: string}
     ): Promise<QuoteThrow | QuoteSetFees | QuoteAmountTooLow | QuoteAmountTooHigh>;
     onHandlePostFromBtcQuote?(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string, pricePrefetch?: Promise<bigint>},
         chainIdentifier: string,

package/src/plugins/PluginManager.ts

@@ -167,7 +167,7 @@ export class PluginManager {
     }
 
     static async onHandlePostFromBtcQuote(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string, pricePrefetch?: Promise<bigint>},
         chainIdentifier: string,
@@ -198,7 +198,7 @@ export class PluginManager {
     }
 
     static async onHandlePreFromBtcQuote(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string},
         chainIdentifier: string,

package/src/swaps/SwapHandler.ts

@@ -17,7 +17,8 @@ export enum SwapHandlerType {
     FROM_BTCLN = "FROM_BTCLN",
     FROM_BTCLN_TRUSTED = "FROM_BTCLN_TRUSTED",
     FROM_BTC_TRUSTED = "FROM_BTC_TRUSTED",
-    FROM_BTC_SPV = "FROM_BTC_SPV"
+    FROM_BTC_SPV = "FROM_BTC_SPV",
+    FROM_BTCLN_AUTO = "FROM_BTCLN_AUTO"
 }
 
 export type SwapHandlerInfoType = {

package/src/swaps/assertions/FromBtcAmountAssertions.ts

@@ -3,7 +3,7 @@ import {FromBtcRequestType} from "../escrow/frombtc_abstract/FromBtcAbs";
 import {FromBtcLnTrustedRequestType} from "../trusted/frombtcln_trusted/FromBtcLnTrusted";
 import {PluginManager} from "../../plugins/PluginManager";
 import {isPluginQuote, isQuoteSetFees} from "../../plugins/IPlugin";
-import {RequestData, SwapHandlerType} from "../SwapHandler";
+import {RequestData, SwapHandler, SwapHandlerType} from "../SwapHandler";
 import {AmountAssertions, AmountAssertionsConfig} from "./AmountAssertions";
 import {ISwapPrice} from "../../prices/ISwapPrice";
 import {FromBtcTrustedRequestType} from "../trusted/frombtc_trusted/FromBtcTrusted";
@@ -32,7 +32,7 @@ export class FromBtcAmountAssertions extends AmountAssertions {
      * @throws {DefinedRuntimeError} will throw an error if the amount is outside minimum/maximum bounds
      */
     async preCheckFromBtcAmounts(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string},
         gasAmount?: {input: false, amount: bigint, token: string}
@@ -94,7 +94,7 @@ export class FromBtcAmountAssertions extends AmountAssertions {
      * @throws {DefinedRuntimeError} will throw an error if the amount is outside minimum/maximum bounds
      */
     async checkFromBtcAmount(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string, pricePrefetch?: Promise<bigint>},
         fees: {baseFee: bigint, feePPM: bigint},

package/src/swaps/escrow/FromBtcBaseSwapHandler.ts

@@ -116,11 +116,12 @@ export abstract class FromBtcBaseSwapHandler<V extends FromBtcBaseSwap<SwapData,
      * @param chainIdentifier
      * @param useToken
      * @param abortController
+     * @param inContract
      */
-    protected async getBalancePrefetch(chainIdentifier: string, useToken: string, abortController: AbortController): Promise<bigint> {
+    protected async getBalancePrefetch(chainIdentifier: string, useToken: string, abortController: AbortController, inContract: boolean = true): Promise<bigint> {
         const {swapContract, signer} = this.getChain(chainIdentifier);
         try {
-            return await swapContract.getBalance(signer.getAddress(), useToken, true);
+            return await swapContract.getBalance(signer.getAddress(), useToken, inContract);
         } catch (e) {
             this.logger.error("getBalancePrefetch(): balancePrefetch error: ", e);
             abortController.abort(e);
@@ -137,6 +138,8 @@ export abstract class FromBtcBaseSwapHandler<V extends FromBtcBaseSwap<SwapData,
      * @throws {DefinedRuntimeError} will throw an error if there are not enough funds in the vault
      */
     protected async checkBalance(totalInToken: bigint, balancePrefetch: Promise<bigint>, signal: AbortSignal | null): Promise<void> {
+        if(totalInToken===0n) return;
+
         const balance = await balancePrefetch;
         if(signal!=null) signal.throwIfAborted();