@solana-mobile/dapp-store-cli 0.9.1 → 0.9.2

package/lib/CliUtils.js

@@ -159,7 +159,7 @@ export var Constants = function Constants() {
     "use strict";
     _class_call_check(this, Constants);
 };
-_define_property(Constants, "CLI_VERSION", "0.9.1");
+_define_property(Constants, "CLI_VERSION", "0.9.2");
 _define_property(Constants, "CONFIG_FILE_NAME", "config.yaml");
 _define_property(Constants, "DEFAULT_RPC_DEVNET", "https://api.devnet.solana.com");
 _define_property(Constants, "DEFAULT_PRIORITY_FEE", 500000);

package/lib/commands/create/CreateCliApp.js

@@ -123,12 +123,13 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { createApp } from "@solana-mobile/dapp-store-publishing-tools";
-import { Connection, Keypair, PublicKey, sendAndConfirmTransaction } from "@solana/web3.js";
-import { Constants, getMetaplexInstance, showMessage } from "../../CliUtils.js";
+import { Connection, Keypair, PublicKey } from "@solana/web3.js";
+import { Constants, getMetaplexInstance } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
+import { sendAndConfirmTransaction } from "../utils.js";
 var createAppNft = function() {
     var _ref = _async_to_generator(function(param) {
-        var appDetails, connection, publisherMintAddress, publisher, storageParams, priorityFeeLamports, mintAddress, metaplex, txBuilder, maxTries, i, blockhash, tx, txSig, e, _e_message, errorMsg, retryMsg;
+        var appDetails, connection, publisherMintAddress, publisher, storageParams, priorityFeeLamports, mintAddress, metaplex, txBuilder, response;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -151,71 +152,19 @@ var createAppNft = function() {
                 case 1:
                     txBuilder = _state.sent();
                     console.info("App NFT data upload complete\nSigning transaction now");
-                    maxTries = 8;
-                    i = 1;
-                    _state.label = 2;
-                case 2:
-                    if (!(i <= maxTries)) return [
-                        3,
-                        8
-                    ];
-                    _state.label = 3;
-                case 3:
-                    _state.trys.push([
-                        3,
-                        6,
-                        ,
-                        7
-                    ]);
                     return [
                         4,
-                        connection.getLatestBlockhashAndContext()
+                        sendAndConfirmTransaction(metaplex, txBuilder)
                     ];
-                case 4:
-                    blockhash = _state.sent();
-                    tx = txBuilder.toTransaction(blockhash.value);
-                    tx.sign(mintAddress, publisher);
-                    return [
-                        4,
-                        sendAndConfirmTransaction(connection, tx, [
-                            publisher,
-                            mintAddress
-                        ], {
-                            commitment: "confirmed",
-                            minContextSlot: blockhash.context.slot
-                        })
-                    ];
-                case 5:
-                    txSig = _state.sent();
+                case 2:
+                    response = _state.sent().response;
                     return [
                         2,
                         {
                             appAddress: mintAddress.publicKey.toBase58(),
-                            transactionSignature: txSig
+                            transactionSignature: response.signature
                         }
                     ];
-                case 6:
-                    e = _state.sent();
-                    errorMsg = (_e_message = e === null || e === void 0 ? void 0 : e.message) !== null && _e_message !== void 0 ? _e_message : "";
-                    if (i == maxTries) {
-                        showMessage("Transaction Failure", errorMsg, "error");
-                        process.exit(-1);
-                    } else {
-                        retryMsg = errorMsg + "\nWill Retry minting app NFT.";
-                        showMessage("Transaction Failure", retryMsg, "standard");
-                    }
-                    return [
-                        3,
-                        7
-                    ];
-                case 7:
-                    i++;
-                    return [
-                        3,
-                        2
-                    ];
-                case 8:
-                    throw new Error("Unable to mint app NFT");
             }
         });
     });
