@solana-mobile/dapp-store-cli 0.13.0 → 0.13.1

package/lib/CliUtils.js

@@ -139,7 +139,7 @@ function _ts_generator(thisArg, body) {
 import fs from "fs";
 import { Keypair, PublicKey } from "@solana/web3.js";
 import debugModule from "debug";
-import { IrysStorageDriver, keypairIdentity, Metaplex } from "@metaplex-foundation/js";
+import { keypairIdentity, Metaplex, lamports } from "@metaplex-foundation/js";
 import updateNotifier from "update-notifier";
 import { readFile } from 'fs/promises';
 var cliPackage = JSON.parse((await readFile(new URL("./package.json", import.meta.url))).toString());
@@ -147,6 +147,7 @@ import boxen from "boxen";
 import ver from "semver";
 import path from "path";
 import { CachedStorageDriver } from "./upload/CachedStorageDriver.js";
+import { TurboStorageDriver } from "./upload/TurboStorageDriver.js";
 import { EnvVariables } from "./config/index.js";
 import { S3Client } from "@aws-sdk/client-s3";
 import { awsStorage } from "@metaplex-foundation/js-plugin-aws";
@@ -155,7 +156,7 @@ export var Constants = function Constants() {
     "use strict";
     _class_call_check(this, Constants);
 };
-_define_property(Constants, "CLI_VERSION", "0.13.0");
+_define_property(Constants, "CLI_VERSION", "0.13.1");
 _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);
