@atomiqlabs/sdk 1.0.0-beta6 → 1.0.0-beta8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,8 +1,9 @@
1
1
  import { SolanaChainType, SolanaFees, SolanaRetryPolicy, StoredDataAccount } from "crosslightning-solana";
2
2
  import { IStorageManager } from "crosslightning-base";
3
+ import { Connection } from "@solana/web3.js";
3
4
  import { SdkChain } from "../ChainInitializer";
4
5
  type SolanaSwapperOptions = {
5
- rpcUrl: string;
6
+ rpcUrl: string | Connection;
6
7
  dataAccountStorage?: IStorageManager<StoredDataAccount>;
7
8
  retryPolicy?: SolanaRetryPolicy;
8
9
  btcRelayContract?: string;
@@ -8,7 +8,9 @@ const SolanaChainEventsBrowser_1 = require("crosslightning-solana/dist/solana/ev
8
8
  const chainId = "SOLANA";
9
9
  function getSolanaCtorData(options, bitcoinRpc, network) {
10
10
  var _a, _b, _c, _d, _e;
11
- const connection = new web3_js_1.Connection(options.chains.SOLANA.rpcUrl);
11
+ const connection = typeof (options.chains.SOLANA.rpcUrl) === "string" ?
12
+ new web3_js_1.Connection(options.chains.SOLANA.rpcUrl) :
13
+ options.chains.SOLANA.rpcUrl;
12
14
  const Fees = (_a = options.chains.SOLANA.fees) !== null && _a !== void 0 ? _a : new crosslightning_solana_1.SolanaFees(connection, 200000, 4, 100);
13
15
  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);
14
16
  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);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atomiqlabs/sdk",
3
- "version": "1.0.0-beta6",
3
+ "version": "1.0.0-beta8",
4
4
  "description": "atomiq labs SDK for cross-chain swaps between smart chains and bitcoin",
5
5
  "main": "./dist/index.js",
6
6
  "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
22
22
  "license": "ISC",
23
23
  "dependencies": {
24
24
  "crosslightning-base": "7.0.0-beta1",
25
- "crosslightning-sdk-base": "10.0.5-beta9",
25
+ "crosslightning-sdk-base": "10.0.5-beta10",
26
26
  "crosslightning-solana": "7.0.0-beta4"
27
27
  },
28
28
  "devDependencies": {
@@ -19,7 +19,7 @@ import {MultichainSwapperOptions} from "../../MultichainSwapper";
19
19
  const chainId = "SOLANA" as const;
20
20
 
21
21
  type SolanaSwapperOptions = {
22
- rpcUrl: string,
22
+ rpcUrl: string | Connection,
23
23
  dataAccountStorage?: IStorageManager<StoredDataAccount>,
24
24
  retryPolicy?: SolanaRetryPolicy,
25
25
 
@@ -32,7 +32,9 @@ type SolanaSwapperOptions = {
32
32
  };
33
33
 
34
34
  function getSolanaCtorData(options: MultichainSwapperOptions, bitcoinRpc: BitcoinRpc<any>, network: BitcoinNetwork): CtorChainData<SolanaChainType> {
35
- const connection = new Connection(options.chains.SOLANA.rpcUrl);
35
+ const connection = typeof(options.chains.SOLANA.rpcUrl)==="string" ?
36
+ new Connection(options.chains.SOLANA.rpcUrl) :
37
+ options.chains.SOLANA.rpcUrl;
36
38
 
37
39
  const Fees = options.chains.SOLANA.fees ?? new SolanaFees(connection, 200000, 4, 100);
38
40
  const btcRelay = new SolanaBtcRelay(connection, bitcoinRpc, options.chains.SOLANA.btcRelayContract ?? SolanaChains[network].addresses.btcRelayContract, Fees);