@atomiqlabs/chain-solana 7.3.7 → 8.0.0-beta.0

package/dist/index.d.ts

@@ -25,4 +25,5 @@ export * from "./solana/swaps/modules/SwapRefund";
 export * from "./solana/wallet/SolanaKeypairWallet";
 export * from "./solana/wallet/SolanaSigner";
 export * from "./solana/SolanaChainType";
+export * from "./solana/SolanaInitializer";
 export * from "./utils/Utils";

package/dist/index.js

@@ -41,4 +41,5 @@ __exportStar(require("./solana/swaps/modules/SwapRefund"), exports);
 __exportStar(require("./solana/wallet/SolanaKeypairWallet"), exports);
 __exportStar(require("./solana/wallet/SolanaSigner"), exports);
 __exportStar(require("./solana/SolanaChainType"), exports);
+__exportStar(require("./solana/SolanaInitializer"), exports);
 __exportStar(require("./utils/Utils"), exports);

package/dist/solana/SolanaChains.d.ts

@@ -0,0 +1,14 @@
+export declare const SolanaChains: {
+    readonly 1: {
+        readonly addresses: {
+            readonly swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM";
+            readonly btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc";
+        };
+    };
+    readonly 0: {
+        readonly addresses: {
+            readonly swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM";
+            readonly btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc";
+        };
+    };
+};

package/dist/solana/SolanaChains.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaChains = void 0;
+const base_1 = require("@atomiqlabs/base");
+exports.SolanaChains = {
+    [base_1.BitcoinNetwork.TESTNET]: {
+        addresses: {
+            swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
+            btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+        }
+    },
+    [base_1.BitcoinNetwork.MAINNET]: {
+        addresses: {
+            swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
+            btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+        }
+    }
+};

package/dist/solana/SolanaInitializer.d.ts

@@ -0,0 +1,18 @@
+import { BaseTokenType, BitcoinNetwork, BitcoinRpc, ChainData, ChainInitializer, IStorageManager, StorageObject } from "@atomiqlabs/base";
+import { Connection } from "@solana/web3.js";
+import { StoredDataAccount } from "./swaps/modules/SolanaDataAccount";
+import { SolanaRetryPolicy } from "./base/SolanaBase";
+import { SolanaFees } from "./base/modules/SolanaFees";
+import { SolanaChainType } from "./SolanaChainType";
+export type SolanaAssetsType = BaseTokenType<"WBTC" | "USDC" | "USDT" | "SOL" | "BONK">;
+export type SolanaSwapperOptions = {
+    rpcUrl: string | Connection;
+    dataAccountStorage?: IStorageManager<StoredDataAccount>;
+    retryPolicy?: SolanaRetryPolicy;
+    btcRelayContract?: string;
+    swapContract?: string;
+    fees?: SolanaFees;
+};
+export declare function initializeSolana(options: SolanaSwapperOptions, bitcoinRpc: BitcoinRpc<any>, network: BitcoinNetwork, storageCtor: <T extends StorageObject>(name: string) => IStorageManager<T>): ChainData<SolanaChainType>;
+export type SolanaInitializerType = ChainInitializer<SolanaSwapperOptions, SolanaChainType, SolanaAssetsType>;
+export declare const SolanaInitializer: SolanaInitializerType;

package/dist/solana/SolanaInitializer.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaInitializer = exports.initializeSolana = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const SolanaFees_1 = require("./base/modules/SolanaFees");
+const SolanaBtcRelay_1 = require("./btcrelay/SolanaBtcRelay");
+const SolanaChains_1 = require("./SolanaChains");
+const SolanaSwapProgram_1 = require("./swaps/SolanaSwapProgram");
+const SolanaChainEventsBrowser_1 = require("./events/SolanaChainEventsBrowser");
+const SolanaSwapData_1 = require("./swaps/SolanaSwapData");
+const chainId = "SOLANA";
+const SolanaAssets = {
+    WBTC: {
+        address: "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh",
+        decimals: 8
+    },
+    USDC: {
+        address: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+        decimals: 6
+    },
+    USDT: {
+        address: "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
+        decimals: 6
+    },
+    SOL: {
+        address: "So11111111111111111111111111111111111111112",
+        decimals: 9
+    },
+    BONK: {
+        address: "DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263",
+        decimals: 5
+    }
+};
+function initializeSolana(options, bitcoinRpc, network, storageCtor) {
+    const connection = typeof (options.rpcUrl) === "string" ?
+        new web3_js_1.Connection(options.rpcUrl) :
+        options.rpcUrl;
+    const Fees = options.fees ?? new SolanaFees_1.SolanaFees(connection, 200000, 4, 100);
+    const btcRelay = new SolanaBtcRelay_1.SolanaBtcRelay(connection, bitcoinRpc, options.btcRelayContract ?? SolanaChains_1.SolanaChains[network].addresses.btcRelayContract, Fees);
+    const swapContract = new SolanaSwapProgram_1.SolanaSwapProgram(connection, btcRelay, options.dataAccountStorage || storageCtor("solAccounts"), options.swapContract ?? SolanaChains_1.SolanaChains[network].addresses.swapContract, options.retryPolicy ?? { transactionResendInterval: 1000 }, Fees);
+    const chainEvents = new SolanaChainEventsBrowser_1.SolanaChainEventsBrowser(connection, swapContract);
+    return {
+        chainId,
+        btcRelay,
+        swapContract,
+        chainEvents,
+        swapDataConstructor: SolanaSwapData_1.SolanaSwapData,
+        //These are defined here to keep the data from old SolLightning-sdk, not needed for other chains
+        storagePrefix: "SOLv4-" + network + "-"
+    };
+}
+exports.initializeSolana = initializeSolana;
+exports.SolanaInitializer = {
+    chainId,
+    chainType: null,
+    initializer: initializeSolana,
+    tokens: SolanaAssets,
+    options: null
+};

