@streamflow/common 6.1.2 → 6.2.1

package/dist/solana/utils.d.ts

@@ -1,6 +1,6 @@
 import { Mint } from "@solana/spl-token";
 import { SignerWalletAdapter } from "@solana/wallet-adapter-base";
-import { BlockhashWithExpiryBlockHeight, Commitment, Connection, Keypair, PublicKey, Transaction, TransactionInstruction, SignatureStatus, VersionedTransaction, Context } from "@solana/web3.js";
+import { BlockhashWithExpiryBlockHeight, Commitment, Connection, Keypair, PublicKey, Transaction, TransactionInstruction, SignatureStatus, VersionedTransaction, Context, RpcResponseAndContext, SimulatedTransactionResponse } from "@solana/web3.js";
 import { Account, AtaParams, ConfirmationParams, ITransactionSolanaExt } from "./types";
 /**
  * Wrapper function for Solana web3 getProgramAccounts with slightly better call interface
@@ -78,7 +78,7 @@ export declare function executeTransaction(connection: Connection, tx: Transacti
  * @param commitment - optional commitment that will be used for simulation and confirmation
  */
 export declare function sendAndConfirmTransaction(connection: Connection, tx: Transaction | VersionedTransaction, { hash, context, commitment }: ConfirmationParams): Promise<string>;
-export declare function simulateTransaction(connection: Connection, tx: Transaction | VersionedTransaction): Promise<void>;
+export declare function simulateTransaction(connection: Connection, tx: Transaction | VersionedTransaction): Promise<RpcResponseAndContext<SimulatedTransactionResponse>>;
 /**
  * Confirms and validates transaction success once
  * @param connection - Solana client connection
@@ -152,5 +152,5 @@ export declare function prepareBaseInstructions(connection: Connection, { comput
  */
 export declare function getMintAndProgram(connection: Connection, address: PublicKey, commitment?: Commitment): Promise<{
     mint: Mint;
-    programId: PublicKey;
+    tokenProgramId: PublicKey;
 }>;

package/dist/solana/utils.js

@@ -327,7 +327,7 @@ function sendAndConfirmTransaction(connection, tx, _a) {
 exports.sendAndConfirmTransaction = sendAndConfirmTransaction;
 function simulateTransaction(connection, tx) {
     return __awaiter(this, void 0, void 0, function () {
-        var i, res, errMessage;
+        var res, i, errMessage;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -335,7 +335,6 @@ function simulateTransaction(connection, tx) {
                     _a.label = 1;
                 case 1:
                     if (!(i < SIMULATE_TRIES)) return [3 /*break*/, 7];
-                    res = void 0;
                     if (!isTransactionVersioned(tx)) return [3 /*break*/, 3];
                     return [4 /*yield*/, connection.simulateTransaction(tx)];
                 case 2:
@@ -351,12 +350,13 @@ function simulateTransaction(connection, tx) {
                         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 [3 /*break*/, 7];
+                    return [2 /*return*/, res];
                 case 6:
                     i++;
                     return [3 /*break*/, 1];
-                case 7: return [2 /*return*/];
+                case 7: throw new web3_js_1.SendTransactionError("failed to simulate transaction");
             }
         });
     });
@@ -464,7 +464,7 @@ function enrichAtaParams(connection, paramsBatch) {
         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, programId;
+                    var mintStr, tokenProgramId;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
@@ -475,8 +475,8 @@ function enrichAtaParams(connection, paramsBatch) {
                                 if (!!(mintStr in programIdByMint)) return [3 /*break*/, 2];
                                 return [4 /*yield*/, getMintAndProgram(connection, params.mint)];
                             case 1:
-                                programId = (_a.sent()).programId;
-                                programIdByMint[mintStr] = programId;
+                                tokenProgramId = (_a.sent()).tokenProgramId;
+                                programIdByMint[mintStr] = tokenProgramId;
                                 _a.label = 2;
                             case 2:
                                 params.programId = programIdByMint[mintStr];
@@ -581,36 +581,42 @@ function checkOrCreateAtaBatch(connection, owners, mint, invoker, programId) {
             switch (_d.label) {
                 case 0:
                     ixs = [];
-                    atas = [];
-                    _d.label = 1;
+                    if (!!programId) return [3 /*break*/, 2];
+                    return [4 /*yield*/, getMintAndProgram(connection, mint)];
                 case 1:
-                    _d.trys.push([1, 6, 7, 8]);
-                    owners_1 = __values(owners), owners_1_1 = owners_1.next();
+                    programId = (_d.sent()).tokenProgramId;
                     _d.label = 2;
                 case 2:
-                    if (!!owners_1_1.done) return [3 /*break*/, 5];
+                    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 3:
+                case 5:
                     _b.apply(_a, [_d.sent()]);
-                    _d.label = 4;
-                case 4:
-                    owners_1_1 = owners_1.next();
-                    return [3 /*break*/, 2];
-                case 5: return [3 /*break*/, 8];
+                    _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*/, 8];
-                case 7:
+                    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 8: return [4 /*yield*/, connection.getMultipleAccountsInfo(atas)];
-                case 9:
+                case 10: return [4 /*yield*/, connection.getMultipleAccountsInfo(atas)];
+                case 11:
                     response = _d.sent();
                     for (i = 0; i < response.length; i++) {
                         if (!response[i]) {
@@ -663,7 +669,7 @@ function getMintAndProgram(connection, address, commitment) {
                     }
                     return [2 /*return*/, {
                             mint: (0, spl_token_1.unpackMint)(address, accountInfo, programId),
-                            programId: programId,
+                            tokenProgramId: programId,
                         }];
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/common",
-  "version": "6.1.2",
+  "version": "6.2.1",
   "description": "Common utilities and types used by streamflow packages.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "dist/index.js",
@@ -23,7 +23,7 @@
     "lint-config": "eslint --print-config",
     "prepublishOnly": "npm run lint && npm run build"
   },
-  "gitHead": "1104b998070b9c5c70142025ba8aa22895990b10",
+  "gitHead": "bd8cb2daf52fbc3c618c1c7f27d300e98f15d264",
   "devDependencies": {
     "@streamflow/eslint-config": "6.0.0",
     "@types/bn.js": "5.1.1",