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

package/package.json

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

package/src/abi.ts

@@ -3,7 +3,7 @@ import process from 'process'
 import path from 'path'
 import fs from 'fs-extra'
 import fetch from 'node-fetch'
-import { AptosChainId, ChainId, StarknetChainId, SuiChainId } from '@sentio/chain'
+import { AptosChainId, ChainId, SuiChainId } from '@sentio/chain'
 
 import type { Aptos } from '@aptos-labs/ts-sdk'
 import type { IotaClient } from '@iota/iota-sdk/client'
@@ -11,7 +11,6 @@ import type { SuiJsonRpcClient } from '@mysten/sui/jsonRpc'
 import { ReadKey } from './key.js'
 import { Auth } from './commands/upload.js'
 import { getApiUrl } from './utils.js'
-import type { RpcProvider as Starknet } from 'starknet'
 
 export async function getABI(
   chain: ChainId,
@@ -135,30 +134,6 @@ export async function getABI(
     console.log('aptos module not loaded')
   }
 
-  // starknet
-  try {
-    const Starknet = (await import('starknet')).RpcProvider
-    let starknetClient: Starknet | undefined
-
-    switch (chain) {
-      case StarknetChainId.STARKNET_MAINNET:
-        starknetClient = new Starknet({
-          nodeUrl: 'https://starknet-mainnet.g.alchemy.com/starknet/version/rpc/v0_8/8sD5yitBslIYCPFzSq_Q1ObJHqPlZxFw'
-        })
-        break
-      case StarknetChainId.STARKNET_SEPOLIA:
-        starknetClient = new Starknet({
-          nodeUrl: 'https://starknet-sepolia.g.alchemy.com/starknet/version/rpc/v0_8/8sD5yitBslIYCPFzSq_Q1ObJHqPlZxFw'
-        })
-        break
-    }
-    if (starknetClient) {
-      const clazz = await starknetClient.getClassAt(address, 'latest')
-      return { abi: clazz.abi, name }
-    }
-  } catch (e) {
-    console.log('starknet module not loaded')
-  }
 
   // ethereum
   try {
@@ -206,7 +181,7 @@ export async function getABI(
 
 export function getABIFilePath(chain: string, name: string, address?: string, folder?: string): string {
   let subpath
-  let filename = name ?? address
+  const filename = name ?? address
   switch (chain) {
     case AptosChainId.APTOS_MAINNET:
       subpath = 'aptos'
@@ -235,14 +210,6 @@ export function getABIFilePath(chain: string, name: string, address?: string, fo
     case SuiChainId.IOTA_TESTNET:
       subpath = 'iota/testnet'
       break
-    case StarknetChainId.STARKNET_MAINNET:
-      subpath = 'starknet'
-      filename = name && address ? `${name}-${address}` : (name ?? address)
-      break
-    case StarknetChainId.STARKNET_SEPOLIA:
-      subpath = 'starknet/sepolia'
-      filename = name && address ? `${name}-${address}` : (name ?? address)
-      break
     default:
       subpath = 'eth'
   }

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/config.ts

@@ -10,7 +10,7 @@ const HostMap: { [host: string]: string } = {
   prod: 'https://app.sentio.xyz'
 }
 
-export const CHAIN_TYPES = ['eth', 'solana', 'aptos', 'sui', 'iota', 'fuel', 'starknet']
+export const CHAIN_TYPES = ['eth', 'solana', 'aptos', 'sui', 'iota', 'fuel']
 
 export interface YamlContractConfig {
   address: string

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)
 

package/templates/starknet/abis/starknet/sepolia/VoteContract-0x00cf88f7ecf1bf36e9262333879e2937611cd81758db64a169776a2710464391.json

@@ -1,65 +0,0 @@
-[
-  {
-    "type": "impl",
-    "name": "VotingContractImpl",
-    "interface_name": "contracts::IVotingContract"
-  },
-  {
-    "type": "interface",
-    "name": "contracts::IVotingContract",
-    "items": [
-      {
-        "type": "function",
-        "name": "vote",
-        "inputs": [
-          {
-            "name": "vote",
-            "type": "core::felt252"
-          }
-        ],
-        "outputs": [],
-        "state_mutability": "external"
-      },
-      {
-        "type": "function",
-        "name": "get_votes",
-        "inputs": [],
-        "outputs": [
-          {
-            "type": "(core::felt252, core::felt252)"
-          }
-        ],
-        "state_mutability": "view"
-      }
-    ]
-  },
-  {
-    "type": "event",
-    "name": "contracts::VotingContract::VoteEvent",
-    "kind": "struct",
-    "members": [
-      {
-        "name": "voter",
-        "type": "core::starknet::contract_address::ContractAddress",
-        "kind": "key"
-      },
-      {
-        "name": "vote",
-        "type": "core::felt252",
-        "kind": "data"
-      }
-    ]
-  },
-  {
-    "type": "event",
-    "name": "contracts::VotingContract::Event",
-    "kind": "enum",
-    "variants": [
-      {
-        "name": "VoteEvent",
-        "type": "contracts::VotingContract::VoteEvent",
-        "kind": "nested"
-      }
-    ]
-  }
-]

package/templates/starknet/package.json

@@ -1,19 +0,0 @@
-{
-  "private": true,
-  "name": "template-starknet",
-  "version": "1.0.0",
-  "type": "module",
-  "scripts": {
-    "build": "sentio build",
-    "gen": "sentio gen",
-    "test": "sentio test",
-    "upload": "sentio upload"
-  },
-  "dependencies": {
-    "@sentio/sdk": "workspace:*"
-  },
-  "devDependencies": {
-    "@sentio/cli": "workspace:*",
-    "typescript": "^5.5.2"
-  }
-}

package/templates/starknet/sentio.yaml

@@ -1,6 +0,0 @@
-project: starknet-example
-host: local
-contracts:
-  - name: VoteContract
-    address: '0x00cf88f7ecf1bf36e9262333879e2937611cd81758db64a169776a2710464391'
-    chain: starknet_sepolia

package/templates/starknet/src/processor.ts

@@ -1,5 +0,0 @@
-import { VoteContractProcessor } from './types/starknet/VoteContract-processor.js'
-
-VoteContractProcessor.bind({}).onVoteEvent(async (event, ctx) => {
-  const votes = await ctx.getContract().get_votes()
-})

package/templates/starknet/tsconfig.json

@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "importHelpers": true,
-    "alwaysStrict": true,
-    "sourceMap": true,
-    "target": "esnext",
-    "esModuleInterop": true,
-    "noImplicitReturns": true,
-    "noImplicitAny": true,
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
-    "strictNullChecks": true,
-    "stripInternal": true,
-    "noFallthroughCasesInSwitch": true,
-    "noEmitOnError": false,
-    "rootDir": "./src",
-    "outDir": "./dist",
-    "skipLibCheck": true,
-    "resolveJsonModule": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
-  },
-  "exclude": ["dist"]
-}