package/dist/solana/base/SolanaAction.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaAction = void 0;
 const web3_js_1 = require("@solana/web3.js");
@@ -61,36 +52,32 @@ class SolanaAction {
             this.feeRate = action.feeRate;
         return this;
     }
-    tx(feeRate, block) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tx = new web3_js_1.Transaction();
-            tx.feePayer = this.mainSigner;
-            if (feeRate == null)
-                feeRate = this.feeRate;
-            if (feeRate == null)
-                feeRate = yield this.estimateFee();
-            let instructions = this.instructions;
-            if (instructions.length > 0 && this.firstIxBeforeComputeBudget) {
-                tx.add(this.instructions[0]);
-                instructions = this.instructions.slice(1);
-            }
-            this.root.Fees.applyFeeRateBegin(tx, this.computeBudget, feeRate);
-            instructions.forEach(ix => tx.add(ix));
-            this.root.Fees.applyFeeRateEnd(tx, this.computeBudget, feeRate);
-            if (block != null) {
-                tx.recentBlockhash = block.blockhash;
-                tx.lastValidBlockHeight = block.blockHeight + this.root.TX_SLOT_VALIDITY;
-            }
-            return {
-                tx,
-                signers: this.signers
-            };
-        });
+    async tx(feeRate, block) {
+        const tx = new web3_js_1.Transaction();
+        tx.feePayer = this.mainSigner;
+        if (feeRate == null)
+            feeRate = this.feeRate;
+        if (feeRate == null)
+            feeRate = await this.estimateFee();
+        let instructions = this.instructions;
+        if (instructions.length > 0 && this.firstIxBeforeComputeBudget) {
+            tx.add(this.instructions[0]);
+            instructions = this.instructions.slice(1);
+        }
+        this.root.Fees.applyFeeRateBegin(tx, this.computeBudget, feeRate);
+        instructions.forEach(ix => tx.add(ix));
+        this.root.Fees.applyFeeRateEnd(tx, this.computeBudget, feeRate);
+        if (block != null) {
+            tx.recentBlockhash = block.blockhash;
+            tx.lastValidBlockHeight = block.blockHeight + this.root.TX_SLOT_VALIDITY;
+        }
+        return {
+            tx,
+            signers: this.signers
+        };
     }