@@ -231,8 +180,7 @@ export var createAppCommand = function() {
                 case 0:
                     signer = param.signer, url = param.url, dryRun = param.dryRun, publisherMintAddress = param.publisherMintAddress, storageParams = param.storageParams, _param_priorityFeeLamports = param.priorityFeeLamports, priorityFeeLamports = _param_priorityFeeLamports === void 0 ? Constants.DEFAULT_PRIORITY_FEE : _param_priorityFeeLamports;
                     connection = new Connection(url, {
-                        commitment: "confirmed",
-                        disableRetryOnRateLimit: true
+                        commitment: "confirmed"
                     });
                     return [
                         4,

package/lib/commands/create/CreateCliPublisher.js

@@ -123,12 +123,13 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { createPublisher } from "@solana-mobile/dapp-store-publishing-tools";
-import { Connection, Keypair, sendAndConfirmTransaction } from "@solana/web3.js";
-import { Constants, getMetaplexInstance, showMessage } from "../../CliUtils.js";
+import { Connection, Keypair } from "@solana/web3.js";
+import { Constants, getMetaplexInstance } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
+import { sendAndConfirmTransaction } from "../utils.js";
 var createPublisherNft = function() {
     var _ref = _async_to_generator(function(param) {
-        var connection, publisher, publisherDetails, storageParams, priorityFeeLamports, mintAddress, metaplex, txBuilder, maxTries, i, blockhash, tx, txSig, e, _e_message, errorMsg, retryMsg;
+        var connection, publisher, publisherDetails, storageParams, priorityFeeLamports, mintAddress, metaplex, txBuilder, response;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -150,71 +151,19 @@ var createPublisherNft = function() {
                 case 1:
                     txBuilder = _state.sent();
                     console.info("Publisher NFT data upload complete\nSigning transaction now");
-                    maxTries = 8;
-                    i = 1;
-                    _state.label = 2;
-                case 2:
-                    if (!(i <= maxTries)) return [
-                        3,
-                        8
-                    ];
-                    _state.label = 3;
-                case 3:
-                    _state.trys.push([
-                        3,
-                        6,
-                        ,
-                        7
-                    ]);
                     return [
                         4,
-                        connection.getLatestBlockhashAndContext()
-                    ];
-                case 4:
-                    blockhash = _state.sent();
-                    tx = txBuilder.toTransaction(blockhash.value);
-                    tx.sign(mintAddress, publisher);
-                    return [
-                        4,
-                        sendAndConfirmTransaction(connection, tx, [
-                            publisher,
-                            mintAddress
-                        ], {
-                            commitment: "confirmed",
-                            minContextSlot: blockhash.context.slot
-                        })
+                        sendAndConfirmTransaction(metaplex, txBuilder)
                     ];
-                case 5:
-                    txSig = _state.sent();
+                case 2:
+                    response = _state.sent().response;
                     return [
                         2,
                         {
                             publisherAddress: mintAddress.publicKey.toBase58(),
-                            transactionSignature: txSig
+                            transactionSignature: response.signature
                         }
                     ];
-                case 6:
-                    e = _state.sent();
-                    errorMsg = (_e_message = e === null || e === void 0 ? void 0 : e.message) !== null && _e_message !== void 0 ? _e_message : "";
-                    if (i == maxTries) {
-                        showMessage("Transaction Failure", errorMsg, "error");
-                        process.exit(-1);
-                    } else {
-                        retryMsg = errorMsg + "\nWill Retry minting publisher.";
-                        showMessage("Transaction Failure", retryMsg, "standard");
-                    }
-                    return [
-                        3,
-                        7
-                    ];
-                case 7:
-                    i++;
-                    return [
-                        3,
-                        2
-                    ];
-                case 8:
-                    throw new Error("Unable to mint publisher NFT");
             }
         });
     });
@@ -230,8 +179,7 @@ export var createPublisherCommand = function() {
                 case 0:
                     signer = param.signer, url = param.url, dryRun = param.dryRun, storageParams = param.storageParams, _param_priorityFeeLamports = param.priorityFeeLamports, priorityFeeLamports = _param_priorityFeeLamports === void 0 ? Constants.DEFAULT_PRIORITY_FEE : _param_priorityFeeLamports;
                     connection = new Connection(url, {
-                        commitment: "confirmed",
-                        disableRetryOnRateLimit: true
+                        commitment: "confirmed"
                     });
                     return [
                         4,

package/lib/commands/create/CreateCliRelease.js

@@ -151,14 +151,15 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { createRelease } from "@solana-mobile/dapp-store-publishing-tools";
-import { Connection, Keypair, PublicKey, sendAndConfirmTransaction } from "@solana/web3.js";
+import { Connection, Keypair, PublicKey } from "@solana/web3.js";
 import fs from "fs";
 import { createHash } from "crypto";
-import { Constants, getMetaplexInstance, showMessage } from "../../CliUtils.js";
+import { Constants, getMetaplexInstance } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
+import { sendAndConfirmTransaction } from "../utils.js";
 var createReleaseNft = function() {
     var _ref = _async_to_generator(function(param) {
-        var appMintAddress, releaseDetails, appDetails, publisherDetails, connection, publisher, storageParams, priorityFeeLamports, releaseMintAddress, metaplex, txBuilder, maxTries, i, blockhash, tx, txSig, e, _e_message, errorMsg, retryMsg;
+        var appMintAddress, releaseDetails, appDetails, publisherDetails, connection, publisher, storageParams, priorityFeeLamports, releaseMintAddress, metaplex, txBuilder, response;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -183,71 +184,19 @@ var createReleaseNft = function() {
                 case 1:
                     txBuilder = _state.sent().txBuilder;
                     console.info("Release NFT data upload complete\nSigning transaction now");
-                    maxTries = 8;
-                    i = 1;
-                    _state.label = 2;
-                case 2:
-                    if (!(i <= maxTries)) return [
-                        3,
-                        8
-                    ];
-                    _state.label = 3;
-                case 3:
-                    _state.trys.push([
-                        3,
-                        6,
-                        ,
-                        7
-                    ]);
                     return [
                         4,
-                        connection.getLatestBlockhashAndContext()
+                        sendAndConfirmTransaction(metaplex, txBuilder)
                     ];
-                case 4:
-                    blockhash = _state.sent();
-                    tx = txBuilder.toTransaction(blockhash.value);
-                    tx.sign(releaseMintAddress, publisher);
-                    return [
-                        4,
-                        sendAndConfirmTransaction(connection, tx, [
-                            publisher,
-                            releaseMintAddress
-                        ], {
-                            commitment: "confirmed",
-                            minContextSlot: blockhash.context.slot
-                        })
-                    ];
-                case 5:
-                    txSig = _state.sent();
+                case 2:
+                    response = _state.sent().response;
                     return [
                         2,
                         {
                             releaseAddress: releaseMintAddress.publicKey.toBase58(),
-                            transactionSignature: txSig
+                            transactionSignature: response.signature
                         }
                     ];
-                case 6:
-                    e = _state.sent();
-                    errorMsg = (_e_message = e === null || e === void 0 ? void 0 : e.message) !== null && _e_message !== void 0 ? _e_message : "";
-                    if (i == maxTries) {
-                        showMessage("Transaction Failure", errorMsg, "error");
-                        process.exit(-1);
-                    } else {
-                        retryMsg = errorMsg + "\nWill Retry minting release NFT";
-                        showMessage("Transaction Failure", retryMsg, "standard");
-                    }
-                    return [
-                        3,
-                        7
-                    ];
-                case 7:
-                    i++;
-                    return [
-                        3,
-                        2
-                    ];
-                case 8:
-                    throw new Error("Unable to mint release NFT");
             }
         });
     });
@@ -263,8 +212,7 @@ export var createReleaseCommand = function() {
                 case 0:
                     appMintAddress = param.appMintAddress, buildToolsPath = param.buildToolsPath, signer = param.signer, url = param.url, _param_dryRun = param.dryRun, dryRun = _param_dryRun === void 0 ? false : _param_dryRun, storageParams = param.storageParams, _param_priorityFeeLamports = param.priorityFeeLamports, priorityFeeLamports = _param_priorityFeeLamports === void 0 ? Constants.DEFAULT_PRIORITY_FEE : _param_priorityFeeLamports;
                     connection = new Connection(url, {
-                        commitment: "confirmed",
-                        disableRetryOnRateLimit: true
+                        commitment: "confirmed"
                     });
                     return [
                         4,

package/lib/commands/utils.js

@@ -0,0 +1,193 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    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(_)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
+        };
+    }
+}
+import { FailedToConfirmTransactionError } from "@metaplex-foundation/js";
+import { TransactionExpiredBlockheightExceededError } from "@solana/web3.js";
+export function sendAndConfirmTransaction(metaplex, builder) {
+    return _sendAndConfirmTransaction.apply(this, arguments);
+}
+function _sendAndConfirmTransaction() {
+    _sendAndConfirmTransaction = _async_to_generator(function(metaplex, builder) {
+        var i, e;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    i = 0;
+                    _state.label = 1;
+                case 1:
+                    if (!(i < 10)) return [
+                        3,
+                        6
+                    ];
+                    _state.label = 2;
+                case 2:
+                    _state.trys.push([
+                        2,
+                        4,
+                        ,
+                        5
+                    ]);
+                    return [
+                        4,
+                        builder.sendAndConfirm(metaplex)
+                    ];
+                case 3:
+                    return [
+                        2,
+                        _state.sent()
+                    ];
+                case 4:
+                    e = _state.sent();
+                    if (isTransientError(e)) {
+                        return [
+                            3,
+                            5
+                        ];
+                    }
+                    throw e;
+                case 5:
+                    i++;
+                    return [
+                        3,
+                        1
+                    ];
+                case 6:
+                    throw new Error("Unable to send transaction. Please try later.");
+            }
+        });
+    });
+    return _sendAndConfirmTransaction.apply(this, arguments);
+}
+function isTransientError(e) {
+    var _e_cause;
+    var _e_cause_message;
+    return _instanceof(e, FailedToConfirmTransactionError) && (_instanceof(e.cause, TransactionExpiredBlockheightExceededError) || /blockhash not found/i.test((_e_cause_message = (_e_cause = e.cause) === null || _e_cause === void 0 ? void 0 : _e_cause.message) !== null && _e_cause_message !== void 0 ? _e_cause_message : ""));
+}

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -53,8 +53,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.321.1",
     "@metaplex-foundation/js-plugin-aws": "^0.20.0",
