@solana-mobile/dapp-store-cli 0.10.0 → 0.11.0

package/lib/generated/config_obj.json

@@ -1 +1 @@
-{"publisher":{"name":"<<YOUR_PUBLISHER_NAME>>","address":"","website":"<<URL_OF_PUBLISHER_WEBSITE>>","email":"<<EMAIL_ADDRESS_TO_CONTACT_PUBLISHER>>","media":[{"purpose":"icon","uri":"<<RELATIVE_PATH_TO_PUBLISHER_ICON>>"}]},"app":{"name":"<<APP_NAME>>","address":"","android_package":"<<ANDROID_PACKAGE_NAME>>","urls":{"license_url":"<<URL_OF_APP_LICENSE_OR_TERMS_OF_SERVICE>>","copyright_url":"<<URL_OF_COPYRIGHT_DETAILS_FOR_APP>>","privacy_policy_url":"<<URL_OF_APP_PRIVACY_POLICY>>","website":"<<URL_OF_APP_WEBSITE>>"},"media":[{"purpose":"icon","uri":"<<RELATIVE_PATH_TO_APP_ICON>>"}]},"release":{"address":"","media":[{"purpose":"icon","uri":"<<RELATIVE_PATH_TO_RELEASE_ICON>>"},{"purpose":"banner","uri":"<<RELATIVE_PATH_TO_BANNER>>"},{"purpose":"featureGraphic","uri":"<<RELATIVE_PATH_TO_FEATURE_GRAPHIC>>"},{"purpose":"screenshot","uri":"<<RELATIVE_PATH_TO_SCREENSHOT1>>"},{"purpose":"screenshot","uri":"<<RELATIVE_PATH_TO_SCREENSHOT2>>"},{"purpose":"screenshot","uri":"<<RELATIVE_PATH_TO_SCREENSHOT3>>"},{"purpose":"screenshot","uri":"<<RELATIVE_PATH_TO_SCREENSHOT4>>"},{"purpose":"video","uri":"<<RELATIVE_PATH_TO_VIDEO1>>"}],"files":[{"purpose":"install","uri":"<<RELATIVE_PATH_TO_APK>>"}],"catalog":{"en-US":{"name":"<<APP_NAME>>","short_description":"<<SHORT_APP_DESCRIPTION>>","long_description":"<<LONG_APP_DESCRIPTION>>","new_in_version":"<<WHATS_NEW_IN_THIS_VERSION>>","saga_features":"<<ANY_FEATURES_ONLY_AVAILBLE_WHEN_RUNNING_ON_SAGA>>"}}},"solana_mobile_dapp_publisher_portal":{"google_store_package":"<<ANDROID_PACKAGE_NAME_OF_GOOGLE_PLAY_STORE_VERSION_IF_DIFFERENT>>","testing_instructions":"<<TESTING_INSTRUCTIONS>>","alpha_testers":[{"address":"<<genesis token wallet address>>","comment":"<<Optional. For internal use only>>"},{"address":"<<genesis token wallet address>>","comment":"<<Optional. For internal use only>>"}]}}
+{"publisher":{"name":"<<YOUR_PUBLISHER_NAME>>","website":"<<URL_OF_PUBLISHER_WEBSITE>>","email":"<<EMAIL_ADDRESS_TO_CONTACT_PUBLISHER>>"},"app":{"name":"<<APP_NAME>>","address":"","android_package":"<<ANDROID_PACKAGE_NAME>>","urls":{"license_url":"<<URL_OF_APP_LICENSE_OR_TERMS_OF_SERVICE>>","copyright_url":"<<URL_OF_COPYRIGHT_DETAILS_FOR_APP>>","privacy_policy_url":"<<URL_OF_APP_PRIVACY_POLICY>>","website":"<<URL_OF_APP_WEBSITE>>"},"media":[{"purpose":"icon","uri":"<<RELATIVE_PATH_TO_APP_ICON>>"}]},"release":{"address":"","media":[{"purpose":"icon","uri":"<<RELATIVE_PATH_TO_RELEASE_ICON>>"},{"purpose":"banner","uri":"<<RELATIVE_PATH_TO_BANNER>>"},{"purpose":"featureGraphic","uri":"<<RELATIVE_PATH_TO_FEATURE_GRAPHIC>>"},{"purpose":"screenshot","uri":"<<RELATIVE_PATH_TO_SCREENSHOT1>>"},{"purpose":"screenshot","uri":"<<RELATIVE_PATH_TO_SCREENSHOT2>>"},{"purpose":"screenshot","uri":"<<RELATIVE_PATH_TO_SCREENSHOT3>>"},{"purpose":"screenshot","uri":"<<RELATIVE_PATH_TO_SCREENSHOT4>>"},{"purpose":"video","uri":"<<RELATIVE_PATH_TO_VIDEO1>>"}],"files":[{"purpose":"install","uri":"<<RELATIVE_PATH_TO_APK>>"}],"catalog":{"en-US":{"name":"<<APP_NAME>>","short_description":"<<SHORT_APP_DESCRIPTION>>","long_description":"<<LONG_APP_DESCRIPTION>>","new_in_version":"<<WHATS_NEW_IN_THIS_VERSION>>","saga_features":"<<ANY_FEATURES_ONLY_AVAILBLE_WHEN_RUNNING_ON_SAGA>>"}}},"solana_mobile_dapp_publisher_portal":{"google_store_package":"<<ANDROID_PACKAGE_NAME_OF_GOOGLE_PLAY_STORE_VERSION_IF_DIFFERENT>>","testing_instructions":"<<TESTING_INSTRUCTIONS>>","alpha_testers":[{"address":"<<genesis token wallet address>>","comment":"<<Optional. For internal use only>>"},{"address":"<<genesis token wallet address>>","comment":"<<Optional. For internal use only>>"}]}}

