@atomiqlabs/sdk 4.0.0-beta.3 → 4.0.0

package/src/SwapperFactory.ts

@@ -1,195 +1,195 @@
-import {
-    ChainData,
-    BitcoinNetwork,
-    BitcoinRpc,
-    BaseTokenType,
-    ChainType,
-    StorageObject,
-    IStorageManager
-} from "@atomiqlabs/base";
-import {
-    BitcoinTokens,
-    BtcToken, CustomPriceFunction, CustomPriceProvider,
-    MempoolApi,
-    MempoolBitcoinRpc, RedundantSwapPrice,
-    RedundantSwapPriceAssets, SCToken, SingleSwapPrice, Swapper,
-    SwapperOptions
-} from "@atomiqlabs/sdk-lib";
-import {SmartChainAssets} from "./SmartChainAssets";
-import {LocalStorageManager} from "./storage/LocalStorageManager";
-
-type ChainInitializer<O, C extends ChainType, T extends BaseTokenType> = {
-    chainId: ChainType["ChainId"],
-    chainType: ChainType,
-    initializer: (
-        options: O,
-        bitcoinRelay: BitcoinRpc<any>,
-        network: BitcoinNetwork,
-        storageCtor: <T extends StorageObject>(name: string) => IStorageManager<T>
-    ) => ChainData<C>,
-    tokens: T,
-    options: O
-}
-
-type TokensDict<T extends ChainInitializer<any, any, any>> = {
-    [K in T["chainId"]]: {
-        [val in keyof T["tokens"]]: SCToken<K>
-    }
-};
-type GetAllTokens<T extends readonly ChainInitializer<any, any, any>[]> =
-    (T extends readonly [infer First extends ChainInitializer<any, any, any>, ...infer Rest extends ChainInitializer<any, any, any>[]]
-        ? TokensDict<First> & GetAllTokens<Rest>
-        : unknown);
-
-export type TokenResolverDict<T extends ChainInitializer<any, any, any>> = {[K in T["chainId"]]: {
-    getToken: (address: string) => SCToken<K>
-}};
-type GetAllTokenResolvers<T extends readonly ChainInitializer<any, any, any>[]> =
-    (T extends readonly [infer First extends ChainInitializer<any, any, any>, ...infer Rest extends ChainInitializer<any, any, any>[]]
-        ? TokenResolverDict<First> & GetAllTokenResolvers<Rest>
-        : unknown);
-
-type OptionsDict<T extends ChainInitializer<any, any, any>> = {[K in T["chainId"]]: T["options"]};
-type GetAllOptions<T extends readonly ChainInitializer<any, any, any>[]> =
-    (T extends readonly [infer First extends ChainInitializer<any, any, any>, ...infer Rest extends ChainInitializer<any, any, any>[]]
-        ? OptionsDict<First> & GetAllOptions<Rest>
-        : unknown);
-
-type ChainTypeDict<T extends ChainInitializer<any, any, any>> = {[K in T["chainId"]]: T["chainType"]};
-type ToMultichain<T extends readonly ChainInitializer<any, any, any>[]> =
-    (T extends readonly [infer First extends ChainInitializer<any, any, any>, ...infer Rest extends ChainInitializer<any, any, any>[]]
-        ? ChainTypeDict<First> & ToMultichain<Rest>
-        : {});
-
-export type MultichainSwapperOptions<T extends readonly ChainInitializer<any, any, any>[]> = SwapperOptions & {
-    chains: GetAllOptions<T>
-} & {
-    chainStorageCtor?: <T extends StorageObject>(name: string) => IStorageManager<T>,
-    pricingFeeDifferencePPM?: bigint,
-    mempoolApi?: MempoolApi,
-    getPriceFn?: CustomPriceFunction
-};
-
-const registries = {
-    [BitcoinNetwork.MAINNET]: "https://api.github.com/repos/adambor/SolLightning-registry/contents/registry-mainnet.json?ref=main",
-    [BitcoinNetwork.TESTNET]: "https://api.github.com/repos/adambor/SolLightning-registry/contents/registry.json?ref=main",
-    [BitcoinNetwork.TESTNET4]: "https://api.github.com/repos/adambor/SolLightning-registry/contents/registry-testnet4.json?ref=main"
-}
-
-const trustedIntermediaries = {
-    [BitcoinNetwork.MAINNET]: "https://node3.gethopa.com:34100",
-    [BitcoinNetwork.TESTNET]: "https://node3.gethopa.com:24100"
-}
-
-const mempoolUrls = {
-    [BitcoinNetwork.MAINNET]: [
-        "https://mempool.space/api/",
-        "https://mempool.fra.mempool.space/api/",
-        "https://mempool.va1.mempool.space/api/",
-        "https://mempool.tk7.mempool.space/api/"
-    ],
-    [BitcoinNetwork.TESTNET]: [
-        "https://mempool.space/testnet/api/",
-        "https://mempool.fra.mempool.space/testnet/api/",
-        "https://mempool.va1.mempool.space/testnet/api/",
-        "https://mempool.tk7.mempool.space/testnet/api/"
-    ],
-    [BitcoinNetwork.TESTNET4]: [
-        "https://mempool.space/testnet4/api/",
-        "https://mempool.fra.mempool.space/testnet4/api/",
-        "https://mempool.va1.mempool.space/testnet4/api/",
-        "https://mempool.tk7.mempool.space/testnet4/api/"
-    ]
-}
-
-export class SwapperFactory<T extends readonly ChainInitializer<any, any, any>[]> {
-
-    Tokens: GetAllTokens<T> & {
-        BITCOIN: {
-            BTC: BtcToken<false>,
-            BTCLN: BtcToken<true>
-        }
-    } = {
-        BITCOIN: BitcoinTokens
-    } as any;
-    TokenResolver: GetAllTokenResolvers<T> = {} as any;
-
-    constructor(readonly initializers: T) {
-        this.initializers = initializers;
-        initializers.forEach(initializer => {
-            const addressMap: {[tokenAddress: string]: SCToken} = {};
-
-            this.Tokens[initializer.chainId] = {} as any;
-
-            for(let ticker in initializer.tokens) {
-                const assetData = initializer.tokens[ticker] as any;
-                this.Tokens[initializer.chainId][ticker] = addressMap[assetData.address] = {
-                    chain: "SC",
-                    chainId: initializer.chainId,
-                    address: assetData.address,
-                    name: SmartChainAssets[ticker].name,
-                    decimals: assetData.decimals,
-                    displayDecimals: assetData.displayDecimals,
-                    ticker
-                } as any;
-            }
-
-            this.TokenResolver[initializer.chainId] = {
-                getToken: (address: string) => addressMap[address]
-            } as any;
-        });
-    }
-
-    newSwapper(options: MultichainSwapperOptions<T>) {
-        options.bitcoinNetwork ??= BitcoinNetwork.MAINNET as any;
-        options.storagePrefix ??= "atomiqsdk-"+options.bitcoinNetwork+"-";
-
-        options.defaultTrustedIntermediaryUrl ??= trustedIntermediaries[options.bitcoinNetwork];
-
-        options.registryUrl ??= registries[options.bitcoinNetwork];
-
-        const mempoolApi = options.mempoolApi ?? new MempoolApi(mempoolUrls[options.bitcoinNetwork]);
-        const bitcoinRpc = new MempoolBitcoinRpc(mempoolApi);
-
-        const pricingAssets: (RedundantSwapPriceAssets<ToMultichain<T>>[number] & {ticker: string, name: string})[] = [];
-        Object.keys(SmartChainAssets).forEach((ticker) => {
-            const chains: any = {};
-            for(let {tokens, chainId} of this.initializers) {
-                if(tokens[ticker]!=null) chains[chainId] = tokens[ticker];
-            }
-            const assetData = SmartChainAssets[ticker];
-            pricingAssets.push({
-                ...assetData.pricing,
-                chains,
-                ticker,
-                name: assetData.name
-            })
-        });
-
-        options.chainStorageCtor ??= (name: string) => new LocalStorageManager(name);
-
-        const chains: {[key in T[number]["chainId"]]: ChainData<any>} = {} as any;
-        for(let {initializer, chainId} of this.initializers) {
-            if(options.chains[chainId]==null) continue;
-            chains[chainId] = initializer(options.chains[chainId], bitcoinRpc, options.bitcoinNetwork, options.chainStorageCtor) as any;
-        }
-
-        const swapPricing = options.getPriceFn!=null ?
-            new SingleSwapPrice(options.pricingFeeDifferencePPM ?? 10000n, new CustomPriceProvider(pricingAssets.map(val => {
-                return {
-                    coinId: val.ticker,
-                    chains: val.chains
-                }
-            }), options.getPriceFn)) :
-            RedundantSwapPrice.createFromTokenMap<ToMultichain<T>>(options.pricingFeeDifferencePPM ?? 10000n, pricingAssets);
-
-        return new Swapper<ToMultichain<T>>(
-            bitcoinRpc,
-            chains as any,
-            swapPricing,
-            pricingAssets,
-            options
-        );
-    }
-
-}
+import {
+    ChainData,
+    BitcoinNetwork,
+    BitcoinRpc,
+    BaseTokenType,
+    ChainType,
+    StorageObject,
+    IStorageManager
+} from "@atomiqlabs/base";
+import {
+    BitcoinTokens,
+    BtcToken, CustomPriceFunction, CustomPriceProvider,
+    MempoolApi,
+    MempoolBitcoinRpc, RedundantSwapPrice,
+    RedundantSwapPriceAssets, SCToken, SingleSwapPrice, Swapper,
+    SwapperOptions
+} from "@atomiqlabs/sdk-lib";
+import {SmartChainAssets} from "./SmartChainAssets";
+import {LocalStorageManager} from "./storage/LocalStorageManager";
+
+type ChainInitializer<O, C extends ChainType, T extends BaseTokenType> = {
+    chainId: ChainType["ChainId"],
+    chainType: ChainType,
+    initializer: (
+        options: O,
+        bitcoinRelay: BitcoinRpc<any>,
+        network: BitcoinNetwork,
+        storageCtor: <T extends StorageObject>(name: string) => IStorageManager<T>
+    ) => ChainData<C>,
+    tokens: T,
+    options: O
+}
+
+type TokensDict<T extends ChainInitializer<any, any, any>> = {
+    [K in T["chainId"]]: {
+        [val in keyof T["tokens"]]: SCToken<K>
+    }
+};
+type GetAllTokens<T extends readonly ChainInitializer<any, any, any>[]> =
+    (T extends readonly [infer First extends ChainInitializer<any, any, any>, ...infer Rest extends ChainInitializer<any, any, any>[]]
+        ? TokensDict<First> & GetAllTokens<Rest>
+        : unknown);
+
+export type TokenResolverDict<T extends ChainInitializer<any, any, any>> = {[K in T["chainId"]]: {
+    getToken: (address: string) => SCToken<K>
+}};
+type GetAllTokenResolvers<T extends readonly ChainInitializer<any, any, any>[]> =
+    (T extends readonly [infer First extends ChainInitializer<any, any, any>, ...infer Rest extends ChainInitializer<any, any, any>[]]
+        ? TokenResolverDict<First> & GetAllTokenResolvers<Rest>
+        : unknown);
+
+type OptionsDict<T extends ChainInitializer<any, any, any>> = {[K in T["chainId"]]: T["options"]};
+type GetAllOptions<T extends readonly ChainInitializer<any, any, any>[]> =
+    (T extends readonly [infer First extends ChainInitializer<any, any, any>, ...infer Rest extends ChainInitializer<any, any, any>[]]
+        ? OptionsDict<First> & GetAllOptions<Rest>
+        : unknown);
+
+type ChainTypeDict<T extends ChainInitializer<any, any, any>> = {[K in T["chainId"]]: T["chainType"]};
+type ToMultichain<T extends readonly ChainInitializer<any, any, any>[]> =
+    (T extends readonly [infer First extends ChainInitializer<any, any, any>, ...infer Rest extends ChainInitializer<any, any, any>[]]
+        ? ChainTypeDict<First> & ToMultichain<Rest>
+        : {});
+
+export type MultichainSwapperOptions<T extends readonly ChainInitializer<any, any, any>[]> = SwapperOptions & {
+    chains: GetAllOptions<T>
+} & {
+    chainStorageCtor?: <T extends StorageObject>(name: string) => IStorageManager<T>,
+    pricingFeeDifferencePPM?: bigint,
+    mempoolApi?: MempoolApi | MempoolBitcoinRpc | string | string[],
+    getPriceFn?: CustomPriceFunction
+};
+
+const registries = {
+    [BitcoinNetwork.MAINNET]: "https://api.github.com/repos/adambor/SolLightning-registry/contents/registry-mainnet.json?ref=main",
+    [BitcoinNetwork.TESTNET]: "https://api.github.com/repos/adambor/SolLightning-registry/contents/registry.json?ref=main",
+    [BitcoinNetwork.TESTNET4]: "https://api.github.com/repos/adambor/SolLightning-registry/contents/registry-testnet4.json?ref=main"
+}
+
+const trustedIntermediaries = {
+    [BitcoinNetwork.MAINNET]: "https://node3.gethopa.com:34100",
+    [BitcoinNetwork.TESTNET]: "https://node3.gethopa.com:24100"
+}
+
+const mempoolUrls = {
+    [BitcoinNetwork.MAINNET]: [
+        "https://mempool.space/api/",
+        "https://mempool.fra.mempool.space/api/",
+        "https://mempool.va1.mempool.space/api/",
+        "https://mempool.tk7.mempool.space/api/"
+    ],
+    [BitcoinNetwork.TESTNET]: [
+        "https://mempool.space/testnet/api/",
+        "https://mempool.fra.mempool.space/testnet/api/",
+        "https://mempool.va1.mempool.space/testnet/api/",
+        "https://mempool.tk7.mempool.space/testnet/api/"
+    ],
+    [BitcoinNetwork.TESTNET4]: [
+        "https://mempool.space/testnet4/api/",
+        "https://mempool.fra.mempool.space/testnet4/api/",
+        "https://mempool.va1.mempool.space/testnet4/api/",
+        "https://mempool.tk7.mempool.space/testnet4/api/"
+    ]
+}
+
+export class SwapperFactory<T extends readonly ChainInitializer<any, any, any>[]> {
+
+    Tokens: GetAllTokens<T> & {
+        BITCOIN: {
+            BTC: BtcToken<false>,
+            BTCLN: BtcToken<true>
+        }
+    } = {
+        BITCOIN: BitcoinTokens
+    } as any;
+    TokenResolver: GetAllTokenResolvers<T> = {} as any;
+
+    constructor(readonly initializers: T) {
+        this.initializers = initializers;
+        initializers.forEach(initializer => {
+            const addressMap: {[tokenAddress: string]: SCToken} = {};
+
+            this.Tokens[initializer.chainId] = {} as any;
+
+            for(let ticker in initializer.tokens) {
+                const assetData = initializer.tokens[ticker] as any;
+                this.Tokens[initializer.chainId][ticker] = addressMap[assetData.address] = {
+                    chain: "SC",
+                    chainId: initializer.chainId,
+                    address: assetData.address,
+                    name: SmartChainAssets[ticker].name,
+                    decimals: assetData.decimals,
+                    displayDecimals: assetData.displayDecimals,
+                    ticker
+                } as any;
+            }
+
+            this.TokenResolver[initializer.chainId] = {
+                getToken: (address: string) => addressMap[address]
+            } as any;
+        });
+    }
+
+    newSwapper(options: MultichainSwapperOptions<T>) {
+        options.bitcoinNetwork ??= BitcoinNetwork.MAINNET as any;
+        options.storagePrefix ??= "atomiqsdk-"+options.bitcoinNetwork+"-";
+
+        options.defaultTrustedIntermediaryUrl ??= trustedIntermediaries[options.bitcoinNetwork];
+
+        options.registryUrl ??= registries[options.bitcoinNetwork];
+
+        const mempoolApi = options.mempoolApi ?? new MempoolBitcoinRpc(mempoolUrls[options.bitcoinNetwork]);
+        const bitcoinRpc = mempoolApi instanceof MempoolBitcoinRpc ? mempoolApi : new MempoolBitcoinRpc(mempoolApi);
+
+        const pricingAssets: (RedundantSwapPriceAssets<ToMultichain<T>>[number] & {ticker: string, name: string})[] = [];
+        Object.keys(SmartChainAssets).forEach((ticker) => {
+            const chains: any = {};
+            for(let {tokens, chainId} of this.initializers) {
+                if(tokens[ticker]!=null) chains[chainId] = tokens[ticker];
+            }
+            const assetData = SmartChainAssets[ticker];
+            pricingAssets.push({
+                ...assetData.pricing,
+                chains,
+                ticker,
+                name: assetData.name
+            })
+        });
+
+        options.chainStorageCtor ??= (name: string) => new LocalStorageManager(name);
+
+        const chains: {[key in T[number]["chainId"]]: ChainData<any>} = {} as any;
+        for(let {initializer, chainId} of this.initializers) {
+            if(options.chains[chainId]==null) continue;
+            chains[chainId] = initializer(options.chains[chainId], bitcoinRpc, options.bitcoinNetwork, options.chainStorageCtor) as any;
+        }
+
+        const swapPricing = options.getPriceFn!=null ?
+            new SingleSwapPrice(options.pricingFeeDifferencePPM ?? 10000n, new CustomPriceProvider(pricingAssets.map(val => {
+                return {
+                    coinId: val.ticker,
+                    chains: val.chains
+                }
+            }), options.getPriceFn)) :
+            RedundantSwapPrice.createFromTokenMap<ToMultichain<T>>(options.pricingFeeDifferencePPM ?? 10000n, pricingAssets);
+
+        return new Swapper<ToMultichain<T>>(
+            bitcoinRpc,
+            chains as any,
+            swapPricing,
+            pricingAssets,
+            options
+        );
+    }
+
+}

