@solana-mobile/dapp-store-cli 0.14.0 → 0.15.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.15.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.15.0",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -54,7 +54,7 @@
     "@ardrive/turbo-sdk": "^1.31.1",
     "@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.15.0",
     "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

package/lib/upload/TurboStorageDriver.js

@@ -248,11 +248,16 @@ import { TurboFactory, lamportToTokenAmount } from "@ardrive/turbo-sdk";
 import bs58 from "bs58";
 import debugModule from "debug";
 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
@@ -427,6 +432,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 +450,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 +466,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:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -47,7 +47,7 @@
     "@ardrive/turbo-sdk": "^1.31.1",
     "@aws-sdk/client-s3": "^3.321.1",
     "@metaplex-foundation/js-plugin-aws": "^0.20.0",
-    "@solana-mobile/dapp-store-publishing-tools": "0.14.0",
+    "@solana-mobile/dapp-store-publishing-tools": "0.15.0",
     "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

package/src/CliUtils.ts

@@ -17,7 +17,7 @@ import { awsStorage } from "@metaplex-foundation/js-plugin-aws";
 import { S3StorageManager } from "./config/index.js";
 
 export class Constants {
-  static CLI_VERSION = "0.14.0";
+  static CLI_VERSION = "0.15.0";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
   static DEFAULT_PRIORITY_FEE = 500000;

package/src/upload/TurboStorageDriver.ts

@@ -22,11 +22,17 @@ interface TurboClient {
   }): Promise<{ id: string }>;
 }
 
+const SOL_IN_LAMPORTS = 1_000_000_000;
+const MIN_TOP_UP_LAMPORTS = 1_000_000;
+const MIN_TOP_UP_SOL = MIN_TOP_UP_LAMPORTS / SOL_IN_LAMPORTS;
+
 const CONSTANTS = {
   FREE_UPLOAD_LIMIT: 97_280, // 95 KiB
   UPLOAD_DELAY_MS: 2000,
   MAX_RETRIES: 5,
-  SOL_IN_LAMPORTS: 1_000_000_000,
+  SOL_IN_LAMPORTS,
+  MIN_TOP_UP_SOL,
+  MIN_TOP_UP_LAMPORTS,
   BACKOFF: {
     BASE_MS: 500,
     MAX_MS: 8000,
@@ -131,6 +137,11 @@ export class TurboStorageDriver {
   }
 
   private async topUpCredits(wincAmount: bigint): Promise<void> {
+    if (wincAmount === 0n) {
+      debug("No Winston Credits requested; skipping top-up.");
+      return;
+    }
+
     try {
       await this.withRetry(async () => {
         const exchangeRate = await this.turbo.getWincForToken?.({
@@ -142,17 +153,35 @@ export class TurboStorageDriver {
         }
 
         const wincPerSol = BigInt(String(exchangeRate.winc));
-        const lamportsNeeded =
-          (wincAmount * BigInt(CONSTANTS.SOL_IN_LAMPORTS)) / wincPerSol;
+        if (wincPerSol <= 0n) {
+          throw new Error("Invalid Winston Credits exchange rate");
+        }
+
+        const solInLamports = BigInt(CONSTANTS.SOL_IN_LAMPORTS);
+        const numerator = wincAmount * solInLamports;
+        const lamportsCalculated =
+          (numerator + (wincPerSol - 1n)) / wincPerSol;
+
+        const minLamports = BigInt(CONSTANTS.MIN_TOP_UP_LAMPORTS);
+        const lamportsToUse =
+          lamportsCalculated < minLamports ? minLamports : lamportsCalculated;
+
+        if (lamportsToUse > lamportsCalculated) {
+          debug(
+            `Applying minimum top-up of ${CONSTANTS.MIN_TOP_UP_SOL} SOL (${CONSTANTS.MIN_TOP_UP_LAMPORTS} lamports)`
+          );
+        }
+        const solAmount =
+          Number(lamportsToUse) / CONSTANTS.SOL_IN_LAMPORTS;
 
         debug(
-          `Buying ${wincAmount} Winston Credits for ~${
-            Number(lamportsNeeded) / 1e9
-          } SOL`
+          `Buying at least ${wincAmount} Winston Credits (~${solAmount.toFixed(9)} SOL / ${lamportsToUse} lamports)`
         );
 
         await this.turbo.topUpWithTokens?.({
-          tokenAmount: String(lamportToTokenAmount(lamportsNeeded.toString())),
+          tokenAmount: String(
+            lamportToTokenAmount(lamportsToUse.toString())
+          ),
         });
 
         debug(`Top-up initiated for ${wincAmount} Winston Credits`);