@atomiqlabs/chain-solana 12.0.14 → 13.0.9

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

@@ -1,26 +1,26 @@
-import { PublicKey, Signer, TransactionInstruction } from "@solana/web3.js";
-import { SolanaTx } from "./modules/SolanaTransactions";
-import { SolanaChainInterface } from "./SolanaChainInterface";
-export declare class SolanaAction {
-    computeBudget: number;
-    readonly mainSigner: PublicKey;
-    private readonly root;
-    private readonly instructions;
-    private feeRate;
-    private readonly signers;
-    private firstIxBeforeComputeBudget;
-    constructor(mainSigner: PublicKey, root: SolanaChainInterface, instructions?: TransactionInstruction[] | TransactionInstruction, computeBudget?: number, feeRate?: string, signers?: Signer[], firstIxBeforeComputeBudget?: boolean);
-    private estimateFee;
-    addIx(instruction: TransactionInstruction, computeBudget?: number, signers?: Signer[]): void;
-    add(action: SolanaAction): this;
-    addAction(action: SolanaAction, index?: number): this;
-    tx(feeRate?: string, block?: {
-        blockhash: string;
-        blockHeight: number;
-    }): Promise<SolanaTx>;
-    addToTxs(txs: SolanaTx[], feeRate?: string, block?: {
-        blockhash: string;
-        blockHeight: number;
-    }): Promise<void>;
-    ixsLength(): number;
-}
+import { PublicKey, Signer, TransactionInstruction } from "@solana/web3.js";
+import { SolanaTx } from "./modules/SolanaTransactions";
+import { SolanaChainInterface } from "./SolanaChainInterface";
+export declare class SolanaAction {
+    computeBudget: number | null;
+    readonly mainSigner: PublicKey;
+    private readonly root;
+    private readonly instructions;
+    private feeRate?;
+    private readonly signers;
+    private firstIxBeforeComputeBudget;
+    constructor(mainSigner: PublicKey, root: SolanaChainInterface, instructions?: TransactionInstruction[] | TransactionInstruction, computeBudget?: number, feeRate?: string, signers?: Signer[], firstIxBeforeComputeBudget?: boolean);
+    private estimateFee;
+    addIx(instruction: TransactionInstruction, computeBudget?: number, signers?: Signer[]): void;
+    add(action: SolanaAction): this;
+    addAction(action: SolanaAction, index?: number): this;
+    tx(feeRate?: string, block?: {
+        blockhash: string;
+        blockHeight: number;
+    }): Promise<SolanaTx>;
+    addToTxs(txs: SolanaTx[], feeRate?: string, block?: {
+        blockhash: string;
+        blockHeight: number;
+    }): Promise<void>;
+    ixsLength(): number;
+}

package/dist/solana/chain/SolanaAction.js