package/src/Utils.js

@@ -1,37 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeoutSignal = exports.fromHumanReadableString = exports.toHumanReadableString = void 0;
-var sdk_lib_1 = require("@atomiqlabs/sdk-lib");
-function toHumanReadableString(amount, currencySpec) {
-    if (amount == null)
-        return null;
-    return (0, sdk_lib_1.toDecimal)(amount, currencySpec.decimals, undefined, currencySpec.displayDecimals);
-}
-exports.toHumanReadableString = toHumanReadableString;
-function fromHumanReadableString(amount, currencySpec) {
-    if (amount === "" || amount == null)
-        return null;
-    return (0, sdk_lib_1.fromDecimal)(amount, currencySpec.decimals);
-}
-exports.fromHumanReadableString = fromHumanReadableString;
-/**
- * Returns an abort signal that aborts after a specified timeout in milliseconds
- *
- * @param timeout Milliseconds to wait
- * @param abortReason Abort with this abort reason
- * @param abortSignal Abort signal to extend
- */
-function timeoutSignal(timeout, abortReason, abortSignal) {
-    if (timeout == null)
-        return abortSignal;
-    var abortController = new AbortController();
-    var timeoutHandle = setTimeout(function () { return abortController.abort(abortReason || new Error("Timed out")); }, timeout);
-    if (abortSignal != null) {
-        abortSignal.addEventListener("abort", function () {
-            clearTimeout(timeoutHandle);
-            abortController.abort(abortSignal.reason);
-        });
-    }
-    return abortController.signal;
-}
-exports.timeoutSignal = timeoutSignal;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.timeoutSignal = exports.fromHumanReadableString = exports.toHumanReadableString = void 0;
+var sdk_lib_1 = require("@atomiqlabs/sdk-lib");
+function toHumanReadableString(amount, currencySpec) {
+    if (amount == null)
+        return null;
+    return (0, sdk_lib_1.toDecimal)(amount, currencySpec.decimals, undefined, currencySpec.displayDecimals);
+}
+exports.toHumanReadableString = toHumanReadableString;
+function fromHumanReadableString(amount, currencySpec) {
+    if (amount === "" || amount == null)
+        return null;
+    return (0, sdk_lib_1.fromDecimal)(amount, currencySpec.decimals);
+}
+exports.fromHumanReadableString = fromHumanReadableString;
+/**
+ * Returns an abort signal that aborts after a specified timeout in milliseconds
+ *
+ * @param timeout Milliseconds to wait
+ * @param abortReason Abort with this abort reason
+ * @param abortSignal Abort signal to extend
+ */
+function timeoutSignal(timeout, abortReason, abortSignal) {
+    if (timeout == null)
+        return abortSignal;
+    var abortController = new AbortController();
+    var timeoutHandle = setTimeout(function () { return abortController.abort(abortReason || new Error("Timed out")); }, timeout);
+    if (abortSignal != null) {
+        abortSignal.addEventListener("abort", function () {
+            clearTimeout(timeoutHandle);
+            abortController.abort(abortSignal.reason);
+        });
+    }
+    return abortController.signal;
+}
+exports.timeoutSignal = timeoutSignal;

