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

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.0");
+_define_property(Constants, "CLI_VERSION", "0.9.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);

package/lib/commands/create/CreateCliApp.js

@@ -181,6 +181,7 @@ var createAppNft = function() {
                             publisher,
                             mintAddress
                         ], {
+                            commitment: "confirmed",
                             minContextSlot: blockhash.context.slot
                         })
                     ];
@@ -229,7 +230,10 @@ export var createAppCommand = function() {
             switch(_state.label){
                 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);
+                    connection = new Connection(url, {
+                        commitment: "confirmed",
+                        disableRetryOnRateLimit: true
+                    });
                     return [
                         4,
                         loadPublishDetailsWithChecks()

package/lib/commands/create/CreateCliPublisher.js

@@ -180,6 +180,7 @@ var createPublisherNft = function() {
                             publisher,
                             mintAddress
                         ], {
+                            commitment: "confirmed",
                             minContextSlot: blockhash.context.slot
                         })
                     ];
@@ -228,7 +229,10 @@ export var createPublisherCommand = function() {
             switch(_state.label){
                 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);
+                    connection = new Connection(url, {
+                        commitment: "confirmed",
+                        disableRetryOnRateLimit: true
+                    });
                     return [
                         4,
                         loadPublishDetailsWithChecks()

package/lib/commands/create/CreateCliRelease.js

@@ -213,6 +213,7 @@ var createReleaseNft = function() {
                             publisher,
                             releaseMintAddress
                         ], {
+                            commitment: "confirmed",
                             minContextSlot: blockhash.context.slot
                         })
                     ];
@@ -261,7 +262,10 @@ export var createReleaseCommand = function() {
             switch(_state.label){
                 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);
+                    connection = new Connection(url, {
+                        commitment: "confirmed",
+                        disableRetryOnRateLimit: true
+                    });
                     return [
                         4,
                         loadPublishDetailsWithChecks(buildToolsPath)

package/lib/config/PublishDetails.js

@@ -228,7 +228,7 @@ var AaptPrefixes = {
     packagePrefix: "package: name=",
     verCodePrefix: "versionCode=",
     verNamePrefix: "versionName=",
-    sdkPrefix: "sdkVersion:",
+    sdkPrefix: "(?:minSdk|sdk)Version:",
     debuggableApkPrefix: "application-debuggable",
     localePrefix: "locales: "
 };
@@ -670,7 +670,7 @@ var getAndroidDetails = function() {
                     versionCode = new RegExp(AaptPrefixes.verCodePrefix + AaptPrefixes.quoteRegex).exec(stdout);
                     versionName = new RegExp(AaptPrefixes.verNamePrefix + AaptPrefixes.quoteRegex).exec(stdout);
                     minSdk = new RegExp(AaptPrefixes.sdkPrefix + AaptPrefixes.quoteRegex).exec(stdout);
-                    permissions = _to_consumable_array(stdout.matchAll(/uses-permission: name='(.*)'/g)).flatMap(function(permission) {
+                    permissions = _to_consumable_array(stdout.matchAll(/(?:uses-permission|uses-permission-sdk-23): name='([^']*)'/g)).flatMap(function(permission) {
                         return permission[1];
                     });
                     locales = new RegExp(AaptPrefixes.localePrefix + AaptPrefixes.quoteNonLazyRegex).exec(stdout);

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.9.0",
+  "version": "0.9.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.20.0",
-    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.9.0",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.9.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.9.0",
+  "version": "0.9.1",
   "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.20.0",
-    "@solana-mobile/dapp-store-publishing-tools": "0.9.0",
+    "@solana-mobile/dapp-store-publishing-tools": "0.9.1",
     "@solana/web3.js": "1.68.0",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

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.0";
+  static CLI_VERSION = "0.9.1";
   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

@@ -57,6 +57,7 @@ const createAppNft = async (
         publisher,
         mintAddress,
       ], {
+        commitment: "confirmed",
         minContextSlot: blockhash.context.slot
       });
       return { appAddress: mintAddress.publicKey.toBase58(), transactionSignature: txSig };
@@ -91,7 +92,13 @@ export const createAppCommand = async ({
   storageParams,
   priorityFeeLamports = Constants.DEFAULT_PRIORITY_FEE,
 }: CreateAppCommandInput) => {
-  const connection = new Connection(url);
+  const connection = new Connection(
+    url,
+    {
+      commitment: "confirmed",
+      disableRetryOnRateLimit: true,
+    }
+  );
 
   const { app: appDetails, publisher: publisherDetails } =
     await loadPublishDetailsWithChecks();

package/src/commands/create/CreateCliPublisher.ts

@@ -48,6 +48,7 @@ const createPublisherNft = async (
         publisher,
         mintAddress,
       ], {
+        commitment: "confirmed",
         minContextSlot: blockhash.context.slot
       });
       return { publisherAddress: mintAddress.publicKey.toBase58(), transactionSignature: txSig};
@@ -78,7 +79,13 @@ export const createPublisherCommand = async ({
   storageParams: string;
   priorityFeeLamports: number;
 }) => {
-  const connection = new Connection(url);
+  const connection = new Connection(
+    url,
+    {
+      commitment: "confirmed",
+      disableRetryOnRateLimit: true,
+    }
+  );
 
   const { publisher: publisherDetails } = await loadPublishDetailsWithChecks();
 

package/src/commands/create/CreateCliRelease.ts

@@ -77,6 +77,7 @@ const createReleaseNft = async ({
         publisher,
         releaseMintAddress,
       ], {
+        commitment: "confirmed",
         minContextSlot: blockhash.context.slot,
       });
       return { releaseAddress: releaseMintAddress.publicKey.toBase58(), transactionSignature: txSig };
@@ -103,7 +104,13 @@ export const createReleaseCommand = async ({
   storageParams,
   priorityFeeLamports = Constants.DEFAULT_PRIORITY_FEE,
 }: CreateReleaseCommandInput) => {
-  const connection = new Connection(url);
+  const connection = new Connection(
+    url,
+    {
+      commitment: "confirmed",
+      disableRetryOnRateLimit: true,
+    }
+  );
 
   const config = await loadPublishDetailsWithChecks(buildToolsPath);
 

package/src/config/PublishDetails.ts

@@ -38,7 +38,7 @@ const AaptPrefixes = {
   packagePrefix: "package: name=",
   verCodePrefix: "versionCode=",
   verNamePrefix: "versionName=",
-  sdkPrefix: "sdkVersion:",
+  sdkPrefix: "(?:minSdk|sdk)Version:",
   debuggableApkPrefix: "application-debuggable",
   localePrefix: "locales: ",
 };
@@ -272,7 +272,7 @@ const getAndroidDetails = async (
     const minSdk = new RegExp(
       AaptPrefixes.sdkPrefix + AaptPrefixes.quoteRegex
     ).exec(stdout);
-    const permissions = [...stdout.matchAll(/uses-permission: name='(.*)'/g)].flatMap(permission => permission[1]);
+    const permissions = [...stdout.matchAll(/(?:uses-permission|uses-permission-sdk-23): name='([^']*)'/g)].flatMap(permission => permission[1]);
     const locales = new RegExp(
       AaptPrefixes.localePrefix + AaptPrefixes.quoteNonLazyRegex
     ).exec(stdout);