package/lib/generated/config_schema.json

@@ -1 +1 @@
-{"type":"object","properties":{"publisher":{"type":"object","properties":{"name":{"type":"string"},"address":{"type":"string"},"website":{"type":"string"},"email":{"type":"string"},"media":{"type":"array","items":{"type":"object","properties":{"purpose":{"type":"string"},"uri":{"type":"string"}}}}}},"app":{"type":"object","properties":{"name":{"type":"string"},"address":{"type":"string"},"android_package":{"type":"string"},"urls":{"type":"object","properties":{"license_url":{"type":"string"},"copyright_url":{"type":"string"},"privacy_policy_url":{"type":"string"},"website":{"type":"string"}}},"media":{"type":"array","items":{"type":"object","properties":{"purpose":{"type":"string"},"uri":{"type":"string"}}}}}},"release":{"type":"object","properties":{"address":{"type":"string"},"media":{"type":"array","items":{"type":"object","properties":{"purpose":{"type":"string"},"uri":{"type":"string"}},"required":["purpose","uri"]}},"files":{"type":"array","items":{"type":"object","properties":{"purpose":{"type":"string"},"uri":{"type":"string"}}}},"catalog":{"type":"object","properties":{"en-US":{"type":"object","properties":{"name":{"type":"string"},"short_description":{"type":"string"},"long_description":{"type":"string"},"new_in_version":{"type":"string"},"saga_features":{"type":"string"}},"required":["short_description"]}}}}},"solana_mobile_dapp_publisher_portal":{"type":"object","properties":{"google_store_package":{"type":"string"},"testing_instructions":{"type":"string"},"alpha_testers":{"type":"array","items":{"type":"object","properties":{"address":{"type":"string"},"comment":{"type":"string"}},"required":["address","comment"]}}}}}}
+{"type":"object","properties":{"publisher":{"type":"object","properties":{"name":{"type":"string"},"website":{"type":"string"},"email":{"type":"string"}}},"app":{"type":"object","properties":{"name":{"type":"string"},"address":{"type":"string"},"android_package":{"type":"string"},"urls":{"type":"object","properties":{"license_url":{"type":"string"},"copyright_url":{"type":"string"},"privacy_policy_url":{"type":"string"},"website":{"type":"string"}}},"media":{"type":"array","items":{"type":"object","properties":{"purpose":{"type":"string"},"uri":{"type":"string"}}}}}},"release":{"type":"object","properties":{"address":{"type":"string"},"media":{"type":"array","items":{"type":"object","properties":{"purpose":{"type":"string"},"uri":{"type":"string"}},"required":["purpose","uri"]}},"files":{"type":"array","items":{"type":"object","properties":{"purpose":{"type":"string"},"uri":{"type":"string"}}}},"catalog":{"type":"object","properties":{"en-US":{"type":"object","properties":{"name":{"type":"string"},"short_description":{"type":"string"},"long_description":{"type":"string"},"new_in_version":{"type":"string"},"saga_features":{"type":"string"}},"required":["short_description"]}}}}},"solana_mobile_dapp_publisher_portal":{"type":"object","properties":{"google_store_package":{"type":"string"},"testing_instructions":{"type":"string"},"alpha_testers":{"type":"array","items":{"type":"object","properties":{"address":{"type":"string"},"comment":{"type":"string"}},"required":["address","comment"]}}}}}}