package/src/Utils.ts

@@ -1,31 +1,31 @@
-import {toDecimal, fromDecimal, Token} from "@atomiqlabs/sdk-lib";
-
-export function toHumanReadableString(amount: bigint, currencySpec: Token): string {
-    if(amount==null) return null;
-    return toDecimal(amount, currencySpec.decimals, undefined, currencySpec.displayDecimals);
-}
-
-export function fromHumanReadableString(amount: string, currencySpec: Token): bigint {
-    if(amount==="" || amount==null) return null;
-    return fromDecimal(amount, currencySpec.decimals);
-}
-
-/**
- * Returns an abort signal that aborts after a specified timeout in milliseconds
- *
- * @param timeout Milliseconds to wait
- * @param abortReason Abort with this abort reason
- * @param abortSignal Abort signal to extend
- */
-export function timeoutSignal(timeout: number, abortReason?: any, abortSignal?: AbortSignal): AbortSignal {
-    if(timeout==null) return abortSignal;
-    const abortController = new AbortController();
-    const timeoutHandle = setTimeout(() => abortController.abort(abortReason || new Error("Timed out")), timeout);
-    if(abortSignal!=null) {
-        abortSignal.addEventListener("abort", () => {
-            clearTimeout(timeoutHandle);
-            abortController.abort(abortSignal.reason);
-        });
-    }
-    return abortController.signal;
-}
+import {toDecimal, fromDecimal, Token} from "@atomiqlabs/sdk-lib";
+
+export function toHumanReadableString(amount: bigint, currencySpec: Token): string {
+    if(amount==null) return null;
+    return toDecimal(amount, currencySpec.decimals, undefined, currencySpec.displayDecimals);
+}
+
+export function fromHumanReadableString(amount: string, currencySpec: Token): bigint {
+    if(amount==="" || amount==null) return null;
+    return fromDecimal(amount, currencySpec.decimals);
+}
+
+/**
+ * Returns an abort signal that aborts after a specified timeout in milliseconds
+ *
+ * @param timeout Milliseconds to wait
+ * @param abortReason Abort with this abort reason
+ * @param abortSignal Abort signal to extend
+ */
+export function timeoutSignal(timeout: number, abortReason?: any, abortSignal?: AbortSignal): AbortSignal {
+    if(timeout==null) return abortSignal;
+    const abortController = new AbortController();
+    const timeoutHandle = setTimeout(() => abortController.abort(abortReason || new Error("Timed out")), timeout);
+    if(abortSignal!=null) {
+        abortSignal.addEventListener("abort", () => {
+            clearTimeout(timeoutHandle);
+            abortController.abort(abortSignal.reason);
+        });
+    }
+    return abortController.signal;
+}