@solana-mobile/dapp-store-cli 0.6.1 → 0.7.2

package/lib/CliSetup.js

@@ -151,7 +151,7 @@ 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), "- short_description value reduced to 30 character limit", "warning");
+    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");
 }
 function tryWithErrorMessage(block) {
     return _tryWithErrorMessage.apply(this, arguments);
@@ -265,6 +265,7 @@ export var createPublisherCliCmd = createCliCmd.command("publisher").description
                                         showMessage("Success", resultText);
                                         _state.label = 3;
                                     case 3:
+                                        process.exit();
                                         return [
                                             2
                                         ];
@@ -336,6 +337,7 @@ export var createAppCliCmd = createCliCmd.command("app").description("Create a a
                                         showMessage("Success", resultText);
                                         _state.label = 4;
                                     case 4:
+                                        process.exit();
                                         return [
                                             2
                                         ];
@@ -412,6 +414,7 @@ export var createReleaseCliCmd = createCliCmd.command("release").description("Cr
                                         showMessage("Success", resultText);
                                         _state.label = 4;
                                     case 4:
+                                        process.exit();
                                         return [
                                             2
                                         ];
@@ -472,6 +475,7 @@ mainCli.command("validate").description("Validates details prior to publishing")
                                         _state.sent();
                                         _state.label = 3;
                                     case 3:
+                                        process.exit();
                                         return [
                                             2
                                         ];
@@ -550,6 +554,7 @@ publishCommand.command("submit").description("Submit a new app to the Solana Mob
                                         showMessage("Success", resultText);
                                         _state.label = 5;
                                     case 5:
+                                        process.exit();
                                         return [
                                             2
                                         ];
@@ -637,6 +642,7 @@ publishCommand.command("update").description("Update an existing app on the Sola
                     ];
                 case 1:
                     _state.sent();
+                    process.exit();
                     return [
                         2
                     ];
@@ -705,6 +711,7 @@ publishCommand.command("remove").description("Remove an existing app from the So
                                         showMessage("Success", resultText);
                                         _state.label = 5;
                                     case 5:
+                                        process.exit();
                                         return [
                                             2
                                         ];
@@ -782,6 +789,7 @@ publishCommand.command("support <request_details>").description("Submit a suppor
                                         showMessage("Success", resultText);
                                         _state.label = 5;
                                     case 5:
+                                        process.exit();
                                         return [
                                             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.6.1");
+_define_property(Constants, "CLI_VERSION", "0.7.1");
 _define_property(Constants, "CONFIG_FILE_NAME", "config.yaml");
 _define_property(Constants, "DEFAULT_RPC_DEVNET", "https://api.devnet.solana.com");
 _define_property(Constants, "getConfigFilePath", function() {

package/lib/commands/create/CreateCliRelease.js

@@ -152,11 +152,11 @@ function _ts_generator(thisArg, body) {
 }
 import { createRelease } from "@solana-mobile/dapp-store-publishing-tools";
 import { Connection, Keypair, PublicKey, sendAndConfirmTransaction } from "@solana/web3.js";
-import { getMetaplexInstance } from "../../CliUtils.js";
+import { getMetaplexInstance, showMessage } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
 var createReleaseNft = function() {
     var _ref = _async_to_generator(function(param) {
-        var appMintAddress, releaseDetails, appDetails, publisherDetails, connection, publisher, storageParams, releaseMintAddress, metaplex, txBuilder, blockhash, tx, txSig;
+        var appMintAddress, releaseDetails, appDetails, publisherDetails, connection, publisher, storageParams, releaseMintAddress, metaplex, txBuilder, maxTries, i, blockhash, tx, txSig, e, _e_message, errorMsg, retryMsg;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -178,11 +178,27 @@ var createReleaseNft = function() {
                     ];
                 case 1:
                     txBuilder = _state.sent().txBuilder;
+                    maxTries = 4;
+                    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(releaseMintAddress, publisher);
@@ -195,7 +211,7 @@ var createReleaseNft = function() {
                             minContextSlot: blockhash.context.slot
                         })
                     ];
-                case 3:
+                case 5:
                     txSig = _state.sent();
                     console.info({
                         txSig: txSig,
@@ -207,6 +223,30 @@ var createReleaseNft = function() {
                             releaseAddress: releaseMintAddress.publicKey.toBase58()
                         }
                     ];
+                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";
+                        showMessage("Transaction Failure", retryMsg, "standard");
+                    }
+                    return [
+                        3,
+                        7
+                    ];
+                case 7:
+                    i++;
+                    return [
+                        3,
+                        2
+                    ];
+                case 8:
+                    return [
+                        2
+                    ];
             }
         });
     });

package/lib/commands/publish/PublishCliSubmit.js

@@ -125,7 +125,7 @@ function _ts_generator(thisArg, body) {
 import { Connection } from "@solana/web3.js";
 import { publishSubmit } from "@solana-mobile/dapp-store-publishing-tools";
 import nacl from "tweetnacl";
-import { checkMintedStatus } from "../../CliUtils.js";
+import { checkMintedStatus, showMessage } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks } from "../../config/PublishDetails.js";
 export var publishSubmitCommand = function() {
     var _ref = _async_to_generator(function(param) {
@@ -134,6 +134,7 @@ export var publishSubmitCommand = function() {
             switch(_state.label){
                 case 0:
                     appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, signer = param.signer, url = param.url, _param_dryRun = param.dryRun, dryRun = _param_dryRun === void 0 ? false : _param_dryRun, _param_compliesWithSolanaDappStorePolicies = param.compliesWithSolanaDappStorePolicies, compliesWithSolanaDappStorePolicies = _param_compliesWithSolanaDappStorePolicies === void 0 ? false : _param_compliesWithSolanaDappStorePolicies, _param_requestorIsAuthorized = param.requestorIsAuthorized, requestorIsAuthorized = _param_requestorIsAuthorized === void 0 ? false : _param_requestorIsAuthorized;
+                    showMessage("Publishing Estimates", "New app submissions take around 3-4 business days for review.", "warning");
                     if (!compliesWithSolanaDappStorePolicies) {
                         console.error("ERROR: Cannot submit a request for which the requestor does not attest that it complies with Solana dApp Store policies");
                         return [

package/lib/commands/publish/PublishCliUpdate.js

@@ -124,7 +124,7 @@ function _ts_generator(thisArg, body) {
 }
 import { Connection } from "@solana/web3.js";
 import { publishUpdate } from "@solana-mobile/dapp-store-publishing-tools";
-import { checkMintedStatus } from "../../CliUtils.js";
+import { checkMintedStatus, showMessage } from "../../CliUtils.js";
 import nacl from "tweetnacl";
 import { loadPublishDetailsWithChecks } from "../../config/PublishDetails.js";
 export var publishUpdateCommand = function() {
@@ -134,6 +134,7 @@ export var publishUpdateCommand = function() {
             switch(_state.label){
                 case 0:
                     appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, signer = param.signer, url = param.url, _param_dryRun = param.dryRun, dryRun = _param_dryRun === void 0 ? false : _param_dryRun, _param_compliesWithSolanaDappStorePolicies = param.compliesWithSolanaDappStorePolicies, compliesWithSolanaDappStorePolicies = _param_compliesWithSolanaDappStorePolicies === void 0 ? false : _param_compliesWithSolanaDappStorePolicies, _param_requestorIsAuthorized = param.requestorIsAuthorized, requestorIsAuthorized = _param_requestorIsAuthorized === void 0 ? false : _param_requestorIsAuthorized, _param_critical = param.critical, critical = _param_critical === void 0 ? false : _param_critical;
+                    showMessage("Publishing Estimates", "App update approvals take around 1-2 business days for review.", "warning");
                     if (!compliesWithSolanaDappStorePolicies) {
                         console.error("ERROR: Cannot submit a request for which the requestor does not attest that it complies with Solana dApp Store policies");
                         return [

package/lib/config/PublishDetails.js

@@ -48,6 +48,13 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -221,6 +228,7 @@ var AaptPrefixes = {
     verCodePrefix: "versionCode=",
     verNamePrefix: "versionName=",
     sdkPrefix: "sdkVersion:",
+    debuggableApkPrefix: "application-debuggable",
     localePrefix: "locales: "
 };
 var ajv = new Ajv({
@@ -456,7 +464,7 @@ var checkIconDimensions = function() {
 }();
 var getAndroidDetails = function() {
     var _ref = _async_to_generator(function(aaptDir, apkPath) {
-        var stdout, appPackage, versionCode, versionName, minSdk, permissions, locales, _locales_values, localeArray, localesSrc, _appPackage_, _minSdk_, _versionCode_, _versionName_, _tmp, e;
+        var stdout, appPackage, versionCode, versionName, minSdk, permissions, locales, isDebuggable, _locales_values, localeArray, localesSrc, _appPackage_, _minSdk_, _versionCode_, _versionName_, _tmp, e;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -478,6 +486,10 @@ var getAndroidDetails = function() {
                     minSdk = new RegExp(AaptPrefixes.sdkPrefix + AaptPrefixes.quoteRegex).exec(stdout);
                     permissions = _to_consumable_array(stdout.matchAll(/uses-permission: name='(.*)'/g));
                     locales = new RegExp(AaptPrefixes.localePrefix + AaptPrefixes.quoteNonLazyRegex).exec(stdout);
+                    isDebuggable = new RegExp(AaptPrefixes.debuggableApkPrefix).exec(stdout);
+                    if (isDebuggable != null) {
+                        throw new TypeError("Debug apks are not supported on Solana dApp store.\nSubmit a signed release apk");
+                    }
                     localeArray = Array.from((_locales_values = locales === null || locales === void 0 ? void 0 : locales.values()) !== null && _locales_values !== void 0 ? _locales_values : []);
                     if (localeArray.length == 2) {
                         localesSrc = localeArray[1];
@@ -507,7 +519,15 @@ var getAndroidDetails = function() {
                     ];
                 case 3:
                     e = _state.sent();
-                    throw new Error("There was an error parsing your APK. Please ensure you have installed Java and provided a valid Android tools directory containing AAPT2.\n" + e);
+                    if (_instanceof(e, TypeError)) {
+                        throw e;
+                    } else {
+                        throw new Error("There was an error parsing your APK. Please ensure you have installed Java and provided a valid Android tools directory containing AAPT2.\n" + e);
+                    }
+                    return [
+                        3,
+                        4
+                    ];
                 case 4:
                     return [
                         2

package/lib/package.json

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

package/package.json

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

package/src/CliSetup.ts

@@ -48,7 +48,7 @@ function resolveBuildToolsPath(buildToolsPath: string | undefined) {
 function latestReleaseMessage() {
   showMessage(
     `Publishing Tools Version ${ Constants.CLI_VERSION }`,
-    "- short_description value reduced to 30 character limit",
+    "- priority fee has been updated to handle network congestion\n- short_description value reduced to 30 character limit",
     "warning"
   );
 }
@@ -108,6 +108,7 @@ export const createPublisherCliCmd = createCliCmd
 
         showMessage("Success", resultText);
       }
+      process.exit()
     });
   });
 
@@ -151,6 +152,7 @@ export const createAppCliCmd = createCliCmd
 
         showMessage("Success", resultText);
       }
+      process.exit()
     });
   });
 
@@ -203,6 +205,7 @@ export const createReleaseCliCmd = createCliCmd
 
           showMessage("Success", resultText);
         }
+        process.exit()
       });
     }
   );
@@ -235,6 +238,7 @@ mainCli
           buildToolsPath: resolvedBuildToolsPath,
         });
       }
+      process.exit()
     });
   });
 
@@ -307,6 +311,7 @@ publishCommand
           const resultText = "Successfully submitted to the Solana Mobile dApp publisher portal";
           showMessage("Success", resultText);
         }
+        process.exit()
       });
     }
   );
