@solana-mobile/dapp-store-cli 0.7.3 → 0.8.1

package/lib/CliSetup.js

@@ -126,7 +126,8 @@ import { Command } from "commander";
 import { validateCommand } from "./commands/index.js";
 import { createAppCommand, createPublisherCommand, createReleaseCommand } from "./commands/create/index.js";
 import { publishRemoveCommand, publishSubmitCommand, publishSupportCommand, publishUpdateCommand } from "./commands/publish/index.js";
-import { checkForSelfUpdate, checkSubmissionNetwork, Constants, generateNetworkSuffix, parseKeypair, showMessage } from "./CliUtils.js";
+import { checkForSelfUpdate, checkSubmissionNetwork, Constants, dryRunSuccessMessage, generateNetworkSuffix, parseKeypair, showMessage } from "./CliUtils.js";
+import { LAMPORTS_PER_SOL } from "@solana/web3.js";
 import * as dotenv from "dotenv";
 import { initScaffold } from "./commands/scaffolding/index.js";
 import { loadPublishDetails, loadPublishDetailsWithChecks } from "./config/PublishDetails.js";
@@ -151,7 +152,12 @@ function resolveBuildToolsPath(buildToolsPath) {
 /**
  * This method should be updated with each new release of the CLI, and just do nothing when there isn't anything to report
  */ function latestReleaseMessage() {
-    showMessage("Publishing Tools Version ".concat(Constants.CLI_VERSION), "- priority fee has been updated to handle network congestion\n- short_description value reduced to 30 character limit", "warning");
+    var messages = [
+        "- priority fee has been updated to ".concat(Constants.DEFAULT_PRIORITY_FEE, " lamports = ").concat(Constants.DEFAULT_PRIORITY_FEE / LAMPORTS_PER_SOL, ' SOL. To adjust this value use param "-p" or "--priority-fee-lamports"'),
+        "- At least 4 screenshots are now required to update or release a new app",
+        "- App icons should be exactly 512x512."
+    ].join("\n\n");
+    showMessage("Publishing Tools Version ".concat(Constants.CLI_VERSION), messages, "warning");
 }
 function tryWithErrorMessage(block) {
     return _tryWithErrorMessage.apply(this, arguments);
@@ -223,17 +229,17 @@ export var initCliCmd = mainCli.command("init").description("First-time initiali
     });
 }));
 export var createCliCmd = mainCli.command("create").description("Create a `publisher`, `app`, or `release`");
