@atomiqlabs/sdk 1.0.0-beta4 → 1.0.0-beta41

package/dist/MultichainSwapper.d.ts

@@ -1,6 +1,7 @@
 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";
 import { IStorageManager, StorageObject } from "crosslightning-base";
 type Chains = {
     "SOLANA": SdkSolanaType;
@@ -17,16 +18,14 @@ export type MultichainSwapperOptions = SwapperOptions & {
     };
 } & {
     storageCtor?: <T extends StorageObject>(name: string) => IStorageManager<T>;
+    pricingFeeDifferencePPM?: BN;
 };
 export declare class MultichainSwapper extends Swapper<SdkMultichain> {
     constructor(options: MultichainSwapperOptions);
 }
 export declare const Tokens: {
     [C in keyof Chains]: {
-        [T in keyof Chains[C]["Assets"]]: SCToken<Chains[C]["ChainType"]["ChainId"]> & {
-            name: string;
-            decimals: number;
-        };
+        [T in keyof Chains[C]["Assets"]]: SCToken<C>;
     };
 } & {
     BITCOIN: {
@@ -36,10 +35,7 @@ export declare const Tokens: {
 };
 export declare const TokenResolver: {
     [C in keyof Chains]: {
-        getToken(address: string): {
-            ticker: string;
-            name: string;
-        };
+        getToken(address: string): SCToken<C>;
     };
 };
 export {};

package/dist/MultichainSwapper.js

@@ -11,7 +11,7 @@ const Chains = {
 };
 class MultichainSwapper extends crosslightning_sdk_base_1.Swapper {
     constructor(options) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         (_a = options.bitcoinNetwork) !== null && _a !== void 0 ? _a : (options.bitcoinNetwork = crosslightning_sdk_base_1.BitcoinNetwork.MAINNET);
         (_b = options.storagePrefix) !== null && _b !== void 0 ? _b : (options.storagePrefix = "atomiqsdk-" + options.bitcoinNetwork);
         (_c = options.storageCtor) !== null && _c !== void 0 ? _c : (options.storageCtor = (name) => new crosslightning_sdk_base_1.IndexedDBStorageManager(name));
@@ -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(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;
@@ -45,23 +47,18 @@ exports.Tokens = Object.assign(Object.assign({}, (0, Utils_1.objectMap)(Chains,
             chainId: value.chainIdentifier,
             address: assetData.address,
             name: SmartChainAssets_1.SmartChainAssets[ticker].name,
-            decimals: assetData.decimals
+            decimals: assetData.decimals,
+            ticker
         };
     });
-})), { BITCOIN: {
-        BTC: {
-            chain: "BTC",
-            lightning: false
-        },
-        BTCLN: {
-            chain: "BTC",
-            lightning: true
-        }
-    } });
-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] = {
+            chain: "SC",
+            chainId: value.chainIdentifier,
+            address: value.assets[ticker].address,
             ticker,
             name: SmartChainAssets_1.SmartChainAssets[ticker].name,
             decimals: value.assets[ticker].decimals
@@ -70,4 +67,4 @@ exports.TokenResolver = (0, Utils_1.objectMap)(Chains, (value, key) => {
     return {
         getToken: (address) => addressMap[address]
     };
-});
+}));

package/dist/chains/solana/SolanaChainInitializer.d.ts

@@ -1,13 +1,15 @@
-import { SolanaChainType, SolanaRetryPolicy, StoredDataAccount } from "crosslightning-solana";
+import { SolanaChainType, SolanaFees, SolanaRetryPolicy, StoredDataAccount } from "crosslightning-solana";
 import { IStorageManager } from "crosslightning-base";
