@atomiqlabs/lp-lib 15.0.13 → 15.0.15

package/dist/info/InfoHandler.js

@@ -47,11 +47,8 @@ class InfoHandler {
                     signature: await singleChain.swapContract.getDataSignature(singleChain.signer, envelopeBuffer)
                 };
             }
-            const defaults = chains[this.chainData.default];
             const response = {
                 envelope,
-                address: defaults.address,
-                signature: defaults.signature,
                 chains
             };
             res.status(200).json(response);

package/dist/swaps/SwapHandler.d.ts

@@ -18,7 +18,6 @@ export type SwapHandlerInfoType = {
     swapBaseFee: number;
     min: number;
     max: number;
-    tokens: string[];
     chainTokens: {
         [chainId: string]: string[];
     };
@@ -41,7 +40,6 @@ export type MultichainData = {
     chains: {
         [identifier: string]: ChainData;
     };
-    default: string;
 };
 export type ChainData<T extends ChainType = ChainType> = {
     signer: T["Signer"];
@@ -90,7 +88,6 @@ export declare abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHan
         error: (swap: SwapHandlerSwap, msg: string, ...args: any) => void;
     };
     protected constructor(storageDirectory: IIntermediaryStorage<V>, path: string, chainsData: MultichainData, swapPricing: ISwapPrice);
-    protected getDefaultChain(): ChainData;
     protected getChain(identifier: string): ChainData;
     protected abstract processPastSwaps(): Promise<void>;
     /**

package/dist/swaps/SwapHandler.js

@@ -31,8 +31,6 @@ class SwapHandler {
         };
         this.storageManager = storageDirectory;
         this.chains = chainsData;
-        if (this.chains.chains[this.chains.default] == null)
-            throw new Error("Invalid default chain specified");
         this.path = path;
         this.swapPricing = swapPricing;
         this.allowedTokens = {};
@@ -40,9 +38,6 @@ class SwapHandler {
             this.allowedTokens[chainId] = new Set(chainsData.chains[chainId].allowedTokens);
         }
     }
-    getDefaultChain() {
-        return this.chains.chains[this.chains.default];
-    }
     getChain(identifier) {
         if (this.chains.chains[identifier] == null)
             throw {
@@ -152,7 +147,6 @@ class SwapHandler {
             min: Number(this.config.min),
             max: Number(this.config.max),
             data: this.getInfoData(),
-            tokens: Array.from(this.allowedTokens[this.chains.default]),
             chainTokens
         };
     }

package/dist/swaps/escrow/frombtc_abstract/FromBtcAbs.js

@@ -178,7 +178,7 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
         restServer.use(this.path + "/getAddress", (0, ServerParamDecoder_1.serverParamDecoder)(10 * 1000));
         restServer.post(this.path + "/getAddress", (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             const metadata = { request: {}, times: {} };
-            const chainIdentifier = req.query.chain ?? this.chains.default;
+            const chainIdentifier = req.query.chain;
             const { swapContract, signer, chainInterface } = this.getChain(chainIdentifier);
             const depositToken = req.query.depositToken ?? chainInterface.getNativeCurrencyAddress();
             this.checkAllowedDepositToken(chainIdentifier, depositToken);

package/dist/swaps/escrow/frombtcln_abstract/FromBtcLnAbs.js

@@ -412,16 +412,14 @@ class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                 msg: "Invoice expired/canceled"
             };
         const arr = invoice.description.split("-");
-        let chainIdentifier;
-        let address;
-        if (arr.length > 1) {
-            chainIdentifier = arr[0];
-            address = arr[1];
-        }
-        else {
-            chainIdentifier = this.chains.default;
-            address = invoice.description;
-        }
+        if (arr.length < 2)
+            throw {
+                _httpStatus: 200,
+                code: 10001,
+                msg: "Invoice expired/canceled"
+            };
+        const chainIdentifier = arr[0];
+        const address = arr[1];
         const { chainInterface } = this.getChain(chainIdentifier);
         if (!chainInterface.isValidAddress(address))
             throw {
@@ -456,7 +454,7 @@ class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
         restServer.use(this.path + "/createInvoice", (0, ServerParamDecoder_1.serverParamDecoder)(10 * 1000));
         restServer.post(this.path + "/createInvoice", (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             const metadata = { request: {}, times: {} };
-            const chainIdentifier = req.query.chain ?? this.chains.default;
+            const chainIdentifier = req.query.chain;
             const { swapContract, signer, chainInterface } = this.getChain(chainIdentifier);
             const depositToken = req.query.depositToken ?? chainInterface.getNativeCurrencyAddress();
             this.checkAllowedDepositToken(chainIdentifier, depositToken);

package/dist/swaps/escrow/tobtc_abstract/ToBtcAbs.js

@@ -502,7 +502,7 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         restServer.use(this.path + "/payInvoice", (0, ServerParamDecoder_1.serverParamDecoder)(10 * 1000));
         restServer.post(this.path + "/payInvoice", (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             const metadata = { request: {}, times: {} };
-            const chainIdentifier = req.query.chain ?? this.chains.default;
+            const chainIdentifier = req.query.chain;
             const { swapContract, signer, chainInterface } = this.getChain(chainIdentifier);
             metadata.times.requestReceived = Date.now();
             /**
@@ -566,13 +566,13 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                 return resp;
             }, abortController.signal);
             metadata.times.priceCalculated = Date.now();
-            const paymentHash = this.getHash(chainIdentifier, parsedBody.address, parsedBody.confirmations, parsedBody.nonce, amountBD).toString("hex");
+            const claimHash = this.getHash(chainIdentifier, parsedBody.address, parsedBody.confirmations, parsedBody.nonce, amountBD).toString("hex");
             //Add grace period another time, so the user has 1 hour to commit
             const expirySeconds = this.getExpiryFromCLTV(parsedBody.confirmationTarget, parsedBody.confirmations) + this.config.gracePeriod;
             const currentTimestamp = BigInt(Math.floor(Date.now() / 1000));
             const minRequiredExpiry = currentTimestamp + expirySeconds;
             const sequence = base_1.BigIntBufferUtils.fromBuffer((0, crypto_1.randomBytes)(8));
-            const payObject = await swapContract.createSwapData(base_1.ChainSwapType.CHAIN_NONCED, parsedBody.offerer, signer.getAddress(), useToken, totalInToken, paymentHash, sequence, minRequiredExpiry, true, false, 0n, 0n);
+            const payObject = await swapContract.createSwapData(base_1.ChainSwapType.CHAIN_NONCED, parsedBody.offerer, signer.getAddress(), useToken, totalInToken, claimHash, sequence, minRequiredExpiry, true, false, 0n, 0n);
             abortController.signal.throwIfAborted();
             metadata.times.swapCreated = Date.now();
             const sigData = await this.getToBtcSignatureData(chainIdentifier, payObject, req, abortController.signal, signDataPrefetchPromise);

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.d.ts

@@ -15,6 +15,7 @@ export type ToBtcLnConfig = ToBtcBaseConfig & {
     minLnRoutingFeePPM?: bigint;
     minLnBaseFee?: bigint;
     exactInExpiry?: number;
+    lnSendBitcoinBlockTimeSafetyFactorPPM?: bigint;
 };
 type ExactInAuthorization = {
     chainIdentifier: string;

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.js

@@ -30,6 +30,10 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         this.config.minLnRoutingFeePPM = this.config.minLnRoutingFeePPM || 1000n;
         this.config.minLnBaseFee = this.config.minLnBaseFee || 5n;
         this.config.exactInExpiry = this.config.exactInExpiry || 10 * 1000;
+        this.config.lnSendBitcoinBlockTimeSafetyFactorPPM = this.config.lnSendBitcoinBlockTimeSafetyFactorPPM ?? (this.config.safetyFactor * 1000000n);
+        if (this.config.lnSendBitcoinBlockTimeSafetyFactorPPM <= 1100000n) {
+            throw new Error("Lightning network send block safety factor set below 1.1, this is insecure!");
+        }
     }
     /**
      * Cleans up exactIn authorization that are already past their expiry
@@ -225,7 +229,7 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         //Compute max cltv delta
         const maxFee = swap.quotedNetworkFee;
         const maxUsableCLTVdelta = (expiryTimestamp - currentTimestamp - this.config.gracePeriod)
-            / (this.config.bitcoinBlocktime * this.config.safetyFactor);
+            / (this.config.bitcoinBlocktime * this.config.lnSendBitcoinBlockTimeSafetyFactorPPM / 1000000n);
         //Initiate payment
         this.swapLogger.info(swap, "sendLightningPayment(): paying lightning network invoice," +
             " cltvDelta: " + maxUsableCLTVdelta.toString(10) +
@@ -426,7 +430,8 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
      * @throws {DefinedRuntimeError} will throw an error if the destination is unreachable
      */
     async checkAndGetNetworkFee(amountBD, maxFee, expiryTimestamp, currentTimestamp, pr, metadata, abortSignal) {
-        const maxUsableCLTV = (expiryTimestamp - currentTimestamp - this.config.gracePeriod) / (this.config.bitcoinBlocktime * this.config.safetyFactor);
+        const maxUsableCLTV = (expiryTimestamp - currentTimestamp - this.config.gracePeriod)
+            / (this.config.bitcoinBlocktime * this.config.lnSendBitcoinBlockTimeSafetyFactorPPM / 1000000n);
         const blockHeight = await this.lightning.getBlockheight();
         abortSignal.throwIfAborted();
         metadata.times.blockheightFetched = Date.now();
@@ -604,7 +609,7 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         restServer.use(this.path + "/payInvoice", (0, ServerParamDecoder_1.serverParamDecoder)(10 * 1000));
         restServer.post(this.path + "/payInvoice", (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             const metadata = { request: {}, times: {} };
-            const chainIdentifier = req.query.chain ?? this.chains.default;
+            const chainIdentifier = req.query.chain;
             const { swapContract, signer, chainInterface } = this.getChain(chainIdentifier);
             metadata.times.requestReceived = Date.now();
             /**

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -174,7 +174,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
         restServer.use(this.path + "/getQuote", (0, ServerParamDecoder_1.serverParamDecoder)(10 * 1000));
         restServer.post(this.path + "/getQuote", (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             const metadata = { request: {}, times: {} };
-            const chainIdentifier = req.query.chain ?? this.chains.default;
+            const chainIdentifier = req.query.chain;
             const { signer, chainInterface, spvVaultContract } = this.getChain(chainIdentifier);
             metadata.times.requestReceived = Date.now();
             /**

package/dist/swaps/trusted/frombtc_trusted/FromBtcTrusted.js

@@ -334,7 +334,7 @@ class FromBtcTrusted extends SwapHandler_1.SwapHandler {
         const getAddress = (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             var _a;
             const metadata = { request: {}, times: {} };
-            const chainIdentifier = req.query.chain ?? this.chains.default;
+            const chainIdentifier = req.query.chain;
             const { chainInterface, signer } = this.getChain(chainIdentifier);
             metadata.times.requestReceived = Date.now();
             /**

package/dist/swaps/trusted/frombtcln_trusted/FromBtcLnTrusted.js

@@ -264,16 +264,14 @@ class FromBtcLnTrusted extends SwapHandler_1.SwapHandler {
                 msg: "Invoice expired/canceled"
             };
         const arr = invoice.description.split("-");
-        let chainIdentifier;
-        let address;
-        if (arr.length > 2 && arr[1] === "GAS") {
-            chainIdentifier = arr[0];
-            address = arr[2];
-        }
-        else {
-            chainIdentifier = this.chains.default;
-            address = invoice.description;
-        }
+        if (arr.length < 3 || arr[1] !== "GAS")
+            throw {
+                _httpStatus: 200,
+                code: 10001,
+                msg: "Invoice expired/canceled"
+            };
+        const chainIdentifier = arr[0];
+        const address = arr[2];
         const { chainInterface } = this.getChain(chainIdentifier);
         if (!chainInterface.isValidAddress(address))
             throw {
@@ -313,7 +311,7 @@ class FromBtcLnTrusted extends SwapHandler_1.SwapHandler {
         const createInvoice = (0, Utils_1.expressHandlerWrapper)(async (req, res) => {
             var _a;
             const metadata = { request: {}, times: {} };
-            const chainIdentifier = req.query.chain ?? this.chains.default;
+            const chainIdentifier = req.query.chain;
             const { signer, chainInterface } = this.getChain(chainIdentifier);
             metadata.times.requestReceived = Date.now();
             /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "15.0.13",
+  "version": "15.0.15",
   "description": "Main functionality implementation for atomiq LP node",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/info/InfoHandler.ts

@@ -13,8 +13,6 @@ type InfoHandlerResponseEnvelope = {
 
 type InfoHandlerResponse = {
     envelope: string,
-    address: string,
-    signature: string,
     chains: {
         [chainIdentifier: string]: {
             address: string,
@@ -88,12 +86,8 @@ export class InfoHandler {
                 };
             }
 
-            const defaults = chains[this.chainData.default];
-
             const response: InfoHandlerResponse = {
                 envelope,
-                address: defaults.address,
-                signature: defaults.signature,
                 chains
             };
 

package/src/swaps/SwapHandler.ts

@@ -24,7 +24,6 @@ export type SwapHandlerInfoType = {
     swapBaseFee: number,
     min: number,
     max: number,
-    tokens: string[],
     chainTokens: {[chainId: string]: string[]};
     data?: any,
 };
@@ -46,8 +45,7 @@ export type SwapBaseConfig = {
 export type MultichainData = {
     chains: {
         [identifier: string]: ChainData
-    },
-    default: string
+    }
 };
 
 export type ChainData<T extends ChainType = ChainType> = {
@@ -107,7 +105,6 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
     ) {
         this.storageManager = storageDirectory;
         this.chains = chainsData;
-        if(this.chains.chains[this.chains.default]==null) throw new Error("Invalid default chain specified");
         this.path = path;
         this.swapPricing = swapPricing;
         this.allowedTokens = {};
@@ -116,10 +113,6 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
         }
     }
 
-    protected getDefaultChain(): ChainData {
-        return this.chains.chains[this.chains.default];
-    }
-
     protected getChain(identifier: string): ChainData {
         if(this.chains.chains[identifier]==null)
             throw {
@@ -268,7 +261,6 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
             min: Number(this.config.min),
             max: Number(this.config.max),
             data: this.getInfoData(),
-            tokens: Array.from<string>(this.allowedTokens[this.chains.default]),
             chainTokens
         };
     }

package/src/swaps/escrow/frombtc_abstract/FromBtcAbs.ts

@@ -254,7 +254,7 @@ export class FromBtcAbs extends FromBtcBaseSwapHandler<FromBtcSwapAbs, FromBtcSw
                 times: {[key: string]: number},
             } = {request: {}, times: {}};
 
-            const chainIdentifier = req.query.chain as string ?? this.chains.default;
+            const chainIdentifier = req.query.chain as string;
             const {swapContract, signer, chainInterface} = this.getChain(chainIdentifier);
             const depositToken = req.query.depositToken as string ?? chainInterface.getNativeCurrencyAddress();
             this.checkAllowedDepositToken(chainIdentifier, depositToken);

package/src/swaps/escrow/frombtcln_abstract/FromBtcLnAbs.ts

@@ -522,15 +522,14 @@ export class FromBtcLnAbs extends FromBtcBaseSwapHandler<FromBtcLnSwapAbs, FromB
         };
 
         const arr = invoice.description.split("-");
-        let chainIdentifier: string;
-        let address: string;
-        if(arr.length>1) {
-            chainIdentifier = arr[0];
-            address = arr[1];
-        } else {
-            chainIdentifier = this.chains.default;
-            address = invoice.description;
-        }
+        if(arr.length<2) throw {
+            _httpStatus: 200,
+            code: 10001,
+            msg: "Invoice expired/canceled"
+        };
+        const chainIdentifier = arr[0];
+        const address = arr[1];
+
         const {chainInterface} = this.getChain(chainIdentifier);
         if(!chainInterface.isValidAddress(address)) throw {
             _httpStatus: 200,
@@ -573,7 +572,7 @@ export class FromBtcLnAbs extends FromBtcBaseSwapHandler<FromBtcLnSwapAbs, FromB
                 times: {[key: string]: number}
             } = {request: {}, times: {}};
 
-            const chainIdentifier = req.query.chain as string ?? this.chains.default;
+            const chainIdentifier = req.query.chain as string;
             const {swapContract, signer, chainInterface} = this.getChain(chainIdentifier);
             const depositToken = req.query.depositToken as string ?? chainInterface.getNativeCurrencyAddress();
             this.checkAllowedDepositToken(chainIdentifier, depositToken);

package/src/swaps/escrow/tobtc_abstract/ToBtcAbs.ts

@@ -608,7 +608,7 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
                 times: {[key: string]: number}
             } = {request: {}, times: {}};
 
-            const chainIdentifier = req.query.chain as string ?? this.chains.default;
+            const chainIdentifier = req.query.chain as string;
             const {swapContract, signer, chainInterface} = this.getChain(chainIdentifier);
 
             metadata.times.requestReceived = Date.now();
@@ -687,7 +687,7 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
             }, abortController.signal);
             metadata.times.priceCalculated = Date.now();
 
-            const paymentHash = this.getHash(chainIdentifier, parsedBody.address, parsedBody.confirmations, parsedBody.nonce, amountBD).toString("hex");
+            const claimHash = this.getHash(chainIdentifier, parsedBody.address, parsedBody.confirmations, parsedBody.nonce, amountBD).toString("hex");
 
             //Add grace period another time, so the user has 1 hour to commit
             const expirySeconds = this.getExpiryFromCLTV(parsedBody.confirmationTarget, parsedBody.confirmations) + this.config.gracePeriod;
@@ -701,7 +701,7 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
                 signer.getAddress(),
                 useToken,
                 totalInToken,
-                paymentHash,
+                claimHash,
                 sequence,
                 minRequiredExpiry,
                 true,

package/src/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.ts

@@ -40,7 +40,9 @@ export type ToBtcLnConfig = ToBtcBaseConfig & {
     minLnRoutingFeePPM?: bigint,
     minLnBaseFee?: bigint,
 
-    exactInExpiry?: number
+    exactInExpiry?: number,
+
+    lnSendBitcoinBlockTimeSafetyFactorPPM?: bigint
 };
 
 type ExactInAuthorization = {
@@ -118,6 +120,10 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
         this.config.minLnRoutingFeePPM = this.config.minLnRoutingFeePPM || 1000n;
         this.config.minLnBaseFee = this.config.minLnBaseFee || 5n;
         this.config.exactInExpiry = this.config.exactInExpiry || 10*1000;
+        this.config.lnSendBitcoinBlockTimeSafetyFactorPPM = this.config.lnSendBitcoinBlockTimeSafetyFactorPPM ?? (this.config.safetyFactor * 1_000_000n);
+        if(this.config.lnSendBitcoinBlockTimeSafetyFactorPPM <= 1_100_000n) {
+            throw new Error("Lightning network send block safety factor set below 1.1, this is insecure!");
+        }
     }
 
     /**
@@ -328,7 +334,7 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
         //Compute max cltv delta
         const maxFee = swap.quotedNetworkFee;
         const maxUsableCLTVdelta = (expiryTimestamp - currentTimestamp - this.config.gracePeriod)
-            / (this.config.bitcoinBlocktime * this.config.safetyFactor);
+            / (this.config.bitcoinBlocktime * this.config.lnSendBitcoinBlockTimeSafetyFactorPPM / 1_000_000n);
 
         //Initiate payment
         this.swapLogger.info(swap, "sendLightningPayment(): paying lightning network invoice,"+
@@ -542,7 +548,8 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
         confidence: number,
         networkFee: bigint
     }> {
-        const maxUsableCLTV: bigint = (expiryTimestamp - currentTimestamp - this.config.gracePeriod) / (this.config.bitcoinBlocktime * this.config.safetyFactor);
+        const maxUsableCLTV: bigint = (expiryTimestamp - currentTimestamp - this.config.gracePeriod)
+            / (this.config.bitcoinBlocktime * this.config.lnSendBitcoinBlockTimeSafetyFactorPPM / 1_000_000n);
 
         const blockHeight = await this.lightning.getBlockheight();
         abortSignal.throwIfAborted();
@@ -785,7 +792,7 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
                 times: {[key: string]: number}
             } = {request: {}, times: {}};
 
-            const chainIdentifier = req.query.chain as string ?? this.chains.default;
+            const chainIdentifier = req.query.chain as string;
             const {swapContract, signer, chainInterface} = this.getChain(chainIdentifier);
 
             metadata.times.requestReceived = Date.now();

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -245,7 +245,7 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 times: {[key: string]: number},
             } = {request: {}, times: {}};
 
-            const chainIdentifier = req.query.chain as string ?? this.chains.default;
+            const chainIdentifier = req.query.chain as string;
             const {signer, chainInterface, spvVaultContract} = this.getChain(chainIdentifier);
 
             metadata.times.requestReceived = Date.now();

package/src/swaps/trusted/frombtc_trusted/FromBtcTrusted.ts

@@ -393,7 +393,7 @@ export class FromBtcTrusted extends SwapHandler<FromBtcTrustedSwap, FromBtcTrust
                 times: {[key: string]: number}
             } = {request: {}, times: {}};
 
-            const chainIdentifier = req.query.chain as string ?? this.chains.default;
+            const chainIdentifier = req.query.chain as string;
             const {chainInterface, signer} = this.getChain(chainIdentifier);
 
             metadata.times.requestReceived = Date.now();

package/src/swaps/trusted/frombtcln_trusted/FromBtcLnTrusted.ts

@@ -315,15 +315,14 @@ export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcL
         }
 
         const arr = invoice.description.split("-");
-        let chainIdentifier: string;
-        let address: string;
-        if(arr.length>2 && arr[1]==="GAS") {
-            chainIdentifier = arr[0];
-            address = arr[2];
-        } else {
-            chainIdentifier = this.chains.default;
-            address = invoice.description;
+        if(arr.length<3 || arr[1]!=="GAS") throw {
+            _httpStatus: 200,
+            code: 10001,
+            msg: "Invoice expired/canceled"
         }
+        const chainIdentifier = arr[0];
+        const address = arr[2];
+
         const { chainInterface} = this.getChain(chainIdentifier);
         if(!chainInterface.isValidAddress(address)) throw {
             _httpStatus: 200,
@@ -370,7 +369,7 @@ export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcL
                 times: {[key: string]: number}
             } = {request: {}, times: {}};
 
-            const chainIdentifier = req.query.chain as string ?? this.chains.default;
+            const chainIdentifier = req.query.chain as string;
             const {signer, chainInterface} = this.getChain(chainIdentifier);
 
             metadata.times.requestReceived = Date.now();