@solana-mobile/dapp-store-cli 0.4.3 → 0.5.0

package/lib/CliSetup.js

@@ -151,7 +151,7 @@ function resolveBuildToolsPath(buildToolsPath) {
 /**
  * This method should be updated with each new release of the CLI, and just do nothing when there isn't anything to report
  */ function latestReleaseMessage() {
-    showMessage("Publishing Tools Version ".concat(Constants.CLI_VERSION), "- S3 bucket-based storage support added \n" + "- short_description value reduced to 30 character limit", "warning");
+    showMessage("Publishing Tools Version ".concat(Constants.CLI_VERSION), "- short_description value reduced to 30 character limit", "warning");
 }
 function tryWithErrorMessage(block) {
     return _tryWithErrorMessage.apply(this, arguments);

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.4.3");
+_define_property(Constants, "CLI_VERSION", "0.5.0");
 _define_property(Constants, "CONFIG_FILE_NAME", "config.yaml");
 _define_property(Constants, "DEFAULT_RPC_DEVNET", "https://api.devnet.solana.com");
 _define_property(Constants, "getConfigFilePath", function() {

package/lib/config/PublishDetails.js

@@ -456,15 +456,15 @@ var checkIconDimensions = function() {
 }();
 var getAndroidDetails = function() {
     var _ref = _async_to_generator(function(aaptDir, apkPath) {
-        var stdout, appPackage, versionCode, versionName, minSdk, permissions, locales, _locales_values, localeArray, localesSrc, _appPackage_, _minSdk_, _versionCode_, _versionName_, e;
+        var stdout, appPackage, versionCode, versionName, minSdk, permissions, locales, _locales_values, localeArray, localesSrc, _appPackage_, _minSdk_, _versionCode_, _versionName_, _tmp, e;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     _state.trys.push([
                         0,
-                        2,
+                        3,
                         ,
-                        3
+                        4
                     ]);
                     return [
                         4,
@@ -488,23 +488,27 @@ var getAndroidDetails = function() {
                     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");
                     }
+                    _tmp = {
+                        android_package: (_appPackage_ = appPackage === null || appPackage === void 0 ? void 0 : appPackage[1]) !== null && _appPackage_ !== void 0 ? _appPackage_ : "",
+                        min_sdk: parseInt((_minSdk_ = minSdk === null || minSdk === void 0 ? void 0 : minSdk[1]) !== null && _minSdk_ !== void 0 ? _minSdk_ : "0", 10),
+                        version_code: parseInt((_versionCode_ = versionCode === null || versionCode === void 0 ? void 0 : versionCode[1]) !== null && _versionCode_ !== void 0 ? _versionCode_ : "0", 10),
+                        version: (_versionName_ = versionName === null || versionName === void 0 ? void 0 : versionName[1]) !== null && _versionName_ !== void 0 ? _versionName_ : "0"
+                    };
                     return [
-                        2,
-                        {
-                            android_package: (_appPackage_ = appPackage === null || appPackage === void 0 ? void 0 : appPackage[1]) !== null && _appPackage_ !== void 0 ? _appPackage_ : "",
-                            min_sdk: parseInt((_minSdk_ = minSdk === null || minSdk === void 0 ? void 0 : minSdk[1]) !== null && _minSdk_ !== void 0 ? _minSdk_ : "0", 10),
-                            version_code: parseInt((_versionCode_ = versionCode === null || versionCode === void 0 ? void 0 : versionCode[1]) !== null && _versionCode_ !== void 0 ? _versionCode_ : "0", 10),
-                            version: (_versionName_ = versionName === null || versionName === void 0 ? void 0 : versionName[1]) !== null && _versionName_ !== void 0 ? _versionName_ : "0",
-                            permissions: permissions.flatMap(function(permission) {
-                                return permission[1];
-                            }),
-                            locales: localeArray
-                        }
+                        4,
+                        extractCertFingerprint(aaptDir, apkPath)
                     ];
                 case 2:
+                    return [
+                        2,
+                        (_tmp.cert_fingerprint = _state.sent(), _tmp.permissions = permissions.flatMap(function(permission) {
+                            return permission[1];
+                        }), _tmp.locales = localeArray, _tmp)
+                    ];
+                case 3:
                     e = _state.sent();
                     throw new Error("There was an error parsing your APK. Please ensure you have provided a valid Android tools directory containing AAPT2.");
-                case 3:
+                case 4:
                     return [
                         2
                     ];
@@ -515,6 +519,38 @@ var getAndroidDetails = function() {
         return _ref.apply(this, arguments);
     };
 }();
+export var extractCertFingerprint = function() {
+    var _ref = _async_to_generator(function(aaptDir, apkPath) {
+        var stdout, regex, match;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    return [
+                        4,
+                        runExec("".concat(aaptDir, '/apksigner verify --print-certs -v "').concat(apkPath, '"'))
+                    ];
+                case 1:
+                    stdout = _state.sent().stdout;
+                    regex = /Signer #1 certificate SHA-256 digest:\s*([a-fA-F0-9]+)/;
+                    match = stdout.match(regex);
+                    if (match && match[1]) {
+                        return [
+                            2,
+                            match[1]
+                        ];
+                    } else {
+                        throw new Error("Could not obtain cert fingerprint");
+                    }
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function extractCertFingerprint(aaptDir, apkPath) {
+        return _ref.apply(this, arguments);
+    };
+}();
 export var writeToPublishDetails = function() {
     var _ref = _async_to_generator(function(param) {
         var publisher, app, release, currentConfig, _publisher_address, _app_address, _release_address, newConfig;

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.4.3",
+  "version": "0.5.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.18.3",
-    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.4.3",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.5.0",
     "@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.4.3",
+  "version": "0.5.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.18.3",
-    "@solana-mobile/dapp-store-publishing-tools": "0.4.3",
+    "@solana-mobile/dapp-store-publishing-tools": "0.5.0",
     "@solana/web3.js": "1.68.0",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

package/src/CliSetup.ts

@@ -48,7 +48,6 @@ function resolveBuildToolsPath(buildToolsPath: string | undefined) {
 function latestReleaseMessage() {
   showMessage(
     `Publishing Tools Version ${ Constants.CLI_VERSION }`,
-    "- S3 bucket-based storage support added \n" +
     "- short_description value reduced to 30 character limit",
     "warning"
   );

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.4.3";
+  static CLI_VERSION = "0.5.0";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
 

package/src/config/PublishDetails.ts

@@ -237,6 +237,7 @@ const getAndroidDetails = async (
       min_sdk: parseInt(minSdk?.[1] ?? "0", 10),
       version_code: parseInt(versionCode?.[1] ?? "0", 10),
       version: versionName?.[1] ?? "0",
+      cert_fingerprint: await extractCertFingerprint(aaptDir, apkPath),
       permissions: permissions.flatMap(permission => permission[1]),
       locales: localeArray
     };
@@ -245,6 +246,19 @@ const getAndroidDetails = async (
   }
 };
 
+export const extractCertFingerprint = async (aaptDir: string, apkPath: string): Promise<string> => {
+  const { stdout } = await runExec(`${aaptDir}/apksigner verify --print-certs -v "${apkPath}"`);
+
+  const regex = /Signer #1 certificate SHA-256 digest:\s*([a-fA-F0-9]+)/;
+  const match = stdout.match(regex);
+
+  if (match && match[1]) {
+    return match[1];
+  } else {
+    throw new Error("Could not obtain cert fingerprint")
+  }
+}
+
 export const writeToPublishDetails = async ({ publisher, app, release }: SaveToConfigArgs) => {
   const currentConfig = await loadPublishDetailsWithChecks();