@@ -333,13 +334,40 @@ export var getMetaplexInstance = function(connection, keypair) {
         var bucketPlugin = awsStorage(awsClient, s3Mgr.s3Config.bucketName);
         metaplex.use(bucketPlugin);
     } else {
-        var irysStorageDriver = isDevnet ? new IrysStorageDriver(metaplex, {
-            address: "https://turbo.ardrive.dev",
-            providerUrl: Constants.DEFAULT_RPC_DEVNET
-        }) : new IrysStorageDriver(metaplex, {
-            address: "https://turbo.ardrive.io"
-        });
-        metaplex.storage().setDriver(irysStorageDriver);
+        var turboDriver = new TurboStorageDriver(keypair, isDevnet ? "devnet" : "mainnet", Number(process.env.TURBO_BUFFER_PERCENTAGE || 20));
+        var metaplexAdapter = {
+            upload: function upload(file) {
+                return _async_to_generator(function() {
+                    return _ts_generator(this, function(_state) {
+                        return [
+                            2,
+                            turboDriver.upload(file)
+                        ];
+                    });
+                })();
+            },
+            getUploadPrice: function getUploadPrice(bytes) {
+                return _async_to_generator(function() {
+                    var price;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    turboDriver.getUploadPrice(bytes)
+                                ];
+                            case 1:
+                                price = _state.sent();
+                                return [
+                                    2,
+                                    lamports(price)
+                                ];
+                        }
+                    });
+                })();
+            }
+        };
+        metaplex.storage().setDriver(metaplexAdapter);
     }
     metaplex.storage().setDriver(new CachedStorageDriver(metaplex.storage().driver(), {
         assetManifestPath: isDevnet ? "./.asset-manifest-devnet.json" : "./.asset-manifest.json"

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -51,13 +51,15 @@
     "ts-node": "^10.9.1"
   },
   "dependencies": {
+    "@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.13.0",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.13.1",
     "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",
     "boxen": "^7.0.1",
+    "bs58": "^5.0.0",
     "chokidar": "^3.5.3",
     "commander": "^9.4.1",
     "debug": "^4.3.4",

package/lib/upload/TurboStorageDriver.js

@@ -0,0 +1,696 @@
+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 _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
+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 _class_call_check(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _create_class(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+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(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+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;
+        }
+    }
+    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 _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+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;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+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 _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+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, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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(g && (g = 0, op[0] && (_ = 0)), _)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
+        };
+    }
+}
+function _ts_values(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function() {
+            if (o && i >= o.length) o = void 0;
+            return {
+                value: o && o[i++],
+                done: !o
+            };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+}
+import { TurboFactory, lamportToTokenAmount } from "@ardrive/turbo-sdk";
+import bs58 from "bs58";
+import debugModule from "debug";
+var debug = debugModule("cli:turbo-storage");
+var CONSTANTS = {
+    FREE_UPLOAD_LIMIT: 97280,
+    UPLOAD_DELAY_MS: 2000,
+    MAX_RETRIES: 5,
+    SOL_IN_LAMPORTS: 1000000000,
+    BACKOFF: {
+        BASE_MS: 500,
+        MAX_MS: 8000
+    },
+    GATEWAYS: {
+        devnet: "https://turbo.ardrive.dev/raw",
+        mainnet: "https://arweave.net"
+    }
+};
+var delay = function(ms) {
+    return new Promise(function(resolve) {
+        return setTimeout(resolve, ms);
+    });
+};
+export var TurboStorageDriver = /*#__PURE__*/ function() {
+    "use strict";
+    function TurboStorageDriver(keypair) {
+        var network = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "mainnet", bufferPercentage = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 20;
+        _class_call_check(this, TurboStorageDriver);
+        _define_property(this, "turbo", void 0);
+        _define_property(this, "bufferPercentage", void 0);
+        _define_property(this, "network", void 0);
+        _define_property(this, "uploadQueue", []);
+        _define_property(this, "isProcessingQueue", false);
+        this.network = network;
+        this.bufferPercentage = bufferPercentage;
+        this.turbo = TurboFactory.authenticated(_object_spread({
+            privateKey: bs58.encode(keypair.secretKey),
+            token: "solana"
+        }, this.getServiceUrls(network === "devnet")));
+    }
+    _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) {
+                return _async_to_generator(function() {
+                    var _ref, cost, base;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (bytes <= CONSTANTS.FREE_UPLOAD_LIMIT) return [
+                                    2,
+                                    BigInt(0)
+                                ];
+                                return [
+                                    4,
+                                    this.turbo.getUploadCosts({
+                                        bytes: [
+                                            bytes
+                                        ]
+                                    })
+                                ];
+                            case 1:
+                                _ref = _sliced_to_array.apply(void 0, [
+                                    _state.sent(),
+                                    1
+                                ]), cost = _ref[0];
+                                base = BigInt(String(cost.winc));
+                                return [
+                                    2,
+                                    base * BigInt(100 + this.bufferPercentage) / BigInt(100)
+                                ];
+                        }
+                    });
+                }).call(this);
+            }
+        },
+        {
+            key: "withRetry",
+            value: function withRetry(operation) {
+                var isRetriable = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : function(msg) {
+                    return msg.includes("429") || msg.includes("Too Many Requests");
+                };
+                return _async_to_generator(function() {
+                    var retry, error, errorMessage, delayMs;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                retry = 0;
+                                _state.label = 1;
+                            case 1:
+                                if (!(retry <= CONSTANTS.MAX_RETRIES)) return [
+                                    3,
+                                    8
+                                ];
+                                _state.label = 2;
+                            case 2:
+                                _state.trys.push([
+                                    2,
+                                    4,
+                                    ,
+                                    7
+                                ]);
+                                return [
+                                    4,
+                                    operation()
+                                ];
+                            case 3:
+                                return [
+                                    2,
+                                    _state.sent()
+                                ];
+                            case 4:
+                                error = _state.sent();
+                                errorMessage = _instanceof(error, Error) ? error.message : String(error);
+                                if (!(retry < CONSTANTS.MAX_RETRIES && isRetriable(errorMessage))) return [
+                                    3,
+                                    6
+                                ];
+                                delayMs = Math.min(CONSTANTS.BACKOFF.BASE_MS * Math.pow(2, retry), CONSTANTS.BACKOFF.MAX_MS);
+                                console.log("Rate limited, retrying after ".concat(delayMs, "ms (attempt ").concat(retry + 1, "/").concat(CONSTANTS.MAX_RETRIES, ")..."));
+                                return [
+                                    4,
+                                    delay(delayMs)
+                                ];
+                            case 5:
+                                _state.sent();
+                                return [
+                                    3,
+                                    7
+                                ];
+                            case 6:
+                                throw error;
+                            case 7:
+                                retry++;
+                                return [
+                                    3,
+                                    1
+                                ];
+                            case 8:
+                                throw new Error("Max retries exceeded");
+                        }
+                    });
+                })();
+            }
+        },
+        {
+            key: "formatInsufficientFundsError",
+            value: function formatInsufficientFundsError(errorMessage) {
+                var match = errorMessage.match(/insufficient lamports (\d+), need (\d+)/);
+                if (!match) return;
+                var _ref = [
+                    BigInt(match[1]),
+                    BigInt(match[2])
+                ], current = _ref[0], needed = _ref[1];
+                var _ref1 = [
+                    Number(current) / 1e9,
+                    Number(needed) / 1e9
+                ], currentSOL = _ref1[0], neededSOL = _ref1[1];
+                console.error("\nInsufficient SOL balance for top-up:");
+                console.error("  Current: ".concat(currentSOL.toFixed(9), " SOL"));
+                console.error("  Required: ".concat(neededSOL.toFixed(9), " SOL"));
+                console.error("  Shortfall: ".concat((neededSOL - currentSOL).toFixed(9), " SOL\n"));
+            }
+        },
+        {
+            key: "topUpCredits",
+            value: function topUpCredits(wincAmount) {
+                return _async_to_generator(function() {
+                    var _this, error, errorMessage;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                _this = this;
+                                _state.label = 1;
+                            case 1:
+                                _state.trys.push([
+                                    1,
+                                    3,
+                                    ,
+                                    4
+                                ]);
+                                return [
+                                    4,
+                                    this.withRetry(function() {
+                                        return _async_to_generator(function() {
+                                            var _this_turbo_getWincForToken, _this_turbo, _this_turbo_topUpWithTokens, _this_turbo1, exchangeRate, wincPerSol, lamportsNeeded;
+                                            return _ts_generator(this, function(_state) {
+                                                switch(_state.label){
+                                                    case 0:
+                                                        return [
+                                                            4,
+                                                            (_this_turbo_getWincForToken = (_this_turbo = this.turbo).getWincForToken) === null || _this_turbo_getWincForToken === void 0 ? void 0 : _this_turbo_getWincForToken.call(_this_turbo, {
+                                                                tokenAmount: CONSTANTS.SOL_IN_LAMPORTS
+                                                            })
+                                                        ];
+                                                    case 1:
+                                                        exchangeRate = _state.sent();
+                                                        if (!exchangeRate) {
+                                                            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"));
+                                                        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()))
+                                                            })
+                                                        ];
+                                                    case 2:
+                                                        _state.sent();
+                                                        debug("Top-up initiated for ".concat(wincAmount, " Winston Credits"));
+                                                        return [
+                                                            2
+                                                        ];
+                                                }
+                                            });
+                                        }).call(_this);
+                                    })
+                                ];
+                            case 2:
+                                _state.sent();
+                                return [
+                                    3,
+                                    4
+                                ];
+                            case 3:
+                                error = _state.sent();
+                                errorMessage = _instanceof(error, Error) ? error.message : String(error);
+                                debug("Top-up failed:", error);
+                                if (errorMessage.includes("insufficient lamports")) {
+                                    this.formatInsufficientFundsError(errorMessage);
+                                }
+                                throw new Error("Failed to top up ".concat(wincAmount, " Winston Credits: ").concat(errorMessage));
+                            case 4:
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                }).call(this);
+            }
+        },
+        {
+            key: "checkBalanceAndTopUp",
+            value: function checkBalanceAndTopUp(requiredWinc) {
+                return _async_to_generator(function() {
+                    var current, deficit;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (requiredWinc === BigInt(0)) return [
+                                    2
+                                ];
+                                return [
+                                    4,
+                                    this.turbo.getBalance()
+                                ];
+                            case 1:
+                                current = BigInt.apply(void 0, [
+                                    String.apply(void 0, [
+                                        _state.sent().winc
+                                    ])
+                                ]);
+                                if (current >= requiredWinc) {
+                                    debug("Sufficient balance: ".concat(current, " Winston Credits (required: ").concat(requiredWinc, ")"));
+                                    return [
+                                        2
+                                    ];
+                                }
+                                deficit = requiredWinc - current;
+                                debug("Current: ".concat(current, ", Required: ").concat(requiredWinc, ", Topping up: ").concat(deficit));
+                                return [
+                                    4,
+                                    this.topUpCredits(deficit)
+                                ];
+                            case 2:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                }).call(this);
+            }
+        },
+        {
+            key: "processQueue",
+            value: function processQueue() {
+                return _async_to_generator(function() {
+                    var _this, _loop;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                _loop = function() {
+                                    var item, estimated, _item_file_tags, tags, uploadResult, gateway, url, error;
+                                    return _ts_generator(this, function(_state) {
+                                        switch(_state.label){
+                                            case 0:
+                                                item = _this.uploadQueue.shift();
+                                                if (!item) return [
+                                                    2,
+                                                    "continue"
+                                                ];
+                                                _state.label = 1;
+                                            case 1:
+                                                _state.trys.push([
+                                                    1,
+                                                    7,
+                                                    ,
+                                                    8
+                                                ]);
+                                                debug("Processing upload for ".concat(item.file.fileName, " (").concat(item.file.buffer.length, " bytes)"));
+                                                return [
+                                                    4,
+                                                    _this.getUploadPrice(item.file.buffer.length)
+                                                ];
+                                            case 2:
+                                                estimated = _state.sent();
+                                                return [
+                                                    4,
+                                                    _this.checkBalanceAndTopUp(estimated)
+                                                ];
+                                            case 3:
+                                                _state.sent();
+                                                tags = _to_consumable_array((_item_file_tags = item.file.tags) !== null && _item_file_tags !== void 0 ? _item_file_tags : []);
+                                                if (item.file.contentType) {
+                                                    tags.push({
+                                                        name: "Content-Type",
+                                                        value: item.file.contentType
+                                                    });
+                                                }
+                                                return [
+                                                    4,
+                                                    _this.turbo.uploadFile({
+                                                        fileStreamFactory: function() {
+                                                            return item.file.buffer;
+                                                        },
+                                                        fileSizeFactory: function() {
+                                                            return item.file.buffer.byteLength;
+                                                        },
+                                                        dataItemOpts: {
+                                                            tags: tags
+                                                        }
+                                                    })
+                                                ];
+                                            case 4:
+                                                uploadResult = _state.sent();
+                                                gateway = CONSTANTS.GATEWAYS[_this.network];
+                                                url = "".concat(gateway, "/").concat(uploadResult.id);
+                                                debug("Upload complete: ".concat(url));
+                                                item.resolve(url);
+                                                if (!(_this.uploadQueue.length > 0)) return [
+                                                    3,
+                                                    6
+                                                ];
+                                                debug("Waiting ".concat(CONSTANTS.UPLOAD_DELAY_MS, "ms before next upload..."));
+                                                return [
+                                                    4,
+                                                    delay(CONSTANTS.UPLOAD_DELAY_MS)
+                                                ];
+                                            case 5:
+                                                _state.sent();
+                                                _state.label = 6;
+                                            case 6:
+                                                return [
+                                                    3,
+                                                    8
+                                                ];
+                                            case 7:
+                                                error = _state.sent();
+                                                item.reject(_instanceof(error, Error) ? error : new Error(String(error)));
+                                                return [
+                                                    3,
+                                                    8
+                                                ];
+                                            case 8:
+                                                return [
+                                                    2
+                                                ];
+                                        }
+                                    });
+                                };
+                                if (this.isProcessingQueue || !this.uploadQueue.length) return [
+                                    2
+                                ];
+                                this.isProcessingQueue = true;
+                                _state.label = 1;
+                            case 1:
+                                if (!(this.uploadQueue.length > 0)) return [
+                                    3,
+                                    3
+                                ];
+                                _this = this;
+                                return [
+                                    5,
+                                    _ts_values(_loop())
+                                ];
+                            case 2:
+                                _state.sent();
+                                return [
+                                    3,
+                                    1
+                                ];
+                            case 3:
+                                this.isProcessingQueue = false;
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                }).call(this);
+            }
+        },
+        {
+            key: "upload",
+            value: function upload(file) {
+                return _async_to_generator(function() {
+                    var _this;
+                    return _ts_generator(this, function(_state) {
+                        _this = this;
+                        return [
+                            2,
+                            new Promise(function(resolve, reject) {
+                                debug("Queueing upload for ".concat(file.fileName, " (").concat(file.buffer.length, " bytes)"));
+                                _this.uploadQueue.push({
+                                    file: file,
+                                    resolve: resolve,
+                                    reject: reject
+                                });
+                                _this.processQueue().catch(reject);
+                            })
+                        ];
+                    });
+                }).call(this);
+            }
+        }
+    ]);
+    return TurboStorageDriver;
+}();

