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

package/src/commands/ValidateCommand.ts

@@ -7,7 +7,7 @@ import {
   validateRelease,
   metaplexFileReplacer,
 } from "@solana-mobile/dapp-store-publishing-tools";
-import { debug } from "../CliUtils.js";
+import { debug, showMessage } from "../CliUtils.js";
 
 import type { Keypair } from "@solana/web3.js";
 import type { MetaplexFile } from "@metaplex-foundation/js";
@@ -39,7 +39,13 @@ export const validateCommand = async ({
     validatePublisher(publisherJson);
     console.info(`Publisher JSON valid!`);
   } catch (e) {
-    console.error(e);
+    const errorMsg = (e as Error | null)?.message ?? "";
+    showMessage(
+      "Publisher JSON invalid",
+      errorMsg,
+      "error"
+    )
+    return
   }
 
   const appJson = createAppJson(appDetails, signer.publicKey);
@@ -52,7 +58,13 @@ export const validateCommand = async ({
     validateApp(appJson);
     console.info(`App JSON valid!`);
   } catch (e) {
-    console.error(e);
+    const errorMsg = (e as Error | null)?.message ?? "";
+    showMessage(
+      "App JSON invalid",
+      errorMsg,
+      "error"
+    )
+    return
   }
 
   const releaseJson = await createReleaseJson(
@@ -60,6 +72,16 @@ export const validateCommand = async ({
     signer.publicKey
   );
 
+
+  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
+  }
+
   const objStringified = JSON.stringify(releaseJson, metaplexFileReplacer, 2);
   debug("releaseJson=", objStringified);
 
@@ -67,6 +89,18 @@ export const validateCommand = async ({
     validateRelease(JSON.parse(objStringified));
     console.info(`Release JSON valid!`);
   } catch (e) {
-    console.error(e);
+    const errorMsg = (e as Error | null)?.message ?? "";
+    showMessage(
+      "Release JSON invalid",
+      errorMsg,
+      "error"
+    )
+    return
   }
+
+  showMessage(
+    "Json is Valid",
+    "Input data is valid",
+    "standard"
+  )
 };

package/src/commands/create/CreateCliApp.ts

@@ -8,7 +8,9 @@ import {
 } from "@solana/web3.js";
 
 import {
+  Constants,
   getMetaplexInstance,
+  showMessage,
 } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
 
@@ -19,15 +21,18 @@ const createAppNft = async (
     publisherMintAddress,
     publisher,
     storageParams,
+    priorityFeeLamports,
   }: {
     appDetails: App;
     connection: Connection;
     publisherMintAddress: string;
     publisher: Keypair;
     storageParams: string;
+    priorityFeeLamports: number;
   },
-  { dryRun }: { dryRun?: boolean }
 ) => {
+  console.info(`Creating App NFT`);
+
   const mintAddress = Keypair.generate();
   const metaplex = getMetaplexInstance(connection, publisher, storageParams);
   const txBuilder = await createApp(
@@ -35,25 +40,37 @@ const createAppNft = async (
       publisherMintAddress: new PublicKey(publisherMintAddress),
       mintAddress,
       appDetails,
+      priorityFeeLamports
     },
     { metaplex, publisher }
   );
 
-  const blockhash = await connection.getLatestBlockhashAndContext();
-  const tx = txBuilder.toTransaction(blockhash.value);
-  tx.sign(mintAddress, publisher);
+  console.info(`App NFT data upload complete\nSigning transaction now`);
+  const maxTries = 8;
+  for (let i = 1; i <= maxTries; i++) {
+    try {
+      const blockhash = await connection.getLatestBlockhashAndContext();
+      const tx = txBuilder.toTransaction(blockhash.value);
+      tx.sign(mintAddress, publisher);
 
-  if (!dryRun) {
-    const txSig = await sendAndConfirmTransaction(connection, tx, [
-      publisher,
-      mintAddress,
-    ], {
-      minContextSlot: blockhash.context.slot
-    });
-    console.info({ txSig, mintAddress: mintAddress.publicKey.toBase58() });
+      const txSig = await sendAndConfirmTransaction(connection, tx, [
+        publisher,
+        mintAddress,
+      ], {
+        minContextSlot: blockhash.context.slot
+      });
+      return { appAddress: mintAddress.publicKey.toBase58(), transactionSignature: txSig };
+    } 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 app NFT."
+        showMessage("Transaction Failure", retryMsg, "standard");
+      }
+    }
   }
-
-  return { appAddress: mintAddress.publicKey.toBase58() };
 };
 
 type CreateAppCommandInput = {
@@ -62,6 +79,7 @@ type CreateAppCommandInput = {
   url: string;
   dryRun?: boolean;
   storageParams: string;
+  priorityFeeLamports: number;
 };
 
 export const createAppCommand = async ({
@@ -70,26 +88,27 @@ export const createAppCommand = async ({
   dryRun,
   publisherMintAddress,
   storageParams,
+  priorityFeeLamports = Constants.DEFAULT_PRIORITY_FEE,
 }: CreateAppCommandInput) => {
   const connection = new Connection(url);
 
   const { app: appDetails, publisher: publisherDetails } =
     await loadPublishDetailsWithChecks();
 
-  const { appAddress } = await createAppNft(
-    {
-      connection,
-      publisher: signer,
-      publisherMintAddress: publisherDetails.address ?? publisherMintAddress,
-      appDetails,
-      storageParams,
-    },
-    { dryRun }
-  );
-
   if (!dryRun) {
+    const { appAddress, transactionSignature } = await createAppNft(
+      {
+        connection,
+        publisher: signer,
+        publisherMintAddress: publisherDetails.address ?? publisherMintAddress,
+        appDetails,
+        storageParams,
+        priorityFeeLamports
+      },
+    );
+
     await writeToPublishDetails({ app: { address: appAddress } });
-  }
 
-  return { appAddress };
+    return { appAddress, transactionSignature };
+  }
 };

package/src/commands/create/CreateCliPublisher.ts

@@ -7,7 +7,9 @@ import {
 } from "@solana/web3.js";
 
 import {
+  Constants,
   getMetaplexInstance,
+  showMessage,
 } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
 
@@ -17,39 +19,49 @@ const createPublisherNft = async (
     publisher,
     publisherDetails,
     storageParams,
+    priorityFeeLamports,
   }: {
     connection: Connection;
     publisher: Keypair;
     publisherDetails: Publisher;
     storageParams: string;
+    priorityFeeLamports: number;
   },
-  { dryRun }: { dryRun: boolean }
 ) => {
+  console.info(`Creating Publisher NFT`);
   const mintAddress = Keypair.generate();
   const metaplex = getMetaplexInstance(connection, publisher, storageParams);
-  console.info(
-    `Creating publisher at address: ${mintAddress.publicKey.toBase58()}`
-  );
   const txBuilder = await createPublisher(
-    { mintAddress, publisherDetails },
+    { mintAddress, publisherDetails, priorityFeeLamports },
     { metaplex, publisher }
   );
 
-  const blockhash = await connection.getLatestBlockhashAndContext();
-  const tx = txBuilder.toTransaction(blockhash.value);
-  tx.sign(mintAddress, publisher);
+  console.info(`Publisher NFT data upload complete\nSigning transaction now`);
+  const maxTries = 8;
+  for (let i = 1; i <= maxTries; i++) {
+    try {
+      const blockhash = await connection.getLatestBlockhashAndContext();
+      const tx = txBuilder.toTransaction(blockhash.value);
+      tx.sign(mintAddress, publisher);
 
-  if (!dryRun) {
-    const txSig = await sendAndConfirmTransaction(connection, tx, [
-      publisher,
-      mintAddress,
-    ], {
-      minContextSlot: blockhash.context.slot
-    });
-    console.info({ txSig, mintAddress: mintAddress.publicKey.toBase58() });
+      const txSig = await sendAndConfirmTransaction(connection, tx, [
+        publisher,
+        mintAddress,
+      ], {
+        minContextSlot: blockhash.context.slot
+      });
+      return { publisherAddress: mintAddress.publicKey.toBase58(), transactionSignature: txSig};
+    } 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 publisher."
+        showMessage("Transaction Failure", retryMsg, "standard");
+      }
+    }
   }
-
-  return { publisherAddress: mintAddress.publicKey.toBase58() };
 };
 
 export const createPublisherCommand = async ({
@@ -57,28 +69,31 @@ export const createPublisherCommand = async ({
   url,
   dryRun,
   storageParams,
+  priorityFeeLamports = Constants.DEFAULT_PRIORITY_FEE,
 }: {
   signer: Keypair;
   url: string;
   dryRun: boolean;
   storageParams: string;
+  priorityFeeLamports: number;
 }) => {
   const connection = new Connection(url);
 
   const { publisher: publisherDetails } = await loadPublishDetailsWithChecks();
 
-  const { publisherAddress } = await createPublisherNft(
-    {
-      connection,
-      publisher: signer,
-      publisherDetails,
-      storageParams: storageParams,
-    },
-    { dryRun }
-  );
+  if (!dryRun) {
+    const { publisherAddress, transactionSignature } = await createPublisherNft(
+      {
+        connection,
+        publisher: signer,
+        publisherDetails,
+        storageParams: storageParams,
+        priorityFeeLamports: priorityFeeLamports,
+      },
+    );
 
-  // TODO(sdlaver): dry-run should not modify config
-  await writeToPublishDetails({ publisher: { address: publisherAddress } });
+    await writeToPublishDetails({ publisher: { address: publisherAddress } });
 
-  return { publisherAddress };
+    return { publisherAddress, transactionSignature };
+  }
 };

package/src/commands/create/CreateCliRelease.ts

@@ -11,6 +11,7 @@ import {
   sendAndConfirmTransaction,
 } from "@solana/web3.js";
 import {
+  Constants,
   getMetaplexInstance,
   showMessage
 } from "../../CliUtils.js";
@@ -23,6 +24,7 @@ type CreateReleaseCommandInput = {
   url: string;
   dryRun?: boolean;
   storageParams: string;
+  priorityFeeLamports: number;
 };
 
 const createReleaseNft = async ({
@@ -33,6 +35,7 @@ const createReleaseNft = async ({
   connection,
   publisher,
   storageParams,
+  priorityFeeLamports,
 }: {
   appMintAddress: string;
   releaseDetails: Release;
@@ -41,7 +44,10 @@ const createReleaseNft = async ({
   connection: Connection;
   publisher: Keypair;
   storageParams: string;
+  priorityFeeLamports: number;
 }) => {
+  console.info(`Creating Release NFT`);
+
   const releaseMintAddress = Keypair.generate();
 
   const metaplex = getMetaplexInstance(connection, publisher, storageParams);
@@ -53,10 +59,12 @@ const createReleaseNft = async ({
       releaseDetails,
       appDetails,
       publisherDetails,
+      priorityFeeLamports
     },
     { metaplex, publisher }
   );
 
+  console.info(`Release NFT data upload complete\nSigning transaction now`);
   const maxTries = 8;
   for (let i = 1; i <= maxTries; i++) {
     try {
@@ -69,18 +77,14 @@ const createReleaseNft = async ({
       ], {
         minContextSlot: blockhash.context.slot,
       });
-      console.info({
-        txSig,
-        releaseMintAddress: releaseMintAddress.publicKey.toBase58(),
-      });
-      return { releaseAddress: releaseMintAddress.publicKey.toBase58() };
+      return { releaseAddress: releaseMintAddress.publicKey.toBase58(), transactionSignature: txSig };
     } 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"
+        const retryMsg = errorMsg + "\nWill Retry minting release NFT"
         showMessage("Transaction Failure", retryMsg, "standard");
       }
     }
@@ -94,13 +98,19 @@ export const createReleaseCommand = async ({
   url,
   dryRun = false,
   storageParams,
+  priorityFeeLamports = Constants.DEFAULT_PRIORITY_FEE,
 }: CreateReleaseCommandInput) => {
   const connection = new Connection(url);
 
   const { release, app, publisher } = await loadPublishDetailsWithChecks(buildToolsPath);
 
+
+  if (app.android_package != release.android_details.android_package) {
+    throw new Error("App package name and release package name do not match.\nApp release specifies " + app.android_package + " while release specifies " + release.android_details.android_package)
+  }
+
   if (!dryRun) {
-    const { releaseAddress } = await createReleaseNft({
+    const { releaseAddress, transactionSignature } = await createReleaseNft({
       appMintAddress: app.address ?? appMintAddress,
       connection,
       publisher: signer,
@@ -110,10 +120,11 @@ export const createReleaseCommand = async ({
       appDetails: app,
       publisherDetails: publisher,
       storageParams: storageParams,
+      priorityFeeLamports: priorityFeeLamports,
     });
 
     await writeToPublishDetails({ release: { address: releaseAddress }, });
 
-    return { releaseAddress };
+    return { releaseAddress, transactionSignature };
   }
 };

package/src/config/PublishDetails.ts

@@ -119,13 +119,25 @@ export const loadPublishDetailsWithChecks = async (
   }
 
   config.release.media.forEach((item: PublishDetails["release"]["media"][0]) => {
-      const imagePath = path.join(process.cwd(), item.uri);
-      if (!fs.existsSync(imagePath) || !checkImageExtension(imagePath)) {
-        throw new Error(`Invalid media path or file type: ${item.uri}. Please ensure the file is a jpeg, png, or webp file.`);
-      }
+    const imagePath = path.join(process.cwd(), item.uri);
+    if (!fs.existsSync(imagePath) || !checkImageExtension(imagePath)) {
+      throw new Error(`Invalid media path or file type: ${item.uri}. Please ensure the file is a jpeg, png, or webp file.`);
     }
+  }
   );
 
+  const screenshots = config.release.media?.filter(
+    (asset: any) => asset.purpose === "screenshot"
+  )
+
+  if (screenshots.length < 4) {
+    showMessage(
+      "Screenshots requirements changing in version 0.9.0",
+      `At least 4 screenshots are required for publishing a new release. Found only ${screenshots.length}`,
+      "warning"
+    )
+  }
+
   validateLocalizableResources(config);
 
   const googlePkg = config.solana_mobile_dapp_publisher_portal.google_store_package;
@@ -146,7 +158,7 @@ const checkIconCompatibility = async (path: string, typeString: string) => {
   }
 
   if (await checkIconDimensions(path)) {
-    throw new Error("Icons must have square dimensions and be no greater than 512px by 512px.");
+    throw new Error("Icons must be 512px by 512px.");
   }
 };
 
@@ -189,7 +201,7 @@ const validateLocalizableResources = (config: PublishDetails) => {
 const checkIconDimensions = async (iconPath: string): Promise<boolean> => {
   const size = await runImgSize(iconPath);
 
-  return size?.width != size?.height || (size?.width ?? 0) > 512;
+  return size?.width != size?.height || (size?.width ?? 0) != 512;
 };
 
 const getAndroidDetails = async (

package/src/upload/CachedStorageDriver.ts

@@ -32,7 +32,6 @@ export class CachedStorageDriver implements StorageDriver {
     { assetManifestPath }: { assetManifestPath: string }
   ) {
     this.assetManifestPath = assetManifestPath;
-    console.info({ loading: true });
     this.assetManifest = this.loadAssetManifest(assetManifestPath) ?? {
       schema_version: CachedStorageDriver.SCHEMA_VERSION,
       assets: {},
@@ -69,15 +68,6 @@ export class CachedStorageDriver implements StorageDriver {
     }
     const hash = createHash("sha256").update(file.buffer).digest("base64");
 
-    console.info(
-      JSON.stringify({
-        file: {
-          name: file.fileName,
-          disn: file.displayName,
-          un: file.uniqueName,
-        },
-      })
-    );
     const uploadedAsset = this.uploadedAsset(file.fileName, { sha256: hash });
     if (uploadedAsset) {
       console.log(
@@ -101,6 +91,7 @@ export class CachedStorageDriver implements StorageDriver {
       JSON.stringify({ assets: { ...this.assetManifest.assets } }, null, 2),
       "utf-8"
     );
+    console.log(`${file.fileName} uploaded at ${uri}`)
 
     return uri;
   }