-    addToTxs(txs, feeRate, block) {
-        return __awaiter(this, void 0, void 0, function* () {
-            txs.push(yield this.tx(feeRate, block));
-        });
+    async addToTxs(txs, feeRate, block) {
+        txs.push(await this.tx(feeRate, block));
     }
     ixsLength() {
         return this.instructions.length;

package/dist/solana/base/modules/SolanaBlocks.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaBlocks = void 0;
 const SolanaModule_1 = require("../SolanaModule");
@@ -44,28 +35,26 @@ class SolanaBlocks extends SolanaModule_1.SolanaModule {
      *
      * @param commitment
      */
-    findLatestParsedBlock(commitment) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let slot = yield this.root.Slots.getSlot(commitment);
-            for (let i = 0; i < 10; i++) {
-                const block = yield this.getParsedBlock(slot).catch(e => {
-                    if (e.toString().startsWith("SolanaJSONRPCError: failed to get block: Block not available for slot")) {
-                        return null;
-                    }
-                    throw e;
-                });
-                if (block != null) {
-                    this.logger.debug("findLatestParsedBlock(): Found valid block, slot: " + slot +
-                        " blockhash: " + block.blockhash + " tries: " + i);
-                    return {
-                        block,
-                        slot
-                    };
+    async findLatestParsedBlock(commitment) {
+        let slot = await this.root.Slots.getSlot(commitment);
+        for (let i = 0; i < 10; i++) {
+            const block = await this.getParsedBlock(slot).catch(e => {
+                if (e.toString().startsWith("SolanaJSONRPCError: failed to get block: Block not available for slot")) {
+                    return null;
                 }
-                slot--;
+                throw e;
+            });
+            if (block != null) {
+                this.logger.debug("findLatestParsedBlock(): Found valid block, slot: " + slot +
+                    " blockhash: " + block.blockhash + " tries: " + i);
+                return {
+                    block,
+                    slot
+                };
             }
-            throw new Error("Ran out of tries trying to find a parsedBlock");
-        });
+            slot--;
+        }
+        throw new Error("Ran out of tries trying to find a parsedBlock");
     }
     /**
      * Gets parsed block for a given slot, uses block cache if the block was already fetched before

package/dist/solana/base/modules/SolanaEvents.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaEvents = void 0;
 const SolanaModule_1 = require("../SolanaModule");
@@ -47,23 +38,21 @@ class SolanaEvents extends SolanaModule_1.SolanaModule {
      * @param abortSignal
      * @param logFetchLimit
      */
-    findInSignatures(topicKey, processor, abortSignal, logFetchLimit) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (logFetchLimit == null || logFetchLimit > this.LOG_FETCH_LIMIT)
-                logFetchLimit = this.LOG_FETCH_LIMIT;
-            let signatures = null;
-            while (signatures == null || signatures.length > 0) {
-                signatures = yield this.getSignatures(topicKey, logFetchLimit, signatures != null ? signatures[signatures.length - 1].signature : null);
-                if (abortSignal != null)
-                    abortSignal.throwIfAborted();
-                const result = yield processor(signatures);
-                if (result != null)
-                    return result;
-                if (signatures.length < logFetchLimit)
-                    break;
-            }
-            return null;
-        });
+    async findInSignatures(topicKey, processor, abortSignal, logFetchLimit) {
+        if (logFetchLimit == null || logFetchLimit > this.LOG_FETCH_LIMIT)
+            logFetchLimit = this.LOG_FETCH_LIMIT;
+        let signatures = null;
+        while (signatures == null || signatures.length > 0) {
+            signatures = await this.getSignatures(topicKey, logFetchLimit, signatures != null ? signatures[signatures.length - 1].signature : null);
+            if (abortSignal != null)
+                abortSignal.throwIfAborted();
+            const result = await processor(signatures);
+            if (result != null)
+                return result;
+            if (signatures.length < logFetchLimit)
+                break;
+        }
+        return null;
     }
 }
 exports.SolanaEvents = SolanaEvents;

package/dist/solana/base/modules/SolanaFees.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" />
-import * as BN from "bn.js";
 import { Connection, PublicKey, SendOptions, Transaction } from "@solana/web3.js";
 export type FeeBribeData = {
     address: string;
     endpoint: string;
-    getBribeFee?: (original: BN) => BN;
+    getBribeFee?: (original: bigint) => bigint;
 };
 export declare class SolanaFees {
     private readonly connection;
@@ -18,7 +17,7 @@ export declare class SolanaFees {
     private readonly getStaticFee?;
     private readonly logger;
     private blockFeeCache;
-    constructor(connection: Connection, maxFeeMicroLamports?: number, numSamples?: number, period?: number, useHeliusApi?: "yes" | "no" | "auto", heliusFeeLevel?: "min" | "low" | "medium" | "high" | "veryHigh" | "unsafeMax", getStaticFee?: (feeRate: BN) => BN, bribeData?: FeeBribeData);
+    constructor(connection: Connection, maxFeeMicroLamports?: number, numSamples?: number, period?: number, useHeliusApi?: "yes" | "no" | "auto", heliusFeeLevel?: "min" | "low" | "medium" | "high" | "veryHigh" | "unsafeMax", getStaticFee?: (feeRate: bigint) => bigint, bribeData?: FeeBribeData);
     /**
      * Returns solana block with transactionDetails="signatures"
      *
@@ -76,7 +75,7 @@ export declare class SolanaFees {
      *
      * @returns {Promise<BN>} global fee rate microLamports/CU
      */
-    getGlobalFeeRate(): Promise<BN>;
+    getGlobalFeeRate(): Promise<bigint>;
     /**
      * Gets the combined microLamports/CU fee rate (from localized & global fee market), cached & adjusted as for
      *  when bribe and/or static fee should be included, format: <uLamports/CU>;<static fee lamport>[;<bribe address>]
@@ -92,7 +91,7 @@ export declare class SolanaFees {
      * @param feeRate
      * @param includeStaticFee whether the include the static/base part of the fee rate
      */
-    getPriorityFee(computeUnits: number, feeRate: string, includeStaticFee?: boolean): BN;
+    getPriorityFee(computeUnits: number, feeRate: string, includeStaticFee?: boolean): bigint;
     /**
      * Applies fee rate to a transaction at the beginning of the transaction (has to be called after
      *  feePayer is set for the tx), specifically adds the setComputeUnitLimit & setComputeUnitPrice instruction