@atomiqlabs/lp-lib 16.0.10 → 16.0.11

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -180,37 +180,75 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             const chainIdentifier = req.query.chain;
             const { signer, chainInterface, spvVaultContract } = this.getChain(chainIdentifier);
             metadata.times.requestReceived = Date.now();
+            /**
+             * token: string                Desired token to use
+             * gasToken: string
+             */
+            const preFetchParsedBody = await req.paramReader.getParams({
+                token: (val) => val != null &&
+                    typeof (val) === "string" &&
+                    this.isTokenSupported(chainIdentifier, val) ? val : null,
+                gasToken: (val) => val != null &&
+                    typeof (val) === "string" &&
+                    chainInterface.isValidToken(val) ? val : null
+            });
+            if (preFetchParsedBody == null)
+                throw {
+                    code: 20100,
+                    msg: "Invalid request body"
+                };
+            //Create abortController for parallel prefetches
+            const responseStream = res.responseStream;
+            const abortController = (0, Utils_1.getAbortController)(responseStream);
+            //Pre-fetch data
+            const { pricePrefetchPromise, gasTokenPricePrefetchPromise } = this.getPricePrefetches(chainIdentifier, preFetchParsedBody.token, preFetchParsedBody.gasToken, abortController);
+            const nativeBalancePrefetch = this.prefetchNativeBalanceIfNeeded(chainIdentifier, abortController);
+            const btcFeeRatePrefetch = this.bitcoin.getFeeRate().catch(e => {
+                abortController.abort(e);
+                return null;
+            });
+            //Listener that re-adds the returned bitcoin address to the unused address list if request fails or closes
+            let abortAddUnusedAddressListener;
+            const bitcoinAddressPrefetch = this.bitcoin.getAddress().then(value => {
+                //Already aborted
+                if (abortController.signal.aborted) {
+                    this.bitcoin.addUnusedAddress(value);
+                    return null;
+                }
+                //Not aborted yet, add an event listener to re-add the address to the unused list
+                abortController.signal.addEventListener("abort", abortAddUnusedAddressListener = () => {
+                    this.bitcoin.addUnusedAddress(value);
+                });
+                return value;
+            }).catch(e => {
+                abortController.abort(e);
+                return null;
+            });
             /**
              * address: string              smart chain address of the recipient
              * amount: string               amount (in sats)
-             * token: string                Desired token to use
              * gasAmount: string            Desired amount in gas token to also get
-             * gasToken: string
              * exactOut: boolean            Whether the swap should be an exact out instead of exact in swap
              * callerFeeRate: string        Caller/watchtower fee (in output token) to assign to the swap
              * frontingFeeRate: string      Fronting fee (in output token) to assign to the swap
              */