package/lib/upload/index.js

@@ -1 +1,2 @@
 export * from "./CachedStorageDriver.js";
+export * from "./TurboStorageDriver.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -44,13 +44,15 @@
     "ts-node": "^10.9.1"
   },
   "dependencies": {
+    "@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.13.0",
+    "@solana-mobile/dapp-store-publishing-tools": "0.13.1",
     "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",
     "boxen": "^7.0.1",
+    "bs58": "^5.0.0",
     "chokidar": "^3.5.3",
     "commander": "^9.4.1",
     "debug": "^4.3.4",

package/src/CliUtils.ts

@@ -2,11 +2,7 @@ import fs from "fs";
 import type { Connection } from "@solana/web3.js";
 import { Keypair, PublicKey } from "@solana/web3.js";
 import debugModule from "debug";
-import {
-  IrysStorageDriver,
-  keypairIdentity,
-  Metaplex,
-} from "@metaplex-foundation/js";
+import { keypairIdentity, Metaplex, type MetaplexFile, type Amount, lamports } from "@metaplex-foundation/js";
 import updateNotifier from "update-notifier";
 import { readFile } from 'fs/promises';
 const cliPackage = JSON.parse((await readFile(new URL("./package.json", import.meta.url))).toString());
@@ -14,13 +10,14 @@ import boxen from "boxen";
 import ver from "semver";
 import path from "path";
 import { CachedStorageDriver } from "./upload/CachedStorageDriver.js";
+import { TurboStorageDriver } from "./upload/TurboStorageDriver.js";
 import { EnvVariables } from "./config/index.js";
 import { S3Client } from "@aws-sdk/client-s3";
 import { awsStorage } from "@metaplex-foundation/js-plugin-aws";
 import { S3StorageManager } from "./config/index.js";
 
 export class Constants {
-  static CLI_VERSION = "0.13.0";
+  static CLI_VERSION = "0.13.1";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
   static DEFAULT_PRIORITY_FEE = 500000;
@@ -205,16 +202,23 @@ export const getMetaplexInstance = (
     const bucketPlugin = awsStorage(awsClient, s3Mgr.s3Config.bucketName);
     metaplex.use(bucketPlugin);
   } else {
-    const irysStorageDriver = isDevnet
-      ? new IrysStorageDriver(metaplex, {
-        address: "https://turbo.ardrive.dev",
-        providerUrl: Constants.DEFAULT_RPC_DEVNET,
-      })
-      : new IrysStorageDriver(metaplex, {
-        address: "https://turbo.ardrive.io",
-      });
-
-    metaplex.storage().setDriver(irysStorageDriver);
+    const turboDriver = new TurboStorageDriver(
+      keypair,
+      isDevnet ? "devnet" : "mainnet",
+      Number(process.env.TURBO_BUFFER_PERCENTAGE || 20)
+    );
+
+    const metaplexAdapter = {
+      async upload(file: MetaplexFile): Promise<string> {
+        return turboDriver.upload(file);
+      },
+      async getUploadPrice(bytes: number): Promise<Amount> {
+        const price = await turboDriver.getUploadPrice(bytes);
+        return lamports(price);
+      },
+    };
+
+    metaplex.storage().setDriver(metaplexAdapter);
   }
 
   metaplex.storage().setDriver(

package/src/upload/TurboStorageDriver.ts

@@ -0,0 +1,248 @@
+import type { Keypair } from "@solana/web3.js";
+import type { MetaplexFile } from "@metaplex-foundation/js";
+import { TurboFactory, lamportToTokenAmount } from "@ardrive/turbo-sdk";
+import bs58 from "bs58";
+import debugModule from "debug";
+
+const debug = debugModule("cli:turbo-storage");
+
+interface TurboClient {
+  getUploadCosts(args: {
+    bytes: number[];
+  }): Promise<Array<{ winc: string | number | bigint }>>;
+  getBalance(): Promise<{ winc: string | number | bigint }>;
+  getWincForToken?(args: {
+    tokenAmount: number;
+  }): Promise<{ winc: string | number | bigint }>;
+  topUpWithTokens?(args: { tokenAmount: string | number }): Promise<unknown>;
+  uploadFile(args: {
+    fileStreamFactory: () => Buffer;
+    fileSizeFactory: () => number;
+    dataItemOpts?: { tags?: Array<{ name: string; value: string }> };
+  }): Promise<{ id: string }>;
+}
+
+const CONSTANTS = {
+  FREE_UPLOAD_LIMIT: 97_280, // 95 KiB
+  UPLOAD_DELAY_MS: 2000,
+  MAX_RETRIES: 5,
+  SOL_IN_LAMPORTS: 1_000_000_000,
+  BACKOFF: {
+    BASE_MS: 500,
+    MAX_MS: 8000,
+  },
+  GATEWAYS: {
+    devnet: "https://turbo.ardrive.dev/raw",
+    mainnet: "https://arweave.net",
+  },
+} as const;
+
+const delay = (ms: number): Promise<void> =>
+  new Promise((resolve) => setTimeout(resolve, ms));
+
+export class TurboStorageDriver {
+  private turbo: TurboClient;
+  private bufferPercentage: number;
+  private network: "devnet" | "mainnet";
+
+  private uploadQueue: Array<{
+    file: MetaplexFile;
+    resolve: (url: string) => void;
+    reject: (error: Error) => void;
+  }> = [];
+  private isProcessingQueue = false;
+
+  constructor(
+    keypair: Keypair,
+    network: "devnet" | "mainnet" = "mainnet",
+    bufferPercentage = 20
+  ) {
+    this.network = network;
+    this.bufferPercentage = bufferPercentage;
+
+    this.turbo = TurboFactory.authenticated({
+      privateKey: bs58.encode(keypair.secretKey),
+      token: "solana",
+      ...this.getServiceUrls(network === "devnet"),
+    }) as TurboClient;
+  }
+
+  private getServiceUrls(isDev: boolean) {
+    const base = isDev ? "ardrive.dev" : "ardrive.io";
+    return {
+      uploadUrl: `https://upload.${base}`,
+      paymentUrl: `https://payment.${base}`,
+    };
+  }
+
+  async getUploadPrice(bytes: number): Promise<bigint> {
+    if (bytes <= CONSTANTS.FREE_UPLOAD_LIMIT) return BigInt(0);
+
+    const [cost] = await this.turbo.getUploadCosts({ bytes: [bytes] });
+    const base = BigInt(String(cost.winc));
+    return (base * BigInt(100 + this.bufferPercentage)) / BigInt(100);
+  }
+
+  private async withRetry<T>(
+    operation: () => Promise<T>,
+    isRetriable: (error: string) => boolean = (msg) =>
+      msg.includes("429") || msg.includes("Too Many Requests")
+  ): Promise<T> {
+    for (let retry = 0; retry <= CONSTANTS.MAX_RETRIES; retry++) {
+      try {
+        return await operation();
+      } catch (error) {
+        const errorMessage =
+          error instanceof Error ? error.message : String(error);
+
+        if (retry < CONSTANTS.MAX_RETRIES && isRetriable(errorMessage)) {
+          const delayMs = Math.min(
+            CONSTANTS.BACKOFF.BASE_MS * Math.pow(2, retry),
+            CONSTANTS.BACKOFF.MAX_MS
+          );
+          console.log(
+            `Rate limited, retrying after ${delayMs}ms (attempt ${retry + 1}/${
+              CONSTANTS.MAX_RETRIES
+            })...`
+          );
+          await delay(delayMs);
+          continue;
+        }
+        throw error;
+      }
+    }
+    throw new Error("Max retries exceeded");
+  }
+
+  private formatInsufficientFundsError(errorMessage: string): void {
+    const match = errorMessage.match(/insufficient lamports (\d+), need (\d+)/);
+    if (!match) return;
+
+    const [current, needed] = [BigInt(match[1]), BigInt(match[2])];
+    const [currentSOL, neededSOL] = [
+      Number(current) / 1e9,
+      Number(needed) / 1e9,
+    ];
+
+    console.error(`\nInsufficient SOL balance for top-up:`);
+    console.error(`  Current: ${currentSOL.toFixed(9)} SOL`);
+    console.error(`  Required: ${neededSOL.toFixed(9)} SOL`);
+    console.error(`  Shortfall: ${(neededSOL - currentSOL).toFixed(9)} SOL\n`);
+  }
+
+  private async topUpCredits(wincAmount: bigint): Promise<void> {
+    try {
+      await this.withRetry(async () => {
+        const exchangeRate = await this.turbo.getWincForToken?.({
+          tokenAmount: CONSTANTS.SOL_IN_LAMPORTS,
+        });
+
+        if (!exchangeRate) {
+          throw new Error("Unable to get Winston Credits exchange rate");
+        }
+
+        const wincPerSol = BigInt(String(exchangeRate.winc));
+        const lamportsNeeded =
+          (wincAmount * BigInt(CONSTANTS.SOL_IN_LAMPORTS)) / wincPerSol;
+
+        debug(
+          `Buying ${wincAmount} Winston Credits for ~${
+            Number(lamportsNeeded) / 1e9
+          } SOL`
+        );
+
+        await this.turbo.topUpWithTokens?.({
+          tokenAmount: String(lamportToTokenAmount(lamportsNeeded.toString())),
+        });
+
+        debug(`Top-up initiated for ${wincAmount} Winston Credits`);
+      });
+    } catch (error) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      debug("Top-up failed:", error);
+
+      if (errorMessage.includes("insufficient lamports")) {
+        this.formatInsufficientFundsError(errorMessage);
+      }
+
+      throw new Error(
+        `Failed to top up ${wincAmount} Winston Credits: ${errorMessage}`
+      );
+    }
+  }
+
+  private async checkBalanceAndTopUp(requiredWinc: bigint): Promise<void> {
+    if (requiredWinc === BigInt(0)) return;
+
+    const current = BigInt(String((await this.turbo.getBalance()).winc));
+
+    if (current >= requiredWinc) {
+      debug(
+        `Sufficient balance: ${current} Winston Credits (required: ${requiredWinc})`
+      );
+      return;
+    }
+
+    const deficit = requiredWinc - current;
+    debug(
+      `Current: ${current}, Required: ${requiredWinc}, Topping up: ${deficit}`
+    );
+    await this.topUpCredits(deficit);
+  }
+
+  private async processQueue(): Promise<void> {
+    if (this.isProcessingQueue || !this.uploadQueue.length) return;
+
+    this.isProcessingQueue = true;
+
+    while (this.uploadQueue.length > 0) {
+      const item = this.uploadQueue.shift();
+      if (!item) continue;
+
+      try {
+        debug(
+          `Processing upload for ${item.file.fileName} (${item.file.buffer.length} bytes)`
+        );
+
+        const estimated = await this.getUploadPrice(item.file.buffer.length);
+        await this.checkBalanceAndTopUp(estimated);
+
+        const tags = [...(item.file.tags ?? [])];
+        if (item.file.contentType) {
+          tags.push({ name: "Content-Type", value: item.file.contentType });
+        }
+
+        const uploadResult = await this.turbo.uploadFile({
+          fileStreamFactory: () => item.file.buffer,
+          fileSizeFactory: () => item.file.buffer.byteLength,
+          dataItemOpts: { tags },
+        });
+
+        const gateway = CONSTANTS.GATEWAYS[this.network];
+        const url = `${gateway}/${uploadResult.id}`;
+        debug(`Upload complete: ${url}`);
+        item.resolve(url);
+
+        if (this.uploadQueue.length > 0) {
+          debug(`Waiting ${CONSTANTS.UPLOAD_DELAY_MS}ms before next upload...`);
+          await delay(CONSTANTS.UPLOAD_DELAY_MS);
+        }
+      } catch (error) {
+        item.reject(error instanceof Error ? error : new Error(String(error)));
+      }
+    }
+
+    this.isProcessingQueue = false;
+  }
+
+  async upload(file: MetaplexFile): Promise<string> {
+    return new Promise((resolve, reject) => {
+      debug(
+        `Queueing upload for ${file.fileName} (${file.buffer.length} bytes)`
+      );
+      this.uploadQueue.push({ file, resolve, reject });
+      this.processQueue().catch(reject);
+    });
+  }
+}

package/src/upload/index.ts

@@ -1 +1,2 @@
 export * from "./CachedStorageDriver.js";
+export * from "./TurboStorageDriver.js";