@atomiqlabs/sdk 1.0.0-beta5 → 1.0.0-beta6

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,6 +18,7 @@ export type MultichainSwapperOptions = SwapperOptions & {
     };
 } & {
     storageCtor?: <T extends StorageObject>(name: string) => IStorageManager<T>;
+    pricingFeeDifferencePPM?: BN;
 };
 export declare class MultichainSwapper extends Swapper<SdkMultichain> {
     constructor(options: MultichainSwapperOptions);

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));
@@ -34,7 +34,7 @@ class MultichainSwapper extends crosslightning_sdk_base_1.Swapper {
         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), options);
     }
 }
 exports.MultichainSwapper = MultichainSwapper;

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

@@ -1,4 +1,4 @@
-import { SolanaChainType, SolanaRetryPolicy, StoredDataAccount } from "crosslightning-solana";
+import { SolanaChainType, SolanaFees, SolanaRetryPolicy, StoredDataAccount } from "crosslightning-solana";
 import { IStorageManager } from "crosslightning-base";
 import { SdkChain } from "../ChainInitializer";
 type SolanaSwapperOptions = {
@@ -8,6 +8,7 @@ type SolanaSwapperOptions = {
     btcRelayContract?: string;
     swapContract?: string;
     trustedIntermediary?: string;
+    fees?: SolanaFees;
 };
 declare const SolanaAssets: {
     readonly WBTC: {

package/dist/chains/solana/SolanaChainInitializer.js

@@ -7,18 +7,18 @@ 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;
+    var _a, _b, _c, _d, _e;
     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);
+    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,6 +1,6 @@
 {
   "name": "@atomiqlabs/sdk",
-  "version": "1.0.0-beta5",
+  "version": "1.0.0-beta6",
   "description": "atomiq labs SDK for cross-chain swaps between smart chains and bitcoin",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/MultichainSwapper.ts

@@ -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> {
@@ -70,7 +71,7 @@ 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), options);
     }
 
 }

package/src/chains/solana/SolanaChainInitializer.ts

@@ -26,13 +26,15 @@ type SolanaSwapperOptions = {
     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 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,