-    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.9.1",
-    "@solana/web3.js": "1.68.0",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.9.2",
+    "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",
     "boxen": "^7.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -46,8 +46,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.321.1",
     "@metaplex-foundation/js-plugin-aws": "^0.20.0",
-    "@solana-mobile/dapp-store-publishing-tools": "0.9.1",
-    "@solana/web3.js": "1.68.0",
+    "@solana-mobile/dapp-store-publishing-tools": "0.9.2",
+    "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",
     "boxen": "^7.0.1",

package/src/CliUtils.ts

@@ -18,7 +18,7 @@ import { awsStorage } from "@metaplex-foundation/js-plugin-aws";
 import { S3StorageManager } from "./config/index.js";
 
 export class Constants {
-  static CLI_VERSION = "0.9.1";
+  static CLI_VERSION = "0.9.2";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
   static DEFAULT_PRIORITY_FEE = 500000;

package/src/commands/create/CreateCliApp.ts

@@ -4,15 +4,14 @@ import {
   Connection,
   Keypair,
   PublicKey,
-  sendAndConfirmTransaction,
 } from "@solana/web3.js";
 
 import {
   Constants,
   getMetaplexInstance,
-  showMessage,
 } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
+import { sendAndConfirmTransaction } from "../utils.js";
 
 const createAppNft = async (
   {
@@ -46,33 +45,13 @@ const createAppNft = async (
   );
 
   console.info(`App NFT data upload complete\nSigning transaction now`);
-  const maxTries = 8;
-  for (let i = 1; i <= maxTries; i++) {
-    try {
-      const blockhash = await connection.getLatestBlockhashAndContext();
-      const tx = txBuilder.toTransaction(blockhash.value);
-      tx.sign(mintAddress, publisher);
 
-      const txSig = await sendAndConfirmTransaction(connection, tx, [
-        publisher,
-        mintAddress,
-      ], {
-        commitment: "confirmed",
-        minContextSlot: blockhash.context.slot
-      });
-      return { appAddress: mintAddress.publicKey.toBase58(), transactionSignature: txSig };
-    } catch (e) {
-      const errorMsg = (e as Error | null)?.message ?? "";
-      if (i == maxTries) {
-        showMessage("Transaction Failure", errorMsg, "error");
-        process.exit(-1)
-      } else {
-        const retryMsg = errorMsg + "\nWill Retry minting app NFT."
-        showMessage("Transaction Failure", retryMsg, "standard");
-      }
-    }
-  }
-  throw new Error("Unable to mint app NFT");
+  const { response } = await sendAndConfirmTransaction(metaplex, txBuilder);
+
+  return {
+    appAddress: mintAddress.publicKey.toBase58(),
+    transactionSignature: response.signature,
+  };
 };
 
 type CreateAppCommandInput = {
@@ -96,7 +75,6 @@ export const createAppCommand = async ({
     url,
     {
       commitment: "confirmed",
-      disableRetryOnRateLimit: true,
     }
   );
 

package/src/commands/create/CreateCliPublisher.ts

@@ -3,15 +3,14 @@ import { createPublisher } from "@solana-mobile/dapp-store-publishing-tools";
 import {
   Connection,
   Keypair,
-  sendAndConfirmTransaction,
 } from "@solana/web3.js";
 
 import {
   Constants,
   getMetaplexInstance,
-  showMessage,
 } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
+import { sendAndConfirmTransaction } from "../utils.js";
 
 const createPublisherNft = async (
   {
@@ -37,33 +36,13 @@ const createPublisherNft = async (
   );
 
   console.info(`Publisher NFT data upload complete\nSigning transaction now`);
-  const maxTries = 8;
-  for (let i = 1; i <= maxTries; i++) {
-    try {
-      const blockhash = await connection.getLatestBlockhashAndContext();
-      const tx = txBuilder.toTransaction(blockhash.value);
-      tx.sign(mintAddress, publisher);
 
-      const txSig = await sendAndConfirmTransaction(connection, tx, [
-        publisher,
-        mintAddress,
-      ], {
-        commitment: "confirmed",
-        minContextSlot: blockhash.context.slot
-      });
-      return { publisherAddress: mintAddress.publicKey.toBase58(), transactionSignature: txSig};
-    } catch (e) {
-      const errorMsg = (e as Error | null)?.message ?? "";
-      if (i == maxTries) {
-        showMessage("Transaction Failure", errorMsg, "error");
-        process.exit(-1)
-      } else {
-        const retryMsg = errorMsg + "\nWill Retry minting publisher."
-        showMessage("Transaction Failure", retryMsg, "standard");
-      }
-    }
-  }
-  throw new Error("Unable to mint publisher NFT");
+  const { response } = await sendAndConfirmTransaction(metaplex, txBuilder);
+
+  return {
+    publisherAddress: mintAddress.publicKey.toBase58(),
+    transactionSignature: response.signature,
+  };
 };
 
 export const createPublisherCommand = async ({
@@ -83,7 +62,6 @@ export const createPublisherCommand = async ({
     url,
     {
       commitment: "confirmed",
-      disableRetryOnRateLimit: true,
     }
   );
 

package/src/commands/create/CreateCliRelease.ts

@@ -8,16 +8,15 @@ import {
   Connection,
   Keypair,
   PublicKey,
-  sendAndConfirmTransaction,
 } from "@solana/web3.js";
 import fs from "fs";
 import { createHash } from "crypto";
 import {
   Constants,
   getMetaplexInstance,
-  showMessage
 } from "../../CliUtils.js";
 import { PublishDetails, loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
+import { sendAndConfirmTransaction } from "../utils.js";
 
 type CreateReleaseCommandInput = {
   appMintAddress: string;
@@ -67,32 +66,13 @@ const createReleaseNft = async ({
   );
 
   console.info(`Release NFT data upload complete\nSigning transaction now`);
-  const maxTries = 8;
-  for (let i = 1; i <= maxTries; i++) {
-    try {
-      const blockhash = await connection.getLatestBlockhashAndContext();
-      const tx = txBuilder.toTransaction(blockhash.value);
-      tx.sign(releaseMintAddress, publisher);
-      const txSig = await sendAndConfirmTransaction(connection, tx, [
-        publisher,
-        releaseMintAddress,
-      ], {
-        commitment: "confirmed",
-        minContextSlot: blockhash.context.slot,
-      });
-      return { releaseAddress: releaseMintAddress.publicKey.toBase58(), transactionSignature: txSig };
-    } catch (e) {
-      const errorMsg = (e as Error | null)?.message ?? "";
-      if (i == maxTries) {
-        showMessage("Transaction Failure", errorMsg, "error");
-        process.exit(-1)
-      } else {
-        const retryMsg = errorMsg + "\nWill Retry minting release NFT"
-        showMessage("Transaction Failure", retryMsg, "standard");
-      }
-    }
-  }
-  throw new Error("Unable to mint release NFT");
+
+  const { response } = await sendAndConfirmTransaction(metaplex, txBuilder);
+
+  return {
+    releaseAddress: releaseMintAddress.publicKey.toBase58(),
+    transactionSignature: response.signature,
+  };
 };
 
 export const createReleaseCommand = async ({
@@ -108,7 +88,6 @@ export const createReleaseCommand = async ({
     url,
     {
       commitment: "confirmed",
-      disableRetryOnRateLimit: true,
     }
   );
 

package/src/commands/utils.ts

@@ -0,0 +1,33 @@
+import {
+  type Metaplex,
+  type TransactionBuilder,
+  FailedToConfirmTransactionError,
+} from "@metaplex-foundation/js";
+import { TransactionExpiredBlockheightExceededError } from "@solana/web3.js";
+
+export async function sendAndConfirmTransaction(
+  metaplex: Metaplex,
+  builder: TransactionBuilder
+): ReturnType<TransactionBuilder["sendAndConfirm"]> {
+  for (let i = 0; i < 10; i++) {
+    try {
+      return await builder.sendAndConfirm(metaplex);
+    } catch (e: unknown) {
+      if (isTransientError(e)) {
+        continue;
+      }
+
+      throw e;
+    }
+  }
+
+  throw new Error("Unable to send transaction. Please try later.");
+}
+
+function isTransientError(e: unknown): boolean {
+  return (
+    e instanceof FailedToConfirmTransactionError &&
+    (e.cause instanceof TransactionExpiredBlockheightExceededError ||
+      /blockhash not found/i.test(e.cause?.message ?? ""))
+  );
+}