@streamflow/common 7.0.0-alpha.2 → 7.0.0-alpha.20

package/dist/cjs/solana/utils.js

@@ -1,64 +1,17 @@
 "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());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMintAndProgram = exports.prepareBaseInstructions = exports.checkOrCreateAtaBatch = exports.createAtaBatch = exports.generateCreateAtaBatchTx = exports.enrichAtaParams = exports.ataBatchExist = exports.ata = exports.confirmAndEnsureTransaction = exports.simulateTransaction = exports.sendAndConfirmTransaction = exports.executeMultipleTransactions = exports.executeTransaction = exports.signAndExecuteTransaction = exports.signTransaction = exports.prepareTransaction = exports.isTransactionVersioned = exports.isSignerKeypair = exports.isSignerWallet = exports.getProgramAccounts = exports.buildSendThrottler = void 0;
-var spl_token_1 = require("@solana/spl-token");
-var web3_js_1 = require("@solana/web3.js");
-var bs58_1 = __importDefault(require("bs58"));
-var p_queue_1 = __importDefault(require("p-queue"));
-var types_js_1 = require("./types.js");
-var utils_js_1 = require("../utils.js");
-var SIMULATE_TRIES = 3;
-var buildSendThrottler = function (sendRate) {
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const bs58_1 = __importDefault(require("bs58"));
+const p_queue_1 = __importDefault(require("p-queue"));
+const types_js_1 = require("./types.js");
+const utils_js_1 = require("../lib/utils.js");
+const SIMULATE_TRIES = 3;
+const buildSendThrottler = (sendRate) => {
     return new p_queue_1.default({ concurrency: sendRate, intervalCap: 1, interval: 1000 });
 };
 exports.buildSendThrottler = buildSendThrottler;
@@ -70,21 +23,18 @@ exports.buildSendThrottler = buildSendThrottler;
  * @param {PublicKey} programId - Solana program ID.
  * @return {Promise<Account[]>} - Array of resulting accounts.
  */
-function getProgramAccounts(connection, wallet, offset, programId) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            return [2 /*return*/, connection === null || connection === void 0 ? void 0 : connection.getProgramAccounts(programId, {
-                    filters: [
-                        {
-                            memcmp: {
-                                offset: offset,
-                                bytes: wallet.toBase58(),
-                            },
-                        },
-                    ],
-                })];
-        });
+async function getProgramAccounts(connection, wallet, offset, programId) {
+    const programAccounts = await connection?.getProgramAccounts(programId, {
+        filters: [
+            {
+                memcmp: {
+                    offset,
+                    bytes: wallet.toBase58(),
+                },
+            },
+        ],
     });
+    return [...programAccounts];
 }
 exports.getProgramAccounts = getProgramAccounts;
 /**
@@ -125,60 +75,37 @@ exports.isTransactionVersioned = isTransactionVersioned;
  * @param partialSigners - optional signers that will be used to partially sign a Transaction
  * @returns Transaction and Blockhash
  */
-function prepareTransaction(connection, ixs, payer, commitment) {
-    var partialSigners = [];
-    for (var _i = 4; _i < arguments.length; _i++) {
-        partialSigners[_i - 4] = arguments[_i];
+async function prepareTransaction(connection, ixs, payer, commitment, ...partialSigners) {
+    if (!payer) {
+        throw new Error("Payer public key is not provided!");
     }
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, hash, context, messageV0, tx, signers;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!payer) {
-                        throw new Error("Payer public key is not provided!");
-                    }
-                    return [4 /*yield*/, connection.getLatestBlockhashAndContext(commitment)];
-                case 1:
-                    _a = _b.sent(), hash = _a.value, context = _a.context;
-                    messageV0 = new web3_js_1.TransactionMessage({
-                        payerKey: payer,
-                        recentBlockhash: hash.blockhash,
-                        instructions: ixs,
-                    }).compileToV0Message();
-                    tx = new web3_js_1.VersionedTransaction(messageV0);
-                    signers = partialSigners.filter(function (item) { return !!item; });
-                    tx.sign(signers);
-                    return [2 /*return*/, { tx: tx, context: context, hash: hash }];
-            }
-        });
-    });
+    const { value: hash, context } = await connection.getLatestBlockhashAndContext(commitment);
+    const messageV0 = new web3_js_1.TransactionMessage({
+        payerKey: payer,
+        recentBlockhash: hash.blockhash,
+        instructions: ixs,
+    }).compileToV0Message();
+    const tx = new web3_js_1.VersionedTransaction(messageV0);
+    const signers = partialSigners.filter((item) => !!item);
+    tx.sign(signers);
+    return { tx, context, hash };
 }
 exports.prepareTransaction = prepareTransaction;