+import { Connection } from "@solana/web3.js";
 import { SdkChain } from "../ChainInitializer";
 type SolanaSwapperOptions = {
-    rpcUrl: string;
+    rpcUrl: string | Connection;
     dataAccountStorage?: IStorageManager<StoredDataAccount>;
     retryPolicy?: SolanaRetryPolicy;
     btcRelayContract?: string;
     swapContract?: string;
     trustedIntermediary?: string;
+    fees?: SolanaFees;
 };
 declare const SolanaAssets: {
     readonly WBTC: {

package/dist/chains/solana/SolanaChainInitializer.js

@@ -7,18 +7,20 @@ const SolanaChains_1 = require("./SolanaChains");
 const SolanaChainEventsBrowser_1 = require("crosslightning-solana/dist/solana/events/SolanaChainEventsBrowser");
 const chainId = "SOLANA";
 function getSolanaCtorData(options, bitcoinRpc, network) {
-    var _a, _b, _c, _d;
-    const connection = new web3_js_1.Connection(options.chains.SOLANA.rpcUrl);
-    const Fees = new crosslightning_solana_1.SolanaFees(connection, 200000, 2, 100);
-    const btcRelay = new crosslightning_solana_1.SolanaBtcRelay(connection, bitcoinRpc, (_a = options.chains.SOLANA.btcRelayContract) !== null && _a !== void 0 ? _a : SolanaChains_1.SolanaChains[network].addresses.btcRelayContract, Fees);
-    const swapContract = new crosslightning_solana_1.SolanaSwapProgram(connection, btcRelay, options.chains.SOLANA.dataAccountStorage || options.storageCtor("solAccounts"), (_b = options.chains.SOLANA.swapContract) !== null && _b !== void 0 ? _b : SolanaChains_1.SolanaChains[network].addresses.swapContract, (_c = options.chains.SOLANA.retryPolicy) !== null && _c !== void 0 ? _c : { transactionResendInterval: 1000 }, Fees);
+    var _a, _b, _c, _d, _e;
+    const connection = typeof (options.chains.SOLANA.rpcUrl) === "string" ?
+        new web3_js_1.Connection(options.chains.SOLANA.rpcUrl) :
+        options.chains.SOLANA.rpcUrl;
+    const Fees = (_a = options.chains.SOLANA.fees) !== null && _a !== void 0 ? _a : new crosslightning_solana_1.SolanaFees(connection, 200000, 4, 100);
+    const btcRelay = new crosslightning_solana_1.SolanaBtcRelay(connection, bitcoinRpc, (_b = options.chains.SOLANA.btcRelayContract) !== null && _b !== void 0 ? _b : SolanaChains_1.SolanaChains[network].addresses.btcRelayContract, Fees);
+    const swapContract = new crosslightning_solana_1.SolanaSwapProgram(connection, btcRelay, options.chains.SOLANA.dataAccountStorage || options.storageCtor("solAccounts"), (_c = options.chains.SOLANA.swapContract) !== null && _c !== void 0 ? _c : SolanaChains_1.SolanaChains[network].addresses.swapContract, (_d = options.chains.SOLANA.retryPolicy) !== null && _d !== void 0 ? _d : { transactionResendInterval: 1000 }, Fees);
     const chainEvents = new SolanaChainEventsBrowser_1.SolanaChainEventsBrowser(connection, swapContract);
     return {
         btcRelay,
         swapContract,
         chainEvents,
         swapDataConstructor: crosslightning_solana_1.SolanaSwapData,
-        defaultTrustedIntermediaryUrl: (_d = options.chains.SOLANA.trustedIntermediary) !== null && _d !== void 0 ? _d : SolanaChains_1.SolanaChains[network].trustedSwapForGasUrl,
+        defaultTrustedIntermediaryUrl: (_e = options.chains.SOLANA.trustedIntermediary) !== null && _e !== void 0 ? _e : SolanaChains_1.SolanaChains[network].trustedSwapForGasUrl,
         //These are defined here to keep the data from old SolLightning-sdk, not needed for other chains
         storage: {
             toBtc: options.storageCtor("SOLv4-" + options.bitcoinNetwork + "-Swaps-ToBTC"),

package/package.json

@@ -1,32 +1,32 @@
-{
-  "name": "@atomiqlabs/sdk",
-  "version": "1.0.0-beta4",
-  "description": "atomiq labs SDK for cross-chain swaps between smart chains and bitcoin",
-  "main": "./dist/index.js",
-  "types:": "./dist/index.d.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "files": [
-    "/dist",
-    "/src"
-  ],
-  "keywords": [
-    "Bitcoin",
-    "Cross-chain",
-    "Cryptocurrency",
-    "Bridge",
-    "Trustless"
-  ],
-  "author": "adambor",
-  "license": "ISC",
-  "dependencies": {
-    "crosslightning-base": "7.0.0-beta1",
-    "crosslightning-sdk-base": "10.0.5-beta8",
-    "crosslightning-solana": "7.0.0-beta4"
-  },
-  "devDependencies": {
-    "@types/bn.js": "5.1.5",
-    "typescript": "4.9.5"
-  }
-}
+{
+  "name": "@atomiqlabs/sdk",
+  "version": "1.0.0-beta41",
+  "description": "atomiq labs SDK for cross-chain swaps between smart chains and bitcoin",
+  "main": "./dist/index.js",
+  "types:": "./dist/index.d.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "files": [
+    "/dist",
+    "/src"
+  ],
+  "keywords": [
+    "Bitcoin",
+    "Cross-chain",
+    "Cryptocurrency",
+    "Bridge",
+    "Trustless"
+  ],
+  "author": "adambor",
+  "license": "ISC",
+  "dependencies": {
+    "crosslightning-base": "7.0.0-beta1",
+    "crosslightning-sdk-base": "10.0.5-beta44",
+    "crosslightning-solana": "7.0.0-beta4"
+  },
+  "devDependencies": {
+    "@types/bn.js": "5.1.5",
+    "typescript": "4.9.5"
+  }
+}

package/src/MultichainSwapper.ts

@@ -1,13 +1,13 @@
 import {
-    BitcoinNetwork,
-    BtcToken, IndexedDBStorageManager,
+    BitcoinNetwork, BitcoinTokens,
+    BtcToken, IndexedDBStorageManager, isToken,
     MempoolApi,
     MempoolBitcoinRpc,
     RedundantSwapPrice,
     RedundantSwapPriceAssets,
     SCToken,
     Swapper,
-    SwapperOptions
+    SwapperOptions, Token
 } from "crosslightning-sdk-base";
 import {objectMap} from "crosslightning-sdk-base/dist/utils/Utils";
 import {SdkSolana, SdkSolanaType} from "./chains/solana/SolanaChainInitializer";
@@ -33,7 +33,8 @@ export type MultichainSwapperOptions = SwapperOptions & {
         [C in keyof Chains]: Chains[C]["Options"]
     }
 } & {
-    storageCtor?: <T extends StorageObject>(name: string) => IStorageManager<T>
+    storageCtor?: <T extends StorageObject>(name: string) => IStorageManager<T>,
+    pricingFeeDifferencePPM?: BN
 };
 
 export class MultichainSwapper extends Swapper<SdkMultichain> {
@@ -54,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
             })
         });
 
