@hawksightco/hawk-sdk 1.1.39 → 1.1.41-hotfix-1

package/dist/src/classes/Transaction3.js

@@ -0,0 +1,406 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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.Transaction3 = void 0;
+///
+/// I call this the weirdshit class. I don't understand the full mechanism why.
+/// The difference between `Transaction3` and `Transaction` class is its name.
+/// This file is just the exact copy of `Transaction` class except this comment.
+///
+/// I will keep this class for now. I just want this thing to compile with our
+/// front-end. This class is meant to isolate the compile error we're experiencing.
+/// But the moment I created this file, everything worked like WTF? Maybe it's
+/// just a "typescript" shit or something. Some undocumented bug...
+///
+/// Therefore I'll keep this for now...
+///
+const client = __importStar(require("@hawksightco/swagger-client"));
+const web3 = __importStar(require("@solana/web3.js"));
+const bn_js_1 = require("bn.js");
+const functions_1 = require("../functions");
+const Logging_1 = require("./Logging");
+/**
+ * Represents a transaction object in Solana using the web3.js library.
+ * This class encapsulates the logic for creating, signing, and verifying signatures of transactions.
+ */
+class Transaction3 {
+    get txMessage() {
+        return this._txMessage;
+    }
+    get versionedTransaction() {
+        return this._versionedTransaction;
+    }
+    get priorityFeeEstimate() {
+        return this._priorityFeeEstimate;
+    }
+    /** The blockhash of a recent ledger entry */
+    get recentBlockhash() {
+        return this.latestBlockhash.blockhash;
+    }
+    get instructions() {
+        return this._instructions;
+    }
+    /** last valid block height */
+    get lastValidBlockHeight() {
+        return this.latestBlockhash.lastValidBlockHeight;
+    }
+    /**
+     * Constructs a new Transaction object.
+     *
+     * @param payerKey PublicKey of the transaction payer
+     * @param instructions Array of TransactionInstruction to be executed in this transaction
+     * @param recentBlockhash The blockhash of a recent ledger entry
+     * @param alts Address lookup tables that optimize account address storage
+     */
+    constructor(txMetadataResponse, payerKey, latestBlockhash, alts, generalUtility, _mainIxs = []) {
+        this.txMetadataResponse = txMetadataResponse;
+        this.payerKey = payerKey;
+        this.latestBlockhash = latestBlockhash;
+        this.alts = alts;
+        this.generalUtility = generalUtility;
+        /** Estimated fee in SOL for priority fee when addPriorityFee() method is called. */
+        this._priorityFeeEstimate = "";
+        txMetadataResponse.payer = payerKey.toBase58();
+        let mainIxs;
+        if (_mainIxs.length > 0) {
+            mainIxs = _mainIxs;
+            txMetadataResponse.mainInstructions = mainIxs.map(ix => {
+                const accounts = ix.keys.map(meta => {
+                    return {
+                        pubkey: meta.pubkey.toString(),
+                        isSigner: meta.isSigner,
+                        isWritable: meta.isWritable,
+                    };
+                });
+                return {
+                    accounts,
+                    programId: ix.programId.toString(),
+                    data: ix.data.toString('base64'),
+                };
+            });
+        }
+        else {
+            // Construct main instructions
+            mainIxs = txMetadataResponse.mainInstructions.map((ix) => {
+                return new web3.TransactionInstruction({
+                    keys: ix.accounts.map((meta) => {
+                        return {
+                            pubkey: new web3.PublicKey(meta.pubkey),
+                            isSigner: meta.isSigner,
+                            isWritable: meta.isWritable,
+                        };
+                    }),
+                    programId: new web3.PublicKey(ix.programId),
+                    data: Buffer.from(ix.data, "base64"),
+                });
+            });
+        }
+        this._instructions = [...mainIxs];
+        const [txMessage, versionedTransaction] = this.buildTransaction(latestBlockhash);
+        this._txMessage = txMessage;
+        this._versionedTransaction = versionedTransaction;
+        this.requiredSigners = this.getRequiredSigners();
+    }
+    /**
+     * Signs the transaction with provided signers.
+     *
+     * @param signers Array of Signer objects whose private keys will be used to sign the transaction.
+     * @param idempotent Boolean indicating whether signing should be idempotent (default is false).
+     * @throws Error if a signer is not required or has already signed the transaction when not idempotent.
+     */
+    sign(signers, idempotent = false) {
+        // First validate all signers
+        signers.forEach((signer) => {
+            const key = signer.publicKey.toString();
+            if (typeof this.requiredSigners[key] !== "boolean") {
+                throw new Error(`Key ${key} is not a required signer!`);
+            }
+            if (!idempotent && this.requiredSigners[key]) {
+                throw new Error(`Key ${key} has already been signed by required signer!`);
+            }
+        });
+        // If all signers are valid and the process is idempotent or they haven't signed yet, update and sign
+        signers.forEach((signer) => {
+            const key = signer.publicKey.toString();
+            this.requiredSigners[key] = true;
+        });
+        this.versionedTransaction.sign(signers);
+    }
+    /**
+     * Add a signature on the transaction with provided signature.
+     *
+     * @param publicKey The public key of the signer
+     * @param signature A signature of the signed transaction
+     * @throws Error if a signer is not required or has already signed the transaction.
+     */
+    addSignature(publicKey, signature) {
+        const key = publicKey.toBase58();
+        if (typeof this.requiredSigners[key] !== "boolean") {
+            throw new Error(`Key ${key} is not a required signer!`);
+        }
+        if (this.requiredSigners[key]) {
+            throw new Error(`Key ${key} has already been signed by required signer!`);
+        }
+        this.requiredSigners[key] = true;
+        this.versionedTransaction.addSignature(publicKey, signature);
+    }
+    /**
+     * Checks if all required signers have signed the transaction.
+     *
+     * @returns Boolean indicating whether all required signers have signed.
+     */
+    isSignedByRequiredSigners() {
+        return Object.values(this.requiredSigners).every((isSigned) => isSigned);
+    }
+    /**
+     * Add priority fee instructions (compute budget)
+     *
+     * This method adds priority fee instructions to the transaction based on the specified
+     * priority level and compute unit limit. It ensures that the total fee does not exceed
+     * the specified maximum priority fee (in SOL) if provided.
+     *
+     * @param connection - The connection to the Solana cluster.
+     * @param computeUnitLimit - The limit on the number of compute units.
+     * @param fixedPriority - If true, a fixed priority fee is used; if false, the fee is based on priority level.
+     * @param priorityLevelOrPriorityFee - The priority level for the fee estimation or the fixed priority fee.
+     * @param maxPriorityFee - The maximum priority fee in SOL (optional, only applicable when fixedPriority is false).
+     * @returns An array of transaction instructions.
+     */
+    addPriorityFeeIx(connection_1, computeUnitLimit_1) {
+        return __awaiter(this, arguments, void 0, function* (connection, computeUnitLimit, fixedPriority = false, priorityLevelOrPriorityFee, maxPriorityFee) {
+            (0, Logging_1.Log)(`addPriorityFeeIx`);
+            // First, remove any existing priority fee instructions
+            this.removePriorityFeeIxs();
+            let totalPriorityFeeLamports;
+            if (fixedPriority && typeof priorityLevelOrPriorityFee === 'number') {
+                // For fixed priority, directly use the provided fixed priority fee
+                totalPriorityFeeLamports = priorityLevelOrPriorityFee - 5000;
+            }
+            else if (typeof priorityLevelOrPriorityFee === 'string') {
+                // Convert maxPriorityFee from SOL to lamports (1 SOL = 1_000_000_000 lamports)
+                const maxPriorityFeeLamports = maxPriorityFee !== undefined ? maxPriorityFee * 1000000000 : undefined;
+                // Get fee estimate by simulating the transaction
+                const startTime = new Date().getTime() / 1000;
+                (0, Logging_1.Log)(`addPriorityFeeIx: Starting getFeeEstimate function`);
+                let estimate = yield (0, functions_1.getFeeEstimate)(this.generalUtility, priorityLevelOrPriorityFee, this.txMetadataResponse);
+                (0, Logging_1.Log)(`addPriorityFeeIx: Starting getFeeEstimate function: Elapsed Time: ${(new Date().getTime() / 1000) - startTime}`);
+                // If priority is set to default or medium, we multiply estimate by 2 to increase its chance on blockchain.
+                if (priorityLevelOrPriorityFee === client.PriorityLevel.Default || priorityLevelOrPriorityFee === client.PriorityLevel.Medium) {
+                    estimate = estimate * 2;
+                }
+                // Calculate the total fee in lamports
+                totalPriorityFeeLamports = new bn_js_1.BN(estimate).mul(new bn_js_1.BN(computeUnitLimit)).div(new bn_js_1.BN(1000000)).toNumber();
+                // If maxPriorityFee is defined and it is less than the total calculated fee, cap it
+                if (maxPriorityFeeLamports !== undefined && totalPriorityFeeLamports > maxPriorityFeeLamports) {
+                    totalPriorityFeeLamports = maxPriorityFeeLamports - 5000;
+                }
+            }
+            else {
+                throw new Error('Invalid parameters');
+            }
+            // Convert the total priority fee back to microLamports per compute unit
+            const priorityFeePerUnitMicroLamports = new bn_js_1.BN(totalPriorityFeeLamports).mul(new bn_js_1.BN(1000000)).div(new bn_js_1.BN(computeUnitLimit)).toNumber();
+            // Create priority fee instructions for the transaction
+            const priorityFeeIxs = [
+                web3.ComputeBudgetProgram.setComputeUnitLimit({
+                    units: computeUnitLimit,
+                }),
+                web3.ComputeBudgetProgram.setComputeUnitPrice({
+                    microLamports: priorityFeePerUnitMicroLamports,
+                }),
+            ];
+            // Store the total priority fee in lamports
+            this._priorityFeeEstimate = totalPriorityFeeLamports.toString();
+            // Append priority fee instructions at the beginning
+            this._instructions.unshift(...priorityFeeIxs);
+            // Rebuild versioned transaction with the latest blockhash
+            const blockhash = yield connection.getLatestBlockhash();
+            this.buildTransaction(blockhash);
+            return priorityFeeIxs;
+        });
+    }
+    /**
+     * Gets the compute unit limit from a transaction simulation.
+     *
+     * This function simulates a transaction and calculates the compute unit limit
+     * based on the simulation results. If an additional compute limit is provided,
+     * it is added to the units consumed in the simulation. Otherwise, the units
+     * consumed are increased by 10%.
+     *
+     * @param {web3.Connection} connection - The connection object to the Solana cluster.
+     * @param {number} [additionalComputeLimit] - Optional additional compute limit to add to the units consumed.
+     * @returns {Promise<number>} - A promise that resolves to the total compute unit limit.
+     * @throws {Error} - Throws an error if the transaction simulation fails.
+     */
+    getComputeUnitLimit(connection, additionalComputeLimit) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const simulation = yield this.simulateTransaction(connection);
+            if (simulation.err !== null) {
+                if (simulation.logs === null) {
+                    (0, Logging_1.Log)(simulation.err);
+                }
+                else {
+                    for (const log of simulation.logs) {
+                        (0, Logging_1.Log)(log);
+                    }
+                }
+                throw new Error(`Transaction simulation error. See logs above.`);
+            }
+            const totalUnitLimit = additionalComputeLimit ? simulation.unitsConsumed + additionalComputeLimit : Math.round(simulation.unitsConsumed * 1.1);
+            return totalUnitLimit;
+        });
+    }
+    /**
+     * Simulate transaction
+     *
+     * @param connection
+     * @returns
+     */
+    simulateTransaction(connection_1) {
+        return __awaiter(this, arguments, void 0, function* (connection, signers = []) {
+            const testInstructions = [
+                ...this.instructions,
+            ];
+            if (this.findSetComputeUnitLimitIndex(testInstructions) === -1) {
+                testInstructions.unshift(web3.ComputeBudgetProgram.setComputeUnitLimit({ units: 1400000 }));
+            }
+            if (this.findSetComputeUnitPriceIndex(testInstructions) === -1) {
+                testInstructions.unshift(web3.ComputeBudgetProgram.setComputeUnitPrice({
+                    // CU * CU PRICE -> 1400000 * feeEstimate.priorityFeeEstimate
+                    microLamports: 100000,
+                }));
+            }
+            const testVersionedTxn = new web3.VersionedTransaction(new web3.TransactionMessage({
+                instructions: testInstructions,
+                payerKey: this.payerKey,
+                recentBlockhash: web3.PublicKey.default.toString(),
+            }).compileToV0Message(this.alts));
+            if (signers.length > 0) {
+                testVersionedTxn.sign(signers);
+            }
+            const simulation = yield connection.simulateTransaction(testVersionedTxn, {
+                replaceRecentBlockhash: true,
+                sigVerify: false,
+            });
+            if (simulation.value.unitsConsumed === undefined) {
+                throw new Error("Unable to calculate compute budget.");
+            }
+            return {
+                err: simulation.value.err,
+                logs: simulation.value.logs,
+                accounts: simulation.value.accounts,
+                unitsConsumed: simulation.value.unitsConsumed,
+                returnData: simulation.value.returnData,
+            };
+        });
+    }
+    /**
+     * Builds transaction object
+     */
+    buildTransaction(latestBlockhash) {
+        this.latestBlockhash = latestBlockhash;
+        this._txMessage = new web3.TransactionMessage({
+            payerKey: this.payerKey,
+            instructions: this.instructions,
+            recentBlockhash: this.recentBlockhash,
+        });
+        this._versionedTransaction = new web3.VersionedTransaction(this.txMessage.compileToV0Message(this.alts));
+        return [this._txMessage, this._versionedTransaction];
+    }
+    /**
+     * Gathers the public keys of all parties required to sign the transaction.
+     *
+     * @returns A record of signer public keys mapped to a boolean indicating whether they have signed.
+     */
+    getRequiredSigners() {
+        const signerKeys = this.instructions.flatMap((ix) => ix.keys
+            .filter((meta) => meta.isSigner)
+            .map((meta) => meta.pubkey.toString()));
+        const result = {};
+        signerKeys.forEach((key) => (result[key] = false));
+        return result;
+    }
+    /**
+     * Find setComputeUnitLimit index within the instructions
+     */
+    findSetComputeUnitLimitIndex(instructions) {
+        let _instructions = [];
+        if (instructions !== undefined) {
+            _instructions = instructions;
+        }
+        else {
+            _instructions = this.instructions;
+        }
+        return _instructions.findIndex((ix) => {
+            const isComputeBudgetProgram = ix.programId.toString() ===
+                "ComputeBudget111111111111111111111111111111";
+            const isSetComputeLimitIx = ix.data[0] === 2;
+            return isComputeBudgetProgram && isSetComputeLimitIx;
+        });
+    }
+    /**
+     * Find setComputeUnitPrice index within the instructions
+     */
+    findSetComputeUnitPriceIndex(instructions) {
+        let _instructions = [];
+        if (instructions !== undefined) {
+            _instructions = instructions;
+        }
+        else {
+            _instructions = this.instructions;
+        }
+        return _instructions.findIndex((ix) => {
+            const isComputeBudgetProgram = ix.programId.toString() ===
+                "ComputeBudget111111111111111111111111111111";
+            const isSetComputeUnitPriceIx = ix.data[0] === 3;
+            return isComputeBudgetProgram && isSetComputeUnitPriceIx;
+        });
+    }
+    /**
+     * Remove priority fee instructions
+     */
+    removePriorityFeeIxs() {
+        while (true) {
+            const setComputeUnitLimitIxIndex = this.findSetComputeUnitLimitIndex();
+            const setComputeUnitPriceIxIndex = this.findSetComputeUnitPriceIndex();
+            if (setComputeUnitLimitIxIndex !== -1)
+                this._instructions.splice(setComputeUnitLimitIxIndex, 1);
+            if (setComputeUnitPriceIxIndex !== -1)
+                this._instructions.splice(setComputeUnitPriceIxIndex, 1);
+            if (setComputeUnitLimitIxIndex && setComputeUnitPriceIxIndex)
+                break;
+        }
+    }
+}
+exports.Transaction3 = Transaction3;

