@atomiqlabs/lp-lib 17.5.1 → 17.5.2

package/src/swaps/escrow/ToBtcBaseSwap.ts

@@ -1,86 +1,86 @@
-import {SwapData} from "@atomiqlabs/base";
-import {deserializeBN, serializeBN} from "../../utils/Utils";
-import {EscrowHandlerSwap} from "./EscrowHandlerSwap";
-
-export abstract class ToBtcBaseSwap<T extends SwapData = SwapData, S = any> extends EscrowHandlerSwap<T, S> {
-
-    amount: bigint;
-
-    quotedNetworkFee: bigint;
-    readonly quotedNetworkFeeInToken: bigint;
-    realNetworkFee: bigint;
-    realNetworkFeeInToken: bigint;
-
-    protected constructor(chainIdentifier: string, amount: bigint, swapFee: bigint, swapFeeInToken: bigint, quotedNetworkFee: bigint, quotedNetworkFeeInToken: bigint);
-    protected constructor(obj: any);
-
-    protected constructor(obj?: any | string, amount?: bigint, swapFee?: bigint, swapFeeInToken?: bigint, quotedNetworkFee?: bigint, quotedNetworkFeeInToken?: bigint) {
-        if(
-            typeof(obj)==="string" && typeof(amount)==="bigint" && typeof(swapFee)==="bigint" && typeof(swapFeeInToken)==="bigint" &&
-            typeof(quotedNetworkFee)==="bigint" && typeof(quotedNetworkFeeInToken)==="bigint"
-        ) {
-            super(obj, swapFee, swapFeeInToken);
-            this.amount = amount;
-            this.quotedNetworkFee = quotedNetworkFee;
-            this.quotedNetworkFeeInToken = quotedNetworkFeeInToken;
-            return;
-        } else {
-            super(obj);
-            this.amount = deserializeBN(obj.amount);
-            this.quotedNetworkFee = deserializeBN(obj.quotedNetworkFee);
-            this.quotedNetworkFeeInToken = deserializeBN(obj.quotedNetworkFeeInToken);
-            this.realNetworkFee = deserializeBN(obj.realNetworkFee);
-            this.realNetworkFeeInToken = deserializeBN(obj.realNetworkFeeInToken);
-        }
-    }
-
-    serialize(): any {
-        const obj = super.serialize();
-        obj.amount = serializeBN(this.amount);
-        obj.quotedNetworkFee = serializeBN(this.quotedNetworkFee);
-        obj.quotedNetworkFeeInToken = serializeBN(this.quotedNetworkFeeInToken);
-        obj.realNetworkFee = serializeBN(this.realNetworkFee);
-        obj.realNetworkFeeInToken = serializeBN(this.realNetworkFeeInToken);
-        return obj;
-    }
-
-    setRealNetworkFee(networkFeeInBtc: bigint) {
-        this.realNetworkFee = networkFeeInBtc;
-        if(this.quotedNetworkFee!=null && this.quotedNetworkFeeInToken!=null) {
-            this.realNetworkFeeInToken = this.realNetworkFee * this.quotedNetworkFeeInToken / this.quotedNetworkFee;
-        }
-    }
-
-    getInputAmount(): bigint {
-        return this.getTotalInputAmount() - this.getSwapFee().inInputToken - this.getQuotedNetworkFee().inInputToken;
-    }
-
-    getTotalInputAmount(): bigint {
-        return this.data.getAmount();
-    }
-
-    getSwapFee(): { inInputToken: bigint; inOutputToken: bigint } {
-        return {inInputToken: this.swapFeeInToken, inOutputToken: this.swapFee};
-    }
-
-    /**
-     * Returns quoted (expected) network fee, denominated in input & output tokens (the fee is paid only once, it is
-     *  just represented here in both denomination for ease of use)
-     */
-    getQuotedNetworkFee(): { inInputToken: bigint; inOutputToken: bigint } {
-        return {inInputToken: this.quotedNetworkFeeInToken, inOutputToken: this.quotedNetworkFee};
-    }
-
-    /**
-     * Returns real network fee paid for the swap, denominated in input & output tokens (the fee is paid only once, it is
-     *  just represented here in both denomination for ease of use)
-     */
-    getRealNetworkFee(): { inInputToken: bigint; inOutputToken: bigint } {
-        return {inInputToken: this.realNetworkFeeInToken, inOutputToken: this.realNetworkFee};
-    }
-
-    getOutputAmount(): bigint {
-        return this.amount;
-    }
-
+import {SwapData} from "@atomiqlabs/base";
+import {deserializeBN, serializeBN} from "../../utils/Utils";
+import {EscrowHandlerSwap} from "./EscrowHandlerSwap";
+
+export abstract class ToBtcBaseSwap<T extends SwapData = SwapData, S = any> extends EscrowHandlerSwap<T, S> {
+
+    amount: bigint;
+
+    quotedNetworkFee: bigint;
+    readonly quotedNetworkFeeInToken: bigint;
+    realNetworkFee: bigint;
+    realNetworkFeeInToken: bigint;
+
+    protected constructor(chainIdentifier: string, amount: bigint, swapFee: bigint, swapFeeInToken: bigint, quotedNetworkFee: bigint, quotedNetworkFeeInToken: bigint);
+    protected constructor(obj: any);
+
+    protected constructor(obj?: any | string, amount?: bigint, swapFee?: bigint, swapFeeInToken?: bigint, quotedNetworkFee?: bigint, quotedNetworkFeeInToken?: bigint) {
+        if(
+            typeof(obj)==="string" && typeof(amount)==="bigint" && typeof(swapFee)==="bigint" && typeof(swapFeeInToken)==="bigint" &&
+            typeof(quotedNetworkFee)==="bigint" && typeof(quotedNetworkFeeInToken)==="bigint"
+        ) {
+            super(obj, swapFee, swapFeeInToken);
+            this.amount = amount;
+            this.quotedNetworkFee = quotedNetworkFee;
+            this.quotedNetworkFeeInToken = quotedNetworkFeeInToken;
+            return;
+        } else {
+            super(obj);
+            this.amount = deserializeBN(obj.amount);
+            this.quotedNetworkFee = deserializeBN(obj.quotedNetworkFee);
+            this.quotedNetworkFeeInToken = deserializeBN(obj.quotedNetworkFeeInToken);
+            this.realNetworkFee = deserializeBN(obj.realNetworkFee);
+            this.realNetworkFeeInToken = deserializeBN(obj.realNetworkFeeInToken);
+        }
+    }
+
+    serialize(): any {
+        const obj = super.serialize();
+        obj.amount = serializeBN(this.amount);
+        obj.quotedNetworkFee = serializeBN(this.quotedNetworkFee);
+        obj.quotedNetworkFeeInToken = serializeBN(this.quotedNetworkFeeInToken);
+        obj.realNetworkFee = serializeBN(this.realNetworkFee);
+        obj.realNetworkFeeInToken = serializeBN(this.realNetworkFeeInToken);
+        return obj;
+    }
+
+    setRealNetworkFee(networkFeeInBtc: bigint) {
+        this.realNetworkFee = networkFeeInBtc;
+        if(this.quotedNetworkFee!=null && this.quotedNetworkFeeInToken!=null) {
+            this.realNetworkFeeInToken = this.realNetworkFee * this.quotedNetworkFeeInToken / this.quotedNetworkFee;
+        }
+    }
+
+    getInputAmount(): bigint {
+        return this.getTotalInputAmount() - this.getSwapFee().inInputToken - this.getQuotedNetworkFee().inInputToken;
+    }
+
+    getTotalInputAmount(): bigint {
+        return this.data.getAmount();
+    }
+
+    getSwapFee(): { inInputToken: bigint; inOutputToken: bigint } {
+        return {inInputToken: this.swapFeeInToken, inOutputToken: this.swapFee};
+    }
+
+    /**
+     * Returns quoted (expected) network fee, denominated in input & output tokens (the fee is paid only once, it is
+     *  just represented here in both denomination for ease of use)
+     */
+    getQuotedNetworkFee(): { inInputToken: bigint; inOutputToken: bigint } {
+        return {inInputToken: this.quotedNetworkFeeInToken, inOutputToken: this.quotedNetworkFee};
+    }
+
+    /**
+     * Returns real network fee paid for the swap, denominated in input & output tokens (the fee is paid only once, it is
+     *  just represented here in both denomination for ease of use)
+     */
+    getRealNetworkFee(): { inInputToken: bigint; inOutputToken: bigint } {
+        return {inInputToken: this.realNetworkFeeInToken, inOutputToken: this.realNetworkFee};
+    }
+
+    getOutputAmount(): bigint {
+        return this.amount;
+    }
+
 }

package/src/swaps/escrow/ToBtcBaseSwapHandler.ts

@@ -1,130 +1,130 @@
-import {MultichainData, SwapBaseConfig} from "../SwapHandler";
-import {SwapData} from "@atomiqlabs/base";
-import {ServerParamEncoder} from "../../utils/paramcoders/server/ServerParamEncoder";
-import {IParamReader} from "../../utils/paramcoders/IParamReader";
-import {FieldTypeEnum} from "../../utils/paramcoders/SchemaVerifier";
-import {Request} from "express";
-import {ToBtcBaseSwap} from "./ToBtcBaseSwap";
-import {EscrowHandler} from "./EscrowHandler";
-import {ToBtcAmountAssertions} from "../assertions/ToBtcAmountAssertions";
-import {IIntermediaryStorage} from "../../storage/IIntermediaryStorage";
-import {ISwapPrice} from "../../prices/ISwapPrice";
-
-export type ToBtcBaseConfig = SwapBaseConfig & {
-    gracePeriod: bigint,
-    refundAuthorizationTimeout: number
-};
-
-export abstract class ToBtcBaseSwapHandler<V extends ToBtcBaseSwap<SwapData, S>, S> extends EscrowHandler<V, S> {
-
-    readonly AmountAssertions: ToBtcAmountAssertions;
-
-    readonly pdaExistsForToken: {
-        [chainIdentifier: string]: {
-            [token: string]: boolean
-        }
-    } = {};
-
-    constructor(
-        storageDirectory: IIntermediaryStorage<V>,
-        path: string,
-        chainsData: MultichainData,
-        swapPricing: ISwapPrice,
-        config: ToBtcBaseConfig
-    ) {
-        super(storageDirectory, path, chainsData, swapPricing);
-        this.AmountAssertions = new ToBtcAmountAssertions(config, swapPricing);
-    }
-
-    protected async checkVaultInitialized(chainIdentifier: string, token: string): Promise<void> {
-        if(!this.pdaExistsForToken[chainIdentifier] || !this.pdaExistsForToken[chainIdentifier][token]) {
-            this.logger.debug("checkVaultInitialized(): checking vault exists for chain: "+chainIdentifier+" token: "+token);
-            const {swapContract, signer} = this.getChain(chainIdentifier);
-            const reputation = await swapContract.getIntermediaryReputation(signer.getAddress(), token);
-            this.logger.debug("checkVaultInitialized(): vault state, chain: "+chainIdentifier+" token: "+token+" exists: "+(reputation!=null));
-            if(reputation!=null) {
-                if(this.pdaExistsForToken[chainIdentifier]==null) this.pdaExistsForToken[chainIdentifier] = {};
-                this.pdaExistsForToken[chainIdentifier][token] = true;
-            } else {
-                throw {
-                    code: 20201,
-                    msg: "Token not supported!"
-                };
-            }
-        }
-    }
-
-    /**
-     * Starts pre-fetches for swap pricing & signature data
-     *
-     * @param chainIdentifier
-     * @param token
-     * @param responseStream
-     * @param abortController
-     */
-    protected getToBtcPrefetches(chainIdentifier: string, token: string, responseStream: ServerParamEncoder, abortController: AbortController): {
-        pricePrefetchPromise?: Promise<bigint>,
-        signDataPrefetchPromise?: Promise<any>
-    } {
-        //Fetch pricing & signature data in parallel
-        const pricePrefetchPromise: Promise<bigint> = this.swapPricing.preFetchPrice(token, chainIdentifier).catch(e => {
-            this.logger.error("getToBtcPrefetches(): pricePrefetch error", e);
-            abortController.abort(e);
-            return null;
-        });
-
-        return {
-            pricePrefetchPromise,
-            signDataPrefetchPromise: this.getSignDataPrefetch(chainIdentifier, abortController, responseStream)
-        }
-    }
-
-    /**
-     * Signs the created swap
-     *
-     * @param chainIdentifier
-     * @param swapObject
-     * @param req
-     * @param abortSignal
-     * @param signDataPrefetchPromise
-     */
-    protected async getToBtcSignatureData(
-        chainIdentifier: string,
-        swapObject: SwapData,
-        req: Request & {paramReader: IParamReader},
-        abortSignal: AbortSignal,
-        signDataPrefetchPromise?: Promise<any>
-    ): Promise<{
-        prefix: string,
-        timeout: string,
-        signature: string,
-        feeRate: string
-    }> {
-        const prefetchedSignData = signDataPrefetchPromise!=null ? await signDataPrefetchPromise : null;
-        if(prefetchedSignData!=null) this.logger.debug("getToBtcSignatureData(): pre-fetched signature data: ", prefetchedSignData);
-        abortSignal.throwIfAborted();
-
-        const feeRateObj = await req.paramReader.getParams({
-            feeRate: FieldTypeEnum.String
-        }).catch(() => null);
-        abortSignal.throwIfAborted();
-
-        const feeRate = feeRateObj?.feeRate!=null && typeof(feeRateObj.feeRate)==="string" ? feeRateObj.feeRate : null;
-        this.logger.debug("getToBtcSignatureData(): using fee rate from client: ", feeRate);
-        const {swapContract, signer} = this.getChain(chainIdentifier);
-        const sigData = await swapContract.getInitSignature(
-            signer,
-            swapObject,
-            this.getInitAuthorizationTimeout(chainIdentifier),
-            prefetchedSignData,
-            feeRate
-        );
-        abortSignal.throwIfAborted();
-
-        return {
-            ...sigData,
-            feeRate
-        };
-    }
-
+import {MultichainData, SwapBaseConfig} from "../SwapHandler";
+import {SwapData} from "@atomiqlabs/base";
+import {ServerParamEncoder} from "../../utils/paramcoders/server/ServerParamEncoder";
+import {IParamReader} from "../../utils/paramcoders/IParamReader";
+import {FieldTypeEnum} from "../../utils/paramcoders/SchemaVerifier";
+import {Request} from "express";
+import {ToBtcBaseSwap} from "./ToBtcBaseSwap";
+import {EscrowHandler} from "./EscrowHandler";
+import {ToBtcAmountAssertions} from "../assertions/ToBtcAmountAssertions";
+import {IIntermediaryStorage} from "../../storage/IIntermediaryStorage";
+import {ISwapPrice} from "../../prices/ISwapPrice";
+
+export type ToBtcBaseConfig = SwapBaseConfig & {
+    gracePeriod: bigint,
+    refundAuthorizationTimeout: number
+};
+
+export abstract class ToBtcBaseSwapHandler<V extends ToBtcBaseSwap<SwapData, S>, S> extends EscrowHandler<V, S> {
+
+    readonly AmountAssertions: ToBtcAmountAssertions;
+
+    readonly pdaExistsForToken: {
+        [chainIdentifier: string]: {
+            [token: string]: boolean
+        }
+    } = {};
+
+    constructor(
+        storageDirectory: IIntermediaryStorage<V>,
+        path: string,
+        chainsData: MultichainData,
+        swapPricing: ISwapPrice,
+        config: ToBtcBaseConfig
+    ) {
+        super(storageDirectory, path, chainsData, swapPricing);
+        this.AmountAssertions = new ToBtcAmountAssertions(config, swapPricing);
+    }
+
+    protected async checkVaultInitialized(chainIdentifier: string, token: string): Promise<void> {
+        if(!this.pdaExistsForToken[chainIdentifier] || !this.pdaExistsForToken[chainIdentifier][token]) {
+            this.logger.debug("checkVaultInitialized(): checking vault exists for chain: "+chainIdentifier+" token: "+token);
+            const {swapContract, signer} = this.getChain(chainIdentifier);
+            const reputation = await swapContract.getIntermediaryReputation(signer.getAddress(), token);
+            this.logger.debug("checkVaultInitialized(): vault state, chain: "+chainIdentifier+" token: "+token+" exists: "+(reputation!=null));
+            if(reputation!=null) {
+                if(this.pdaExistsForToken[chainIdentifier]==null) this.pdaExistsForToken[chainIdentifier] = {};
+                this.pdaExistsForToken[chainIdentifier][token] = true;
+            } else {
+                throw {
+                    code: 20201,
+                    msg: "Token not supported!"
+                };
+            }
+        }
+    }
+
+    /**
+     * Starts pre-fetches for swap pricing & signature data
+     *
+     * @param chainIdentifier
+     * @param token
+     * @param responseStream
+     * @param abortController
+     */
+    protected getToBtcPrefetches(chainIdentifier: string, token: string, responseStream: ServerParamEncoder, abortController: AbortController): {
+        pricePrefetchPromise?: Promise<bigint>,
+        signDataPrefetchPromise?: Promise<any>
+    } {
+        //Fetch pricing & signature data in parallel
+        const pricePrefetchPromise: Promise<bigint> = this.swapPricing.preFetchPrice(token, chainIdentifier).catch(e => {
+            this.logger.error("getToBtcPrefetches(): pricePrefetch error", e);
+            abortController.abort(e);
+            return null;
+        });
+
+        return {
+            pricePrefetchPromise,
+            signDataPrefetchPromise: this.getSignDataPrefetch(chainIdentifier, abortController, responseStream)
+        }
+    }
+
+    /**
+     * Signs the created swap
+     *
+     * @param chainIdentifier
+     * @param swapObject
+     * @param req
+     * @param abortSignal
+     * @param signDataPrefetchPromise
+     */
+    protected async getToBtcSignatureData(
+        chainIdentifier: string,
+        swapObject: SwapData,
+        req: Request & {paramReader: IParamReader},
+        abortSignal: AbortSignal,
+        signDataPrefetchPromise?: Promise<any>
+    ): Promise<{
+        prefix: string,
+        timeout: string,
+        signature: string,
+        feeRate: string
+    }> {
+        const prefetchedSignData = signDataPrefetchPromise!=null ? await signDataPrefetchPromise : null;
+        if(prefetchedSignData!=null) this.logger.debug("getToBtcSignatureData(): pre-fetched signature data: ", prefetchedSignData);
+        abortSignal.throwIfAborted();
+
+        const feeRateObj = await req.paramReader.getParams({
+            feeRate: FieldTypeEnum.String
+        }).catch(() => null);
+        abortSignal.throwIfAborted();
+
+        const feeRate = feeRateObj?.feeRate!=null && typeof(feeRateObj.feeRate)==="string" ? feeRateObj.feeRate : null;
+        this.logger.debug("getToBtcSignatureData(): using fee rate from client: ", feeRate);
+        const {swapContract, signer} = this.getChain(chainIdentifier);
+        const sigData = await swapContract.getInitSignature(
+            signer,
+            swapObject,
+            this.getInitAuthorizationTimeout(chainIdentifier),
+            prefetchedSignData,
+            feeRate
+        );
+        abortSignal.throwIfAborted();
+
+        return {
+            ...sigData,
+            feeRate
+        };
+    }
+
 }