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

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 },

package/src/config/PublishDetails.ts

@@ -90,18 +90,6 @@ export const loadPublishDetailsWithChecks = async (
     );
   }
 
-  const publisherIcon = config.publisher.media?.find(
-    (asset: any) => asset.purpose === "icon"
-  )?.uri;
-
-  if (publisherIcon) {
-    const iconPath = path.join(process.cwd(), publisherIcon);
-    await checkIconCompatibility(iconPath, "Publisher");
-
-    const iconBuffer = await fs.promises.readFile(iconPath);
-    config.publisher.icon = toMetaplexFile(iconBuffer, publisherIcon);
-  }
-
   const appIcon = config.app.media?.find(
     (asset: any) => asset.purpose === "icon"
   )?.uri;
@@ -127,6 +115,26 @@ export const loadPublishDetailsWithChecks = async (
     throw new Error("Please specify at least one media entry of type icon in your configuration file");
   }
 
+  const banner = config.release.media?.find(
+      (asset: any) => asset.purpose === "banner"
+    )?.uri;
+
+    if (banner) {
+      const bannerPath = path.join(process.cwd(), banner);
+      await checkBannerCompatibility(bannerPath);
+    } else {
+      throw new Error("Please specify banner image of size 1200x600 in your configuration file");
+    }
+
+  const featureGraphic = config.release.media?.find(
+    (asset: any) => asset.purpose === "featureGraphic"
+  )?.uri;
+
+  if (featureGraphic) {
+    const featureGraphicPath = path.join(process.cwd(), featureGraphic);
+    await checkFeatureGraphicCompatibility(featureGraphicPath);
+  }
+
   config.release.media.forEach((item: PublishDetails["release"]["media"][0]) => {
     const mediaPath = path.join(process.cwd(), item.uri);
     if (!fs.existsSync(mediaPath)) {
@@ -149,7 +157,7 @@ export const loadPublishDetailsWithChecks = async (
 
   for (const item of screenshots) {
     const mediaPath = path.join(process.cwd(), item.uri);
-    if (await checkScreenshotSize(mediaPath)) {
+    if (await checkScreenshotDimensions(mediaPath)) {
       throw new Error(`Screenshot ${mediaPath} must be at least 1080px in width and height.`);
     }
   }
@@ -160,7 +168,7 @@ export const loadPublishDetailsWithChecks = async (
 
   for (const video of videos) {
     const mediaPath = path.join(process.cwd(), video.uri);
-    if (await checkVideoSize(mediaPath)) {
+    if (await checkVideoDimensions(mediaPath)) {
       throw new Error(`Video ${mediaPath} must be at least 720px in width and height.`);
     }
   }
@@ -208,6 +216,26 @@ const checkIconCompatibility = async (path: string, typeString: string) => {
   }
 };
 
+const checkBannerCompatibility = async (path: string) => {
+  if (!fs.existsSync(path) || !checkImageExtension(path)) {
+    throw new Error(`Please check the path to your banner image and ensure the file is a jpeg, png, or webp file.`);
+  }
+
+  if (await checkBannerDimensions(path)) {
+    throw new Error("Banner must be 1200px by 600px.");
+  }
+};
+
+const checkFeatureGraphicCompatibility = async (path: string) => {
+  if (!fs.existsSync(path) || !checkImageExtension(path)) {
+    throw new Error(`Please check the path to your featureGraphic image and ensure the file is a jpeg, png, or webp file.`);
+  }
+
+  if (await checkFeatureGraphicDimensions(path)) {
+    throw new Error("Feature Graphic must be 1200px by 1200px.");
+  }
+};
+
 const checkImageExtension = (uri: string): boolean => {
   const fileExt = path.extname(uri).toLowerCase();
   return (
@@ -257,13 +285,25 @@ const checkIconDimensions = async (iconPath: string): Promise<boolean> => {
   return size?.width != size?.height || (size?.width ?? 0) != 512;
 };
 
-const checkScreenshotSize = async (imagePath: string): Promise<boolean> => {
+const checkScreenshotDimensions = async (imagePath: string): Promise<boolean> => {
   const size = await runImgSize(imagePath);
 
   return (size?.width ?? 0) < 1080 || (size?.height ?? 0) < 1080;
 }
 
-const checkVideoSize = async (imagePath: string): Promise<boolean> => {
+const checkBannerDimensions = async (imagePath: string): Promise<boolean> => {
+  const size = await runImgSize(imagePath);
+
+  return (size?.width ?? 0) != 1200 || (size?.height ?? 0) != 600;
+}
+
+const checkFeatureGraphicDimensions = async (imagePath: string): Promise<boolean> => {
+  const size = await runImgSize(imagePath);
+
+  return (size?.width ?? 0) != 1200 || (size?.height ?? 0) != 1200;
+}
+
+const checkVideoDimensions = async (imagePath: string): Promise<boolean> => {
   const size = await getVideoDimensions(imagePath);
 
   return (size?.width ?? 0) < 720 || (size?.height ?? 0) < 720;
@@ -323,7 +363,7 @@ const getAndroidDetails = async (
       );
     }
 
-    if (permissions.includes("com.solanamobile.seedvault.ACCESS_SEED_VAULT")) {
+    if (permissions.includes("com.solanamobile.seedvault.ACCESS_SEED_VAULT") || permissions.includes("com.solanamobile.seedvault.ACCESS_SEED_VAULT_PRIVILEGED")) {
       showMessage(
         "App requests Seed Vault permission",
         "If this is not a wallet application, your app maybe rejected from listing on Solana dApp Store.",
@@ -331,19 +371,6 @@ const getAndroidDetails = async (
       );
     }
 
-    if (localeArray.length >= 60) {
-      showMessage(
-        "The bundle apk claims supports for following locales",
-        "Claim for supported locales::\n" +
-        localeArray +
-        "\nIf this release does not support all these locales the release may be rejected" +
-        "\nSee details at https://developer.android.com/guide/topics/resources/multilingual-support#design for configuring the supported locales",
-        "warning"
-      );
-    }
-
-    checkAbis(apkPath);
-
     return {
       android_package: appPackage?.[1] ?? "",
       min_sdk: parseInt(minSdk?.[1] ?? "0", 10),
@@ -362,35 +389,6 @@ const getAndroidDetails = async (
   }
 };
 
-const checkAbis = async (apkPath: string) => {
-  try {
-    const { stdout } = await runExec(`zipinfo -s ${apkPath} | grep \.so$`);
-    const amV7libs = [...stdout.matchAll(/lib\/armeabi-v7a\/(.*)/g)].flatMap(permission => permission[1]);
-    const x86libs = [...stdout.matchAll(/lib\/x86\/(.*)/g)].flatMap(permission => permission[1]);
-    const x8664libs = [...stdout.matchAll(/lib\/x86_64\/(.*)/g)].flatMap(permission => permission[1]);
-    if (amV7libs.length > 0 || x86libs.length > 0 || x8664libs.length > 0) {
-
-      const messages = [
-        `Solana dApp Store only supports arm64-v8a abi.`,
-        `Your apk file contains following unsupported abis`,
-        ... amV7libs.length > 0 ? [`\narmeabi-v7a:\n` + amV7libs] : [],
-        ... x86libs.length > 0 ? [`\nx86:\n` + x86libs] : [],
-        ... x8664libs.length > 0 ? [`\nx86_64:\n` + x8664libs] : [],
-        `\n\nAlthough your app works fine on Saga, these library files are unused and increase the size of apk file making the download and update time longer for your app.`,
-        `\n\nSee https://developer.android.com/games/optimize/64-bit#build-with-64-bit for how to optimize your app.`,
-      ].join('\n')
-    
-      showMessage(
-        `Unsupported files found in apk`,
-        messages,
-        `warning`
-      )
-    }
-  } catch (e) {
-    // Ignore this error.
-  }
-}
-
 export const extractCertFingerprint = async (aaptDir: string, apkPath: string): Promise<string> => {
   const { stdout } = await runExec(`${aaptDir}/apksigner verify --print-certs -v "${apkPath}"`);
 
@@ -404,7 +402,7 @@ export const extractCertFingerprint = async (aaptDir: string, apkPath: string):
   }
 }
 
-export const writeToPublishDetails = async ({ publisher, app, release, lastSubmittedVersionOnChain, lastUpdatedVersionOnStore }: SaveToConfigArgs) => {
+export const writeToPublishDetails = async ({ app, release, lastSubmittedVersionOnChain, lastUpdatedVersionOnStore }: SaveToConfigArgs) => {
   const currentConfig = await loadPublishDetailsWithChecks();
 
   delete currentConfig.publisher.icon;
@@ -413,7 +411,6 @@ export const writeToPublishDetails = async ({ publisher, app, release, lastSubmi
   const newConfig: PublishDetails = {
     publisher: {
       ...currentConfig.publisher,
-      address: publisher?.address ?? currentConfig.publisher.address
     },
     app: {
       ...currentConfig.app,

package/src/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: ""
@@ -23,6 +19,10 @@ release:
   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

package/lib/commands/create/CreateCliPublisher.js

@@ -1,237 +0,0 @@
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    } catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
-}
-function _async_to_generator(fn) {
-    return function() {
-        var self = this, args = arguments;
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-            _next(undefined);
-        });
-    };
-}
-function _ts_generator(thisArg, body) {
-    var f, y, t, g, _ = {
-        label: 0,
-        sent: function() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
-    };
-    return(g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g);
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(_)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,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
-            op = [
-                6,
-                e
-            ];
-            y = 0;
-        } finally{
-            f = t = 0;
-        }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
-}
-import { createPublisher } from "@solana-mobile/dapp-store-publishing-tools";
-import { Connection, Keypair } from "@solana/web3.js";
-import { Constants, getMetaplexInstance } from "../../CliUtils.js";
-import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
-import { sendAndConfirmTransaction } from "../utils.js";
-var createPublisherNft = function() {
-    var _ref = _async_to_generator(function(param) {
-        var connection, publisher, publisherDetails, storageParams, priorityFeeLamports, mintAddress, metaplex, txBuilder, response;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    connection = param.connection, publisher = param.publisher, publisherDetails = param.publisherDetails, storageParams = param.storageParams, priorityFeeLamports = param.priorityFeeLamports;
-                    console.info("Creating Publisher NFT");
-                    mintAddress = Keypair.generate();
-                    metaplex = getMetaplexInstance(connection, publisher, storageParams);
-                    return [
-                        4,
-                        createPublisher({
-                            mintAddress: mintAddress,
-                            publisherDetails: publisherDetails,
-                            priorityFeeLamports: priorityFeeLamports
-                        }, {
-                            metaplex: metaplex,
-                            publisher: publisher
-                        })
-                    ];
-                case 1:
-                    txBuilder = _state.sent();
-                    console.info("Publisher NFT data upload complete\nSigning transaction now");
-                    return [
-                        4,
-                        sendAndConfirmTransaction(metaplex, txBuilder)
-                    ];
-                case 2:
-                    response = _state.sent().response;
-                    return [
-                        2,
-                        {
-                            publisherAddress: mintAddress.publicKey.toBase58(),
-                            transactionSignature: response.signature
-                        }
-                    ];
-            }
-        });
-    });
-    return function createPublisherNft(_) {
-        return _ref.apply(this, arguments);
-    };
-}();
-export var createPublisherCommand = function() {
-    var _ref = _async_to_generator(function(param) {
-        var signer, url, dryRun, storageParams, _param_priorityFeeLamports, priorityFeeLamports, connection, _ref, publisherDetails, _ref1, publisherAddress, transactionSignature;
-        return _ts_generator(this, function(_state) {
-            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, {
-                        commitment: "confirmed"
-                    });
-                    return [
-                        4,
-                        loadPublishDetailsWithChecks()
-                    ];
-                case 1:
-                    _ref = _state.sent(), publisherDetails = _ref.publisher;
-                    if (!!dryRun) return [
-                        3,
-                        4
-                    ];
-                    return [
-                        4,
-                        createPublisherNft({
-                            connection: connection,
-                            publisher: signer,
-                            publisherDetails: publisherDetails,
-                            storageParams: storageParams,
-                            priorityFeeLamports: priorityFeeLamports
-                        })
-                    ];
-                case 2:
-                    _ref1 = _state.sent(), publisherAddress = _ref1.publisherAddress, transactionSignature = _ref1.transactionSignature;
-                    return [
-                        4,
-                        writeToPublishDetails({
-                            publisher: {
-                                address: publisherAddress
-                            }
-                        })
-                    ];
-                case 3:
-                    _state.sent();
-                    return [
-                        2,
-                        {
-                            publisherAddress: publisherAddress,
-                            transactionSignature: transactionSignature
-                        }
-                    ];
-                case 4:
-                    return [
-                        2,
-                        {
-                            publisherAddress: "",
-                            transactionSignature: ""
-                        }
-                    ];
-            }
-        });
-    });
-    return function createPublisherCommand(_) {
-        return _ref.apply(this, arguments);
-    };
-}();

package/src/commands/create/CreateCliPublisher.ts

@@ -1,87 +0,0 @@
-import type { Publisher } from "@solana-mobile/dapp-store-publishing-tools";
-import { createPublisher } from "@solana-mobile/dapp-store-publishing-tools";
-import {
-  Connection,
-  Keypair,
-} from "@solana/web3.js";
-
-import {
-  Constants,
-  getMetaplexInstance,
-} from "../../CliUtils.js";
-import { loadPublishDetailsWithChecks, writeToPublishDetails } from "../../config/PublishDetails.js";
-import { sendAndConfirmTransaction } from "../utils.js";
-
-const createPublisherNft = async (
-  {
-    connection,
-    publisher,
-    publisherDetails,
-    storageParams,
-    priorityFeeLamports,
-  }: {
-    connection: Connection;
-    publisher: Keypair;
-    publisherDetails: Publisher;
-    storageParams: string;
-    priorityFeeLamports: number;
-  },
-) => {
-  console.info(`Creating Publisher NFT`);
-  const mintAddress = Keypair.generate();
-  const metaplex = getMetaplexInstance(connection, publisher, storageParams);
-  const txBuilder = await createPublisher(
-    { mintAddress, publisherDetails, priorityFeeLamports },
-    { metaplex, publisher }
-  );
-
-  console.info(`Publisher NFT data upload complete\nSigning transaction now`);
-
-  const { response } = await sendAndConfirmTransaction(metaplex, txBuilder);
-
-  return {
-    publisherAddress: mintAddress.publicKey.toBase58(),
-    transactionSignature: response.signature,
-  };
-};
-
-export const createPublisherCommand = async ({
-  signer,
-  url,
-  dryRun,
-  storageParams,
-  priorityFeeLamports = Constants.DEFAULT_PRIORITY_FEE,
-}: {
-  signer: Keypair;
-  url: string;
-  dryRun: boolean;
-  storageParams: string;
-  priorityFeeLamports: number;
-}) => {
-  const connection = new Connection(
-    url,
-    {
-      commitment: "confirmed",
-    }
-  );
-
-  const { publisher: publisherDetails } = await loadPublishDetailsWithChecks();
-
-  if (!dryRun) {
-    const { publisherAddress, transactionSignature } = await createPublisherNft(
-      {
-        connection,
-        publisher: signer,
-        publisherDetails,
-        storageParams: storageParams,
-        priorityFeeLamports: priorityFeeLamports,
-      },
-    );
-
-    await writeToPublishDetails({ publisher: { address: publisherAddress } });
-
-    return { publisherAddress, transactionSignature };
-  }
-
-  return { publisherAddress: "", transactionSignature: "" };
-};