@@ -70,14 +74,20 @@ export class MultichainSwapper extends Swapper<SdkMultichain> {
             return value.getCtorData(options, bitcoinRpc, options.bitcoinNetwork);
         });
 
-        super(bitcoinRpc, ctorChainData, RedundantSwapPrice.createFromTokenMap<SdkMultichain>(new BN(10000), pricingAssets), options);
+        super(
+            bitcoinRpc,
+            ctorChainData,
+            RedundantSwapPrice.createFromTokenMap<SdkMultichain>(options.pricingFeeDifferencePPM ?? new BN(10000), pricingAssets),
+            pricingAssets,
+            options
+        );
     }
 
 }
 
 export const Tokens: {
     [C in keyof Chains]: {
-        [T in keyof Chains[C]["Assets"]]: SCToken<Chains[C]["ChainType"]["ChainId"]> & {name: string, decimals: number}
+        [T in keyof Chains[C]["Assets"]]: SCToken<C>
     }
 } & {
     BITCOIN: {
@@ -92,36 +102,33 @@ export const Tokens: {
                 chainId: value.chainIdentifier,
                 address: assetData.address,
                 name: SmartChainAssets[ticker].name,
-                decimals: assetData.decimals
+                decimals: assetData.decimals,
+                ticker
             }
         });
     }),
-    BITCOIN: {
-        BTC: {
-            chain: "BTC",
-            lightning: false
-        },
-        BTCLN: {
-            chain: "BTC",
-            lightning: true
-        }
-    }
+    BITCOIN: BitcoinTokens
 };
 
 export const TokenResolver: {
     [C in keyof Chains]: {
-        getToken(address: string): {ticker: string, name: string}
+        getToken(address: string): SCToken<C>
     }
-} = objectMap(Chains, (value, key) => {
-    const addressMap: {[tokenAddress: string]: {ticker: string, name: string, decimals: number}} = {};
-    for(let ticker in value.assets) {
-        addressMap[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]
+        };
+    })
+};

package/src/chains/solana/SolanaChainInitializer.ts

@@ -19,20 +19,24 @@ import {MultichainSwapperOptions} from "../../MultichainSwapper";
 const chainId = "SOLANA" as const;
 
 type SolanaSwapperOptions = {
-    rpcUrl: string,
+    rpcUrl: string | Connection,
     dataAccountStorage?: IStorageManager<StoredDataAccount>,
     retryPolicy?: SolanaRetryPolicy,
 
     btcRelayContract?: string,
     swapContract?: string,
 
-    trustedIntermediary?: string
+    trustedIntermediary?: string,
+
+    fees?: SolanaFees
 };
 
 function getSolanaCtorData(options: MultichainSwapperOptions, bitcoinRpc: BitcoinRpc<any>, network: BitcoinNetwork): CtorChainData<SolanaChainType> {
-    const connection = new Connection(options.chains.SOLANA.rpcUrl);
+    const connection = typeof(options.chains.SOLANA.rpcUrl)==="string" ?
+        new Connection(options.chains.SOLANA.rpcUrl) :
+        options.chains.SOLANA.rpcUrl;
 
-    const Fees = new SolanaFees(connection, 200000, 2, 100);
+    const Fees = options.chains.SOLANA.fees ?? new SolanaFees(connection, 200000, 4, 100);
     const btcRelay = new SolanaBtcRelay(connection, bitcoinRpc, options.chains.SOLANA.btcRelayContract ?? SolanaChains[network].addresses.btcRelayContract, Fees);
     const swapContract = new SolanaSwapProgram(
         connection,