-function signTransaction(invoker, tx) {
-    return __awaiter(this, void 0, void 0, function () {
-        var signedTx;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!isSignerWallet(invoker)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, invoker.signTransaction(tx)];
-                case 1:
-                    signedTx = _a.sent();
-                    return [3 /*break*/, 3];
-                case 2:
-                    if (isTransactionVersioned(tx)) {
-                        tx.sign([invoker]);
-                    }
-                    else {
-                        tx.partialSign(invoker);
-                    }
-                    signedTx = tx;
-                    _a.label = 3;
-                case 3: return [2 /*return*/, signedTx];
-            }
-        });
-    });
+async function signTransaction(invoker, tx) {
+    let signedTx;
+    if (isSignerWallet(invoker)) {
+        signedTx = await invoker.signTransaction(tx);
+    }
+    else {
+        if (isTransactionVersioned(tx)) {
+            tx.sign([invoker]);
+        }
+        else {
+            tx.partialSign(invoker);
+        }
+        signedTx = tx;
+    }
+    return signedTx;
 }
 exports.signTransaction = signTransaction;
 /**
@@ -190,18 +117,9 @@ exports.signTransaction = signTransaction;
  * @param throttleParams - rate or throttler instance to throttle TX sending - to not spam the blockchain too much
  * @returns Transaction signature
  */
-function signAndExecuteTransaction(connection, invoker, tx, confirmationParams, throttleParams) {
-    return __awaiter(this, void 0, void 0, function () {
-        var signedTx;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, signTransaction(invoker, tx)];
-                case 1:
-                    signedTx = _a.sent();
-                    return [2 /*return*/, executeTransaction(connection, signedTx, confirmationParams, throttleParams)];
-            }
-        });
-    });
+async function signAndExecuteTransaction(connection, invoker, tx, confirmationParams, throttleParams) {
+    const signedTx = await signTransaction(invoker, tx);
+    return executeTransaction(connection, signedTx, confirmationParams, throttleParams);
 }
 exports.signAndExecuteTransaction = signAndExecuteTransaction;
 /**
@@ -219,21 +137,12 @@ exports.signAndExecuteTransaction = signAndExecuteTransaction;
  * @param throttleParams - rate or throttler instance to throttle TX sending - to not spam the blockchain too much
  * @returns Transaction signature
  */
-function executeTransaction(connection, tx, confirmationParams, throttleParams) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (tx.signatures.length === 0) {
-                        throw Error("Error with transaction parameters.");
-                    }
-                    return [4 /*yield*/, simulateTransaction(connection, tx)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, sendAndConfirmTransaction(connection, tx, confirmationParams, throttleParams)];
-            }
-        });
-    });
+async function executeTransaction(connection, tx, confirmationParams, throttleParams) {
+    if (tx.signatures.length === 0) {
+        throw Error("Error with transaction parameters.");
+    }
+    await simulateTransaction(connection, tx);
+    return sendAndConfirmTransaction(connection, tx, confirmationParams, throttleParams);
 }
 exports.executeTransaction = executeTransaction;
 /**
@@ -246,18 +155,11 @@ exports.executeTransaction = executeTransaction;
  * @param throttleParams.sendThrottler -  throttler instance
  * @returns Raw Promise Results - should be handled by the consumer and unwrapped accordingly
  */