-export var createPublisherCliCmd = createCliCmd.command("publisher").description("Create a publisher").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT").option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details").action(function() {
+export var createPublisherCliCmd = createCliCmd.command("publisher").description("Create a publisher").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT").option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details").option("-p, --priority-fee-lamports <priority-fee-lamports>", "Priority Fee lamports").action(function() {
     var _ref = _async_to_generator(function(param) {
-        var keypair, url, dryRun, storageConfig;
+        var keypair, url, dryRun, storageConfig, priorityFeeLamports;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    keypair = param.keypair, url = param.url, dryRun = param.dryRun, storageConfig = param.storageConfig;
+                    keypair = param.keypair, url = param.url, dryRun = param.dryRun, storageConfig = param.storageConfig, priorityFeeLamports = param.priorityFeeLamports;
                     return [
                         4,
                         tryWithErrorMessage(/*#__PURE__*/ _async_to_generator(function() {
-                            var signer, result, displayUrl, resultText;
+                            var signer, result, displayUrl, transactionUrl, resultText;
                             return _ts_generator(this, function(_state) {
                                 switch(_state.label){
                                     case 0:
@@ -255,14 +261,20 @@ export var createPublisherCliCmd = createCliCmd.command("publisher").description
                                                 signer: signer,
                                                 url: url,
                                                 dryRun: dryRun,
-                                                storageParams: storageConfig
+                                                storageParams: storageConfig,
+                                                priorityFeeLamports: priorityFeeLamports
                                             })
                                         ];
                                     case 2:
                                         result = _state.sent();
-                                        displayUrl = "https://solscan.io/token/".concat(result.publisherAddress).concat(generateNetworkSuffix(url));
-                                        resultText = "Publisher NFT successfully minted:\n".concat(displayUrl);
-                                        showMessage("Success", resultText);
+                                        if (dryRun) {
+                                            dryRunSuccessMessage();
+                                        } else {
+                                            displayUrl = "https://explorer.solana.com/address/".concat(result.publisherAddress).concat(generateNetworkSuffix(url));
+                                            transactionUrl = "https://explorer.solana.com/tx/".concat(result.transactionSignature).concat(generateNetworkSuffix(url));
+                                            resultText = "Publisher NFT successfully minted successfully:\n".concat(displayUrl, "\n").concat(transactionUrl);
+                                            showMessage("Success", resultText);
+                                        }
                                         _state.label = 3;
                                     case 3:
                                         return [
@@ -284,17 +296,17 @@ export var createPublisherCliCmd = createCliCmd.command("publisher").description
         return _ref.apply(this, arguments);
     };
 }());
-export var createAppCliCmd = createCliCmd.command("app").description("Create a app").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").option("-p, --publisher-mint-address <publisher-mint-address>", "The mint address of the publisher NFT").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT").option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details").action(function() {
+export var createAppCliCmd = createCliCmd.command("app").description("Create a app").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").option("-p, --publisher-mint-address <publisher-mint-address>", "The mint address of the publisher NFT").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT").option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details").option("-p, --priority-fee-lamports <priority-fee-lamports>", "Priority Fee lamports").action(function() {
     var _ref = _async_to_generator(function(param) {
-        var publisherMintAddress, keypair, url, dryRun, storageConfig;
+        var publisherMintAddress, keypair, url, dryRun, storageConfig, priorityFeeLamports;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    publisherMintAddress = param.publisherMintAddress, keypair = param.keypair, url = param.url, dryRun = param.dryRun, storageConfig = param.storageConfig;
+                    publisherMintAddress = param.publisherMintAddress, keypair = param.keypair, url = param.url, dryRun = param.dryRun, storageConfig = param.storageConfig, priorityFeeLamports = param.priorityFeeLamports;
                     return [
                         4,
                         tryWithErrorMessage(/*#__PURE__*/ _async_to_generator(function() {
-                            var config, signer, result, displayUrl, resultText;
+                            var config, signer, result, displayUrl, transactionUrl, resultText;
                             return _ts_generator(this, function(_state) {
                                 switch(_state.label){
                                     case 0:
@@ -326,14 +338,20 @@ export var createAppCliCmd = createCliCmd.command("app").description("Create a a
                                                 signer: signer,
                                                 url: url,
                                                 dryRun: dryRun,
-                                                storageParams: storageConfig
+                                                storageParams: storageConfig,
+                                                priorityFeeLamports: priorityFeeLamports
                                             })
                                         ];
                                     case 3:
                                         result = _state.sent();
-                                        displayUrl = "https://solscan.io/token/".concat(result.appAddress).concat(generateNetworkSuffix(url));
-                                        resultText = "App NFT successfully minted:\n".concat(displayUrl);
-                                        showMessage("Success", resultText);
+                                        if (dryRun) {
+                                            dryRunSuccessMessage();
+                                        } else {
+                                            displayUrl = "https://explorer.solana.com/address/".concat(result.appAddress).concat(generateNetworkSuffix(url));
+                                            transactionUrl = "https://explorer.solana.com/tx/".concat(result.transactionSignature).concat(generateNetworkSuffix(url));
+                                            resultText = "App NFT successfully minted:\n".concat(displayUrl, "\n").concat(transactionUrl);
+                                            showMessage("Success", resultText);
+                                        }
                                         _state.label = 4;
                                     case 4:
                                         return [
@@ -355,17 +373,17 @@ export var createAppCliCmd = createCliCmd.command("app").description("Create a a
         return _ref.apply(this, arguments);
     };
 }());
-export var createReleaseCliCmd = createCliCmd.command("release").description("Create a release").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").option("-a, --app-mint-address <app-mint-address>", "The mint address of the app NFT").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT").option("-b, --build-tools-path <build-tools-path>", "Path to Android build tools which contains AAPT2").option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details").action(function() {
+export var createReleaseCliCmd = createCliCmd.command("release").description("Create a release").requiredOption("-k, --keypair <path-to-keypair-file>", "Path to keypair file").option("-a, --app-mint-address <app-mint-address>", "The mint address of the app NFT").option("-u, --url <url>", "RPC URL", Constants.DEFAULT_RPC_DEVNET).option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT").option("-b, --build-tools-path <build-tools-path>", "Path to Android build tools which contains AAPT2").option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details").option("-p, --priority-fee-lamports <priority-fee-lamports>", "Priority Fee lamports").action(function() {
     var _ref = _async_to_generator(function(param) {
-        var appMintAddress, keypair, url, dryRun, buildToolsPath, storageConfig;
+        var appMintAddress, keypair, url, dryRun, buildToolsPath, storageConfig, priorityFeeLamports;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    appMintAddress = param.appMintAddress, keypair = param.keypair, url = param.url, dryRun = param.dryRun, buildToolsPath = param.buildToolsPath, storageConfig = param.storageConfig;
+                    appMintAddress = param.appMintAddress, keypair = param.keypair, url = param.url, dryRun = param.dryRun, buildToolsPath = param.buildToolsPath, storageConfig = param.storageConfig, priorityFeeLamports = param.priorityFeeLamports;
                     return [
                         4,
                         tryWithErrorMessage(/*#__PURE__*/ _async_to_generator(function() {
-                            var resolvedBuildToolsPath, config, signer, result, displayUrl, resultText;
+                            var resolvedBuildToolsPath, config, signer, result, displayUrl, transactionUrl, resultText;
                             return _ts_generator(this, function(_state) {
                                 switch(_state.label){
                                     case 0:
@@ -402,14 +420,20 @@ export var createReleaseCliCmd = createCliCmd.command("release").description("Cr
                                                 signer: signer,
                                                 url: url,
                                                 dryRun: dryRun,
-                                                storageParams: storageConfig
+                                                storageParams: storageConfig,
+                                                priorityFeeLamports: priorityFeeLamports
                                             })
                                         ];
                                     case 3:
                                         result = _state.sent();
-                                        displayUrl = "https://solscan.io/token/".concat(result === null || result === void 0 ? void 0 : result.releaseAddress).concat(generateNetworkSuffix(url));
-                                        resultText = "Release NFT successfully minted:\n".concat(displayUrl);
-                                        showMessage("Success", resultText);
+                                        if (dryRun) {
+                                            dryRunSuccessMessage();
+                                        } else {
+                                            displayUrl = "https://explorer.solana.com/address/".concat(result === null || result === void 0 ? void 0 : result.releaseAddress).concat(generateNetworkSuffix(url));
+                                            transactionUrl = "https://explorer.solana.com/tx/".concat(result.transactionSignature).concat(generateNetworkSuffix(url));
+                                            resultText = "Release NFT successfully minted:\n".concat(displayUrl, "\n").concat(transactionUrl);
+                                            showMessage("Success", resultText);
+                                        }
                                         _state.label = 4;
                                     case 4:
                                         return [
@@ -502,7 +526,7 @@ publishCommand.command("submit").description("Submit a new app to the Solana Mob
                     return [
                         4,
                         tryWithErrorMessage(/*#__PURE__*/ _async_to_generator(function() {
-                            var config, signer, resultText;
+                            var config, signer;
                             return _ts_generator(this, function(_state) {
                                 switch(_state.label){
                                     case 0:
@@ -546,8 +570,11 @@ publishCommand.command("submit").description("Submit a new app to the Solana Mob
                                         ];
                                     case 4:
                                         _state.sent();
-                                        resultText = "Successfully submitted to the Solana Mobile dApp publisher portal";
-                                        showMessage("Success", resultText);
+                                        if (dryRun) {
+                                            dryRunSuccessMessage();
+                                        } else {
+                                            showMessage("Success", "Successfully submitted to the Solana Mobile dApp publisher portal");
+                                        }
                                         _state.label = 5;
                                     case 5:
                                         return [
@@ -579,7 +606,7 @@ publishCommand.command("update").description("Update an existing app on the Sola
                     return [
                         4,
                         tryWithErrorMessage(/*#__PURE__*/ _async_to_generator(function() {
-                            var config, signer, resultText;
+                            var config, signer;
                             return _ts_generator(this, function(_state) {
                                 switch(_state.label){
                                     case 0:
@@ -624,8 +651,11 @@ publishCommand.command("update").description("Update an existing app on the Sola
                                         ];
                                     case 4:
                                         _state.sent();
-                                        resultText = "dApp successfully updated on the publisher portal";
-                                        showMessage("Success", resultText);
+                                        if (dryRun) {
+                                            dryRunSuccessMessage();
+                                        } else {
+                                            showMessage("Success", "dApp successfully updated on the publisher portal");
+                                        }
                                         _state.label = 5;
                                     case 5:
                                         return [
@@ -657,7 +687,7 @@ publishCommand.command("remove").description("Remove an existing app from the So
                     return [
                         4,
                         tryWithErrorMessage(/*#__PURE__*/ _async_to_generator(function() {
-                            var config, signer, resultText;
+                            var config, signer;
                             return _ts_generator(this, function(_state) {
                                 switch(_state.label){
                                     case 0:
@@ -701,8 +731,11 @@ publishCommand.command("remove").description("Remove an existing app from the So
                                         ];
                                     case 4:
                                         _state.sent();
-                                        resultText = "dApp successfully removed from the publisher portal";
-                                        showMessage("Success", resultText);
+                                        if (dryRun) {
+                                            dryRunSuccessMessage();
+                                        } else {
+                                            showMessage("Success", "dApp successfully removed from the publisher portal");
+                                        }
                                         _state.label = 5;
                                     case 5:
                                         return [
@@ -734,7 +767,7 @@ publishCommand.command("support <request_details>").description("Submit a suppor
                     return [
                         4,
                         tryWithErrorMessage(/*#__PURE__*/ _async_to_generator(function() {
-                            var config, signer, resultText;
+                            var config, signer;
                             return _ts_generator(this, function(_state) {
                                 switch(_state.label){
                                     case 0:
@@ -778,8 +811,11 @@ publishCommand.command("support <request_details>").description("Submit a suppor
                                         ];
                                     case 4:
                                         _state.sent();
-                                        resultText = "Support request sent successfully";
-                                        showMessage("Success", resultText);
+                                        if (dryRun) {
+                                            dryRunSuccessMessage();
+                                        } else {
+                                            showMessage("Success", "Support request sent successfully");
+                                        }
                                         _state.label = 5;
                                     case 5:
                                         return [

package/lib/CliUtils.js

@@ -159,9 +159,10 @@ export var Constants = function Constants() {
     "use strict";
     _class_call_check(this, Constants);
 };
-_define_property(Constants, "CLI_VERSION", "0.7.3");
+_define_property(Constants, "CLI_VERSION", "0.8.1");
 _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);
 _define_property(Constants, "getConfigFilePath", function() {
     return "".concat(process.cwd(), "/").concat(Constants.CONFIG_FILE_NAME);
 });
@@ -258,6 +259,9 @@ export var generateNetworkSuffix = function(rpcUrl) {
     }
     return suffix;
 };
+export var dryRunSuccessMessage = function() {
+    showMessage("Dry run", "Dry run was successful", "standard");
+};
 export var showMessage = function() {
     var titleMessage = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", contentMessage = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "", type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "standard";
     var color = "cyan";

package/lib/__tests__/CliSetupTest.js

@@ -134,7 +134,7 @@ describe("Cli Setup & Execution", function() {
     var initHelp = "Usage: dapp-store init [options]\n\nFirst-time initialization of tooling configuration\n\nOptions:\n  -h, --help  display help for command\n";
     var keyPairArgHelp = "error: required option '-k, --keypair <path-to-keypair-file>' not specified";
     var createHelp = "Usage: dapp-store create [options] [command]\n\nCreate a `publisher`, `app`, or `release`\n\nOptions:\n  -h, --help           display help for command\n\nCommands:\n  publisher [options]  Create a publisher\n  app [options]        Create a app\n  release [options]    Create a release\n  help [command]       display help for command\n";
-    var createPublisherHelp = 'Usage: dapp-store create publisher [options]\n\nCreate a publisher\n\nOptions:\n  -k, --keypair <path-to-keypair-file>   Path to keypair file\n  -u, --url <url>                        RPC URL (default: "https://api.devnet.solana.com")\n  -d, --dry-run                          Flag for dry run. Doesn\'t mint an NFT\n  -s, --storage-config <storage-config>  Provide alternative storage configuration details\n  -h, --help                             display help for command\n';
-    var createAppHelp = 'Usage: dapp-store create app [options]\n\nCreate a app\n\nOptions:\n  -k, --keypair <path-to-keypair-file>                   Path to keypair file\n  -p, --publisher-mint-address <publisher-mint-address>  The mint address of the publisher NFT\n  -u, --url <url>                                        RPC URL (default: "https://api.devnet.solana.com")\n  -d, --dry-run                                          Flag for dry run. Doesn\'t mint an NFT\n  -s, --storage-config <storage-config>                  Provide alternative storage configuration details\n  -h, --help                                             display help for command\n';
-    var createReleaseHelp = 'Usage: dapp-store create release [options]\n\nCreate a release\n\nOptions:\n  -k, --keypair <path-to-keypair-file>       Path to keypair file\n  -a, --app-mint-address <app-mint-address>  The mint address of the app NFT\n  -u, --url <url>                            RPC URL (default: "https://api.devnet.solana.com")\n  -d, --dry-run                              Flag for dry run. Doesn\'t mint an NFT\n  -b, --build-tools-path <build-tools-path>  Path to Android build tools which contains AAPT2\n  -s, --storage-config <storage-config>      Provide alternative storage configuration details\n  -h, --help                                 display help for command\n';
+    var createPublisherHelp = 'Usage: dapp-store create publisher [options]\n\nCreate a publisher\n\nOptions:\n  -k, --keypair <path-to-keypair-file>                 Path to keypair file\n  -u, --url <url>                                      RPC URL (default: "https://api.devnet.solana.com")\n  -d, --dry-run                                        Flag for dry run. Doesn\'t mint an NFT\n  -s, --storage-config <storage-config>                Provide alternative storage configuration details\n  -p, --priority-fee-lamports <priority-fee-lamports>  Priority Fee lamports\n  -h, --help                                           display help for command\n';
+    var createAppHelp = 'Usage: dapp-store create app [options]\n\nCreate a app\n\nOptions:\n  -k, --keypair <path-to-keypair-file>                   Path to keypair file\n  -p, --publisher-mint-address <publisher-mint-address>  The mint address of the publisher NFT\n  -u, --url <url>                                        RPC URL (default: "https://api.devnet.solana.com")\n  -d, --dry-run                                          Flag for dry run. Doesn\'t mint an NFT\n  -s, --storage-config <storage-config>                  Provide alternative storage configuration details\n  -p, --priority-fee-lamports <priority-fee-lamports>    Priority Fee lamports\n  -h, --help                                             display help for command\n';
+    var createReleaseHelp = 'Usage: dapp-store create release [options]\n\nCreate a release\n\nOptions:\n  -k, --keypair <path-to-keypair-file>                 Path to keypair file\n  -a, --app-mint-address <app-mint-address>            The mint address of the app NFT\n  -u, --url <url>                                      RPC URL (default: "https://api.devnet.solana.com")\n  -d, --dry-run                                        Flag for dry run. Doesn\'t mint an NFT\n  -b, --build-tools-path <build-tools-path>            Path to Android build tools which contains AAPT2\n  -s, --storage-config <storage-config>                Provide alternative storage configuration details\n  -p, --priority-fee-lamports <priority-fee-lamports>  Priority Fee lamports\n  -h, --help                                           display help for command\n';
 });

package/lib/commands/ValidateCommand.js

@@ -123,11 +123,11 @@ function _ts_generator(thisArg, body) {
     }
 }
 import { createAppJson, createPublisherJson, createReleaseJson, validateApp, validatePublisher, validateRelease, metaplexFileReplacer } from "@solana-mobile/dapp-store-publishing-tools";
-import { debug } from "../CliUtils.js";
+import { debug, showMessage } from "../CliUtils.js";
 import { loadPublishDetailsWithChecks } from "../config/PublishDetails.js";
 export var validateCommand = function() {
     var _ref = _async_to_generator(function(param) {
-        var signer, buildToolsPath, _ref, publisherDetails, appDetails, releaseDetails, publisherJson, _publisherJson_image, appJson, _appJson_image, releaseJson, objStringified;
+        var signer, buildToolsPath, _ref, publisherDetails, appDetails, releaseDetails, publisherJson, _publisherJson_image, _e_message, errorMsg, appJson, _appJson_image, _e_message1, errorMsg1, releaseJson, objStringified, _e_message2, errorMsg2;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -155,7 +155,12 @@ export var validateCommand = function() {
                         validatePublisher(publisherJson);
                         console.info("Publisher JSON valid!");
                     } catch (e) {
-                        console.error(e);
+                        ;
+                        errorMsg = (_e_message = e === null || e === void 0 ? void 0 : e.message) !== null && _e_message !== void 0 ? _e_message : "";
+                        showMessage("Publisher JSON invalid", errorMsg, "error");
+                        return [
+                            2
+                        ];
                     }
                     appJson = createAppJson(appDetails, signer.publicKey);
                     if (typeof appJson.image !== "string") {
@@ -169,7 +174,12 @@ export var validateCommand = function() {
                         validateApp(appJson);
                         console.info("App JSON valid!");
                     } catch (e) {
-                        console.error(e);
+                        ;
+                        errorMsg1 = (_e_message1 = e === null || e === void 0 ? void 0 : e.message) !== null && _e_message1 !== void 0 ? _e_message1 : "";
+                        showMessage("App JSON invalid", errorMsg1, "error");
+                        return [
+                            2
+                        ];
                     }
                     return [
                         4,
@@ -181,14 +191,26 @@ export var validateCommand = function() {
                     ];
                 case 2:
                     releaseJson = _state.sent();
+                    if (appDetails.android_package != releaseDetails.android_details.android_package) {
+                        showMessage("App package name and release package name do not match", "App release specifies " + appDetails.android_package + " while release specifies " + releaseDetails.android_details.android_package, "error");
+                        return [
+                            2
+                        ];
+                    }
                     objStringified = JSON.stringify(releaseJson, metaplexFileReplacer, 2);
                     debug("releaseJson=", objStringified);
                     try {
                         validateRelease(JSON.parse(objStringified));
                         console.info("Release JSON valid!");
                     } catch (e) {
-                        console.error(e);
+                        ;
+                        errorMsg2 = (_e_message2 = e === null || e === void 0 ? void 0 : e.message) !== null && _e_message2 !== void 0 ? _e_message2 : "";
+                        showMessage("Release JSON invalid", errorMsg2, "error");
+                        return [
+                            2
+                        ];
                     }
+                    showMessage("Json is Valid", "Input data is valid", "standard");
                     return [
                         2
                     ];

package/lib/commands/create/CreateCliApp.js

@@ -124,15 +124,16 @@ function _ts_generator(thisArg, body) {
 }
 import { createApp } from "@solana-mobile/dapp-store-publishing-tools";
 import { Connection, Keypair, PublicKey, sendAndConfirmTransaction } from "@solana/web3.js";
-import { getMetaplexInstance } from "../../CliUtils.js";
+import { Constants, getMetaplexInstance, showMessage } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
 var createAppNft = function() {
-    var _ref = _async_to_generator(function(param, param1) {
-        var appDetails, connection, publisherMintAddress, publisher, storageParams, dryRun, mintAddress, metaplex, txBuilder, blockhash, tx, txSig;
+    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;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    appDetails = param.appDetails, connection = param.connection, publisherMintAddress = param.publisherMintAddress, publisher = param.publisher, storageParams = param.storageParams, dryRun = param1.dryRun;
+                    appDetails = param.appDetails, connection = param.connection, publisherMintAddress = param.publisherMintAddress, publisher = param.publisher, storageParams = param.storageParams, priorityFeeLamports = param.priorityFeeLamports;
+                    console.info("Creating App NFT");
                     mintAddress = Keypair.generate();
                     metaplex = getMetaplexInstance(connection, publisher, storageParams);
                     return [
@@ -140,7 +141,8 @@ var createAppNft = function() {
                         createApp({
                             publisherMintAddress: new PublicKey(publisherMintAddress),
                             mintAddress: mintAddress,
-                            appDetails: appDetails
+                            appDetails: appDetails,
+                            priorityFeeLamports: priorityFeeLamports
                         }, {
                             metaplex: metaplex,
                             publisher: publisher
@@ -148,18 +150,31 @@ 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()
                     ];
-                case 2:
+                case 4:
                     blockhash = _state.sent();
                     tx = txBuilder.toTransaction(blockhash.value);
                     tx.sign(mintAddress, publisher);
-                    if (!!dryRun) return [
-                        3,
-                        4
-                    ];
                     return [
                         4,
                         sendAndConfirmTransaction(connection, tx, [
@@ -169,34 +184,53 @@ var createAppNft = function() {
                             minContextSlot: blockhash.context.slot
                         })
                     ];
-                case 3:
+                case 5:
                     txSig = _state.sent();
-                    console.info({
-                        txSig: txSig,
-                        mintAddress: mintAddress.publicKey.toBase58()
-                    });
-                    _state.label = 4;
-                case 4:
                     return [
                         2,
                         {
-                            appAddress: mintAddress.publicKey.toBase58()
+                            appAddress: mintAddress.publicKey.toBase58(),
+                            transactionSignature: txSig
                         }
                     ];
+                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:
+                    return [
+                        2
+                    ];
             }
         });
     });
-    return function createAppNft(_, _1) {
+    return function createAppNft(_) {
         return _ref.apply(this, arguments);
     };
 }();
 export var createAppCommand = function() {
     var _ref = _async_to_generator(function(param) {
-        var signer, url, dryRun, publisherMintAddress, storageParams, connection, _ref, appDetails, publisherDetails, _publisherDetails_address, appAddress;
+        var signer, url, dryRun, publisherMintAddress, storageParams, _param_priorityFeeLamports, priorityFeeLamports, connection, _ref, appDetails, publisherDetails, _publisherDetails_address, _ref1, appAddress, transactionSignature;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    signer = param.signer, url = param.url, dryRun = param.dryRun, publisherMintAddress = param.publisherMintAddress, storageParams = param.storageParams;
+                    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);
                     return [
                         4,
@@ -204,6 +238,10 @@ export var createAppCommand = function() {
                     ];
                 case 1:
                     _ref = _state.sent(), appDetails = _ref.app, publisherDetails = _ref.publisher;
+                    if (!!dryRun) return [
+                        3,
+                        4
+                    ];
                     return [
                         4,
                         createAppNft({
@@ -211,17 +249,12 @@ export var createAppCommand = function() {
                             publisher: signer,
                             publisherMintAddress: (_publisherDetails_address = publisherDetails.address) !== null && _publisherDetails_address !== void 0 ? _publisherDetails_address : publisherMintAddress,
                             appDetails: appDetails,
-                            storageParams: storageParams
-                        }, {
-                            dryRun: dryRun
+                            storageParams: storageParams,
+                            priorityFeeLamports: priorityFeeLamports
                         })
                     ];
                 case 2:
-                    appAddress = _state.sent().appAddress;
-                    if (!!dryRun) return [
-                        3,
-                        4
-                    ];
+                    _ref1 = _state.sent(), appAddress = _ref1.appAddress, transactionSignature = _ref1.transactionSignature;
                     return [
                         4,
                         writeToPublishDetails({
@@ -232,14 +265,17 @@ export var createAppCommand = function() {
                     ];
                 case 3:
                     _state.sent();
-                    _state.label = 4;
-                case 4:
                     return [
                         2,
                         {
-                            appAddress: appAddress
+                            appAddress: appAddress,
+                            transactionSignature: transactionSignature
                         }
                     ];
+                case 4:
+                    return [
+                        2
+                    ];
             }
         });
     });