package/lib/index.js

@@ -28,7 +28,7 @@ function _async_to_generator(fn) {
     };
 }
 function _ts_generator(thisArg, body) {
-    var f, y, t, g, _ = {
+    var f, y, t, _ = {
         label: 0,
         sent: function() {
             if (t[0] & 1) throw t[1];
@@ -36,12 +36,8 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    };
-    return g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
     }), g;
     function verb(n) {
@@ -54,7 +50,7 @@ function _ts_generator(thisArg, body) {
     }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
+        while(g && (g = 0, op[0] && (_ = 0)), _)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,
@@ -124,10 +120,7 @@ function _ts_generator(thisArg, body) {
 }
 import { mainCli } from "./CliSetup.js";
 function main() {
-    return _main.apply(this, arguments);
-}
-function _main() {
-    _main = _async_to_generator(function() {
+    return _async_to_generator(function() {
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -142,7 +135,6 @@ function _main() {
                     ];
             }
         });
-    });
-    return _main.apply(this, arguments);
+    })();
 }
 main();

package/lib/package.json

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

package/lib/prebuild_schema/publishing_source.yaml

@@ -1,11 +1,7 @@
 publisher:
   name: <<YOUR_PUBLISHER_NAME>>
-  address: ""
   website: <<URL_OF_PUBLISHER_WEBSITE>>
   email: <<EMAIL_ADDRESS_TO_CONTACT_PUBLISHER>>
-  media:
-    - purpose: icon
-      uri: <<RELATIVE_PATH_TO_PUBLISHER_ICON>>
 app:
   name: <<APP_NAME>>
   address: ""

package/lib/upload/CachedStorageDriver.js