-function executeMultipleTransactions(connection, txs, confirmationParams, _a) {
-    var _b = _a.sendRate, sendRate = _b === void 0 ? 1 : _b, sendThrottler = _a.sendThrottler;
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_c) {
-            if (!sendThrottler) {
-                sendThrottler = (0, exports.buildSendThrottler)(sendRate);
-            }
-            return [2 /*return*/, Promise.allSettled(txs.map(function (tx) {
-                    return executeTransaction(connection, tx, confirmationParams, { sendRate: sendRate, sendThrottler: sendThrottler });
-                }))];
-        });
-    });
+async function executeMultipleTransactions(connection, txs, confirmationParams, { sendRate = 1, sendThrottler }) {
+    if (!sendThrottler) {
+        sendThrottler = (0, exports.buildSendThrottler)(sendRate);
+    }
+    return Promise.allSettled(txs.map((tx) => executeTransaction(connection, tx, confirmationParams, { sendRate: sendRate, sendThrottler: sendThrottler })));
 }
 exports.executeMultipleTransactions = executeMultipleTransactions;
 /**
@@ -273,137 +175,83 @@ exports.executeMultipleTransactions = executeMultipleTransactions;
  * @param throttleParams.sendRate - rate
  * @param throttleParams.sendThrottler -  throttler instance
  */
-function sendAndConfirmTransaction(connection, tx, _a, _b) {
-    var hash = _a.hash, context = _a.context, commitment = _a.commitment;
-    var _c = _b.sendRate, sendRate = _c === void 0 ? 1 : _c, sendThrottler = _b.sendThrottler;
-    return __awaiter(this, void 0, void 0, function () {
-        var isVersioned, signature, blockheight, transactionSent, rawTransaction, e_1, value, e_2, _e_1;
-        var _this = this;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0:
-                    isVersioned = isTransactionVersioned(tx);
-                    if (isVersioned) {
-                        signature = bs58_1.default.encode(tx.signatures[0]);
-                    }
-                    else {
-                        signature = bs58_1.default.encode(tx.signature);
-                    }
-                    if (!sendThrottler) {
-                        sendThrottler = (0, exports.buildSendThrottler)(sendRate);
-                    }
-                    return [4 /*yield*/, connection.getBlockHeight(commitment)];
-                case 1:
-                    blockheight = _d.sent();
-                    transactionSent = false;
-                    rawTransaction = tx.serialize();
-                    _d.label = 2;
-                case 2:
-                    if (!(blockheight < hash.lastValidBlockHeight + 15)) return [3 /*break*/, 20];
-                    _d.label = 3;
-                case 3:
-                    _d.trys.push([3, 6, , 9]);
-                    if (!(blockheight < hash.lastValidBlockHeight || !transactionSent)) return [3 /*break*/, 5];
-                    return [4 /*yield*/, sendThrottler.add(function () { return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                return [2 /*return*/, connection.sendRawTransaction(rawTransaction, {
-                                        maxRetries: 0,
-                                        minContextSlot: context.slot,
-                                        preflightCommitment: commitment,
-                                        skipPreflight: true,
-                                    })];
-                            });
-                        }); })];
-                case 4:
-                    _d.sent();
-                    transactionSent = true;
-                    _d.label = 5;
-                case 5: return [3 /*break*/, 9];
-                case 6:
-                    e_1 = _d.sent();
-                    if (!(transactionSent ||
-                        (e_1 instanceof web3_js_1.SendTransactionError && e_1.message.includes("Minimum context slot has not been reached")))) return [3 /*break*/, 8];
-                    return [4 /*yield*/, (0, utils_js_1.sleep)(500)];
-                case 7:
-                    _d.sent();
-                    return [3 /*break*/, 2];
-                case 8: throw e_1;
-                case 9: return [4 /*yield*/, (0, utils_js_1.sleep)(500)];
-                case 10:
-                    _d.sent();
-                    _d.label = 11;
-                case 11:
-                    _d.trys.push([11, 13, , 15]);
-                    return [4 /*yield*/, confirmAndEnsureTransaction(connection, signature)];
-                case 12:
-                    value = _d.sent();
-                    if (value) {
-                        return [2 /*return*/, signature];
-                    }
-                    return [3 /*break*/, 15];
-                case 13:
-                    e_2 = _d.sent();
-                    if (e_2 instanceof types_js_1.TransactionFailedError) {
-                        throw e_2;
-                    }
-                    return [4 /*yield*/, (0, utils_js_1.sleep)(500)];
-                case 14:
-                    _d.sent();
-                    return [3 /*break*/, 15];
-                case 15:
-                    _d.trys.push([15, 17, , 19]);
-                    return [4 /*yield*/, connection.getBlockHeight(commitment)];
-                case 16:
-                    blockheight = _d.sent();
-                    return [3 /*break*/, 19];
-                case 17:
-                    _e_1 = _d.sent();
-                    return [4 /*yield*/, (0, utils_js_1.sleep)(500)];
-                case 18:
-                    _d.sent();
-                    return [3 /*break*/, 19];
-                case 19: return [3 /*break*/, 2];
-                case 20: throw new Error("Transaction ".concat(signature, " expired."));
+async function sendAndConfirmTransaction(connection, tx, { hash, context, commitment }, { sendRate = 1, sendThrottler }) {
+    const isVersioned = isTransactionVersioned(tx);
+    let signature;
+    if (isVersioned) {
+        signature = bs58_1.default.encode(tx.signatures[0]);
+    }
+    else {
+        signature = bs58_1.default.encode(tx.signature);
+    }
+    if (!sendThrottler) {
+        sendThrottler = (0, exports.buildSendThrottler)(sendRate);
+    }
+    let blockheight = await connection.getBlockHeight(commitment);
+    let transactionSent = false;
+    const rawTransaction = tx.serialize();
+    while (blockheight < hash.lastValidBlockHeight + 15) {
+        try {
+            if (blockheight < hash.lastValidBlockHeight || !transactionSent) {
+                await sendThrottler.add(async () => connection.sendRawTransaction(rawTransaction, {
+                    maxRetries: 0,
+                    minContextSlot: context.slot,
+                    preflightCommitment: commitment,
+                    skipPreflight: true,
+                }));
+                transactionSent = true;
             }
-        });
-    });
+        }
+        catch (e) {
+            if (transactionSent ||
+                (e instanceof web3_js_1.SendTransactionError && e.message.includes("Minimum context slot has not been reached"))) {
+                await (0, utils_js_1.sleep)(500);
+                continue;
+            }
+            throw e;
+        }
+        await (0, utils_js_1.sleep)(500);
+        try {
+            const value = await confirmAndEnsureTransaction(connection, signature);
+            if (value) {
+                return signature;
+            }
+        }
+        catch (e) {
+            if (e instanceof types_js_1.TransactionFailedError) {
+                throw e;
+            }
+            await (0, utils_js_1.sleep)(500);
+        }
+        try {
+            blockheight = await connection.getBlockHeight(commitment);
+        }
+        catch (_e) {
+            await (0, utils_js_1.sleep)(500);
+        }
+    }
+    throw new Error(`Transaction ${signature} expired.`);
 }
 exports.sendAndConfirmTransaction = sendAndConfirmTransaction;