@@ -1,86 +1,86 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaAction = void 0;
-const web3_js_1 = require("@solana/web3.js");
-class SolanaAction {
-    constructor(mainSigner, root, instructions = [], computeBudget = 0, feeRate, signers, firstIxBeforeComputeBudget) {
-        this.firstIxBeforeComputeBudget = false;
-        this.mainSigner = mainSigner;
-        this.root = root;
-        this.instructions = Array.isArray(instructions) ? instructions : [instructions];
-        this.computeBudget = computeBudget;
-        this.feeRate = feeRate;
-        this.signers = signers || [];
-        if (firstIxBeforeComputeBudget != null)
-            this.firstIxBeforeComputeBudget = firstIxBeforeComputeBudget;
-    }
-    estimateFee() {
-        const mutableAccounts = [];
-        this.instructions.forEach(ix => ix.keys.forEach(key => key.isWritable && mutableAccounts.push(key.pubkey)));
-        return this.root.Fees.getFeeRate(mutableAccounts);
-    }
-    addIx(instruction, computeBudget, signers) {
-        this.instructions.push(instruction);
-        if (this.computeBudget == null) {
-            this.computeBudget = computeBudget;
-        }
-        else {
-            if (computeBudget != null)
-                this.computeBudget += computeBudget;
-        }
-    }
-    add(action) {
-        return this.addAction(action);
-    }
-    addAction(action, index = this.instructions.length) {
-        if (action.firstIxBeforeComputeBudget) {
-            if (this.instructions.length > 0)
-                throw new Error("Tried to add firstIxBeforeComputeBudget action to existing action with instructions");
-            this.firstIxBeforeComputeBudget = true;
-        }
-        if (this.firstIxBeforeComputeBudget && this.instructions.length > 0 && index === 0)
-            throw new Error("Tried adding to firstIxBeforeComputeBudget action on 0th index");
-        if (!action.mainSigner.equals(this.mainSigner))
-            throw new Error("Actions need to have the same signer!");
-        if (this.computeBudget == null && action.computeBudget != null)
-            this.computeBudget = action.computeBudget;
-        if (this.computeBudget != null && action.computeBudget != null)
-            this.computeBudget += action.computeBudget;
-        this.instructions.splice(index, 0, ...action.instructions);
-        this.signers.push(...action.signers);
-        if (this.feeRate == null)
-            this.feeRate = action.feeRate;
-        return this;
-    }
-    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
-        };
-    }
-    async addToTxs(txs, feeRate, block) {
-        txs.push(await this.tx(feeRate, block));
-    }
-    ixsLength() {
-        return this.instructions.length;
-    }
-}
-exports.SolanaAction = SolanaAction;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaAction = void 0;
+const web3_js_1 = require("@solana/web3.js");
+class SolanaAction {
+    constructor(mainSigner, root, instructions = [], computeBudget = 0, feeRate, signers, firstIxBeforeComputeBudget) {
+        this.firstIxBeforeComputeBudget = false;
+        this.mainSigner = mainSigner;
+        this.root = root;
+        this.instructions = Array.isArray(instructions) ? instructions : [instructions];
+        this.computeBudget = computeBudget;
+        this.feeRate = feeRate;
+        this.signers = signers || [];
+        if (firstIxBeforeComputeBudget != null)
+            this.firstIxBeforeComputeBudget = firstIxBeforeComputeBudget;
+    }
+    estimateFee() {
+        const mutableAccounts = [];
+        this.instructions.forEach(ix => ix.keys.forEach(key => key.isWritable && mutableAccounts.push(key.pubkey)));
+        return this.root.Fees.getFeeRate(mutableAccounts);
+    }
+    addIx(instruction, computeBudget, signers) {
+        this.instructions.push(instruction);
+        if (this.computeBudget == null) {
+            this.computeBudget = computeBudget ?? null;
+        }
+        else {
+            if (computeBudget != null)
+                this.computeBudget += computeBudget;
+        }
+    }
+    add(action) {
+        return this.addAction(action);
+    }
+    addAction(action, index = this.instructions.length) {
+        if (action.firstIxBeforeComputeBudget) {
+            if (this.instructions.length > 0)
+                throw new Error("Tried to add firstIxBeforeComputeBudget action to existing action with instructions");
+            this.firstIxBeforeComputeBudget = true;
+        }
+        if (this.firstIxBeforeComputeBudget && this.instructions.length > 0 && index === 0)
+            throw new Error("Tried adding to firstIxBeforeComputeBudget action on 0th index");
+        if (!action.mainSigner.equals(this.mainSigner))
+            throw new Error("Actions need to have the same signer!");
+        if (this.computeBudget == null && action.computeBudget != null)
+            this.computeBudget = action.computeBudget;
+        if (this.computeBudget != null && action.computeBudget != null)
+            this.computeBudget += action.computeBudget;
+        this.instructions.splice(index, 0, ...action.instructions);
+        this.signers.push(...action.signers);
+        if (this.feeRate == null)
+            this.feeRate = action.feeRate;
+        return this;
+    }
+    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
+        };
+    }
+    async addToTxs(txs, feeRate, block) {
+        txs.push(await this.tx(feeRate, block));
+    }
+    ixsLength() {
+        return this.instructions.length;
+    }
+}
+exports.SolanaAction = SolanaAction;

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

