@atomiqlabs/lp-lib 17.5.1 → 17.5.3

package/dist/prices/CoinGeckoSwapPrice.d.ts

@@ -23,7 +23,7 @@ export declare class CoinGeckoSwapPrice extends ISwapPrice<{
         decimals: number;
     }>);
     /**
-     * Returns coin price in mSat
+     * Returns coin price in uSat (sats-per-token * 1_000_000)
      *
      * @param coin
      */

package/dist/prices/CoinGeckoSwapPrice.js

@@ -10,7 +10,7 @@ class CoinGeckoSwapPrice extends ISwapPrice_1.ISwapPrice {
         this.url = url || "https://api.coingecko.com/api/v3";
     }
     /**
-     * Returns coin price in mSat
+     * Returns coin price in uSat (sats-per-token * 1_000_000)
      *
      * @param coin
      */
@@ -18,7 +18,7 @@ class CoinGeckoSwapPrice extends ISwapPrice_1.ISwapPrice {
         const coinId = coin.coinId;
         if (coinId.startsWith("$fixed-")) {
             const amt = parseFloat(coinId.substring(7));
-            return BigInt(Math.floor(amt * 1000));
+            return BigInt(Math.floor(amt * 1000000));
         }
         const cachedValue = this.cache[coinId];
         if (cachedValue != null && cachedValue.expiry > Date.now()) {
@@ -40,7 +40,7 @@ class CoinGeckoSwapPrice extends ISwapPrice_1.ISwapPrice {
         }
         let jsonBody = await response.json();
         const amt = jsonBody[coinId].sats;
-        const result = BigInt(Math.floor(amt * 1000));
+        const result = BigInt(Math.floor(amt * 1000000));
         this.cache[coinId] = {
             price: result,
             expiry: Date.now() + CACHE_DURATION

package/dist/prices/ISwapPrice.d.ts

@@ -13,7 +13,7 @@ export declare abstract class ISwapPrice<T extends {
     protected coinsMap: ISwapPriceCoinsMap<T>;
     protected constructor(coinsMap: ISwapPriceCoinsMap<T>);
     /**
-     * Returns coin price in mSat
+     * Returns coin price in uSat (sats-per-token * 1_000_000)
      *
      * @param tokenData
      */

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

@@ -8,7 +8,7 @@ import { ToBtcBaseConfig, ToBtcBaseSwapHandler } from "../ToBtcBaseSwapHandler";
 import { ILightningWallet, ParsedPaymentRequest } from "../../../wallets/ILightningWallet";
 import { LightningAssertions } from "../../assertions/LightningAssertions";
 export type ToBtcLnConfig = ToBtcBaseConfig & {
-    routingFeeMultiplier: bigint;
+    routingFeeMultiplier: bigint | number;
     minSendCltv: bigint;
     allowProbeFailedSwaps: boolean;
     allowShortExpiry: boolean;

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

@@ -497,7 +497,9 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                 " fee mtokens: " + probeOrRouteResp.feeMtokens.toString(10));
         }
         const safeFeeTokens = (probeOrRouteResp.feeMtokens + 999n) / 1000n;
-        let actualRoutingFee = safeFeeTokens * this.config.routingFeeMultiplier;
+        let actualRoutingFee = safeFeeTokens
+            * BigInt(Math.floor(Number(this.config.routingFeeMultiplier) * 1000000))
+            / 1000000n;
         const minRoutingFee = (amountBD * this.config.minLnRoutingFeePPM / 1000000n) + this.config.minLnBaseFee;
         if (actualRoutingFee < minRoutingFee) {
             actualRoutingFee = minRoutingFee;

package/package.json

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

package/src/prices/CoinGeckoSwapPrice.ts

@@ -27,7 +27,7 @@ export class CoinGeckoSwapPrice extends ISwapPrice<{coinId: string, decimals: nu
     }
 
     /**
-     * Returns coin price in mSat
+     * Returns coin price in uSat (sats-per-token * 1_000_000)
      *
      * @param coin
      */
@@ -35,7 +35,7 @@ export class CoinGeckoSwapPrice extends ISwapPrice<{coinId: string, decimals: nu
         const coinId = coin.coinId;
         if(coinId.startsWith("$fixed-")) {
             const amt: number = parseFloat(coinId.substring(7));
-            return BigInt(Math.floor(amt*1000));
+            return BigInt(Math.floor(amt*1000000));
         }
 
         const cachedValue = this.cache[coinId];
@@ -62,7 +62,7 @@ export class CoinGeckoSwapPrice extends ISwapPrice<{coinId: string, decimals: nu
 
         const amt: number = jsonBody[coinId].sats;
 
-        const result = BigInt(Math.floor(amt*1000));
+        const result = BigInt(Math.floor(amt*1000000));
 
         this.cache[coinId] = {
             price: result,

package/src/prices/ISwapPrice.ts

@@ -13,7 +13,7 @@ export abstract class ISwapPrice<T extends {decimals: number} = {decimals: numbe
     }
 
     /**
-     * Returns coin price in mSat
+     * Returns coin price in uSat (sats-per-token * 1_000_000)
      *
      * @param tokenData
      */

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

@@ -32,7 +32,7 @@ import {isQuoteThrow} from "../../../plugins/IPlugin";
 import {ToBtcSwapState} from "../tobtc_abstract/ToBtcSwapAbs";
 
 export type ToBtcLnConfig = ToBtcBaseConfig & {
-    routingFeeMultiplier: bigint,
+    routingFeeMultiplier: bigint | number,
 
     minSendCltv: bigint,
 
@@ -625,7 +625,9 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
 
         const safeFeeTokens = (probeOrRouteResp.feeMtokens + 999n) / 1000n;
 
-        let actualRoutingFee: bigint = safeFeeTokens * this.config.routingFeeMultiplier;
+        let actualRoutingFee: bigint = safeFeeTokens
+            * BigInt(Math.floor(Number(this.config.routingFeeMultiplier) * 1_000_000))
+            / 1_000_000n;
 
         const minRoutingFee: bigint = (amountBD * this.config.minLnRoutingFeePPM / 1000000n)  + this.config.minLnBaseFee;
         if(actualRoutingFee < minRoutingFee) {