-function simulateTransaction(connection, tx) {
-    return __awaiter(this, void 0, void 0, function () {
-        var res, i, errMessage;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    i = 0;
-                    _a.label = 1;
-                case 1:
-                    if (!(i < SIMULATE_TRIES)) return [3 /*break*/, 7];
-                    if (!isTransactionVersioned(tx)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, connection.simulateTransaction(tx)];
-                case 2:
-                    res = _a.sent();
-                    return [3 /*break*/, 5];
-                case 3: return [4 /*yield*/, connection.simulateTransaction(tx)];
-                case 4:
-                    res = _a.sent();
-                    _a.label = 5;
-                case 5:
-                    if (res.value.err) {
-                        errMessage = JSON.stringify(res.value.err);
-                        if (!errMessage.includes("BlockhashNotFound") || i === SIMULATE_TRIES - 1) {
-                            throw new web3_js_1.SendTransactionError("failed to simulate transaction: " + errMessage, res.value.logs || undefined);
-                        }
-                        return [3 /*break*/, 6];
-                    }
-                    return [2 /*return*/, res];
-                case 6:
-                    i++;
-                    return [3 /*break*/, 1];
-                case 7: throw new web3_js_1.SendTransactionError("failed to simulate transaction");
+async function simulateTransaction(connection, tx) {
+    let res;
+    for (let i = 0; i < SIMULATE_TRIES; i++) {
+        if (isTransactionVersioned(tx)) {
+            res = await connection.simulateTransaction(tx);
+        }
+        else {
+            res = await connection.simulateTransaction(tx);
+        }
+        if (res.value.err) {
+            const errMessage = JSON.stringify(res.value.err);
+            if (!errMessage.includes("BlockhashNotFound") || i === SIMULATE_TRIES - 1) {
+                throw new web3_js_1.SendTransactionError("failed to simulate transaction: " + errMessage, res.value.logs || undefined);
             }
-        });
-    });
+            continue;
+        }
+        return res;
+    }
+    throw new web3_js_1.SendTransactionError("failed to simulate transaction");
 }
 exports.simulateTransaction = simulateTransaction;
 /**
@@ -413,50 +261,41 @@ exports.simulateTransaction = simulateTransaction;
  * @param ignoreError - return status even if tx failed
  * @returns Transaction Status
  */
