@solana-mobile/dapp-store-cli 0.14.0 → 0.16.0

package/lib/CliUtils.js

@@ -156,7 +156,7 @@ export var Constants = function Constants() {
     "use strict";
     _class_call_check(this, Constants);
 };
-_define_property(Constants, "CLI_VERSION", "0.14.0");
+_define_property(Constants, "CLI_VERSION", "0.16.0");
 _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);

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -51,10 +51,10 @@
     "ts-node": "^10.9.1"
   },
   "dependencies": {
-    "@ardrive/turbo-sdk": "^1.31.1",
+    "@ardrive/turbo-sdk": "^1.41.0",
     "@aws-sdk/client-s3": "^3.321.1",
     "@metaplex-foundation/js-plugin-aws": "^0.20.0",
-    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.14.0",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.16.0",
     "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

package/lib/upload/CachedStorageDriver.js

@@ -1,3 +1,11 @@
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
+}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -59,20 +67,54 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-function _object_spread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _iterable_to_array_limit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
         }
-        ownKeys.forEach(function(key) {
-            _define_property(target, key, source[key]);
-        });
     }
-    return target;
+    return _arr;
+}
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+}
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 function _ts_generator(thisArg, body) {
     var f, y, t, _ = {
@@ -168,6 +210,7 @@ function _ts_generator(thisArg, body) {
 import fs from "fs";
 import path from "path";
 import { createHash } from "crypto";
+import { normalizePublicContentUrl } from "./contentGateway.js";
 // TODO(jon): We need to manage the removal / replacement of assets in the manifest
 export var CachedStorageDriver = /*#__PURE__*/ function() {
     "use strict";
@@ -199,11 +242,96 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
                 }).call(this);
             }
         },