@@ -75,7 +75,7 @@ function _object_spread(target) {
     return target;
 }
 function _ts_generator(thisArg, body) {
-    var f, y, t, g, _ = {
+    var f, y, t, _ = {
         label: 0,
         sent: function() {
             if (t[0] & 1) throw t[1];
@@ -83,12 +83,8 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    };
-    return g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
     }), g;
     function verb(n) {
@@ -101,7 +97,7 @@ function _ts_generator(thisArg, body) {
     }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
+        while(g && (g = 0, op[0] && (_ = 0)), _)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,
@@ -192,15 +188,14 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
         {
             key: "getUploadPrice",
             value: function getUploadPrice(bytes) {
-                var _this = this;
                 return _async_to_generator(function() {
                     return _ts_generator(this, function(_state) {
                         return [
                             2,
-                            _this.storageDriver.getUploadPrice(bytes)
+                            this.storageDriver.getUploadPrice(bytes)
                         ];
                     });
-                })();
+                }).call(this);
             }
         },
         {
@@ -228,7 +223,6 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
         {
             key: "upload",
             value: function upload(file) {
-                var _this = this;
                 return _async_to_generator(function() {
                     var hash, uploadedAsset, uri;
                     return _ts_generator(this, function(_state) {
@@ -240,7 +234,7 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
                                 ];
                                 return [
                                     4,
-                                    _this.storageDriver.upload(file)
+                                    this.storageDriver.upload(file)
                                 ];
                             case 1:
                                 return [
@@ -249,7 +243,7 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
                                 ];
                             case 2:
                                 hash = createHash("sha256").update(file.buffer).digest("base64");
-                                uploadedAsset = _this.uploadedAsset(file.fileName, {
+                                uploadedAsset = this.uploadedAsset(file.fileName, {
                                     sha256: hash
                                 });
                                 if (uploadedAsset) {
@@ -262,20 +256,20 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
                                 console.log("Uploading ".concat(file.fileName));
                                 return [
                                     4,
-                                    _this.storageDriver.upload(file)
+                                    this.storageDriver.upload(file)
                                 ];
                             case 3:
                                 uri = _state.sent();
-                                _this.assetManifest.assets[file.fileName] = {
+                                this.assetManifest.assets[file.fileName] = {
                                     path: file.fileName,
                                     sha256: hash,
                                     uri: uri
                                 };
                                 return [
                                     4,
-                                    fs.promises.writeFile("".concat(process.cwd(), "/").concat(_this.assetManifestPath), // Something is really weird, I can't seem to stringify `this.assetManifest` straight-up. Here be dragons
+                                    fs.promises.writeFile("".concat(process.cwd(), "/").concat(this.assetManifestPath), // Something is really weird, I can't seem to stringify `this.assetManifest` straight-up. Here be dragons
                                     JSON.stringify({
-                                        assets: _object_spread({}, _this.assetManifest.assets)
+                                        assets: _object_spread({}, this.assetManifest.assets)
                                     }, null, 2), "utf-8")
                                 ];
                             case 4:
@@ -287,7 +281,7 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
                                 ];
                         }
                     });
-                })();
+                }).call(this);
             }
         }
     ]);

package/package.json

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

package/src/CliSetup.ts

@@ -1,6 +1,6 @@
 import { Command } from "commander";
 import { validateCommand } from "./commands/index.js";