-function confirmAndEnsureTransaction(connection, signature, ignoreError) {
-    return __awaiter(this, void 0, void 0, function () {
-        var response, value;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, connection.getSignatureStatus(signature)];
-                case 1:
-                    response = _a.sent();
-                    if (!response) {
-                        return [2 /*return*/, null];
-                    }
-                    value = response.value;
-                    if (!value) {
-                        return [2 /*return*/, null];
-                    }
-                    if (!ignoreError && value.err) {
-                        // That's how solana-web3js does it, `err` here is an object that won't really be handled
-                        throw new types_js_1.TransactionFailedError("Raw transaction ".concat(signature, " failed (").concat(JSON.stringify({ err: value.err }), ")"));
-                    }
-                    switch (connection.commitment) {
-                        case "confirmed":
-                        case "single":
-                        case "singleGossip": {
-                            if (value.confirmationStatus === "processed") {
-                                return [2 /*return*/, null];
-                            }
-                            break;
-                        }
-                        case "finalized":
-                        case "max":
-                        case "root": {
-                            if (value.confirmationStatus === "processed" || value.confirmationStatus === "confirmed") {
-                                return [2 /*return*/, null];
-                            }
-                            break;
-                        }
-                        // exhaust enums to ensure full coverage
-                        case "processed":
-                        case "recent":
-                    }
-                    return [2 /*return*/, value];
+async function confirmAndEnsureTransaction(connection, signature, ignoreError) {
+    const response = await connection.getSignatureStatuses([signature]);
+    if (!response || response.value.length === 0 || response.value[0] === null) {
+        return null;
+    }
+    const value = response.value[0];
+    if (!value) {
+        return null;
+    }
+    if (!ignoreError && value.err) {
+        // That's how solana-web3js does it, `err` here is an object that won't really be handled
+        throw new types_js_1.TransactionFailedError(`Raw transaction ${signature} failed (${JSON.stringify({ err: value.err })})`);
+    }
+    switch (connection.commitment) {
+        case "confirmed":
+        case "single":
+        case "singleGossip": {
+            if (value.confirmationStatus === "processed") {
+                return null;
             }
-        });
-    });
+            break;
+        }
+        case "finalized":
+        case "max":
+        case "root": {
+            if (value.confirmationStatus === "processed" || value.confirmationStatus === "confirmed") {
+                return null;
+            }
+            break;
+        }
+        // exhaust enums to ensure full coverage
+        case "processed":
+        case "recent":
+    }
+    return value;
 }
 exports.confirmAndEnsureTransaction = confirmAndEnsureTransaction;
 /**
@@ -476,60 +315,28 @@ exports.ata = ata;
  * @param paramsBatch - Array of Params for each ATA account: {mint, owner}
  * @returns Array of boolean where each member corresponds to an owner
  */
