@atomiqlabs/sdk 1.0.0-beta10 → 1.0.0-beta12

package/dist/MultichainSwapper.d.ts

@@ -1,4 +1,4 @@
-import { BtcToken, SCToken, Swapper, SwapperOptions, Token } from "crosslightning-sdk-base";
+import { BtcToken, SCToken, Swapper, SwapperOptions } from "crosslightning-sdk-base";
 import { SdkSolanaType } from "./chains/solana/SolanaChainInitializer";
 import { SdkChain } from "./chains/ChainInitializer";
 import * as BN from "bn.js";
@@ -23,41 +23,19 @@ export type MultichainSwapperOptions = SwapperOptions & {
 export declare class MultichainSwapper extends Swapper<SdkMultichain> {
     constructor(options: MultichainSwapperOptions);
 }
-export type TokenExtended<C extends string = string, T extends string = string> = Token<C> & {
-    name: string;
-    decimals: number;
-    ticker: T;
-};
-export type SCTokenExtended<C extends string = string, T extends string = string> = SCToken<C> & {
-    name: string;
-    decimals: number;
-    ticker: T;
-};
 export declare const Tokens: {
     [C in keyof Chains]: {
-        [T in keyof Chains[C]["Assets"]]: SCToken<C> & {
-            name: string;
-            decimals: number;
-            ticker: T;
-        };
+        [T in keyof Chains[C]["Assets"]]: SCToken<C>;
     };
 } & {
     BITCOIN: {
-        BTC: BtcToken<false> & {
-            name: "Bitcoin (on-chain)";
-            decimals: 8;
-            ticker: "BTC";
-        };
-        BTCLN: BtcToken<true> & {
-            name: "Bitcoin (lightning L2)";
-            decimals: 8;
-            ticker: "BTCLN";
-        };
+        BTC: BtcToken<false>;
+        BTCLN: BtcToken<true>;
     };
 };
 export declare const TokenResolver: {
     [C in keyof Chains]: {
-        getToken(address: string): SCTokenExtended<C>;
+        getToken(address: string): SCToken<C>;
     };
 };
 export {};

package/dist/MultichainSwapper.js

@@ -29,12 +29,14 @@ class MultichainSwapper extends crosslightning_sdk_base_1.Swapper {
                 if (Chains[chainId].assets[ticker] != null)
                     chains[chainId] = Chains[chainId].assets[ticker];
             }
-            pricingAssets.push(Object.assign(Object.assign({}, SmartChainAssets_1.SmartChainAssets[ticker].pricing), { chains }));
+            const assetData = SmartChainAssets_1.SmartChainAssets[ticker];
+            pricingAssets.push(Object.assign(Object.assign({}, assetData.pricing), { chains,
+                ticker, name: assetData.name }));
         });
         const ctorChainData = (0, Utils_1.objectMap)(Chains, (value, key) => {
             return value.getCtorData(options, bitcoinRpc, options.bitcoinNetwork);
         });
-        super(bitcoinRpc, ctorChainData, crosslightning_sdk_base_1.RedundantSwapPrice.createFromTokenMap((_e = options.pricingFeeDifferencePPM) !== null && _e !== void 0 ? _e : new BN(10000), pricingAssets), options);
+        super(bitcoinRpc, ctorChainData, crosslightning_sdk_base_1.RedundantSwapPrice.createFromTokenMap((_e = options.pricingFeeDifferencePPM) !== null && _e !== void 0 ? _e : new BN(10000), pricingAssets), pricingAssets, options);
     }
 }
 exports.MultichainSwapper = MultichainSwapper;
@@ -49,23 +51,8 @@ exports.Tokens = Object.assign(Object.assign({}, (0, Utils_1.objectMap)(Chains,
             ticker
         };
     });