package/dist/src/classes/TransactionBatchExecute2.d.ts

@@ -2,6 +2,9 @@
 import * as web3 from '@solana/web3.js';
 import { TransactionBatchExecute, DummySigners } from './TransactionBatchExecute';
 import { CreateTxMetadata } from './CreateTxMetadata';
+import { InsertNonceAtOpt } from '../types';
+import { GeneralUtility } from './GeneralUtility';
+import { MultiTransaction } from './MultiTransaction';
 /**
  * Executes transactions in batches
  */
@@ -12,6 +15,7 @@ export declare class TransactionBatchExecute2 extends TransactionBatchExecute {
     protected createTxMetadataInstance: CreateTxMetadata;
     protected latestBlockhash: web3.BlockhashWithExpiryBlockHeight;
     protected payerKey: web3.PublicKey;
+    private _insertNonceAt;
     /**
      * Creates an instance of TransactionExecute class
      *
@@ -39,10 +43,20 @@ export declare class TransactionBatchExecute2 extends TransactionBatchExecute {
      * Downoad address lookup table from given cluster
      */
     protected downloadAlts2(lookupTableAddresses: web3.PublicKey[]): Promise<void>;
+    /**
+     * Option to include nonce advance instruction
+     *
+     * @param opt
+     */
+    insertNonceAt(opt: InsertNonceAtOpt): void;
     /**
      * Builds a batch of executable transaction instructions
      */
     buildBatch(): Promise<web3.TransactionInstruction[][]>;
+    /**
+     * Builds a batch of executable transaction instructions
+     */
+    buildBatchWithAlts(description: string, generalUtility: GeneralUtility): Promise<MultiTransaction>;
     /**
      * Split transactions
      *
@@ -51,6 +65,10 @@ export declare class TransactionBatchExecute2 extends TransactionBatchExecute {
      * @returns
      */
     protected splitToTransactions(simulationIxs: web3.TransactionInstruction[], dummySigners: DummySigners): Promise<web3.TransactionInstruction[][]>;
+    /**
+     * Generate nonde advance instruction (dummy instruction)
+     */
+    private generateNonceAdvanceIx;
     private getEstimateSize;
     /**
      * Find required signers from instructions

package/dist/src/classes/TransactionBatchExecute2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionBatchExecute2.d.ts","sourceRoot":"","sources":["../../../src/classes/TransactionBatchExecute2.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,uBAAuB;IAWjE,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE;IAChD,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE;IACrD,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IACrC,SAAS,CAAC,wBAAwB,EAAE,gBAAgB;IACpD,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,8BAA8B;IAC9D,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS;IAdpC;;;;;;;OAOG;gBAES,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE,EACtC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAC3C,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,wBAAwB,EAAE,gBAAgB,EAC1C,eAAe,EAAE,IAAI,CAAC,8BAA8B,EACpD,QAAQ,EAAE,IAAI,CAAC,SAAS;IAWpC;;;;OAIG;IACH,MAAM,CAAC,yBAAyB,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAEzF;IAED;;OAEG;cACa,mBAAmB;IAEnC;;OAEG;cACa,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IAI7F;;OAEG;cACa,aAAa,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE;IAMpE;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;IA4B5D;;;;;;OAMG;cACa,mBAAmB,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;IA6CvJ,OAAO,CAAC,eAAe;IAqBvB;;;;;OAKG;IACH,SAAS,CAAC,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,sBAAsB,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE;IAsB1F;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,CAAC,eAAe,EAAE,IAAI,CAAC,8BAA8B,EAAE,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAAE,YAAY,EAAE,YAAY,GAAG,MAAM;IAclK;;;;OAIG;IACI,yBAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,GAAG,IAAI,CAAC,yBAAyB,EAAE;IAmBxG;;;;;OAKG;IACH,OAAO,CAAC,6BAA6B;CAStC"}
+{"version":3,"file":"TransactionBatchExecute2.d.ts","sourceRoot":"","sources":["../../../src/classes/TransactionBatchExecute2.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,uBAAuB;IAajE,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE;IAChD,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE;IACrD,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IACrC,SAAS,CAAC,wBAAwB,EAAE,gBAAgB;IACpD,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,8BAA8B;IAC9D,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS;IAhBpC,OAAO,CAAC,cAAc,CAAwB;IAE9C;;;;;;;OAOG;gBAES,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE,EACtC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAC3C,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,wBAAwB,EAAE,gBAAgB,EAC1C,eAAe,EAAE,IAAI,CAAC,8BAA8B,EACpD,QAAQ,EAAE,IAAI,CAAC,SAAS;IAWpC;;;;OAIG;IACH,MAAM,CAAC,yBAAyB,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAEzF;IAED;;OAEG;cACa,mBAAmB;IAEnC;;OAEG;cACa,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IAI7F;;OAEG;cACa,aAAa,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE;IAMpE;;;;OAIG;IACH,aAAa,CAAC,GAAG,EAAE,gBAAgB;IAInC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;IAmC5D;;OAEG;IACG,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAqCxG;;;;;;OAMG;cACa,mBAAmB,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;IAgDvJ;;OAEG;YACW,sBAAsB;IAWpC,OAAO,CAAC,eAAe;IAqBvB;;;;;OAKG;IACH,SAAS,CAAC,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,sBAAsB,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE;IAsB1F;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,CAAC,eAAe,EAAE,IAAI,CAAC,8BAA8B,EAAE,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAAE,YAAY,EAAE,YAAY,GAAG,MAAM;IAclK;;;;OAIG;IACI,yBAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,GAAG,IAAI,CAAC,yBAAyB,EAAE;IAmBxG;;;;;OAKG;IACH,OAAO,CAAC,6BAA6B;CAStC"}

package/dist/src/classes/TransactionBatchExecute2.js

@@ -36,6 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionBatchExecute2 = void 0;
 const web3 = __importStar(require("@solana/web3.js"));
 const TransactionBatchExecute_1 = require("./TransactionBatchExecute");
+const MultiTransaction_1 = require("./MultiTransaction");
+const functions_1 = require("../functions");
 /**
  * Executes transactions in batches
  */
@@ -57,6 +59,7 @@ class TransactionBatchExecute2 extends TransactionBatchExecute_1.TransactionBatc
         this.createTxMetadataInstance = createTxMetadataInstance;
         this.latestBlockhash = latestBlockhash;
         this.payerKey = payerKey;
+        this._insertNonceAt = {};
     }
     ;
     /**
@@ -83,6 +86,14 @@ class TransactionBatchExecute2 extends TransactionBatchExecute_1.TransactionBatc
             this.alts.push(...alts);
         });
     }
+    /**
+     * Option to include nonce advance instruction
+     *
+     * @param opt
+     */
+    insertNonceAt(opt) {
+        this._insertNonceAt = opt;
+    }
     /**
      * Builds a batch of executable transaction instructions
      */
