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

package/bin/dapp-store.js

@@ -1,3 +1,3 @@
-#!/usr/bin/env node --experimental-json-modules
+#!/usr/bin/env node
 
 import "../lib/index.js";

package/lib/CliUtils.js

@@ -145,9 +145,8 @@ import { Keypair, PublicKey } from "@solana/web3.js";
 import debugModule from "debug";
 import { IrysStorageDriver, keypairIdentity, Metaplex } from "@metaplex-foundation/js";
 import updateNotifier from "update-notifier";
-import cliPackage from "./package.json" assert {
-    type: "json"
-};
+import { readFile } from "fs/promises";
+var cliPackage = JSON.parse((await readFile(new URL("./package.json", import.meta.url))).toString());
 import boxen from "boxen";
 import ver from "semver";
 import { CachedStorageDriver } from "./upload/CachedStorageDriver.js";
@@ -159,7 +158,7 @@ export var Constants = function Constants() {
     "use strict";
     _class_call_check(this, Constants);
 };
-_define_property(Constants, "CLI_VERSION", "0.9.2");
+_define_property(Constants, "CLI_VERSION", "0.9.4");
 _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);
@@ -199,10 +198,17 @@ export var checkForSelfUpdate = function() {
 }();
 export var checkMintedStatus = function() {
     var _ref = _async_to_generator(function(conn, pubAddr, appAddr, releaseAddr) {
-        var results, rentAccounts;
+        var i, _results_, _results_1, _results_2, results, isPublisherMinted, isAppMinted, isReleaseMinted, errorMessage;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    i = 0;
+                    _state.label = 1;
+                case 1:
+                    if (!(i < 5)) return [
+                        3,
+                        4
+                    ];
                     return [
                         4,
                         conn.getMultipleAccountsInfo([
@@ -211,14 +217,40 @@ export var checkMintedStatus = function() {
                             new PublicKey(releaseAddr)
                         ])
                     ];
-                case 1:
+                case 2:
                     results = _state.sent();
-                    rentAccounts = results.filter(function(item) {
-                        return !(item == undefined) && (item === null || item === void 0 ? void 0 : item.lamports) > 0;
-                    });
-                    if ((rentAccounts === null || rentAccounts === void 0 ? void 0 : rentAccounts.length) != 3) {
-                        throw new Error("Please ensure you have minted all of your NFTs before submitting to the Solana Mobile dApp publisher portal.");
+                    isPublisherMinted = results[0] != undefined && ((_results_ = results[0]) === null || _results_ === void 0 ? void 0 : _results_.lamports) > 0;
+                    isAppMinted = results[1] != undefined && ((_results_1 = results[1]) === null || _results_1 === void 0 ? void 0 : _results_1.lamports) > 0;
+                    isReleaseMinted = results[2] != undefined && ((_results_2 = results[2]) === null || _results_2 === void 0 ? void 0 : _results_2.lamports) > 0;
+                    if (isPublisherMinted && isAppMinted && isReleaseMinted) {
+                        return [
+                            2
+                        ];
+                    } else {
+                        errorMessage = "";
+                        if (!isPublisherMinted) {
+                            errorMessage = errorMessage + "Publisher NFT fetch at address ".concat(pubAddr, " failed.\n");
+                        }
+                        if (!isAppMinted) {
+                            errorMessage = errorMessage + "App NFT fetch at address ".concat(appAddr, " failed.\n");
+                        }
+                        if (!isReleaseMinted) {
+                            errorMessage = errorMessage + "Release NFT fetch at address ".concat(releaseAddr, " failed.\n");
+                        }
+                        if (i == 4) {
+                            throw new Error("Expected Publisher :: ".concat(pubAddr, ", App :: ").concat(appAddr, " and Release :: ").concat(releaseAddr, " to be minted before submission.\n\n          but ").concat(errorMessage, "\n\n          Please ensure you have minted all of your NFTs before submitting to the Solana Mobile dApp publisher portal."));
+                        } else {
+                            sleep(2000);
+                        }
                     }
+                    _state.label = 3;
+                case 3:
+                    i++;
+                    return [
+                        3,
+                        1
+                    ];
+                case 4:
                     return [
                         2
                     ];
@@ -229,6 +261,11 @@ export var checkMintedStatus = function() {
         return _ref.apply(this, arguments);
     };
 }();
+export var sleep = function(ms) {
+    return new Promise(function(resolve) {
+        return setTimeout(resolve, ms);
+    });
+};
 export var parseKeypair = function(pathToKeypairFile) {
     try {
         var keypairFile = fs.readFileSync(pathToKeypairFile, "utf-8");

package/lib/commands/publish/PublishCliRemove.js

@@ -140,7 +140,9 @@ export var publishRemoveCommand = function() {
                             2
                         ];
                     }
-                    connection = new Connection(url);
+                    connection = new Connection(url, {
+                        commitment: "confirmed"
+                    });
                     return [
                         4,
                         loadPublishDetailsWithChecks()

package/lib/commands/publish/PublishCliSupport.js

@@ -140,7 +140,9 @@ export var publishSupportCommand = function() {
                             2
                         ];
                     }
-                    connection = new Connection(url);
+                    connection = new Connection(url, {
+                        commitment: "confirmed"
+                    });
                     return [
                         4,
                         loadPublishDetailsWithChecks()

package/lib/commands/publish/PublishCliUpdate.js

@@ -146,7 +146,9 @@ export var publishUpdateCommand = function() {
                             2
                         ];
                     }
-                    connection = new Connection(url);
+                    connection = new Connection(url, {
+                        commitment: "confirmed"
+                    });
                     return [
                         4,
                         loadPublishDetailsWithChecks()

package/lib/commands/scaffolding/ScaffoldInit.js

@@ -1,8 +1,6 @@
 import { dump } from "js-yaml";
-// eslint-disable-next-line require-extensions/require-extensions
-import releaseSchema from "../../generated/config_obj.json" assert {
-    type: "json"
-};
+import { readFile } from "fs/promises";
+var releaseSchema = JSON.parse((await readFile(new URL("../../generated/config_obj.json", import.meta.url))).toString());
 import fs from "fs";
 import { Constants } from "../../CliUtils.js";
 export var initScaffold = function() {

package/lib/config/PublishDetails.js

@@ -209,9 +209,8 @@ function _ts_generator(thisArg, body) {
 import { dump, load } from "js-yaml";
 import Ajv from "ajv";
 // eslint-disable-next-line require-extensions/require-extensions
-import schemaJson from "../generated/config_schema.json" assert {
-    type: "json"
-};
+import { readFile } from "fs/promises";
+var schemaJson = JSON.parse((await readFile(new URL("../generated/config_schema.json", import.meta.url))).toString());
 import fs from "fs";
 import path from "path";
 import { toMetaplexFile } from "@metaplex-foundation/js";

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "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.2",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.9.4",
     "@solana/web3.js": "1.92.1",
     "@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.2",
+  "version": "0.9.4",
   "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.2",
+    "@solana-mobile/dapp-store-publishing-tools": "0.9.4",
     "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

package/src/CliUtils.ts

@@ -8,7 +8,8 @@ import {
   Metaplex,
 } from "@metaplex-foundation/js";
 import updateNotifier from "update-notifier";
-import cliPackage from "./package.json" assert { type: "json" };
+import { readFile } from 'fs/promises';
+const cliPackage = JSON.parse((await readFile(new URL("./package.json", import.meta.url))).toString());
 import boxen from "boxen";
 import ver from "semver";
 import { CachedStorageDriver } from "./upload/CachedStorageDriver.js";
@@ -18,7 +19,7 @@ import { awsStorage } from "@metaplex-foundation/js-plugin-aws";
 import { S3StorageManager } from "./config/index.js";
 
 export class Constants {
-  static CLI_VERSION = "0.9.2";
+  static CLI_VERSION = "0.9.4";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
   static DEFAULT_PRIORITY_FEE = 500000;
@@ -53,22 +54,47 @@ export const checkMintedStatus = async (
   appAddr: string,
   releaseAddr: string
 ) => {
-  const results = await conn.getMultipleAccountsInfo([
-    new PublicKey(pubAddr),
-    new PublicKey(appAddr),
-    new PublicKey(releaseAddr),
-  ]);
-
-  const rentAccounts = results.filter(
-    (item) => !(item == undefined) && item?.lamports > 0
-  );
-  if (rentAccounts?.length != 3) {
-    throw new Error(
-      "Please ensure you have minted all of your NFTs before submitting to the Solana Mobile dApp publisher portal."
-    );
+  for (let i = 0; i < 5; i++) {
+    const results = await conn.getMultipleAccountsInfo([
+      new PublicKey(pubAddr),
+      new PublicKey(appAddr),
+      new PublicKey(releaseAddr),
+    ]);
+
+    const isPublisherMinted = results[0] != undefined && results[0]?.lamports > 0
+    const isAppMinted = results[1] != undefined && results[1]?.lamports > 0
+    const isReleaseMinted = results[2] != undefined && results[2]?.lamports > 0
+
+    if (isPublisherMinted && isAppMinted && isReleaseMinted) {
+      return
+    } else {
+      let errorMessage = ``
+      if (!isPublisherMinted) {
+        errorMessage = errorMessage + `Publisher NFT fetch at address ${pubAddr} failed.\n`
+      }
+      if (!isAppMinted) {
+        errorMessage = errorMessage + `App NFT fetch at address ${appAddr} failed.\n`
+      }
+      if (!isReleaseMinted) {
+        errorMessage = errorMessage + `Release NFT fetch at address ${releaseAddr} failed.\n`
+      }
+      if (i == 4) {
+        throw new Error(
+          `Expected Publisher :: ${pubAddr}, App :: ${appAddr} and Release :: ${releaseAddr} to be minted before submission.\n
+          but ${errorMessage}\n
+          Please ensure you have minted all of your NFTs before submitting to the Solana Mobile dApp publisher portal.`
+        );
+      } else {
+        sleep(2000)
+      }
+    }
   }
 };
 
+export const sleep = (ms: number):Promise<void> => {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
 export const parseKeypair = (pathToKeypairFile: string) => {
   try {
     const keypairFile = fs.readFileSync(pathToKeypairFile, "utf-8");
@@ -77,7 +103,7 @@ export const parseKeypair = (pathToKeypairFile: string) => {
     showMessage(
       "KeyPair Error",
       "Something went wrong when attempting to retrieve the keypair at " +
-        pathToKeypairFile,
+      pathToKeypairFile,
       "error"
     );
   }

package/src/commands/publish/PublishCliRemove.ts

@@ -31,7 +31,13 @@ export const publishRemoveCommand = async ({
     return;
   }
 
-  const connection = new Connection(url);
+  const connection = new Connection(
+    url,
+    {
+      commitment: "confirmed",
+    }
+  );
+
   const {
     publisher: publisherDetails,
     app: appDetails,

package/src/commands/publish/PublishCliSupport.ts

@@ -31,7 +31,13 @@ export const publishSupportCommand = async ({
     return;
   }
 
-  const connection = new Connection(url);
+  const connection = new Connection(
+    url,
+    {
+      commitment: "confirmed",
+    }
+  );
+
   const {
     publisher: publisherDetails,
     app: appDetails,

package/src/commands/publish/PublishCliUpdate.ts

@@ -45,7 +45,13 @@ export const publishUpdateCommand = async ({
     return;
   }
 
-  const connection = new Connection(url);
+  const connection = new Connection(
+    url,
+    {
+      commitment: "confirmed",
+    }
+  );
+
   const {
     publisher: publisherDetails,
     app: appDetails,

package/src/commands/scaffolding/ScaffoldInit.ts

@@ -1,7 +1,7 @@
 import yaml, { dump } from "js-yaml";
 
-// eslint-disable-next-line require-extensions/require-extensions
-import releaseSchema from "../../generated/config_obj.json" assert { type: "json" };
+import { readFile } from 'fs/promises';
+const releaseSchema = JSON.parse((await readFile(new URL("../../generated/config_obj.json", import.meta.url))).toString());
 import fs from "fs";
 import { Constants } from "../../CliUtils.js";
 

package/src/config/PublishDetails.ts

@@ -10,7 +10,8 @@ import type {
 import { dump, load } from "js-yaml";
 import Ajv from "ajv";
 // eslint-disable-next-line require-extensions/require-extensions
-import schemaJson from "../generated/config_schema.json" assert { type: "json" };
+import { readFile } from 'fs/promises';
+const schemaJson = JSON.parse((await readFile(new URL("../generated/config_schema.json", import.meta.url))).toString());
 import fs from "fs";
 import path from "path";
 import { toMetaplexFile } from "@metaplex-foundation/js";