+        {
+            key: "resolveAssetManifestPath",
+            value: function resolveAssetManifestPath() {
+                var filename = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : this.assetManifestPath;
+                return path.resolve(process.cwd(), filename);
+            }
+        },
+        {
+            key: "normalizeAsset",
+            value: function normalizeAsset(filename, asset) {
+                if (!asset || (typeof asset === "undefined" ? "undefined" : _type_of(asset)) !== "object") return;
+                var candidate = asset;
+                var pathValue = typeof candidate.path === "string" ? candidate.path : filename;
+                if (typeof candidate.sha256 !== "string" || typeof candidate.uri !== "string") {
+                    return;
+                }
+                return {
+                    path: pathValue,
+                    sha256: candidate.sha256,
+                    uri: candidate.uri
+                };
+            }
+        },
+        {
+            key: "normalizeAssetManifest",
+            value: function normalizeAssetManifest(assetManifest) {
+                if (!assetManifest || (typeof assetManifest === "undefined" ? "undefined" : _type_of(assetManifest)) !== "object") return;
+                var assets = {};
+                var assetEntries = assetManifest.assets && _type_of(assetManifest.assets) === "object" ? Object.entries(assetManifest.assets) : [];
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = assetEntries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var _step_value = _sliced_to_array(_step.value, 2), filename = _step_value[0], asset = _step_value[1];
+                        var normalizedAsset = this.normalizeAsset(filename, asset);
+                        if (normalizedAsset) {
+                            assets[filename] = normalizedAsset;
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+                return {
+                    schema_version: typeof assetManifest.schema_version === "string" ? assetManifest.schema_version : CachedStorageDriver.SCHEMA_VERSION,
+                    assets: assets
+                };
+            }
+        },
+        {
+            key: "writeAssetManifest",
+            value: function writeAssetManifest() {
+                return _async_to_generator(function() {
+                    var normalizedAssetManifest;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                normalizedAssetManifest = this.normalizeAssetManifest(this.assetManifest);
+                                if (!normalizedAssetManifest) {
+                                    throw new Error("Asset manifest is not serializable");
+                                }
+                                this.assetManifest = normalizedAssetManifest;
+                                return [
+                                    4,
+                                    fs.promises.writeFile(this.resolveAssetManifestPath(), JSON.stringify(this.assetManifest, null, 2), "utf-8")
+                                ];
+                            case 1:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                }).call(this);
+            }
+        },
         {
             key: "loadAssetManifest",
             value: function loadAssetManifest(filename) {
                 try {
-                    return JSON.parse(fs.readFileSync(filename, "utf-8"));
+                    return this.normalizeAssetManifest(JSON.parse(fs.readFileSync(this.resolveAssetManifestPath(filename), "utf-8")));
                 } catch (error) {
                     console.warn("Failed opening ".concat(filename, "; initializing with a blank asset manifest"));
                     return;
@@ -225,7 +353,7 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
             key: "upload",
             value: function upload(file) {
                 return _async_to_generator(function() {
-                    var hash, uploadedAsset, uri;
+                    var hash, uploadedAsset, normalizedUri, error, message, uri;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -240,27 +368,67 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
                             case 1:
                                 return [
                                     2,
-                                    _state.sent()
+                                    normalizePublicContentUrl.apply(void 0, [
+                                        _state.sent()
+                                    ])
                                 ];
                             case 2:
                                 hash = createHash("sha256").update(file.buffer).digest("base64");
                                 uploadedAsset = this.uploadedAsset(file.fileName, {
                                     sha256: hash
                                 });
-                                if (uploadedAsset) {
-                                    console.log("Asset ".concat(file.fileName, " already uploaded at ").concat(uploadedAsset.uri));
-                                    return [
-                                        2,
-                                        uploadedAsset.uri
-                                    ];
-                                }
+                                if (!uploadedAsset) return [
+                                    3,
+                                    7
+                                ];
+                                normalizedUri = normalizePublicContentUrl(uploadedAsset.uri);
+                                if (!(normalizedUri !== uploadedAsset.uri)) return [
+                                    3,
+                                    6
+                                ];
+                                uploadedAsset.uri = normalizedUri;
+                                _state.label = 3;
+                            case 3:
+                                _state.trys.push([
+                                    3,
+                                    5,
+                                    ,
+                                    6
+                                ]);
+                                return [
+                                    4,
+                                    this.writeAssetManifest()
+                                ];
+                            case 4:
+                                _state.sent();
+                                return [
+                                    3,
+                                    6
+                                ];
+                            case 5:
+                                error = _state.sent();
+                                message = _instanceof(error, Error) ? error.message : String(error);
+                                console.warn("Failed to rewrite ".concat(this.assetManifestPath, "; continuing with normalized URL: ").concat(message));
+                                return [
+                                    3,
+                                    6
+                                ];
+                            case 6:
+                                console.log("Asset ".concat(file.fileName, " already uploaded at ").concat(normalizedUri));
+                                return [
+                                    2,
+                                    normalizedUri
+                                ];
+                            case 7:
                                 console.log("Uploading ".concat(file.fileName));
                                 return [
                                     4,
                                     this.storageDriver.upload(file)
                                 ];
-                            case 3:
-                                uri = _state.sent();
+                            case 8:
+                                uri = normalizePublicContentUrl.apply(void 0, [
+                                    _state.sent()
+                                ]);
                                 this.assetManifest.assets[file.fileName] = {
                                     path: file.fileName,
                                     sha256: hash,
@@ -268,12 +436,9 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
                                 };
                                 return [
                                     4,
-                                    fs.promises.writeFile(path.join(process.cwd(), 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)
-                                    }, null, 2), "utf-8")
+                                    this.writeAssetManifest()
                                 ];
-                            case 4:
+                            case 9:
                                 _state.sent();
                                 console.log("".concat(file.fileName, " uploaded at ").concat(uri));
                                 return [

package/lib/upload/TurboStorageDriver.js

@@ -247,19 +247,32 @@ function _ts_values(o) {
 import { TurboFactory, lamportToTokenAmount } from "@ardrive/turbo-sdk";
 import bs58 from "bs58";
 import debugModule from "debug";
+import { buildPublicContentUrl } from "./contentGateway.js";
 var debug = debugModule("cli:turbo-storage");
+var SOL_IN_LAMPORTS = 1000000000;
+var MIN_TOP_UP_LAMPORTS = 1000000;
+var MIN_TOP_UP_SOL = MIN_TOP_UP_LAMPORTS / SOL_IN_LAMPORTS;
 var CONSTANTS = {
     FREE_UPLOAD_LIMIT: 97280,
     UPLOAD_DELAY_MS: 2000,
     MAX_RETRIES: 5,
-    SOL_IN_LAMPORTS: 1000000000,
+    SOL_IN_LAMPORTS: SOL_IN_LAMPORTS,
+    MIN_TOP_UP_SOL: MIN_TOP_UP_SOL,
+    MIN_TOP_UP_LAMPORTS: MIN_TOP_UP_LAMPORTS,
     BACKOFF: {
         BASE_MS: 500,
         MAX_MS: 8000
     },
-    GATEWAYS: {
-        devnet: "https://turbo.ardrive.dev/raw",
-        mainnet: "https://arweave.net"
+    SERVICE_URLS: {
+        devnet: {
+            gatewayUrl: "https://api.devnet.solana.com",
+            uploadServiceConfig: {
+                url: "https://upload.ardrive.dev"
+            },
+            paymentServiceConfig: {
+                url: "https://payment.ardrive.dev"
+            }
+        }
     }
 };
 var delay = function(ms) {
@@ -282,19 +295,9 @@ export var TurboStorageDriver = /*#__PURE__*/ function() {
         this.turbo = TurboFactory.authenticated(_object_spread({
             privateKey: bs58.encode(keypair.secretKey),
             token: "solana"
-        }, this.getServiceUrls(network === "devnet")));
+        }, getTurboServiceConfig(network)));
     }
     _create_class(TurboStorageDriver, [
-        {
-            key: "getServiceUrls",
-            value: function getServiceUrls(isDev) {
-                var base = isDev ? "ardrive.dev" : "ardrive.io";
-                return {
-                    uploadUrl: "https://upload.".concat(base),
-                    paymentUrl: "https://payment.".concat(base)
-                };
-            }
-        },
         {
             key: "getUploadPrice",
             value: function getUploadPrice(bytes) {
@@ -427,6 +430,12 @@ export var TurboStorageDriver = /*#__PURE__*/ function() {
                         switch(_state.label){
                             case 0:
                                 _this = this;
+                                if (wincAmount === 0n) {
+                                    debug("No Winston Credits requested; skipping top-up.");
+                                    return [
+                                        2
+                                    ];
+                                }
                                 _state.label = 1;
                             case 1:
                                 _state.trys.push([
@@ -439,7 +448,7 @@ export var TurboStorageDriver = /*#__PURE__*/ function() {
                                     4,
                                     this.withRetry(function() {
                                         return _async_to_generator(function() {
-                                            var _this_turbo_getWincForToken, _this_turbo, _this_turbo_topUpWithTokens, _this_turbo1, exchangeRate, wincPerSol, lamportsNeeded;
+                                            var _this_turbo_getWincForToken, _this_turbo, _this_turbo_topUpWithTokens, _this_turbo1, exchangeRate, wincPerSol, solInLamports, numerator, lamportsCalculated, minLamports, lamportsToUse, solAmount;
                                             return _ts_generator(this, function(_state) {
                                                 switch(_state.label){
                                                     case 0:
@@ -455,12 +464,23 @@ export var TurboStorageDriver = /*#__PURE__*/ function() {
                                                             throw new Error("Unable to get Winston Credits exchange rate");
                                                         }
                                                         wincPerSol = BigInt(String(exchangeRate.winc));
-                                                        lamportsNeeded = wincAmount * BigInt(CONSTANTS.SOL_IN_LAMPORTS) / wincPerSol;
-                                                        debug("Buying ".concat(wincAmount, " Winston Credits for ~").concat(Number(lamportsNeeded) / 1e9, " SOL"));
+                                                        if (wincPerSol <= 0n) {
+                                                            throw new Error("Invalid Winston Credits exchange rate");
+                                                        }
+                                                        solInLamports = BigInt(CONSTANTS.SOL_IN_LAMPORTS);
+                                                        numerator = wincAmount * solInLamports;
+                                                        lamportsCalculated = (numerator + (wincPerSol - 1n)) / wincPerSol;
+                                                        minLamports = BigInt(CONSTANTS.MIN_TOP_UP_LAMPORTS);
+                                                        lamportsToUse = lamportsCalculated < minLamports ? minLamports : lamportsCalculated;
+                                                        if (lamportsToUse > lamportsCalculated) {
+                                                            debug("Applying minimum top-up of ".concat(CONSTANTS.MIN_TOP_UP_SOL, " SOL (").concat(CONSTANTS.MIN_TOP_UP_LAMPORTS, " lamports)"));
+                                                        }
+                                                        solAmount = Number(lamportsToUse) / CONSTANTS.SOL_IN_LAMPORTS;
+                                                        debug("Buying at least ".concat(wincAmount, " Winston Credits (~").concat(solAmount.toFixed(9), " SOL / ").concat(lamportsToUse, " lamports)"));
                                                         return [
                                                             4,
                                                             (_this_turbo_topUpWithTokens = (_this_turbo1 = this.turbo).topUpWithTokens) === null || _this_turbo_topUpWithTokens === void 0 ? void 0 : _this_turbo_topUpWithTokens.call(_this_turbo1, {
-                                                                tokenAmount: String(lamportToTokenAmount(lamportsNeeded.toString()))
+                                                                tokenAmount: String(lamportToTokenAmount(lamportsToUse.toString()))
                                                             })
                                                         ];
                                                     case 2:
@@ -549,7 +569,7 @@ export var TurboStorageDriver = /*#__PURE__*/ function() {
                         switch(_state.label){
                             case 0:
                                 _loop = function() {
-                                    var item, estimated, _item_file_tags, tags, uploadResult, gateway, url, error;
+                                    var item, estimated, _item_file_tags, tags, uploadResult, url, error;
                                     return _ts_generator(this, function(_state) {
                                         switch(_state.label){
                                             case 0:
@@ -602,8 +622,7 @@ export var TurboStorageDriver = /*#__PURE__*/ function() {
                                                 ];
                                             case 4:
                                                 uploadResult = _state.sent();
-                                                gateway = CONSTANTS.GATEWAYS[_this.network];
-                                                url = "".concat(gateway, "/").concat(uploadResult.id);
+                                                url = buildPublicContentUrl(uploadResult.id, _this.network);
                                                 debug("Upload complete: ".concat(url));
                                                 item.resolve(url);
                                                 if (!(_this.uploadQueue.length > 0)) return [
@@ -694,3 +713,6 @@ export var TurboStorageDriver = /*#__PURE__*/ function() {
     ]);
     return TurboStorageDriver;
 }();
+export var getTurboServiceConfig = function(network) {
+    return network === "devnet" ? CONSTANTS.SERVICE_URLS.devnet : {};
+};