@@ -97,7 +108,10 @@ class TransactionBatchExecute2 extends TransactionBatchExecute_1.TransactionBatc
             // Batch of actual instructions
             const batch = [];
             let index = 0;
+            let i = 0;
+            const lastIndex = dummyBatches.length - 1;
             for (const dummyIxs of dummyBatches) {
+                const isLastIndex = i == lastIndex;
                 const currentBatch = [];
                 for (const ix of dummyIxs) {
                     // If program id is compute budget, ignore
@@ -106,7 +120,47 @@ class TransactionBatchExecute2 extends TransactionBatchExecute_1.TransactionBatc
                     // Otherwise, include in batch
                     currentBatch.push(this.instructions[index++]);
                 }
+                if (isLastIndex && this._insertNonceAt.onlyEndOfTx) {
+                    currentBatch.push(yield this.generateNonceAdvanceIx(i));
+                }
                 batch.push(currentBatch);
+                i++;
+            }
+            return batch;
+        });
+    }
+    /**
+     * Builds a batch of executable transaction instructions
+     */
+    buildBatchWithAlts(description, generalUtility) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Download address lookup table from given cluster
+            yield this.downloadAlts();
+            // Generate dummy instructions for batch calculation
+            const [simulationIxs, dummySigners] = this.generateSimulationIxs();
+            // Split simulation ixs
+            const dummyBatches = yield this.splitToTransactions(simulationIxs, dummySigners);
+            // Batch of actual instructions
+            const batch = new MultiTransaction_1.MultiTransaction(description, generalUtility, this.latestBlockhash, this.payerKey);
+            let index = 0;
+            let i = 0;
+            const lastIndex = dummyBatches.length - 1;
+            for (const dummyIxs of dummyBatches) {
+                const isLastIndex = i == lastIndex;
+                const currentBatch = [];
+                for (const ix of dummyIxs) {
+                    // If program id is compute budget, ignore
+                    if (ix.programId.equals(web3.ComputeBudgetProgram.programId))
+                        continue;
+                    // Otherwise, include in batch
+                    currentBatch.push(this.instructions[index++]);
+                }
+                if (lastIndex !== 0 && isLastIndex && this._insertNonceAt.onlyEndOfTx) {
+                    currentBatch.push(yield this.generateNonceAdvanceIx(i));
+                }
+                const alts = this.findRequiredAltsForBatch2(currentBatch);
+                batch.push(alts, currentBatch);
+                i++;
             }
             return batch;
         });
