@shelby-protocol/cli 0.0.17 → 0.0.18

package/bin/entry.js

@@ -508,7 +508,7 @@ import { Command } from "@commander-js/extra-typings";
 
 // package.json
 var name = "@shelby-protocol/cli";
-var version = "0.0.17";
+var version = "0.0.18";
 
 // src/commands/account.tsx
 import readline from "readline";
@@ -564,7 +564,7 @@ var SHELBY_DEPLOYER = "0xc63d6a5efb0080a6029403131715bd4971e1149f7cc099aac69bb00
 var SHELBYUSD_TOKEN_NAME = "ShelbyUSD";
 var SHELBYUSD_FA_METADATA_ADDRESS = "0x1b18363a9f1fe5e6ebf247daba5cc1c18052bb232efdc4c50f556053922d98e1";
 
-// ../../packages/sdk/dist/chunk-CTGCK3H2.mjs
+// ../../packages/sdk/dist/chunk-LHVCCJIB.mjs
 import {
   AccountAddress,
   Aptos,
@@ -4514,7 +4514,7 @@ var ERASURE_CODE_AND_CHUNK_MAPPING = {
   }
 };
 
-// ../../packages/sdk/dist/chunk-ZPW742E7.mjs
+// ../../packages/sdk/dist/chunk-LZSIZJYR.mjs
 var ERASURE_CODE_PARAMS = {
   [
     "ClayCode_16Total_10Data_13Helper"
@@ -4542,14 +4542,14 @@ var DEFAULT_ERASURE_D = ERASURE_CODE_PARAMS[
 ].erasure_d;
 var DEFAULT_ERASURE_M = DEFAULT_ERASURE_N - DEFAULT_ERASURE_K;
 
-// ../../packages/sdk/dist/chunk-GY5DCVVL.mjs
+// ../../packages/sdk/dist/chunk-W5NRGZEP.mjs
 import { AccountAddress as AccountAddress2 } from "@aptos-labs/ts-sdk";
 import { z } from "zod";
 var BlobNameSchema = z.string().min(1, "Blob name path parameter cannot be empty.").max(1024, "Blob name cannot exceed 1024 characters.").refine((name2) => !name2.endsWith("/"), {
   message: "Blob name cannot end with a slash"
 });
 
-// ../../packages/sdk/dist/chunk-QRGZJBAG.mjs
+// ../../packages/sdk/dist/chunk-4EPQP4DM.mjs
 import { AccountAddress as AccountAddress3 } from "@aptos-labs/ts-sdk";
 function encodeURIComponentKeepSlashes(str) {
   return encodeURIComponent(str).replace(/%2F/g, "/");
@@ -4605,7 +4605,7 @@ var ShelbyRPCClient = class {
     }
     throw new Error(`Failed to upload part ${partIdx}.`);
   }
-  async #putBlobMultipart(account, blobName, blobData, partSize = 5 * 1024 * 1024) {
+  async #putBlobMultipart(account, blobName, blobData, partSize = 5 * 1024 * 1024, onProgress) {
     const startResponse = await fetch(
       buildRequestUrl("/v1/multipart-uploads", this.baseUrl),
       {
@@ -4638,6 +4638,13 @@ var ShelbyRPCClient = class {
       const end = Math.min(start + partSize, blobData.length);
       const partData = blobData.slice(start, end);
       await this.#uploadPart(uploadId, partIdx, partData);
+      onProgress?.({
+        partIdx,
+        totalParts,
+        partBytes: partData.length,
+        uploadedBytes: end,
+        totalBytes: blobData.length
+      });
     }
     const completeResponse = await fetch(
       buildRequestUrl(
@@ -4688,7 +4695,9 @@ var ShelbyRPCClient = class {
     await this.#putBlobMultipart(
       params.account,
       params.blobName,
-      params.blobData
+      params.blobData,
+      void 0,
+      params.onProgress
     );
   }
   // FIXME make this possible to stream in put ^^^
@@ -4819,7 +4828,7 @@ var createBlobKey = (params) => {
   return `@${AccountAddress4.from(params.account).toStringLongWithoutPrefix()}/${params.blobName}`;
 };
 
-// ../../packages/sdk/dist/chunk-XWAPNLU6.mjs
+// ../../packages/sdk/dist/chunk-ONW6NSKZ.mjs
 import { Hex as Hex3 } from "@aptos-labs/ts-sdk";
 import { z as z2 } from "zod";
 var ChunksetCommitmentSchema = z2.object({
@@ -4966,7 +4975,7 @@ function validatePrePaddedChunkset(chunkset, expectedSize, chunksetIdx) {
   return chunkset;
 }
 
-// ../../packages/sdk/dist/chunk-BBOG5JSX.mjs
+// ../../packages/sdk/dist/chunk-X345MKRA.mjs
 import {
   AccountAddress as AccountAddress5,
   Aptos as Aptos2,
@@ -5485,7 +5494,7 @@ var ShelbyBlobClient = class _ShelbyBlobClient {
   }
 };
 
-// ../../packages/sdk/dist/chunk-NLPIHQ7K.mjs
+// ../../packages/sdk/dist/chunk-UCDAABAS.mjs
 import {
   createDecoder,
   createEncoder
@@ -5622,7 +5631,7 @@ function buildClayConfig(input) {
   };
 }
 
-// ../../packages/sdk/dist/chunk-MGAN2SBA.mjs
+// ../../packages/sdk/dist/chunk-GVROD2TF.mjs
 import {
   AccountAddress as AccountAddress6,
   Aptos as Aptos3,
@@ -5767,7 +5776,7 @@ function validateConcurrency(concurrency) {
   }
 }
 
-// ../../packages/sdk/dist/chunk-MGAN2SBA.mjs
+// ../../packages/sdk/dist/chunk-GVROD2TF.mjs
 var ShelbyClient = class {
   /**
    * The coordination client is used to interact with the Aptos blockchain which handles the commitments
@@ -5885,7 +5894,8 @@ var ShelbyClient = class {
         blobName: params.blobName,
         blobMerkleRoot: blobCommitments.blob_merkle_root,
         size: params.blobData.length,
-        expirationMicros: params.expirationMicros
+        expirationMicros: params.expirationMicros,
+        options: params.options
       });
       await this.coordination.aptos.waitForTransaction({
         transactionHash: pendingRegisterBlobTransaction.hash
@@ -6075,7 +6085,7 @@ var ShelbyClient = class {
   }
 };
 
-// ../../packages/sdk/dist/chunk-LGNWAXBG.mjs
+// ../../packages/sdk/dist/chunk-NRDGHGOH.mjs
 var ShelbyNodeClient = class extends ShelbyClient {
 };
 
@@ -10183,12 +10193,16 @@ function uploadCommand(program) {
         totalSize += entry.sizeBytes;
       }
       const isSingleFile = filelist.length === 1;
-      const formatProgressPercent = () => totalSize > 0 ? (100 * (amountUploaded / totalSize)).toFixed(2) : "0.00";
+      const formatOverallProgressPercent = (currentFileUploadedBytes = 0) => totalSize > 0 ? (100 * ((amountUploaded + currentFileUploadedBytes) / totalSize)).toFixed(2) : "0.00";
       let filesProcessed = 0;
       for (const entry of filelist) {
         const fileName = path7.basename(entry.filename);
-        const fileProgress = isSingleFile ? `(${formatProgressPercent()}%)` : `(${filesProcessed}/${filelist.length} files, ${formatProgressPercent()}%)`;
-        spinner.text = `\u{1F4D6} Reading ${fileName}... ${fileProgress}`;
+        let currentFileUploadedBytes = 0;
+        const formatOverallProgress = () => isSingleFile ? `(${formatOverallProgressPercent(currentFileUploadedBytes)}%)` : `(${filesProcessed}/${filelist.length} files, ${formatOverallProgressPercent(
+          currentFileUploadedBytes
+        )}%)`;
+        const overallProgress = formatOverallProgress();
+        spinner.text = `\u{1F4D6} Reading ${fileName}... ${overallProgress}`;
         try {
           const blobData = await fs8.readFile(entry.filename);
           if (blobData.length !== entry.sizeBytes) {
@@ -10196,7 +10210,7 @@ function uploadCommand(program) {
               `Size of file ${entry.filename} changed after initial scan. Original size was ${entry.sizeBytes} but it is now ${blobData.length}`
             );
           }
-          spinner.text = `\u{1F517} Checking if blob exists... ${fileProgress}`;
+          spinner.text = `\u{1F517} Checking if blob exists... ${overallProgress}`;
           const existingBlobMetadata = await shelbyClient.coordination.getBlobMetadata({
             account: activeAccount.accountAddress,
             name: entry.blobname
@@ -10207,13 +10221,13 @@ function uploadCommand(program) {
             );
             process.exit(1);
           }
-          spinner.text = `\u{1F517} Generating commitments for ${fileName}... ${fileProgress}`;
+          spinner.text = `\u{1F517} Generating commitments for ${fileName}... ${overallProgress}`;
           const provider = await getErasureCodingProvider();
           const blobCommitments = await generateCommitments(provider, blobData);
           if (options.outputCommitments) {
             outputCommitments[entry.filename] = blobCommitments;
           }
-          spinner.text = `\u{1F517} Registering ${fileName} on L1... ${fileProgress}`;
+          spinner.text = `\u{1F517} Registering ${fileName} on L1... ${overallProgress}`;
           const { transaction: pendingRegisterBlobTransaction } = await shelbyClient.coordination.registerBlob({
             account: activeAccount,
             blobName: entry.blobname,
@@ -10228,11 +10242,16 @@ function uploadCommand(program) {
           await aptos.waitForTransaction({
             transactionHash: pendingRegisterBlobTransaction.hash
           });
-          spinner.text = `\u{1F4E4} Uploading ${fileName} to Shelby RPC... ${fileProgress}`;
+          spinner.text = `\u{1F4E4} Uploading ${fileName} to Shelby RPC... ${overallProgress}`;
           await shelbyClient.rpc.putBlob({
             account: activeAccount.accountAddress,
             blobName: entry.blobname,
-            blobData
+            blobData,
+            onProgress: ({ uploadedBytes, totalBytes }) => {
+              currentFileUploadedBytes = uploadedBytes;
+              const pct = totalBytes > 0 ? (100 * uploadedBytes / totalBytes).toFixed(2) : "0.00";
+              spinner.text = isSingleFile ? `\u{1F4E4} Uploading ${fileName} to Shelby RPC... ${pct}%` : `\u{1F4E4} Uploading ${fileName} to Shelby RPC... ${pct}% ${formatOverallProgress()}`;
+            }
           });
           amountUploaded += blobData.length;
           filesProcessed++;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shelby-protocol/cli",
   "type": "module",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "private": false,
   "bin": {
     "shelby": "bin/entry.js"
@@ -44,7 +44,7 @@
     "yaml": "2.8.1",
     "zod": "^3.22.4",
     "@shelby-protocol/clay-codes": "0.0.2",
-    "@shelby-protocol/sdk": "0.0.8"
+    "@shelby-protocol/sdk": "0.0.9"
   },
   "devDependencies": {
     "@types/dockerode": "^3.3.45",