@@ -1,65 +1,77 @@
-/// <reference types="node" />
-import { Connection, SendOptions } from "@solana/web3.js";
-import { SolanaFees } from "./modules/SolanaFees";
-import { SolanaBlocks } from "./modules/SolanaBlocks";
-import { SolanaSlots } from "./modules/SolanaSlots";
-import { SolanaTokens } from "./modules/SolanaTokens";
-import { SolanaTransactions, SolanaTx } from "./modules/SolanaTransactions";
-import { SolanaSignatures } from "./modules/SolanaSignatures";
-import { SolanaEvents } from "./modules/SolanaEvents";
-import { ChainInterface, TransactionConfirmationOptions } from "@atomiqlabs/base";
-import { SolanaSigner } from "../wallet/SolanaSigner";
-import { Buffer } from "buffer";
-import { Wallet } from "@coral-xyz/anchor/dist/cjs/provider";
-export type SolanaRetryPolicy = {
-    maxRetries?: number;
-    delay?: number;
-    exponential?: boolean;
-    transactionResendInterval?: number;
-};
-export declare class SolanaChainInterface implements ChainInterface<SolanaTx, SolanaSigner, "SOLANA", Wallet> {
-    readonly chainId = "SOLANA";
-    readonly SLOT_TIME = 400;
-    readonly TX_SLOT_VALIDITY = 151;
-    readonly connection: Connection;
-    readonly retryPolicy: SolanaRetryPolicy;
-    readonly Blocks: SolanaBlocks;
-    Fees: SolanaFees;
-    readonly Slots: SolanaSlots;
-    readonly Tokens: SolanaTokens;
-    readonly Transactions: SolanaTransactions;
-    readonly Signatures: SolanaSignatures;
-    readonly Events: SolanaEvents;
-    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(connection: Connection, retryPolicy?: SolanaRetryPolicy, solanaFeeEstimator?: SolanaFees);
-    getBalance(signer: string, tokenAddress: string): Promise<bigint>;
-    isValidAddress(address: string): boolean;
-    normalizeAddress(address: string): string;
-    getNativeCurrencyAddress(): string;
-    txsTransfer(signer: string, token: string, amount: bigint, dstAddress: string, feeRate?: string): Promise<SolanaTx[]>;
-    transfer(signer: SolanaSigner, token: string, amount: bigint, dstAddress: string, txOptions?: TransactionConfirmationOptions): Promise<string>;
-    sendAndConfirm(signer: SolanaSigner, txs: SolanaTx[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]>;
-    serializeTx(tx: SolanaTx): Promise<string>;
-    deserializeTx(txData: string): Promise<SolanaTx>;
-    getTxIdStatus(txId: string): Promise<"not_found" | "pending" | "success" | "reverted">;
-    getTxStatus(tx: string): Promise<"not_found" | "pending" | "success" | "reverted">;
-    getFinalizedBlock(): Promise<{
-        height: number;
-        blockHash: string;
-    }>;
-    offBeforeTxReplace(callback: (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => Promise<void>): boolean;
-    onBeforeTxReplace(callback: (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => Promise<void>): void;
-    onBeforeTxSigned(callback: (tx: SolanaTx) => Promise<void>): void;
-    offBeforeTxSigned(callback: (tx: SolanaTx) => Promise<void>): boolean;
-    onSendTransaction(callback: (tx: Buffer, options?: SendOptions) => Promise<string>): void;
-    offSendTransaction(callback: (tx: Buffer, options?: SendOptions) => Promise<string>): boolean;
-    isValidToken(tokenIdentifier: string): boolean;
-    randomAddress(): string;
-    randomSigner(): SolanaSigner;
-    wrapSigner(signer: Wallet): Promise<SolanaSigner>;
-}
+/// <reference types="node" />
+/// <reference types="node" />
+import { Connection, SendOptions, Transaction } from "@solana/web3.js";
+import { SolanaFees } from "./modules/SolanaFees";
+import { SolanaBlocks } from "./modules/SolanaBlocks";
+import { SolanaSlots } from "./modules/SolanaSlots";
+import { SolanaTokens } from "./modules/SolanaTokens";
+import { SignedSolanaTx, SolanaTransactions, SolanaTx } from "./modules/SolanaTransactions";
+import { SolanaSignatures } from "./modules/SolanaSignatures";
+import { SolanaEvents } from "./modules/SolanaEvents";
+import { ChainInterface, TransactionConfirmationOptions } from "@atomiqlabs/base";
+import { SolanaSigner } from "../wallet/SolanaSigner";
+import { Buffer } from "buffer";
+import { Wallet } from "@coral-xyz/anchor/dist/cjs/provider";
+/**
+ * Retry policy configuration for Solana RPC calls
+ * @category Chain Interface
+ */
+export type SolanaRetryPolicy = {
+    maxRetries?: number;
+    delay?: number;
+    exponential?: boolean;
+    transactionResendInterval?: number;
+};
+/**
+ * Main chain interface for interacting with Solana blockchain
+ * @category Chain Interface
+ */
+export declare class SolanaChainInterface implements ChainInterface<SolanaTx, SignedSolanaTx, SolanaSigner, "SOLANA", Wallet> {
+    readonly chainId = "SOLANA";
+    readonly SLOT_TIME = 400;
+    readonly TX_SLOT_VALIDITY = 151;
+    readonly connection: Connection;
+    readonly retryPolicy?: SolanaRetryPolicy;
+    readonly Blocks: SolanaBlocks;
+    Fees: SolanaFees;
+    readonly Slots: SolanaSlots;
+    readonly Tokens: SolanaTokens;
+    readonly Transactions: SolanaTransactions;
+    readonly Signatures: SolanaSignatures;
+    readonly Events: SolanaEvents;
+    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(connection: Connection, retryPolicy?: SolanaRetryPolicy, solanaFeeEstimator?: SolanaFees);
+    getBalance(signer: string, tokenAddress: string): Promise<bigint>;
+    isValidAddress(address: string): boolean;
+    normalizeAddress(address: string): string;
+    getNativeCurrencyAddress(): string;
+    txsTransfer(signer: string, token: string, amount: bigint, dstAddress: string, feeRate?: string): Promise<SolanaTx[]>;
+    transfer(signer: SolanaSigner, token: string, amount: bigint, dstAddress: string, txOptions?: TransactionConfirmationOptions): Promise<string>;
+    sendAndConfirm(signer: SolanaSigner, txs: SolanaTx[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]>;
+    sendSignedAndConfirm(txs: SignedSolanaTx[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]>;
+    serializeTx(tx: SolanaTx): Promise<string>;
+    deserializeTx(txData: string): Promise<SolanaTx>;
+    serializeSignedTx(tx: Transaction): Promise<string>;
+    deserializeSignedTx(txData: string): Promise<Transaction>;
+    getTxIdStatus(txId: string): Promise<"not_found" | "pending" | "success" | "reverted">;
+    getTxStatus(tx: string): Promise<"not_found" | "pending" | "success" | "reverted">;
+    getFinalizedBlock(): Promise<{
+        height: number;
+        blockHash: string;
+    }>;
+    offBeforeTxReplace(callback: (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => Promise<void>): boolean;
+    onBeforeTxReplace(callback: (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => Promise<void>): void;
+    onBeforeTxSigned(callback: (tx: SolanaTx) => Promise<void>): void;
+    offBeforeTxSigned(callback: (tx: SolanaTx) => Promise<void>): boolean;
+    onSendTransaction(callback: (tx: Buffer, options?: SendOptions) => Promise<string>): void;
+    offSendTransaction(callback: (tx: Buffer, options?: SendOptions) => Promise<string>): boolean;
+    isValidToken(tokenIdentifier: string): boolean;
+    randomAddress(): string;
+    randomSigner(): SolanaSigner;
+    wrapSigner(signer: Wallet): Promise<SolanaSigner>;
+}