@atomiqlabs/chain-solana 12.0.14 → 13.0.9

package/dist/solana/chain/SolanaChainInterface.js

@@ -1,125 +1,138 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaChainInterface = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const SolanaFees_1 = require("./modules/SolanaFees");
-const SolanaBlocks_1 = require("./modules/SolanaBlocks");
-const SolanaSlots_1 = require("./modules/SolanaSlots");
-const SolanaTokens_1 = require("./modules/SolanaTokens");
-const SolanaTransactions_1 = require("./modules/SolanaTransactions");
-const SolanaSignatures_1 = require("./modules/SolanaSignatures");
-const SolanaEvents_1 = require("./modules/SolanaEvents");
-const Utils_1 = require("../../utils/Utils");
-const SolanaAddresses_1 = require("./modules/SolanaAddresses");
-const SolanaSigner_1 = require("../wallet/SolanaSigner");
-const SolanaKeypairWallet_1 = require("../wallet/SolanaKeypairWallet");
-class SolanaChainInterface {
-    constructor(connection, retryPolicy, solanaFeeEstimator = new SolanaFees_1.SolanaFees(connection)) {
-        this.chainId = "SOLANA";
-        this.SLOT_TIME = 400;
-        this.TX_SLOT_VALIDITY = 151;
-        this.logger = (0, Utils_1.getLogger)(this.constructor.name + ": ");
-        this.connection = connection;
-        this.retryPolicy = retryPolicy;
-        this.Blocks = new SolanaBlocks_1.SolanaBlocks(this);
-        this.Fees = solanaFeeEstimator;
-        this.Slots = new SolanaSlots_1.SolanaSlots(this);
-        this.Tokens = new SolanaTokens_1.SolanaTokens(this);
-        this.Transactions = new SolanaTransactions_1.SolanaTransactions(this);
-        this.Signatures = new SolanaSignatures_1.SolanaSignatures(this);
-        this.Events = new SolanaEvents_1.SolanaEvents(this);
-    }
-    async getBalance(signer, tokenAddress) {
-        const token = new web3_js_1.PublicKey(tokenAddress);
-        const publicKey = new web3_js_1.PublicKey(signer);
-        let { balance } = await this.Tokens.getTokenBalance(publicKey, token);
-        if (token.equals(SolanaTokens_1.SolanaTokens.WSOL_ADDRESS)) {
-            const accountRentExemptCost = 1000000n;
-            balance = balance - accountRentExemptCost;
-            if (balance < 0n)
-                balance = 0n;
-        }
-        this.logger.debug("getBalance(): token balance, token: " + token.toBase58() + " balance: " + balance.toString(10));
-        return balance;
-    }
-    isValidAddress(address) {
-        return SolanaAddresses_1.SolanaAddresses.isValidAddress(address);
-    }
-    normalizeAddress(address) {
-        return address;
-    }
-    getNativeCurrencyAddress() {
-        return this.Tokens.getNativeCurrencyAddress().toString();
-    }
-    txsTransfer(signer, token, amount, dstAddress, feeRate) {
-        return this.Tokens.txsTransfer(new web3_js_1.PublicKey(signer), new web3_js_1.PublicKey(token), amount, new web3_js_1.PublicKey(dstAddress), feeRate);
-    }
-    async transfer(signer, token, amount, dstAddress, txOptions) {
-        const txs = await this.Tokens.txsTransfer(signer.getPublicKey(), new web3_js_1.PublicKey(token), amount, new web3_js_1.PublicKey(dstAddress), txOptions?.feeRate);
-        const [txId] = await this.Transactions.sendAndConfirm(signer, txs, txOptions?.waitForConfirmation, txOptions?.abortSignal, false);
-        return txId;
-    }
-    ////////////////////////////////////////////
-    //// Transactions
-    sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
-        return this.Transactions.sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish);
-    }
-    serializeTx(tx) {
-        return this.Transactions.serializeTx(tx);
-    }
-    deserializeTx(txData) {
-        return this.Transactions.deserializeTx(txData);
-    }
-    getTxIdStatus(txId) {
-        return this.Transactions.getTxIdStatus(txId);
-    }
-    getTxStatus(tx) {
-        return this.Transactions.getTxStatus(tx);
-    }
-    async getFinalizedBlock() {
-        const { block } = await this.Blocks.findLatestParsedBlock("finalized");
-        return {
-            height: block.blockHeight,
-            blockHash: block.blockhash
-        };
-    }
-    ///////////////////////////////////
-    //// Callbacks & handlers
-    offBeforeTxReplace(callback) {
-        return true;
-    }
-    onBeforeTxReplace(callback) { }
-    onBeforeTxSigned(callback) {
-        this.Transactions.onBeforeTxSigned(callback);
-    }
-    offBeforeTxSigned(callback) {
-        return this.Transactions.offBeforeTxSigned(callback);
-    }
-    onSendTransaction(callback) {
-        this.Transactions.onSendTransaction(callback);
-    }
-    offSendTransaction(callback) {
-        return this.Transactions.offSendTransaction(callback);
-    }
-    isValidToken(tokenIdentifier) {
-        try {
-            new web3_js_1.PublicKey(tokenIdentifier);
-            return true;
-        }
-        catch (e) {
-            return false;
-        }
-    }
-    randomAddress() {
-        return web3_js_1.Keypair.generate().publicKey.toString();
-    }
-    randomSigner() {
-        const keypair = web3_js_1.Keypair.generate();
-        const wallet = new SolanaKeypairWallet_1.SolanaKeypairWallet(keypair);
-        return new SolanaSigner_1.SolanaSigner(wallet, keypair);
-    }
-    wrapSigner(signer) {
-        return Promise.resolve(new SolanaSigner_1.SolanaSigner(signer));
-    }
-}
-exports.SolanaChainInterface = SolanaChainInterface;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaChainInterface = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const SolanaFees_1 = require("./modules/SolanaFees");
+const SolanaBlocks_1 = require("./modules/SolanaBlocks");
+const SolanaSlots_1 = require("./modules/SolanaSlots");
+const SolanaTokens_1 = require("./modules/SolanaTokens");
+const SolanaTransactions_1 = require("./modules/SolanaTransactions");
+const SolanaSignatures_1 = require("./modules/SolanaSignatures");
+const SolanaEvents_1 = require("./modules/SolanaEvents");
+const Utils_1 = require("../../utils/Utils");
+const SolanaAddresses_1 = require("./modules/SolanaAddresses");
+const SolanaSigner_1 = require("../wallet/SolanaSigner");
+const SolanaKeypairWallet_1 = require("../wallet/SolanaKeypairWallet");
+/**
+ * Main chain interface for interacting with Solana blockchain
+ * @category Chain Interface
+ */
+class SolanaChainInterface {
+    constructor(connection, retryPolicy, solanaFeeEstimator = new SolanaFees_1.SolanaFees(connection)) {
+        this.chainId = "SOLANA";
+        this.SLOT_TIME = 400;
+        this.TX_SLOT_VALIDITY = 151;
+        this.logger = (0, Utils_1.getLogger)(this.constructor.name + ": ");
+        this.connection = connection;
+        this.retryPolicy = retryPolicy;
+        this.Blocks = new SolanaBlocks_1.SolanaBlocks(this);
+        this.Fees = solanaFeeEstimator;
+        this.Slots = new SolanaSlots_1.SolanaSlots(this);
+        this.Tokens = new SolanaTokens_1.SolanaTokens(this);
+        this.Transactions = new SolanaTransactions_1.SolanaTransactions(this);
+        this.Signatures = new SolanaSignatures_1.SolanaSignatures(this);
+        this.Events = new SolanaEvents_1.SolanaEvents(this);
+    }
+    async getBalance(signer, tokenAddress) {
+        const token = new web3_js_1.PublicKey(tokenAddress);
+        const publicKey = new web3_js_1.PublicKey(signer);
+        let { balance } = await this.Tokens.getTokenBalance(publicKey, token);
+        if (token.equals(SolanaTokens_1.SolanaTokens.WSOL_ADDRESS)) {
+            const accountRentExemptCost = 1000000n;
+            balance = balance - accountRentExemptCost;
+            if (balance < 0n)
+                balance = 0n;
+        }
+        this.logger.debug("getBalance(): token balance, token: " + token.toBase58() + " balance: " + balance.toString(10));
+        return balance;
+    }
+    isValidAddress(address) {
+        return SolanaAddresses_1.SolanaAddresses.isValidAddress(address);
+    }
+    normalizeAddress(address) {
+        return address;
+    }
+    getNativeCurrencyAddress() {
+        return this.Tokens.getNativeCurrencyAddress().toString();
+    }
+    txsTransfer(signer, token, amount, dstAddress, feeRate) {
+        return this.Tokens.txsTransfer(new web3_js_1.PublicKey(signer), new web3_js_1.PublicKey(token), amount, new web3_js_1.PublicKey(dstAddress), feeRate);
+    }
+    async transfer(signer, token, amount, dstAddress, txOptions) {
+        const txs = await this.Tokens.txsTransfer(signer.getPublicKey(), new web3_js_1.PublicKey(token), amount, new web3_js_1.PublicKey(dstAddress), txOptions?.feeRate);
+        const [txId] = await this.Transactions.sendAndConfirm(signer, txs, txOptions?.waitForConfirmation, txOptions?.abortSignal, false);
+        return txId;
+    }
+    ////////////////////////////////////////////
+    //// Transactions
+    sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
+        return this.Transactions.sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish);
+    }
+    sendSignedAndConfirm(txs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
+        return this.Transactions.sendSignedAndConfirm(txs, waitForConfirmation, abortSignal, parallel, onBeforePublish);
+    }
+    serializeTx(tx) {
+        return Promise.resolve(this.Transactions.serializeUnsignedTx(tx));
+    }
+    deserializeTx(txData) {
+        return Promise.resolve(this.Transactions.deserializeUnsignedTx(txData));
+    }
+    serializeSignedTx(tx) {
+        return Promise.resolve(this.Transactions.serializeSignedTx(tx));
+    }
+    deserializeSignedTx(txData) {
+        return Promise.resolve(this.Transactions.deserializeSignedTransaction(txData));
+    }
+    getTxIdStatus(txId) {
+        return this.Transactions.getTxIdStatus(txId);
+    }
+    getTxStatus(tx) {
+        return this.Transactions.getTxStatus(tx);
+    }
+    async getFinalizedBlock() {
+        const { block } = await this.Blocks.findLatestParsedBlock("finalized");
+        return {
+            height: block.blockHeight,
+            blockHash: block.blockhash
+        };
+    }
+    ///////////////////////////////////
+    //// Callbacks & handlers
+    offBeforeTxReplace(callback) {
+        return true;
+    }
+    onBeforeTxReplace(callback) { }
+    onBeforeTxSigned(callback) {
+        this.Transactions.onBeforeTxSigned(callback);
+    }
+    offBeforeTxSigned(callback) {
+        return this.Transactions.offBeforeTxSigned(callback);
+    }
+    onSendTransaction(callback) {
+        this.Transactions.onSendTransaction(callback);
+    }
+    offSendTransaction(callback) {
+        return this.Transactions.offSendTransaction(callback);
+    }
+    isValidToken(tokenIdentifier) {
+        try {
+            new web3_js_1.PublicKey(tokenIdentifier);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    randomAddress() {
+        return web3_js_1.Keypair.generate().publicKey.toString();
+    }
+    randomSigner() {
+        const keypair = web3_js_1.Keypair.generate();
+        const wallet = new SolanaKeypairWallet_1.SolanaKeypairWallet(keypair);
+        return new SolanaSigner_1.SolanaSigner(wallet, keypair);
+    }
+    wrapSigner(signer) {
+        return Promise.resolve(new SolanaSigner_1.SolanaSigner(signer));
+    }
+}
+exports.SolanaChainInterface = SolanaChainInterface;

package/dist/solana/chain/SolanaModule.d.ts

@@ -1,14 +1,14 @@
-import { Connection } from "@solana/web3.js";
-import { SolanaChainInterface, SolanaRetryPolicy } from "./SolanaChainInterface";
-export declare class SolanaModule {
-    protected readonly connection: Connection;
-    protected readonly retryPolicy: SolanaRetryPolicy;
-    protected readonly root: SolanaChainInterface;
-    protected readonly logger: {
-        debug: (msg: any, ...args: any[]) => void;
-        info: (msg: any, ...args: any[]) => void;
-        warn: (msg: any, ...args: any[]) => void;
-        error: (msg: any, ...args: any[]) => void;
-    };
-    constructor(root: SolanaChainInterface);
-}
+import { Connection } from "@solana/web3.js";
+import { SolanaChainInterface, SolanaRetryPolicy } from "./SolanaChainInterface";
+export declare class SolanaModule {
+    protected readonly connection: Connection;
+    protected readonly retryPolicy?: SolanaRetryPolicy;
+    protected readonly root: SolanaChainInterface;
+    protected readonly logger: {
+        debug: (msg: string, ...args: any[]) => false | void;
+        info: (msg: string, ...args: any[]) => false | void;
+        warn: (msg: string, ...args: any[]) => false | void;
+        error: (msg: string, ...args: any[]) => false | void;
+    };
+    constructor(root: SolanaChainInterface);
+}

package/dist/solana/chain/SolanaModule.js

@@ -1,13 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaModule = void 0;
-const Utils_1 = require("../../utils/Utils");
-class SolanaModule {
-    constructor(root) {
-        this.logger = (0, Utils_1.getLogger)(this.constructor.name + ": ");
-        this.connection = root.connection;
-        this.retryPolicy = root.retryPolicy;
-        this.root = root;
-    }
-}
-exports.SolanaModule = SolanaModule;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaModule = void 0;
+const Utils_1 = require("../../utils/Utils");
+class SolanaModule {
+    constructor(root) {
+        this.logger = (0, Utils_1.getLogger)(this.constructor.name + ": ");
+        this.connection = root.connection;
+        this.retryPolicy = root.retryPolicy;
+        this.root = root;
+    }
+}
+exports.SolanaModule = SolanaModule;

package/dist/solana/chain/modules/SolanaAddresses.d.ts

@@ -1,8 +1,8 @@
-export declare class SolanaAddresses {
-    /**
-     * Checks whether an address is a valid Solana address (base58 encoded ed25519 public key)
-     *
-     * @param address
-     */
-    static isValidAddress(address: string): boolean;
-}
+export declare class SolanaAddresses {
+    /**
+     * Checks whether an address is a valid Solana address (base58 encoded ed25519 public key)
+     *
+     * @param address
+     */
+    static isValidAddress(address: string): boolean;
+}

package/dist/solana/chain/modules/SolanaAddresses.js

@@ -1,22 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaAddresses = void 0;
-const web3_js_1 = require("@solana/web3.js");
-class SolanaAddresses {
-    ///////////////////
-    //// Address utils
-    /**
-     * Checks whether an address is a valid Solana address (base58 encoded ed25519 public key)
-     *
-     * @param address
-     */
-    static isValidAddress(address) {
-        try {
-            return web3_js_1.PublicKey.isOnCurve(address);
-        }
-        catch (e) {
-            return false;
-        }
-    }
-}
-exports.SolanaAddresses = SolanaAddresses;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaAddresses = void 0;
+const web3_js_1 = require("@solana/web3.js");
+class SolanaAddresses {
+    ///////////////////
+    //// Address utils
+    /**
+     * Checks whether an address is a valid Solana address (base58 encoded ed25519 public key)
+     *
+     * @param address
+     */
+    static isValidAddress(address) {
+        try {
+            return web3_js_1.PublicKey.isOnCurve(address);
+        }
+        catch (e) {
+            return false;
+        }
+    }
+}
+exports.SolanaAddresses = SolanaAddresses;

package/dist/solana/chain/modules/SolanaBlocks.d.ts

@@ -1,28 +1,32 @@
-import { SolanaModule } from "../SolanaModule";
-import { Commitment, ParsedAccountsModeBlockResponse } from "@solana/web3.js";
-export declare class SolanaBlocks extends SolanaModule {
-    private blockCache;
-    /**
-     * Initiates a fetch of the block at specified slot & saves the fetch promise into a block cache
-     *
-     * @param slot
-     * @private
-     */
-    private fetchAndSaveParsedBlock;
-    /**
-     * Tries to find the latest existing block for a given commitment, skipping blocks that are not available, runs a
-     *  search backwards from the latest slot for the given commitment and fails after 10 tries
-     *
-     * @param commitment
-     */
-    findLatestParsedBlock(commitment: Commitment): Promise<{
-        block: ParsedAccountsModeBlockResponse;
-        slot: number;
-    }>;
-    /**
-     * Gets parsed block for a given slot, uses block cache if the block was already fetched before
-     *
-     * @param slot
-     */
-    getParsedBlock(slot: number): Promise<ParsedAccountsModeBlockResponse>;
-}
+import { SolanaModule } from "../SolanaModule";
+import { Commitment, ParsedAccountsModeBlockResponse } from "@solana/web3.js";
+export type BlockChecked = ParsedAccountsModeBlockResponse & {
+    blockTime: number;
+    blockHeight: number;
+};
+export declare class SolanaBlocks extends SolanaModule {
+    private blockCache;
+    /**
+     * Initiates a fetch of the block at specified slot & saves the fetch promise into a block cache
+     *
+     * @param slot
+     * @private
+     */
+    private fetchAndSaveParsedBlock;
+    /**
+     * Tries to find the latest existing block for a given commitment, skipping blocks that are not available, runs a
+     *  search backwards from the latest slot for the given commitment and fails after 10 tries
+     *
+     * @param commitment
+     */
+    findLatestParsedBlock(commitment: Commitment): Promise<{
+        block: BlockChecked;
+        slot: number;
+    }>;
+    /**
+     * Gets parsed block for a given slot, uses block cache if the block was already fetched before
+     *
+     * @param slot
+     */
+    getParsedBlock(slot: number): Promise<BlockChecked>;
+}

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

@@ -1,72 +1,76 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaBlocks = void 0;
-const SolanaModule_1 = require("../SolanaModule");
-class SolanaBlocks extends SolanaModule_1.SolanaModule {
-    constructor() {
-        super(...arguments);
-        this.blockCache = new Map();
-    }
-    /**
-     * Initiates a fetch of the block at specified slot & saves the fetch promise into a block cache
-     *
-     * @param slot
-     * @private
-     */
-    fetchAndSaveParsedBlock(slot) {
-        const blockCacheData = this.connection.getParsedBlock(slot, {
-            transactionDetails: "none",
-            commitment: "confirmed",
-            rewards: false
-        });
-        this.blockCache.set(slot, blockCacheData);
-        blockCacheData.catch(e => {
-            if (this.blockCache.get(slot) == blockCacheData)
-                this.blockCache.delete(slot);
-            throw e;
-        });
-        return blockCacheData;
-    }
-    ///////////////////
-    //// Blocks
-    /**
-     * Tries to find the latest existing block for a given commitment, skipping blocks that are not available, runs a
-     *  search backwards from the latest slot for the given commitment and fails after 10 tries
-     *
-     * @param commitment
-     */
-    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;
-                }
-                throw e;
-            });
-            if (block != null) {
-                this.logger.debug("findLatestParsedBlock(): Found valid block, slot: " + slot +
-                    " blockhash: " + block.blockhash + " tries: " + i);
-                return {
-                    block,
-                    slot
-                };
-            }
-            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
-     *
-     * @param slot
-     */
-    getParsedBlock(slot) {
-        let blockCacheData = this.blockCache.get(slot);
-        if (blockCacheData == null) {
-            blockCacheData = this.fetchAndSaveParsedBlock(slot);
-        }
-        return blockCacheData;
-    }
-}
-exports.SolanaBlocks = SolanaBlocks;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaBlocks = void 0;
+const SolanaModule_1 = require("../SolanaModule");
+class SolanaBlocks extends SolanaModule_1.SolanaModule {
+    constructor() {
+        super(...arguments);
+        this.blockCache = new Map();
+    }
+    /**
+     * Initiates a fetch of the block at specified slot & saves the fetch promise into a block cache
+     *
+     * @param slot
+     * @private
+     */
+    fetchAndSaveParsedBlock(slot) {
+        const blockCacheData = this.connection.getParsedBlock(slot, {
+            transactionDetails: "none",
+            commitment: "confirmed",
+            rewards: false
+        }).then(val => {
+            if (val.blockHeight == null || val.blockTime == null)
+                throw new Error(`Cannot get block for slot ${slot}: blockHeight or blockTime empty!`);
+            return val;
+        });
+        this.blockCache.set(slot, blockCacheData);
+        blockCacheData.catch(e => {
+            if (this.blockCache.get(slot) == blockCacheData)
+                this.blockCache.delete(slot);
+            throw e;
+        });
+        return blockCacheData;
+    }
+    ///////////////////
+    //// Blocks
+    /**
+     * Tries to find the latest existing block for a given commitment, skipping blocks that are not available, runs a
+     *  search backwards from the latest slot for the given commitment and fails after 10 tries
+     *
+     * @param commitment
+     */
+    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;
+                }
+                throw e;
+            });
+            if (block != null) {
+                this.logger.debug("findLatestParsedBlock(): Found valid block, slot: " + slot +
+                    " blockhash: " + block.blockhash + " tries: " + i);
+                return {
+                    block,
+                    slot
+                };
+            }
+            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
+     *
+     * @param slot
+     */
+    getParsedBlock(slot) {
+        let blockCacheData = this.blockCache.get(slot);
+        if (blockCacheData == null) {
+            blockCacheData = this.fetchAndSaveParsedBlock(slot);
+        }
+        return blockCacheData;
+    }
+}
+exports.SolanaBlocks = SolanaBlocks;