@sentio/cli 3.5.1-rc.2 → 3.5.1-rc.3

package/lib/index.js

@@ -112339,12 +112339,14 @@ var DefaultBatchUploader = class extends BatchUploader {
   constructor(options, auth) {
     super(0 /* DEFAULT */, options, auth);
   }
-  async upload(files, commitSha, gitUrl, debug, continueFrom, networkOverrides, rollback) {
-    const fileTypes = {
-      source: 1 /* SOURCE */,
-      code: 0 /* PROCESSOR */
-    };
-    const initResponse = await this.initUpload(fileTypes);
+  async upload(files, commitSha, gitUrl, debug, continueFrom, networkOverrides, rollback, initResponse) {
+    if (!initResponse) {
+      const fileTypes = {
+        source: 1 /* SOURCE */,
+        code: 0 /* PROCESSOR */
+      };
+      initResponse = await this.initUpload(fileTypes);
+    }
     for (const [fileKey, payload] of Object.entries(initResponse.payloads)) {
       if (!payload?.object?.putUrl) {
         throw new Error(`No S3 put URL found for file: ${fileKey}`);
@@ -112380,14 +112382,16 @@ var DefaultBatchUploader = class extends BatchUploader {
 };
 var IPFSBatchUploader = class extends BatchUploader {
   constructor(options, auth) {
-    super(0 /* DEFAULT */, options, auth);
+    super(5 /* IPFS */, options, auth);
   }
-  async upload(files, commitSha, gitUrl, debug, continueFrom, networkOverrides, rollback) {
-    const fileTypes = {
-      source: 1 /* SOURCE */,
-      code: 0 /* PROCESSOR */
-    };
-    const initResponse = await this.initUpload(fileTypes);
+  async upload(files, commitSha, gitUrl, debug, continueFrom, networkOverrides, rollback, initResponse) {
+    if (!initResponse) {
+      const fileTypes = {
+        source: 1 /* SOURCE */,
+        code: 0 /* PROCESSOR */
+      };
+      initResponse = await this.initUpload(fileTypes);
+    }
     for (const [fileKey, payload] of Object.entries(initResponse.payloads)) {
       const putUrl = payload.object?.putUrl || payload.ipfs?.putUrl;
       if (!putUrl) {
@@ -112448,12 +112452,14 @@ var WalrusBatchUploader = class extends BatchUploader {
     form.append("_metadata", JSON.stringify(metadata));
     return form;
   }
-  async upload(files, commitSha, gitUrl, debug, continueFrom, networkOverrides, rollback) {
-    const fileTypes = {
-      source: 1 /* SOURCE */,
-      code: 0 /* PROCESSOR */
-    };
-    const initResponse = await this.initUpload(fileTypes);
+  async upload(files, commitSha, gitUrl, debug, continueFrom, networkOverrides, rollback, initResponse) {
+    if (!initResponse) {
+      const fileTypes = {
+        source: 1 /* SOURCE */,
+        code: 0 /* PROCESSOR */
+      };
+      initResponse = await this.initUpload(fileTypes);
+    }
     const formData = this.createQuiltMultipartFormData(files);
     const firstPayload = Object.values(initResponse.payloads)[0];
     if (!firstPayload?.walrus?.putUrl || !firstPayload.walrus.jwtToken) {
@@ -112775,6 +112781,15 @@ async function checkOrCreateProject(options, auth) {
     );
     process.exit(1);
   }
+  if (!options.sentioNetwork && project.sentioNetwork === true) {
+    console.error(
+      source_default.red(
+        `Project ${project?.slug} is a Sentio Network project. Please add the --sentio-network flag when uploading.
+Example: sentio upload --sentio-network testnet`
+      )
+    );
+    process.exit(1);
+  }
   return project?.id;
 }
 async function uploadFile(config, auth, options) {
@@ -112841,6 +112856,22 @@ async function uploadFile(config, auth, options) {
       const sourceBuffer = await createSourceZip();
       const codeBuffer = fs16.readFileSync(processorFile);
       const uploader = options.walrus ? new WalrusBatchUploader(config, auth) : options.sentioNetwork ? new IPFSBatchUploader(config, auth) : new DefaultBatchUploader(config, auth);
+      const fileTypes = {
+        source: 1 /* SOURCE */,
+        code: 0 /* PROCESSOR */
+      };
+      const initResponse = await uploader.initUpload(fileTypes);
+      if (initResponse.warning) {
+        console.log(source_default.yellow(initResponse.warning));
+      }
+      if (initResponse.replacing_version && !config.silentOverwrite) {
+        const confirmed = await confirm(
+          `This will replace processor version ${initResponse.replacing_version}. Continue?`
+        );
+        if (!confirmed) {
+          process.exit(0);
+        }
+      }
       if (config.variables && config.variables.length > 0) {
         const ret = await updateVariables(projectId, config, auth);
         if (!ret.ok) {
@@ -112856,7 +112887,8 @@ async function uploadFile(config, auth, options) {
         config.debug || options.debug,
         continueFrom,
         config.networkOverrides,
-        rollbackMap
+        rollbackMap,
+        initResponse
       );
       console.log(source_default.green("Upload success: "));
       const codeHash = createHash3("sha256").update(codeBuffer).digest("hex");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/cli",
-  "version": "3.5.1-rc.2",
+  "version": "3.5.1-rc.3",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {

package/src/commands/upload.ts

@@ -13,7 +13,7 @@ import readline from 'readline'
 import JSZip from 'jszip'
 import { UserInfo } from '../../../protos/lib/service/common/protos/common.js'
 import { CommandOptionsType } from './types.js'
-import { Auth, DefaultBatchUploader, IPFSBatchUploader, WalrusBatchUploader } from '../uploader.js'
+import { Auth, DefaultBatchUploader, FileType, IPFSBatchUploader, WalrusBatchUploader } from '../uploader.js'
 export { type Auth } from '../uploader.js'
 
 function myParseInt(value: string, dummyPrevious: number): number {
@@ -322,6 +322,15 @@ async function checkOrCreateProject(options: YamlProjectConfig, auth: Auth) {
     )
     process.exit(1)
   }
+  if (!options.sentioNetwork && project.sentioNetwork === true) {
+    console.error(
+      chalk.red(
+        `Project ${project?.slug} is a Sentio Network project. Please add the --sentio-network flag when uploading.\n` +
+          `Example: sentio upload --sentio-network testnet`
+      )
+    )
+    process.exit(1)
+  }
   return project?.id
 }
 
@@ -421,6 +430,26 @@ export async function uploadFile(
           ? new IPFSBatchUploader(config, auth)
           : new DefaultBatchUploader(config, auth)
 
+      // Initialize upload and handle confirmation
+      const fileTypes: Record<string, number> = {
+        source: FileType.SOURCE,
+        code: FileType.PROCESSOR
+      }
+      const initResponse = await uploader.initUpload(fileTypes)
+
+      if (initResponse.warning) {
+        console.log(chalk.yellow(initResponse.warning))
+      }
+
+      if (initResponse.replacing_version && !config.silentOverwrite) {
+        const confirmed = await confirm(
+          `This will replace processor version ${initResponse.replacing_version}. Continue?`
+        )
+        if (!confirmed) {
+          process.exit(0)
+        }
+      }
+
       // Handle variables update if needed
       if (config.variables && config.variables.length > 0) {
         const ret = await updateVariables(projectId, config, auth)
@@ -439,7 +468,8 @@ export async function uploadFile(
         config.debug || options.debug,
         continueFrom,
         config.networkOverrides,
-        rollbackMap
+        rollbackMap,
+        initResponse
       )
 
       console.log(chalk.green('Upload success: '))

package/src/uploader.ts

@@ -89,7 +89,8 @@ export abstract class BatchUploader {
     debug?: boolean,
     continueFrom?: number,
     networkOverrides?: NetworkOverride[],
-    rollback?: Record<string, number>
+    rollback?: Record<string, number>,
+    initResponse?: InitBatchUploadResponse
   ): Promise<FinishBatchUploadResponse>
 
   async initUpload(fileTypes?: Record<string, FileType>): Promise<InitBatchUploadResponse> {
@@ -184,16 +185,18 @@ export class DefaultBatchUploader extends BatchUploader {
     debug?: boolean,
     continueFrom?: number,
     networkOverrides?: NetworkOverride[],
-    rollback?: Record<string, number>
+    rollback?: Record<string, number>,
+    initResponse?: InitBatchUploadResponse
   ): Promise<FinishBatchUploadResponse> {
-    // Step 1: Initialize upload with file types
-    const fileTypes: Record<string, FileType> = {
-      source: FileType.SOURCE,
-      code: FileType.PROCESSOR
+    // Step 1: Initialize upload with file types (if not already done)
+    if (!initResponse) {
+      const fileTypes: Record<string, FileType> = {
+        source: FileType.SOURCE,
+        code: FileType.PROCESSOR
+      }
+      initResponse = await this.initUpload(fileTypes)
     }
 
-    const initResponse = await this.initUpload(fileTypes)
-
     // Step 3: Upload files to S3 using presigned URLs
     for (const [fileKey, payload] of Object.entries(initResponse.payloads)) {
       if (!payload?.object?.putUrl) {
@@ -235,7 +238,7 @@ export class DefaultBatchUploader extends BatchUploader {
 
 export class IPFSBatchUploader extends BatchUploader {
   constructor(options: YamlProjectConfig, auth: Auth) {
-    super(StorageEngine.DEFAULT, options, auth)
+    super(StorageEngine.IPFS, options, auth)
   }
 
   async upload(
@@ -245,15 +248,17 @@ export class IPFSBatchUploader extends BatchUploader {
     debug?: boolean,
     continueFrom?: number,
     networkOverrides?: NetworkOverride[],
-    rollback?: Record<string, number>
+    rollback?: Record<string, number>,
+    initResponse?: InitBatchUploadResponse
   ): Promise<FinishBatchUploadResponse> {
-    const fileTypes: Record<string, FileType> = {
-      source: FileType.SOURCE,
-      code: FileType.PROCESSOR
+    if (!initResponse) {
+      const fileTypes: Record<string, FileType> = {
+        source: FileType.SOURCE,
+        code: FileType.PROCESSOR
+      }
+      initResponse = await this.initUpload(fileTypes)
     }
 
-    const initResponse = await this.initUpload(fileTypes)
-
     for (const [fileKey, payload] of Object.entries(initResponse.payloads)) {
       const putUrl = payload.object?.putUrl || payload.ipfs?.putUrl
       if (!putUrl) {
@@ -334,16 +339,18 @@ export class WalrusBatchUploader extends BatchUploader {
     debug?: boolean,
     continueFrom?: number,
     networkOverrides?: NetworkOverride[],
-    rollback?: Record<string, number>
+    rollback?: Record<string, number>,
+    initResponse?: InitBatchUploadResponse
   ): Promise<FinishBatchUploadResponse> {
-    // Step 1: Initialize upload with file types
-    const fileTypes: Record<string, FileType> = {
-      source: FileType.SOURCE,
-      code: FileType.PROCESSOR
+    // Step 1: Initialize upload with file types (if not already done)
+    if (!initResponse) {
+      const fileTypes: Record<string, FileType> = {
+        source: FileType.SOURCE,
+        code: FileType.PROCESSOR
+      }
+      initResponse = await this.initUpload(fileTypes)
     }
 
-    const initResponse = await this.initUpload(fileTypes)
-
     // Step 2: Create quilt multipart form data for all files
     const formData = this.createQuiltMultipartFormData(files)