@@ -380,6 +385,7 @@ publishCommand
           showMessage("Success", resultText);
         }
       });
+      process.exit()
     }
   );
 
@@ -445,6 +451,7 @@ publishCommand
           const resultText = "dApp successfully removed from the publisher portal";
           showMessage("Success", resultText);
         }
+        process.exit()
       })
     }
   );
@@ -505,6 +512,7 @@ publishCommand
           const resultText = "Support request sent successfully";
           showMessage("Success", resultText);
         }
+        process.exit()
       });
     }
   );

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.6.1";
+  static CLI_VERSION = "0.7.2";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
 

package/src/commands/create/CreateCliRelease.ts

@@ -12,6 +12,7 @@ import {
 } from "@solana/web3.js";
 import {
   getMetaplexInstance,
+  showMessage
 } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
 
@@ -56,22 +57,34 @@ const createReleaseNft = async ({
     { metaplex, publisher }
   );
 
-  const blockhash = await connection.getLatestBlockhashAndContext();
-  const tx = txBuilder.toTransaction(blockhash.value);
-  tx.sign(releaseMintAddress, publisher);
-
-  const txSig = await sendAndConfirmTransaction(connection, tx, [
-    publisher,
-    releaseMintAddress,
-  ], {
-    minContextSlot: blockhash.context.slot
-  });
-  console.info({
-    txSig,
-    releaseMintAddress: releaseMintAddress.publicKey.toBase58(),
-  });
-
-  return { releaseAddress: releaseMintAddress.publicKey.toBase58() };
+  const maxTries = 4;
+  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,
+      ], {
+        minContextSlot: blockhash.context.slot,
+      });
+      console.info({
+        txSig,
+        releaseMintAddress: releaseMintAddress.publicKey.toBase58(),
+      });
+      return { releaseAddress: releaseMintAddress.publicKey.toBase58() };
+    } 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"
+        showMessage("Transaction Failure", retryMsg, "standard");
+      }
+    }
+  }
 };
 
 export const createReleaseCommand = async ({

package/src/commands/publish/PublishCliSubmit.ts

@@ -2,7 +2,7 @@ import { AccountInfo, Connection, Keypair, PublicKey } from "@solana/web3.js";
 import type { SignWithPublisherKeypair } from "@solana-mobile/dapp-store-publishing-tools";
 import { publishSubmit } from "@solana-mobile/dapp-store-publishing-tools";
 import nacl from "tweetnacl";
-import { checkMintedStatus } from "../../CliUtils.js";
+import { checkMintedStatus, showMessage } from "../../CliUtils.js";
 import { Buffer } from "buffer";
 import { loadPublishDetailsWithChecks } from "../../config/PublishDetails.js";
 
@@ -25,6 +25,12 @@ export const publishSubmitCommand = async ({
   compliesWithSolanaDappStorePolicies = false,
   requestorIsAuthorized = false,
 }: PublishSubmitCommandInput) => {
+  showMessage(
+    `Publishing Estimates`,
+    "New app submissions take around 3-4 business days for review.",
+    "warning"
+  );
+
   if (!compliesWithSolanaDappStorePolicies) {
     console.error(
       "ERROR: Cannot submit a request for which the requestor does not attest that it complies with Solana dApp Store policies"

package/src/commands/publish/PublishCliUpdate.ts

@@ -1,7 +1,7 @@
 import { Connection, Keypair } from "@solana/web3.js";
 import type { SignWithPublisherKeypair } from "@solana-mobile/dapp-store-publishing-tools";
 import { publishUpdate } from "@solana-mobile/dapp-store-publishing-tools";
-import { checkMintedStatus } from "../../CliUtils.js";
+import { checkMintedStatus, showMessage } from "../../CliUtils.js";
 import nacl from "tweetnacl";
 import { loadPublishDetailsWithChecks } from "../../config/PublishDetails.js";
 
@@ -26,6 +26,13 @@ export const publishUpdateCommand = async ({
   requestorIsAuthorized = false,
   critical = false,
 }: PublishUpdateCommandInput) => {
+
+  showMessage(
+    `Publishing Estimates`,
+    "App update approvals take around 1-2 business days for review.",
+    "warning"
+  );
+
   if (!compliesWithSolanaDappStorePolicies) {
     console.error(
       "ERROR: Cannot submit a request for which the requestor does not attest that it complies with Solana dApp Store policies"

package/src/config/PublishDetails.ts

@@ -34,6 +34,7 @@ const AaptPrefixes = {
   verCodePrefix: "versionCode=",
   verNamePrefix: "versionName=",
   sdkPrefix: "sdkVersion:",
+  debuggableApkPrefix: "application-debuggable",
   localePrefix: "locales: ",
 };
 
@@ -214,6 +215,13 @@ const getAndroidDetails = async (
     const locales = new RegExp(
       AaptPrefixes.localePrefix + AaptPrefixes.quoteNonLazyRegex
     ).exec(stdout);
+    const isDebuggable = new RegExp(
+      AaptPrefixes.debuggableApkPrefix
+    ).exec(stdout);
+
+    if (isDebuggable != null) {
+      throw new TypeError("Debug apks are not supported on Solana dApp store.\nSubmit a signed release apk")
+    }
 
     let localeArray = Array.from(locales?.values() ?? []);
     if (localeArray.length == 2) {
@@ -242,7 +250,11 @@ const getAndroidDetails = async (
       locales: localeArray
     };
   } catch (e) {
-    throw new Error(`There was an error parsing your APK. Please ensure you have installed Java and provided a valid Android tools directory containing AAPT2.\n` + e);
+    if (e instanceof TypeError) {
+      throw e
+    } else {
+      throw new Error(`There was an error parsing your APK. Please ensure you have installed Java and provided a valid Android tools directory containing AAPT2.\n` + e);
+    }
   }
 };