-})), { BITCOIN: {
-        BTC: {
-            chain: "BTC",
-            lightning: false,
-            decimals: 8,
-            name: "Bitcoin (on-chain)",
-            ticker: "BTC"
-        },
-        BTCLN: {
-            chain: "BTC",
-            lightning: true,
-            decimals: 8,
-            name: "Bitcoin (lightning L2)",
-            ticker: "BTCLN"
-        }
-    } });
-exports.TokenResolver = (0, Utils_1.objectMap)(Chains, (value, key) => {
+})), { BITCOIN: crosslightning_sdk_base_1.BitcoinTokens });
+exports.TokenResolver = Object.assign({}, (0, Utils_1.objectMap)(Chains, (value, key) => {
     const addressMap = {};
     for (let ticker in value.assets) {
         addressMap[value.assets[ticker].address] = {
@@ -80,4 +67,4 @@ exports.TokenResolver = (0, Utils_1.objectMap)(Chains, (value, key) => {
     return {
         getToken: (address) => addressMap[address]
     };
-});
+}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/sdk",
-  "version": "1.0.0-beta10",
+  "version": "1.0.0-beta12",
   "description": "atomiq labs SDK for cross-chain swaps between smart chains and bitcoin",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "license": "ISC",
   "dependencies": {
     "crosslightning-base": "7.0.0-beta1",
-    "crosslightning-sdk-base": "10.0.5-beta10",
+    "crosslightning-sdk-base": "10.0.5-beta13",
     "crosslightning-solana": "7.0.0-beta4"
   },
   "devDependencies": {

package/src/MultichainSwapper.ts

@@ -1,6 +1,6 @@
 import {
-    BitcoinNetwork,
-    BtcToken, IndexedDBStorageManager,
+    BitcoinNetwork, BitcoinTokens,
+    BtcToken, IndexedDBStorageManager, isToken,
     MempoolApi,
     MempoolBitcoinRpc,
     RedundantSwapPrice,
@@ -55,15 +55,18 @@ export class MultichainSwapper extends Swapper<SdkMultichain> {
         );
         const bitcoinRpc = new MempoolBitcoinRpc(mempoolApi);
 
-        const pricingAssets: RedundantSwapPriceAssets<SdkMultichain> = [];
+        const pricingAssets: (RedundantSwapPriceAssets<SdkMultichain>[number] & {ticker: string, name: string})[] = [];
         Object.keys(SmartChainAssets).forEach((ticker) => {
             const chains: any = {};
             for(let chainId in Chains) {
                 if(Chains[chainId].assets[ticker]!=null) chains[chainId] = Chains[chainId].assets[ticker];
             }
+            const assetData = SmartChainAssets[ticker];
             pricingAssets.push({
-                ...SmartChainAssets[ticker].pricing,
-                chains
+                ...assetData.pricing,
+                chains,
+                ticker,
+                name: assetData.name
             })
         });
 
@@ -71,27 +74,25 @@ export class MultichainSwapper extends Swapper<SdkMultichain> {
             return value.getCtorData(options, bitcoinRpc, options.bitcoinNetwork);
         });
 
-        super(bitcoinRpc, ctorChainData, RedundantSwapPrice.createFromTokenMap<SdkMultichain>(options.pricingFeeDifferencePPM ?? new BN(10000), pricingAssets), options);
+        super(
+            bitcoinRpc,
+            ctorChainData,
+            RedundantSwapPrice.createFromTokenMap<SdkMultichain>(options.pricingFeeDifferencePPM ?? new BN(10000), pricingAssets),
+            pricingAssets,
+            options
+        );
     }
 
 }
 
-export type TokenExtended<C extends string = string, T extends string = string> = Token<C> & {
-    name: string, decimals: number, ticker: T
-};
-
-export type SCTokenExtended<C extends string = string, T extends string = string> = SCToken<C> & {
-    name: string, decimals: number, ticker: T
-};
-
 export const Tokens: {
     [C in keyof Chains]: {
-        [T in keyof Chains[C]["Assets"]]: SCToken<C> & {name: string, decimals: number, ticker: T}
+        [T in keyof Chains[C]["Assets"]]: SCToken<C>
     }
 } & {
     BITCOIN: {
-        BTC: BtcToken<false> & {name: "Bitcoin (on-chain)", decimals: 8, ticker: "BTC"},
-        BTCLN: BtcToken<true> & {name: "Bitcoin (lightning L2)", decimals: 8, ticker: "BTCLN"}
+        BTC: BtcToken<false>,
+        BTCLN: BtcToken<true>
     }
 } = {
     ...objectMap(Chains, (value, key) => {
@@ -106,41 +107,28 @@ export const Tokens: {
             }
         });
     }),
-    BITCOIN: {
-        BTC: {
-            chain: "BTC",
-            lightning: false,
-            decimals: 8,
-            name: "Bitcoin (on-chain)",
-            ticker: "BTC"
-        },
-        BTCLN: {
-            chain: "BTC",
-            lightning: true,
-            decimals: 8,
-            name: "Bitcoin (lightning L2)",
-            ticker: "BTCLN"
-        }
-    }
+    BITCOIN: BitcoinTokens
 };
 
 export const TokenResolver: {
     [C in keyof Chains]: {
-        getToken(address: string): SCTokenExtended<C>
+        getToken(address: string): SCToken<C>
     }
-} = objectMap(Chains, (value, key) => {
-    const addressMap: {[tokenAddress: string]: SCTokenExtended} = {};
-    for(let ticker in value.assets) {
-        addressMap[value.assets[ticker].address] = {
-            chain: "SC",
-            chainId: value.chainIdentifier,
-            address: value.assets[ticker].address,
-            ticker,
-            name: SmartChainAssets[ticker].name,
-            decimals: value.assets[ticker].decimals
+} = {
+    ...objectMap(Chains, (value, key) => {
+        const addressMap: {[tokenAddress: string]: SCToken} = {};
+        for(let ticker in value.assets) {
+            addressMap[value.assets[ticker].address] = {
+                chain: "SC",
+                chainId: value.chainIdentifier,
+                address: value.assets[ticker].address,
+                ticker,
+                name: SmartChainAssets[ticker].name,
+                decimals: value.assets[ticker].decimals
+            }
         }
-    }
-    return {
-        getToken: (address: string) => addressMap[address]
-    };
-});
+        return {
+            getToken: (address: string) => addressMap[address]
+        };
+    })
+};