-function ataBatchExist(connection, paramsBatch) {
-    return __awaiter(this, void 0, void 0, function () {
-        var tokenAccounts, response;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, Promise.all(paramsBatch.map(function (_a) {
-                        var mint = _a.mint, owner = _a.owner, programId = _a.programId;
-                        return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_b) {
-                                return [2 /*return*/, ata(mint, owner, programId)];
-                            });
-                        });
-                    }))];
-                case 1:
-                    tokenAccounts = _a.sent();
-                    return [4 /*yield*/, connection.getMultipleAccountsInfo(tokenAccounts)];
-                case 2:
-                    response = _a.sent();
-                    return [2 /*return*/, response.map(function (accInfo) { return !!accInfo; })];
-            }
-        });
-    });
+async function ataBatchExist(connection, paramsBatch) {
+    const tokenAccounts = await Promise.all(paramsBatch.map(async ({ mint, owner, programId }) => {
+        return ata(mint, owner, programId);
+    }));
+    const response = await connection.getMultipleAccountsInfo(tokenAccounts);
+    return response.map((accInfo) => !!accInfo);
 }
 exports.ataBatchExist = ataBatchExist;
-function enrichAtaParams(connection, paramsBatch) {
-    return __awaiter(this, void 0, void 0, function () {
-        var programIdByMint;
-        var _this = this;
-        return __generator(this, function (_a) {
-            programIdByMint = {};
-            return [2 /*return*/, Promise.all(paramsBatch.map(function (params) { return __awaiter(_this, void 0, void 0, function () {
-                    var mintStr, tokenProgramId;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0:
-                                if (params.programId) {
-                                    return [2 /*return*/, params];
-                                }
-                                mintStr = params.mint.toString();
-                                if (!!(mintStr in programIdByMint)) return [3 /*break*/, 2];
-                                return [4 /*yield*/, getMintAndProgram(connection, params.mint)];
-                            case 1:
-                                tokenProgramId = (_a.sent()).tokenProgramId;
-                                programIdByMint[mintStr] = tokenProgramId;
-                                _a.label = 2;
-                            case 2:
-                                params.programId = programIdByMint[mintStr];
-                                return [2 /*return*/, params];
-                        }
-                    });
-                }); }))];
-        });
-    });
+async function enrichAtaParams(connection, paramsBatch) {
+    const programIdByMint = {};
+    return Promise.all(paramsBatch.map(async (params) => {
+        if (params.programId) {
+            return params;
+        }
+        const mintStr = params.mint.toString();
+        if (!(mintStr in programIdByMint)) {
+            const { tokenProgramId } = await getMintAndProgram(connection, params.mint);
+            programIdByMint[mintStr] = tokenProgramId;
+        }
+        params.programId = programIdByMint[mintStr];
+        return params;
+    }));
 }
 exports.enrichAtaParams = enrichAtaParams;
 /**
@@ -540,45 +347,19 @@ exports.enrichAtaParams = enrichAtaParams;
  * @param commitment - optional commitment that will be used to fetch Blockhash
  * @returns Unsigned Transaction with create ATA instructions
  */