-import { createAppCommand, createPublisherCommand, createReleaseCommand } from "./commands/create/index.js";
+import { createAppCommand, createReleaseCommand } from "./commands/create/index.js";
 import {
   publishRemoveCommand,
   publishSubmitCommand,
@@ -18,7 +18,6 @@ import {
   showMessage,
   showNetworkWarningIfApplicable
 } 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";
@@ -51,11 +50,8 @@ function resolveBuildToolsPath(buildToolsPath: string | undefined) {
  */
 function latestReleaseMessage() {
   const messages = [
-    `- App details page now supports a Banner Graphic image of size 1200x600px and a Feature Graphic image of size 1200x1200px (optional)`,
-    `- App details page now supports video files. (mp4 file format only and minimum resolution 720p)`,
-    `- priority fee has been updated to ${Constants.DEFAULT_PRIORITY_FEE} lamports = ${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.`
+    `- Banner Graphic image of size 1200x600px is now manadatory for publishing updates.`,
+    `- Feature Graphic image of size 1200x1200px is required to be featured in Editor's choice carousel. (optional)`,
   ].join('\n\n')
   showMessage(
     `Publishing Tools Version ${ Constants.CLI_VERSION }`,
@@ -93,41 +89,7 @@ export const initCliCmd = mainCli
 
 export const createCliCmd = mainCli
   .command("create")
-  .description("Create a `publisher`, `app`, or `release`")
-
-export const 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(async ({ keypair, url, dryRun, storageConfig, priorityFeeLamports }) => {
-    await tryWithErrorMessage(async () => {
-      showNetworkWarningIfApplicable(url)
-      latestReleaseMessage();
-      await checkForSelfUpdate();
-
-      const signer = parseKeypair(keypair);
-      if (signer) {
-        const result: { publisherAddress: string, transactionSignature: string } = await createPublisherCommand({ signer, url, dryRun, storageParams: storageConfig, priorityFeeLamports });
-
-        if (dryRun) {
-          dryRunSuccessMessage()
-        } else {
-          const displayUrl = `https://explorer.solana.com/address/${result.publisherAddress}${generateNetworkSuffix(url)}`;
-          const transactionUrl = `https://explorer.solana.com/tx/${result.transactionSignature}${generateNetworkSuffix(url)}`;
-          const resultText = `Publisher NFT successfully minted successfully:\n${displayUrl}\n${transactionUrl}`;
-
-          showMessage("Success", resultText);
-        }
-      }
-    });
-  });
+  .description("Create a `app`, or `release`")
 
 export const createAppCliCmd = createCliCmd
   .command("app")
@@ -136,30 +98,19 @@ export const createAppCliCmd = createCliCmd
     "-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(async ({ publisherMintAddress, keypair, url, dryRun, storageConfig, priorityFeeLamports }) => {
+  .action(async ({keypair, url, dryRun, storageConfig, priorityFeeLamports }) => {
     await tryWithErrorMessage(async () => {
       showNetworkWarningIfApplicable(url)
       latestReleaseMessage();
       await checkForSelfUpdate();
 
-      const config = await loadPublishDetailsWithChecks();
-
-      if (!hasAddressInConfig(config.publisher) && !publisherMintAddress) {
-        throw new Error("Either specify a publisher mint address in the config file or specify as a CLI argument to this command.");
-      }
-
       const signer = parseKeypair(keypair);
       if (signer) {
         const result = await createAppCommand({
-          publisherMintAddress: publisherMintAddress,
           signer,
           url,
           dryRun,

package/src/CliUtils.ts

@@ -19,7 +19,7 @@ import { awsStorage } from "@metaplex-foundation/js-plugin-aws";
 import { S3StorageManager } from "./config/index.js";
 
 export class Constants {
-  static CLI_VERSION = "0.10.0";
+  static CLI_VERSION = "0.11.0";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
   static DEFAULT_PRIORITY_FEE = 500000;
@@ -50,28 +50,22 @@ export const checkForSelfUpdate = async () => {
 
 export const checkMintedStatus = async (
   conn: Connection,
-  pubAddr: string,
   appAddr: string,
   releaseAddr: string
 ) => {
   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
+    const isAppMinted = results[0] != undefined && results[0]?.lamports > 0
+    const isReleaseMinted = results[1] != undefined && results[1]?.lamports > 0
 
-    if (isPublisherMinted && isAppMinted && isReleaseMinted) {
+    if (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`
       }
@@ -80,7 +74,7 @@ export const checkMintedStatus = async (
       }
       if (i == 4) {
         throw new Error(
-          `Expected Publisher :: ${pubAddr}, App :: ${appAddr} and Release :: ${releaseAddr} to be minted before submission.\n
+          `Expected 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.`
         );

package/src/__tests__/CliSetupTest.ts

@@ -2,7 +2,6 @@ import { beforeEach, expect } from "@jest/globals";
 import {
   createAppCliCmd,
   createCliCmd,
-  createPublisherCliCmd,
   createReleaseCliCmd,
   initCliCmd,
   mainCli
@@ -71,25 +70,6 @@ describe("Cli Setup & Execution", () => {
     expect(errorOutput).toEqual(createHelp)
   });
 
-  test("Calling create publisher command with no arguments warns about required argument", () => {
-    createPublisherCliCmd.exitOverride()
-
-    expect(() => {
-        createPublisherCliCmd.parse(["dapp-store", "create", "publisher"]);
-      }
-    ).toThrow(keyPairArgHelp);
-  });
-
-  test("Calling create publisher command with help flag shows contextual help", () => {
-    createPublisherCliCmd.exitOverride()
-
-    expect(() => {
-      createPublisherCliCmd.parse(["dapp-store", "create", "publisher", "-h"]);
-    }).toThrow(outputHelpReference)
-
-    expect(otherOutput).toEqual(createPublisherHelp)
-  });
-
   test("Calling create app command with no arguments warns about required argument", () => {
     createAppCliCmd.exitOverride()
 
@@ -140,7 +120,7 @@ Options:
 
 Commands:
   init                First-time initialization of tooling configuration
-  create              Create a \`publisher\`, \`app\`, or \`release\`
+  create              Create a \`app\`, or \`release\`
   validate [options]  Validates details prior to publishing
   publish             Submit a publishing request (\`submit\`, \`update\`, \`remove\`, or \`support\`) to the Solana Mobile dApp publisher portal
   help [command]      display help for command
@@ -158,21 +138,20 @@ Options:
 
   const createHelp = `Usage: dapp-store create [options] [command]
 
-Create a \`publisher\`, \`app\`, or \`release\`
+Create a \`app\`, or \`release\`
 
 Options:
-  -h, --help           display help for command
+  -h, --help         display help for command
 
 Commands:
-  publisher [options]  Create a publisher
-  app [options]        Create a app
-  release [options]    Create a release
-  help [command]       display help for command
+  app [options]      Create a app
+  release [options]  Create a release
+  help [command]     display help for command
 `;
 
-  const createPublisherHelp = `Usage: dapp-store create publisher [options]
+  const createAppHelp = `Usage: dapp-store create app [options]
 
-Create a publisher
+Create a app
 
 Options:
   -k, --keypair <path-to-keypair-file>                 Path to keypair file
@@ -183,20 +162,6 @@ Options:
   -h, --help                                           display help for command
 `;
 
-  const createAppHelp = `Usage: dapp-store create app [options]
-
-Create a app
-
-Options:
-  -k, --keypair <path-to-keypair-file>                   Path to keypair file
-  -p, --publisher-mint-address <publisher-mint-address>  The mint address of the publisher NFT
-  -u, --url <url>                                        RPC URL (default: "https://api.devnet.solana.com")
-  -d, --dry-run                                          Flag for dry run. Doesn't mint an NFT
-  -s, --storage-config <storage-config>                  Provide alternative storage configuration details
-  -p, --priority-fee-lamports <priority-fee-lamports>    Priority Fee lamports
-  -h, --help                                             display help for command
-`;
-
   const createReleaseHelp = `Usage: dapp-store create release [options]
 
 Create a release

package/src/commands/ValidateCommand.ts

@@ -1,9 +1,7 @@
 import {
   createAppJson,
-  createPublisherJson,
   createReleaseJson,
   validateApp,
-  validatePublisher,
   validateRelease,
   metaplexFileReplacer,
 } from "@solana-mobile/dapp-store-publishing-tools";
@@ -28,24 +26,6 @@ export const validateCommand = async ({
 
   debug({ publisherDetails, appDetails, releaseDetails });
 
-  const publisherJson = createPublisherJson(publisherDetails);
-  if (typeof publisherJson.image !== "string") {
-    publisherJson.image = (publisherJson.image as MetaplexFile)?.fileName;
-  }
-  debug("publisherJson=", JSON.stringify({ publisherJson }, metaplexFileReplacer, 2));
-
-  try {
-    validatePublisher(publisherJson);
-  } catch (e) {
-    const errorMsg = (e as Error | null)?.message ?? "";
-    showMessage(
-      "Publisher JSON invalid",
-      errorMsg,
-      "error"
-    )
-    return
-  }
-
   const appJson = createAppJson(appDetails, signer.publicKey);
   if (typeof appJson.image !== "string") {
     appJson.image = (appJson.image as MetaplexFile)?.fileName;

package/src/commands/create/CreateCliApp.ts

@@ -3,7 +3,6 @@ import { createApp } from "@solana-mobile/dapp-store-publishing-tools";
 import {
   Connection,
   Keypair,
-  PublicKey,
 } from "@solana/web3.js";
 
 import {
@@ -17,14 +16,12 @@ const createAppNft = async (
   {
     appDetails,
     connection,
-    publisherMintAddress,
     publisher,
     storageParams,
     priorityFeeLamports,
   }: {
     appDetails: App;
     connection: Connection;
-    publisherMintAddress: string;
     publisher: Keypair;
     storageParams: string;
     priorityFeeLamports: number;
@@ -36,7 +33,6 @@ const createAppNft = async (
   const metaplex = getMetaplexInstance(connection, publisher, storageParams);
   const txBuilder = await createApp(
     {
-      publisherMintAddress: new PublicKey(publisherMintAddress),
       mintAddress,
       appDetails,
       priorityFeeLamports
@@ -55,7 +51,6 @@ const createAppNft = async (
 };
 
 type CreateAppCommandInput = {
-  publisherMintAddress: string;
   signer: Keypair;
   url: string;
   dryRun?: boolean;
@@ -67,7 +62,6 @@ export const createAppCommand = async ({
   signer,
   url,
   dryRun,
-  publisherMintAddress,
   storageParams,
   priorityFeeLamports = Constants.DEFAULT_PRIORITY_FEE,
 }: CreateAppCommandInput) => {
@@ -78,7 +72,7 @@ export const createAppCommand = async ({
     }
   );
 
-  const { app: appDetails, publisher: publisherDetails } =
+  const { app: appDetails } =
     await loadPublishDetailsWithChecks();
 
   if (!dryRun) {
@@ -86,7 +80,6 @@ export const createAppCommand = async ({
       {
         connection,
         publisher: signer,
-        publisherMintAddress: publisherDetails.address ?? publisherMintAddress,
         appDetails,
         storageParams,
         priorityFeeLamports

package/src/commands/create/index.ts

@@ -1,4 +1,3 @@
-export * from "./CreateCliPublisher.js";
 export * from "./CreateCliApp.js";
 export * from "./CreateCliRelease.js";
 

package/src/commands/publish/PublishCliRemove.ts

@@ -47,11 +47,10 @@ export const publishRemoveCommand = async ({
   const sign = ((buf: Buffer) =>
     nacl.sign(buf, signer.secretKey)) as SignWithPublisherKeypair;
 
-  const pubAddr = publisherDetails.address;
   const appAddr = appMintAddress ?? appDetails.address;
   const releaseAddr = releaseMintAddress ?? releaseDetails.address;
 
-  await checkMintedStatus(connection, pubAddr, appAddr, releaseAddr);
+  await checkMintedStatus(connection, appAddr, releaseAddr);
 
   await publishRemove(
     { connection, sign },

package/src/commands/publish/PublishCliSubmit.ts

@@ -61,7 +61,6 @@ export const publishSubmitCommand = async ({
   const sign = ((buf: Buffer) =>
     nacl.sign(buf, signer.secretKey)) as SignWithPublisherKeypair;
 
-  const pubAddr = publisherDetails.address;
   const appAddr = appMintAddress ?? appDetails.address;
   const releaseAddr = releaseMintAddress ?? releaseDetails.address;
 
@@ -69,7 +68,7 @@ export const publishSubmitCommand = async ({
     throw new Error(`You've already submitted this version for review.`);
   }
 
-  await checkMintedStatus(connection, pubAddr, appAddr, releaseAddr);
+  await checkMintedStatus(connection, appAddr, releaseAddr);
 
   await publishSubmit(
     { connection, sign },

package/src/commands/publish/PublishCliSupport.ts

@@ -47,11 +47,10 @@ export const publishSupportCommand = async ({
   const sign = ((buf: Buffer) =>
     nacl.sign(buf, signer.secretKey)) as SignWithPublisherKeypair;
 
-  const pubAddr = publisherDetails.address;
   const appAddr = appMintAddress ?? appDetails.address;
   const releaseAddr = releaseMintAddress ?? releaseDetails.address;
 
-  await checkMintedStatus(connection, pubAddr, appAddr, releaseAddr);
+  await checkMintedStatus(connection, appAddr, releaseAddr);
 
   await publishSupport(
     { connection, sign },

package/src/commands/publish/PublishCliUpdate.ts

@@ -69,7 +69,6 @@ export const publishUpdateCommand = async ({
   const sign = ((buf: Buffer) =>
     nacl.sign(buf, signer.secretKey)) as SignWithPublisherKeypair;
 
-  const pubAddr = publisherDetails.address;
   const appAddr = appMintAddress ?? appDetails.address;
   const releaseAddr = releaseMintAddress ?? releaseDetails.address;
 
@@ -77,7 +76,7 @@ export const publishUpdateCommand = async ({
     throw new Error(`You've already submitted this version for review.`);
   }
 
-  await checkMintedStatus(connection, pubAddr, appAddr, releaseAddr);
+  await checkMintedStatus(connection, appAddr, releaseAddr);
 
   await publishUpdate(
     { connection, sign },