-            const parsedBody = await req.paramReader.getParams({
+            const actualParsedBody = await req.paramReader.getParams({
                 address: (val) => val != null &&
                     typeof (val) === "string" &&
                     chainInterface.isValidAddress(val, true) ? val : null,
                 amount: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                token: (val) => val != null &&
-                    typeof (val) === "string" &&
-                    this.isTokenSupported(chainIdentifier, val) ? val : null,
                 gasAmount: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                gasToken: (val) => val != null &&
-                    typeof (val) === "string" &&
-                    chainInterface.isValidToken(val) ? val : null,
                 exactOut: SchemaVerifier_1.FieldTypeEnum.BooleanOptional,
                 callerFeeRate: SchemaVerifier_1.FieldTypeEnum.BigInt,
                 frontingFeeRate: SchemaVerifier_1.FieldTypeEnum.BigInt,
             });
-            if (parsedBody == null)
+            abortController.signal.throwIfAborted();
+            if (actualParsedBody == null)
                 throw {
                     code: 20100,
                     msg: "Invalid request body"
                 };
+            const parsedBody = { ...preFetchParsedBody, ...actualParsedBody };
             metadata.request = parsedBody;
             if (parsedBody.gasToken !== chainInterface.getNativeCurrencyAddress())
                 throw {
@@ -251,12 +289,6 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             //Check request params
             const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount, gasTokenAmount);
             metadata.times.requestChecked = Date.now();
-            //Create abortController for parallel prefetches
-            const responseStream = res.responseStream;
-            const abortController = (0, Utils_1.getAbortController)(responseStream);
-            //Pre-fetch data
-            const { pricePrefetchPromise, gasTokenPricePrefetchPromise } = this.getPricePrefetches(chainIdentifier, useToken, gasToken, abortController);
-            const nativeBalancePrefetch = this.prefetchNativeBalanceIfNeeded(chainIdentifier, abortController);
             await this.checkNativeBalance(chainIdentifier, nativeBalancePrefetch, abortController.signal);
             //Check valid amount specified (min/max)
             let { amountBD, swapFee, swapFeeInToken, totalInToken, amountBDgas, gasSwapFee, gasSwapFeeInToken, totalInGasToken } = await this.AmountAssertions.checkFromBtcAmount(this.type, request, { ...requestedAmount, pricePrefetch: pricePrefetchPromise }, fees, abortController.signal, { ...gasTokenAmount, pricePrefetch: gasTokenPricePrefetchPromise });
@@ -270,8 +302,8 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             abortController.signal.throwIfAborted();
             metadata.times.vaultPicked = Date.now();
             //Create swap receive bitcoin address
-            const btcFeeRate = await this.bitcoin.getFeeRate();
-            const receiveAddress = await this.bitcoin.getAddress();
+            const btcFeeRate = await btcFeeRatePrefetch;
+            const receiveAddress = await bitcoinAddressPrefetch;
             abortController.signal.throwIfAborted();
             metadata.times.addressCreated = Date.now();
             //Adjust the amounts based on passed fees
@@ -294,6 +326,8 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             const quoteId = (0, crypto_1.randomBytes)(32).toString("hex");
             const swap = new SpvVaultSwap_1.SpvVaultSwap(chainIdentifier, quoteId, expiry, vault, utxo, receiveAddress, btcFeeRate, parsedBody.address, totalBtcOutput, totalInToken, totalInGasToken, swapFee, swapFeeInToken, gasSwapFee, gasSwapFeeInToken, callerFeeShare, frontingFeeShare, executionFeeShare, useToken, gasToken);
             swap.metadata = metadata;
+            //We can remove the listener to add unused address now, as we are about to save the swap
+            abortController.signal.removeEventListener("abort", abortAddUnusedAddressListener);
             await PluginManager_1.PluginManager.swapCreate(swap);
             await this.saveSwapData(swap);
             this.swapLogger.info(swap, "REST: /getQuote: Created swap address: " + receiveAddress + " amount: " + totalBtcOutput.toString(10));

package/package.json

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

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -251,36 +251,82 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             const {signer, chainInterface, spvVaultContract} = this.getChain(chainIdentifier);
 
             metadata.times.requestReceived = Date.now();
+
+            /**
+             * token: string                Desired token to use
+             * gasToken: string
+             */
+            const preFetchParsedBody = await req.paramReader.getParams({
+                token: (val: string) => val!=null &&
+                    typeof(val)==="string" &&
+                    this.isTokenSupported(chainIdentifier, val) ? val : null,
+                gasToken: (val: string) => val!=null &&
+                    typeof(val)==="string" &&
+                    chainInterface.isValidToken(val) ? val : null
+            });
+            if(preFetchParsedBody==null) throw {
+                code: 20100,
+                msg: "Invalid request body"
+            };
+
+            //Create abortController for parallel prefetches
+            const responseStream = res.responseStream;
+            const abortController = getAbortController(responseStream);
+
+            //Pre-fetch data
+            const {
+                pricePrefetchPromise,
+                gasTokenPricePrefetchPromise
+            } = this.getPricePrefetches(chainIdentifier, preFetchParsedBody.token, preFetchParsedBody.gasToken, abortController);
+            const nativeBalancePrefetch = this.prefetchNativeBalanceIfNeeded(chainIdentifier, abortController);
+            const btcFeeRatePrefetch = this.bitcoin.getFeeRate().catch(e => {
+                abortController.abort(e);
+                return null;
+            });
+
+            //Listener that re-adds the returned bitcoin address to the unused address list if request fails or closes
+            let abortAddUnusedAddressListener: () => void;
+            const bitcoinAddressPrefetch = this.bitcoin.getAddress().then(value => {
+                //Already aborted
+                if(abortController.signal.aborted) {
+                    this.bitcoin.addUnusedAddress(value);
+                    return null;
+                }
+                //Not aborted yet, add an event listener to re-add the address to the unused list
+                abortController.signal.addEventListener("abort", abortAddUnusedAddressListener = () => {
+                    this.bitcoin.addUnusedAddress(value);
+                });
+                return value;
+            }).catch(e => {
+                abortController.abort(e);
+                return null;
+            });
+
             /**
              * address: string              smart chain address of the recipient
              * amount: string               amount (in sats)
-             * token: string                Desired token to use
              * gasAmount: string            Desired amount in gas token to also get
-             * gasToken: string
              * exactOut: boolean            Whether the swap should be an exact out instead of exact in swap
              * callerFeeRate: string        Caller/watchtower fee (in output token) to assign to the swap
              * frontingFeeRate: string      Fronting fee (in output token) to assign to the swap
              */
-            const parsedBody: SpvVaultSwapRequestType = await req.paramReader.getParams({
+            const actualParsedBody = await req.paramReader.getParams({
                 address: (val: string) => val!=null &&
                     typeof(val)==="string" &&
                     chainInterface.isValidAddress(val, true) ? val : null,
                 amount: FieldTypeEnum.BigInt,
-                token: (val: string) => val!=null &&
-                    typeof(val)==="string" &&
-                    this.isTokenSupported(chainIdentifier, val) ? val : null,
                 gasAmount: FieldTypeEnum.BigInt,
-                gasToken: (val: string) => val!=null &&
-                    typeof(val)==="string" &&
-                    chainInterface.isValidToken(val) ? val : null,
                 exactOut: FieldTypeEnum.BooleanOptional,
                 callerFeeRate: FieldTypeEnum.BigInt,
                 frontingFeeRate: FieldTypeEnum.BigInt,
             });
-            if(parsedBody==null) throw {
+            abortController.signal.throwIfAborted();
+            if(actualParsedBody==null) throw {
                 code: 20100,
                 msg: "Invalid request body"
             };
+
+            const parsedBody: SpvVaultSwapRequestType = {...preFetchParsedBody, ...actualParsedBody};
             metadata.request = parsedBody;
 
             if(parsedBody.gasToken!==chainInterface.getNativeCurrencyAddress()) throw {
@@ -324,17 +370,6 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount, gasTokenAmount);
             metadata.times.requestChecked = Date.now();
 
-            //Create abortController for parallel prefetches
-            const responseStream = res.responseStream;
-            const abortController = getAbortController(responseStream);
-
-            //Pre-fetch data
-            const {
-                pricePrefetchPromise,
-                gasTokenPricePrefetchPromise
-            } = this.getPricePrefetches(chainIdentifier, useToken, gasToken, abortController);
-            const nativeBalancePrefetch = this.prefetchNativeBalanceIfNeeded(chainIdentifier, abortController);
-
             await this.checkNativeBalance(chainIdentifier, nativeBalancePrefetch, abortController.signal);
 
             //Check valid amount specified (min/max)
@@ -368,8 +403,8 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             metadata.times.vaultPicked = Date.now();
 
             //Create swap receive bitcoin address
-            const btcFeeRate = await this.bitcoin.getFeeRate();
-            const receiveAddress = await this.bitcoin.getAddress();
+            const btcFeeRate = await btcFeeRatePrefetch;
+            const receiveAddress = await bitcoinAddressPrefetch;
             abortController.signal.throwIfAborted();
             metadata.times.addressCreated = Date.now();
 
@@ -404,6 +439,8 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             );
             swap.metadata = metadata;
 
+            //We can remove the listener to add unused address now, as we are about to save the swap
+            abortController.signal.removeEventListener("abort", abortAddUnusedAddressListener);
             await PluginManager.swapCreate(swap);
             await this.saveSwapData(swap);