@@ -140,7 +194,9 @@ class TransactionBatchExecute2 extends TransactionBatchExecute_1.TransactionBatc
                     const estimateTxSize = this.getEstimateSize([...preIxs, ...batch]);
                     if (estimateTxSize < this.MAX_SIZE)
                         continue;
-                    const txSize = this.calculateTransactionSize(this.latestBlockhash, [...preIxs, ...batch], dummySigners);
+                    // Generate dummy nonce advance (anticipation)
+                    const nonceAdvance = this._insertNonceAt.onlyEndOfTx ? [yield this.generateNonceAdvanceIx(result.length)] : [];
+                    const txSize = this.calculateTransactionSize(this.latestBlockhash, [...preIxs, ...nonceAdvance, ...batch], dummySigners);
                     if (txSize > this.MAX_SIZE) {
                         batch.pop();
                         result.push([...preIxs, ...batch]);
@@ -159,6 +215,21 @@ class TransactionBatchExecute2 extends TransactionBatchExecute_1.TransactionBatc
             return result;
         });
     }
+    /**
+     * Generate nonde advance instruction (dummy instruction)
+     */
+    generateNonceAdvanceIx(index) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const noncePubkey = yield (0, functions_1.generateNonceAddressFromIndex)(this.payerKey, index);
+            // Generate dummy nonce ix
+            return web3.SystemProgram.nonceAdvance({
+                /** Nonce account */
+                noncePubkey,
+                /** Public key of the nonce authority */
+                authorizedPubkey: this.payerKey,
+            });
+        });
+    }
     getEstimateSize(ixs) {
         let length = 0;
         const alts = {};

package/dist/src/classes/Transactions.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="@meteora-ag/dlmm/node_modules/@solana/web3.js" />
 import * as web3 from "@solana/web3.js";
 import { MeteoraClaim, MeteoraClaimAll, MeteoraClose, MeteoraCompound, MeteoraCreatePositionAndDeposit, MeteoraDeposit, MeteoraInitializeBinArrays, MeteoraRebalance, MeteoraWithdraw, Register, TxgenParams, InitializeStorageTokenAccount, MeteoraLimitCloseAutomation, OrcaOpenPosition, OrcaClosePosition, OrcaDeposit, OrcaWithdraw, OrcaClaimRewards, TransactionMetadataResponse } from '../types';
+import { GeneralUtility } from "./GeneralUtility";
+import { MultiTransaction } from "./MultiTransaction";
 export declare class Transactions {
     /**
      * Generate UserPDA
@@ -70,9 +72,9 @@ export declare class Transactions {
      * @param connection The Solana web3 connection object for blockchain interactions.
      * @param payer The public key of the payer for transaction fees.
      * @param params Parameters required
-     * @returns A ResponseWithStatus containing either TransactionMetadataResponse.
+     * @returns Array of transaction instructions (simplified output)
      */
-    meteoraClaimAll({ connection, params, }: TxgenParams<MeteoraClaimAll>): Promise<TransactionMetadataResponse>;
+    meteoraClaimAll({ connection, params, }: TxgenParams<MeteoraClaimAll>, payer: web3.PublicKey, generalUtility: GeneralUtility): Promise<MultiTransaction>;
     /**
      * Creates meteora instruction that closes position.
      *

package/dist/src/classes/Transactions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAiBxC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,eAAe,EACf,+BAA+B,EAC/B,cAAc,EACd,0BAA0B,EAC1B,gBAAgB,EAChB,eAAe,EACf,QAAQ,EAER,WAAW,EACX,6BAA6B,EAC7B,2BAA2B,EAC3B,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AA6BlB,qBAAa,YAAY;IACvB;;;;;;OAMG;IACH,eAAe,CACb,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,IAAI,GAAE,IAAI,CAAC,SAAqB,GAC/B,IAAI,CAAC,SAAS;IAIjB;;;;;;;OAOG;IACG,QAAQ,CAAC,EACb,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAqD/D;;;;;;;OAOG;IACG,+BAA+B,CAAC,EACpC,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,+BAA+B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAkCtF;;;;;;;OAOG;IACG,0BAA0B,CAAC,EAC/B,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,0BAA0B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAwBjF;;;;;;;OAOG;IACG,cAAc,CAAC,EACnB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA+CrE;;;;;;;OAOG;IACG,eAAe,CAAC,EACpB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA+DtE;;;;;;;OAOG;IACG,YAAY,CAAC,EACjB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAiCnE;;;;;;;OAOG;IACK,eAAe,CAAC,EACpB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAqBxE;;;;;;;OAOG;IACG,oBAAoB,CAAC,EACzB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA4B7D,oBAAoB,CAAC,EACzB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,eAAe,CAAC;IA+DzB,qBAAqB,CAAC,EAC1B,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,gBAAgB,CAAC;IA8EhC;;;;;;OAMG;IACG,8BAA8B,CAAC,EACnC,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,6BAA6B,CAAC,GAAG,OAAO,CACrD,2BAA2B,GAAG,EAAE,CACjC;IAgEK,sBAAsB,CAAC,EAC3B,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,2BAA2B,CAAC;IA+H3C,OAAO,CAAC,0BAA0B;IAkClC;;;;;;;OAOG;IACG,gBAAgB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA2DnH;;;;;;;OAOG;IACG,iBAAiB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAkDrH;;;;;;;OAOG;IACG,WAAW,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAuHzG;;;;;;;OAOG;IACG,YAAY,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAyF3G;;;;;;;OAOG;IACG,gBAAgB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAqGpH;AAED,eAAO,MAAM,KAAK,cAAqB,CAAC"}
+{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAiBxC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,eAAe,EACf,+BAA+B,EAC/B,cAAc,EACd,0BAA0B,EAC1B,gBAAgB,EAChB,eAAe,EACf,QAAQ,EAER,WAAW,EACX,6BAA6B,EAC7B,2BAA2B,EAC3B,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AA8BlB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,YAAY;IACvB;;;;;;OAMG;IACH,eAAe,CACb,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,IAAI,GAAE,IAAI,CAAC,SAAqB,GAC/B,IAAI,CAAC,SAAS;IAIjB;;;;;;;OAOG;IACG,QAAQ,CAAC,EACb,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAqD/D;;;;;;;OAOG;IACG,+BAA+B,CAAC,EACpC,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,+BAA+B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAkCtF;;;;;;;OAOG;IACG,0BAA0B,CAAC,EAC/B,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,0BAA0B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAwBjF;;;;;;;OAOG;IACG,cAAc,CAAC,EACnB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA+CrE;;;;;;;OAOG;IACG,eAAe,CAAC,EACpB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA+DtE;;;;;;;OAOG;IACG,YAAY,CAAC,EACjB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAiCnE;;;;;;;OAOG;IACK,eAAe,CAAC,EACpB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAoCpH;;;;;;;OAOG;IACG,oBAAoB,CAAC,EACzB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA4B7D,oBAAoB,CAAC,EACzB,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,eAAe,CAAC;IA+DzB,qBAAqB,CAAC,EAC1B,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,gBAAgB,CAAC;IA8EhC;;;;;;OAMG;IACG,8BAA8B,CAAC,EACnC,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,6BAA6B,CAAC,GAAG,OAAO,CACrD,2BAA2B,GAAG,EAAE,CACjC;IAgEK,sBAAsB,CAAC,EAC3B,UAAU,EACV,MAAM,GACP,EAAE,WAAW,CAAC,2BAA2B,CAAC;IA+H3C,OAAO,CAAC,0BAA0B;IAkClC;;;;;;;OAOG;IACG,gBAAgB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA2DnH;;;;;;;OAOG;IACG,iBAAiB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAkDrH;;;;;;;OAOG;IACG,WAAW,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAuHzG;;;;;;;OAOG;IACG,YAAY,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAyF3G;;;;;;;OAOG;IACG,gBAAgB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAqGpH;AAED,eAAO,MAAM,KAAK,cAAqB,CAAC"}