-function generateCreateAtaBatchTx(connection, payer, paramsBatch, commitment) {
-    return __awaiter(this, void 0, void 0, function () {
-        var ixs, _a, hash, context, messageV0, tx;
-        var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, enrichAtaParams(connection, paramsBatch)];
-                case 1:
-                    paramsBatch = _b.sent();
-                    return [4 /*yield*/, Promise.all(paramsBatch.map(function (_a) {
-                            var mint = _a.mint, owner = _a.owner, programId = _a.programId;
-                            return __awaiter(_this, void 0, void 0, function () {
-                                var _b, _c;
-                                return __generator(this, function (_d) {
-                                    switch (_d.label) {
-                                        case 0:
-                                            _b = spl_token_1.createAssociatedTokenAccountInstruction;
-                                            _c = [payer];
-                                            return [4 /*yield*/, ata(mint, owner)];
-                                        case 1: return [2 /*return*/, _b.apply(void 0, _c.concat([_d.sent(), owner, mint, programId]))];
-                                    }
-                                });
-                            });
-                        }))];
-                case 2:
-                    ixs = _b.sent();
-                    return [4 /*yield*/, connection.getLatestBlockhashAndContext({ commitment: commitment })];
-                case 3:
-                    _a = _b.sent(), hash = _a.value, context = _a.context;
-                    messageV0 = new web3_js_1.TransactionMessage({
-                        payerKey: payer,
-                        recentBlockhash: hash.blockhash,
-                        instructions: ixs,
-                    }).compileToV0Message();
-                    tx = new web3_js_1.VersionedTransaction(messageV0);
-                    return [2 /*return*/, { tx: tx, hash: hash, context: context }];
-            }
-        });
-    });
+async function generateCreateAtaBatchTx(connection, payer, paramsBatch, commitment) {
+    paramsBatch = await enrichAtaParams(connection, paramsBatch);
+    const ixs = await Promise.all(paramsBatch.map(async ({ mint, owner, programId }) => {
+        return (0, spl_token_1.createAssociatedTokenAccountInstruction)(payer, await ata(mint, owner), owner, mint, programId);
+    }));
+    const { value: hash, context } = await connection.getLatestBlockhashAndContext({ commitment });
+    const messageV0 = new web3_js_1.TransactionMessage({
+        payerKey: payer,
+        recentBlockhash: hash.blockhash,
+        instructions: ixs,
+    }).compileToV0Message();
+    const tx = new web3_js_1.VersionedTransaction(messageV0);
+    return { tx, hash, context };
 }
 exports.generateCreateAtaBatchTx = generateCreateAtaBatchTx;
 /**
@@ -590,23 +371,9 @@ exports.generateCreateAtaBatchTx = generateCreateAtaBatchTx;
  * @param rate - throttle rate for tx sending
  * @returns Transaction signature
  */
-function createAtaBatch(connection, invoker, paramsBatch, commitment, rate) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, tx, hash, context, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0:
-                    _b = generateCreateAtaBatchTx;
-                    _c = [connection,
-                        invoker.publicKey];
-                    return [4 /*yield*/, enrichAtaParams(connection, paramsBatch)];
-                case 1: return [4 /*yield*/, _b.apply(void 0, _c.concat([_d.sent(), commitment]))];
-                case 2:
-                    _a = _d.sent(), tx = _a.tx, hash = _a.hash, context = _a.context;
-                    return [2 /*return*/, signAndExecuteTransaction(connection, invoker, tx, { hash: hash, context: context, commitment: commitment }, { sendRate: rate })];
-            }
-        });
-    });
+async function createAtaBatch(connection, invoker, paramsBatch, commitment, rate) {
+    const { tx, hash, context } = await generateCreateAtaBatchTx(connection, invoker.publicKey, await enrichAtaParams(connection, paramsBatch), commitment);
+    return signAndExecuteTransaction(connection, invoker, tx, { hash, context, commitment }, { sendRate: rate });
 }
 exports.createAtaBatch = createAtaBatch;
 /**
@@ -618,60 +385,23 @@ exports.createAtaBatch = createAtaBatch;
  * @param programId - Program ID of the Mint
  * @returns Array of Transaction Instructions that should be added to a transaction
  */
