@atomiqlabs/lp-lib 11.0.5 → 12.0.0-beta.0

package/src/utils/Utils.ts

@@ -1,6 +1,5 @@
 import {Request, Response} from "express";
 import {ServerParamEncoder} from "./paramcoders/server/ServerParamEncoder";
-import * as BN from "bn.js";
 
 export type DefinedRuntimeError = {
     code: number;
@@ -68,10 +67,10 @@ export function getLogger(prefix: string) {
 
 export const HEX_REGEX = /[0-9a-fA-F]+/;
 
-export function serializeBN(bn: BN | null): string | null {
+export function serializeBN(bn: bigint | null): string | null {
     return bn==null ? null : bn.toString(10);
 }
 
-export function deserializeBN(str: string | null): BN | null {
-    return str==null ? null : new BN(str);
+export function deserializeBN(str: string | null): bigint | null {
+    return str==null ? null : BigInt(str);
 }

package/src/utils/paramcoders/ParamDecoder.ts

@@ -1,4 +1,4 @@
-import {FieldTypeEnum, parseBN, RequestSchema, RequestSchemaResult, verifySchema} from "./SchemaVerifier";
+import {FieldTypeEnum, parseBigInt, RequestSchema, RequestSchemaResult, verifySchema} from "./SchemaVerifier";
 import {IParamReader} from "./IParamReader";
 
 
@@ -155,8 +155,8 @@ export class ParamDecoder implements IParamReader {
                 if(typeof(val)!=="number") return null;
                 if(isNaN(val as number)) return null;
                 resultSchema[fieldName] = val;
-            } else if(type===FieldTypeEnum.BN || type===FieldTypeEnum.BNOptional) {
-                const result = parseBN(val);
+            } else if(type===FieldTypeEnum.BigInt || type===FieldTypeEnum.BigIntOptional) {
+                const result = parseBigInt(val);
                 if(result==null) return null;
                 resultSchema[fieldName] = result;
             } else if(type===FieldTypeEnum.String || type===FieldTypeEnum.StringOptional) {
@@ -199,8 +199,8 @@ export class ParamDecoder implements IParamReader {
                 if(typeof(val)!=="number") return null;
                 if(isNaN(val as number)) return null;
                 resultSchema[fieldName] = val;
-            } else if(type===FieldTypeEnum.BN || type===FieldTypeEnum.BNOptional) {
-                const result = parseBN(val);
+            } else if(type===FieldTypeEnum.BigInt || type===FieldTypeEnum.BigIntOptional) {
+                const result = parseBigInt(val);
                 if(result==null) return null;
                 resultSchema[fieldName] = result;
             } else if(type===FieldTypeEnum.String || type===FieldTypeEnum.StringOptional) {

package/src/utils/paramcoders/SchemaVerifier.ts

@@ -1,10 +1,9 @@
-import * as BN from "bn.js";
 
-export function parseBN(str: string | number): BN | null {
+export function parseBigInt(str: string | number): bigint | null {
     if(str==null) return null;
     if(typeof(str)!=="string" && typeof(str)!=="number") return null;
     try {
-        return new BN(str);
+        return BigInt(str);
     } catch (e) {
         return null;
     }
@@ -14,32 +13,32 @@ export enum FieldTypeEnum {
     String=0,
     Boolean=1,
     Number=2,
-    BN=3,
+    BigInt=3,
     Any=4,
 
     StringOptional=100,
     BooleanOptional=101,
     NumberOptional=102,
-    BNOptional=103,
+    BigIntOptional=103,
     AnyOptional=104,
 }
 
-export type FieldType<T extends FieldTypeEnum | RequestSchema | ((val: any) => (string | boolean | number | BN | any))> =
+export type FieldType<T extends FieldTypeEnum | RequestSchema | ((val: any) => (string | boolean | number | bigint | any))> =
     T extends FieldTypeEnum.String ? string :
     T extends FieldTypeEnum.Boolean ? boolean :
     T extends FieldTypeEnum.Number ? number :
-    T extends FieldTypeEnum.BN ? BN :
+    T extends FieldTypeEnum.BigInt ? bigint :
     T extends FieldTypeEnum.Any ? any :
     T extends FieldTypeEnum.StringOptional ? string :
     T extends FieldTypeEnum.BooleanOptional ? boolean :
     T extends FieldTypeEnum.NumberOptional ? number :
-    T extends FieldTypeEnum.BNOptional ? BN :
+    T extends FieldTypeEnum.BigIntOptional ? bigint :
     T extends FieldTypeEnum.AnyOptional ? any :
     T extends RequestSchema ? RequestSchemaResult<T> :
     T extends ((val: any) => string) ? string :
     T extends ((val: any) => boolean) ? boolean :
     T extends ((val: any) => number) ? number :
-    T extends ((val: any) => BN) ? BN :
+    T extends ((val: any) => bigint) ? bigint :
     T extends ((val: any) => any) ? any :
         never;
 
@@ -79,8 +78,8 @@ export function verifySchema<T extends RequestSchema>(req: any, schema: T): Requ
             if(typeof(val)!=="number") return null;
             if(isNaN(val as number)) return null;
             resultSchema[fieldName] = val;
-        } else if(type===FieldTypeEnum.BN || type===FieldTypeEnum.BNOptional) {
-            const result = parseBN(val);
+        } else if(type===FieldTypeEnum.BigInt || type===FieldTypeEnum.BigIntOptional) {
+            const result = parseBigInt(val);
             if(result==null) return null;
             resultSchema[fieldName] = result;
         } else if(type===FieldTypeEnum.String || type===FieldTypeEnum.StringOptional) {

package/src/utils/paramcoders/server/ServerParamDecoder.ts

@@ -38,7 +38,7 @@ export const serverParamDecoder = (timeoutMillis: number) => (req: Request, res:
         });
         req.on("end", () => {
             try {
-                const body = JSON.parse(Buffer.concat(dataBuffers).toString());
+                const body = dataBuffers.length===0 ? {} : JSON.parse(Buffer.concat(dataBuffers).toString());
                 const paramReader: IParamReader = {
                     getParams: <T extends RequestSchema>(schema: T) => {
                         return Promise.resolve(verifySchema(body, schema));

package/src/wallets/IBitcoinWallet.ts

@@ -1,7 +1,6 @@
-import BN from "bn.js";
-import {Psbt, Transaction} from "bitcoinjs-lib";
 import {BtcTx} from "@atomiqlabs/base";
 import {Command} from "@atomiqlabs/server-base";
+import {Transaction} from "@scure/btc-signer";
 
 export type BitcoinUtxo = {
     address: string,
@@ -14,7 +13,7 @@ export type BitcoinUtxo = {
 };
 
 export type SignPsbtResponse = {
-    psbt: Psbt,
+    psbt: Transaction,
     tx: Transaction,
     raw: string,
     txId: string,
@@ -53,9 +52,9 @@ export interface IBitcoinWallet {
     getWalletTransaction(txId: string): Promise<BtcTx | null>;
     subscribeToWalletTransactions(callback: (tx: BtcTx) => void, abortSignal?: AbortSignal): void;
 
-    signPsbt(psbt: Psbt): Promise<SignPsbtResponse>;
+    signPsbt(psbt: Transaction): Promise<SignPsbtResponse>;
     sendRawTransaction(tx: string): Promise<void>;
-    getSignedTransaction(destination: string, amount: number, feeRate?: number, nonce?: BN, maxAllowedFeeRate?: number): Promise<SignPsbtResponse>;
+    getSignedTransaction(destination: string, amount: number, feeRate?: number, nonce?: bigint, maxAllowedFeeRate?: number): Promise<SignPsbtResponse>;
     estimateFee(destination: string, amount: number, feeRate?: number, feeRateMultiplier?: number): Promise<{satsPerVbyte: number, networkFee: number}>;
     drainAll(destination: string | Buffer, inputs: Omit<BitcoinUtxo, "address">[], feeRate?: number): Promise<SignPsbtResponse>;
     burnAll(inputs: Omit<BitcoinUtxo, "address">[]): Promise<SignPsbtResponse>;

package/src/wallets/ILightningWallet.ts

@@ -1,4 +1,3 @@
-import * as BN from "bn.js";
 import {Command} from "@atomiqlabs/server-base";
 
 export type IncomingLightningNetworkPayment = {
@@ -10,7 +9,7 @@ export type IncomingLightningNetworkPayment = {
 
     status: "held" | "canceled" | "confirmed"
 
-    mtokens: BN
+    mtokens: bigint
 }
 
 export type LightningNetworkInvoice = {
@@ -19,7 +18,7 @@ export type LightningNetworkInvoice = {
     secret?: string,
 
     cltvDelta: number,
-    mtokens: BN,
+    mtokens: bigint,
 
     createdAt: number,
     expiresAt: number,
@@ -36,25 +35,25 @@ export type OutgoingLightningNetworkPayment = {
     failedReason?: "insufficient_balance" | "invalid_payment" | "pathfinding_timeout" | "route_not_found",
     status: "confirmed" | "failed" | "pending",
     secret?: string,
-    feeMtokens?: BN
+    feeMtokens?: bigint
 };
 
 export type LightningNetworkChannel = {
     id: string,
-    capacity: BN,
+    capacity: bigint,
     isActive: boolean,
 
-    localBalance: BN,
-    localReserve: BN,
-    remoteBalance: BN,
-    remoteReserve: BN,
-    unsettledBalance: BN,
+    localBalance: bigint,
+    localReserve: bigint,
+    remoteBalance: bigint,
+    remoteReserve: bigint,
+    unsettledBalance: bigint,
     transactionId: string,
     transactionVout: number
 };
 
 export type InvoiceInit = {
-    mtokens: BN,
+    mtokens: bigint,
     descriptionHash?: string
     description?: string,
     cltvDelta?: number,
@@ -66,7 +65,7 @@ export type HodlInvoiceInit = {
     cltvDelta: number,
     expiresAt: number,
     id: string,
-    mtokens: BN,
+    mtokens: bigint,
     descriptionHash?: string
 };
 
@@ -75,12 +74,12 @@ export type LNRoutes = {
     feeRate?: number,
     cltvDelta?: number,
     channel?: string,
-    baseFeeMtokens?: BN
+    baseFeeMtokens?: bigint
 }[][];
 
 export type ParsedPaymentRequest = {
     id: string,
-    mtokens: BN,
+    mtokens: bigint,
     expiryEpochMillis: number,
     destination: string,
     cltvDelta: number,
@@ -90,26 +89,26 @@ export type ParsedPaymentRequest = {
 
 export type LightningPaymentInit = {
     request: string,
-    maxFeeMtokens?: BN,
+    maxFeeMtokens?: bigint,
     maxTimeoutHeight?: number
 };
 
 export type LightningBalanceResponse = {
-    localBalance: BN,
-    remoteBalance: BN,
-    unsettledBalance: BN
+    localBalance: bigint,
+    remoteBalance: bigint,
+    unsettledBalance: bigint
 };
 
 export type ProbeAndRouteInit = {
     request: string,
-    amountMtokens: BN,
-    maxFeeMtokens: BN,
+    amountMtokens: bigint,
+    maxFeeMtokens: bigint,
     maxTimeoutHeight: number
 }
 
 export type ProbeAndRouteResponse = {
     confidence: number,
-    feeMtokens: BN,
+    feeMtokens: bigint,
     destination: string,
     privateRoutes: LNRoutes
 }
@@ -133,7 +132,7 @@ export function routesMatch(routesA: LNRoutes, routesB: LNRoutes) {
             }
             if(
                 routesA[i][e].publicKey!==routesB[i][e].publicKey ||
-                !routesA[i][e].baseFeeMtokens.eq(routesB[i][e].baseFeeMtokens) ||
+                routesA[i][e].baseFeeMtokens!==routesB[i][e].baseFeeMtokens ||
                 routesA[i][e].channel!==routesB[i][e].channel ||
                 routesA[i][e].cltvDelta!==routesB[i][e].cltvDelta ||
                 routesA[i][e].feeRate!==routesB[i][e].feeRate