-function checkOrCreateAtaBatch(connection, owners, mint, invoker, programId) {
-    return __awaiter(this, void 0, void 0, function () {
-        var ixs, atas, owners_1, owners_1_1, owner, _a, _b, e_3_1, response, i;
-        var e_3, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0:
-                    ixs = [];
-                    if (!!programId) return [3 /*break*/, 2];
-                    return [4 /*yield*/, getMintAndProgram(connection, mint)];
-                case 1:
-                    programId = (_d.sent()).tokenProgramId;
-                    _d.label = 2;
-                case 2:
-                    atas = [];
-                    _d.label = 3;
-                case 3:
-                    _d.trys.push([3, 8, 9, 10]);
-                    owners_1 = __values(owners), owners_1_1 = owners_1.next();
-                    _d.label = 4;
-                case 4:
-                    if (!!owners_1_1.done) return [3 /*break*/, 7];
-                    owner = owners_1_1.value;
-                    _b = (_a = atas).push;
-                    return [4 /*yield*/, ata(mint, owner, programId)];
-                case 5:
-                    _b.apply(_a, [_d.sent()]);
-                    _d.label = 6;
-                case 6:
-                    owners_1_1 = owners_1.next();
-                    return [3 /*break*/, 4];
-                case 7: return [3 /*break*/, 10];
-                case 8:
-                    e_3_1 = _d.sent();
-                    e_3 = { error: e_3_1 };
-                    return [3 /*break*/, 10];
-                case 9:
-                    try {
-                        if (owners_1_1 && !owners_1_1.done && (_c = owners_1.return)) _c.call(owners_1);
-                    }
-                    finally { if (e_3) throw e_3.error; }
-                    return [7 /*endfinally*/];
-                case 10: return [4 /*yield*/, connection.getMultipleAccountsInfo(atas)];
-                case 11:
-                    response = _d.sent();
-                    for (i = 0; i < response.length; i++) {
-                        if (!response[i]) {
-                            ixs.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(invoker.publicKey, atas[i], owners[i], mint, programId));
-                        }
-                    }
-                    return [2 /*return*/, ixs];
-            }
-        });
-    });
+async function checkOrCreateAtaBatch(connection, owners, mint, invoker, programId) {
+    const ixs = [];
+    if (!programId) {
+        programId = (await getMintAndProgram(connection, mint)).tokenProgramId;
+    }
+    // TODO: optimize fetching and maps/arrays
+    const atas = [];
+    for (const owner of owners) {
+        atas.push(await ata(mint, owner, programId));
+    }
+    const response = await connection.getMultipleAccountsInfo(atas);
+    for (let i = 0; i < response.length; i++) {
+        if (!response[i]) {
+            ixs.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(invoker.publicKey, atas[i], owners[i], mint, programId));
+        }
+    }
+    return ixs;
 }
 exports.checkOrCreateAtaBatch = checkOrCreateAtaBatch;
 /**
@@ -679,9 +409,8 @@ exports.checkOrCreateAtaBatch = checkOrCreateAtaBatch;
  * - sets compute price if `computePrice` is provided
  * - sets compute limit if `computeLimit` is provided
  */
-function prepareBaseInstructions(connection, _a) {
-    var computePrice = _a.computePrice, computeLimit = _a.computeLimit;
-    var ixs = [];
+function prepareBaseInstructions(connection, { computePrice, computeLimit }) {
+    const ixs = [];
     if (computePrice) {
         ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: computePrice }));
     }
@@ -700,24 +429,15 @@ exports.prepareBaseInstructions = prepareBaseInstructions;
  *
  * @return Mint information
  */
-function getMintAndProgram(connection, address, commitment) {
-    return __awaiter(this, void 0, void 0, function () {
-        var accountInfo, programId;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, connection.getAccountInfo(address, commitment)];
-                case 1:
-                    accountInfo = _a.sent();
-                    programId = accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.owner;
-                    if (!(programId === null || programId === void 0 ? void 0 : programId.equals(spl_token_1.TOKEN_PROGRAM_ID)) && !(programId === null || programId === void 0 ? void 0 : programId.equals(spl_token_1.TOKEN_2022_PROGRAM_ID))) {
-                        programId = spl_token_1.TOKEN_PROGRAM_ID;
-                    }
-                    return [2 /*return*/, {
-                            mint: (0, spl_token_1.unpackMint)(address, accountInfo, programId),
-                            tokenProgramId: programId,
-                        }];
-            }
-        });
-    });
+async function getMintAndProgram(connection, address, commitment) {
+    const accountInfo = await connection.getAccountInfo(address, commitment);
+    let programId = accountInfo?.owner;
+    if (!programId?.equals(spl_token_1.TOKEN_PROGRAM_ID) && !programId?.equals(spl_token_1.TOKEN_2022_PROGRAM_ID)) {
+        programId = spl_token_1.TOKEN_PROGRAM_ID;
+    }
+    return {
+        mint: (0, spl_token_1.unpackMint)(address, accountInfo, programId),
+        tokenProgramId: programId,
+    };
 }
 exports.getMintAndProgram = getMintAndProgram;