@sentio/cli 3.6.2 → 3.7.0-rc.1

package/lib/index.js

@@ -139214,8 +139214,14 @@ var PROCESSOR_REGISTRY_ABI = [
     tuple(string chainId, bool enableRpc, bool enableTrace)[] requireChains,
     string sdkVersion
   ) returns (string)`,
+  `function createProcessor(
+    address owner,
+    string id,
+    tuple(uint8 sourceType, string ipfsCid) source,
+    tuple(string chainId, bool enableRpc, bool enableTrace)[] requireChains,
+    string sdkVersion
+  ) returns (string)`,
   "event ProcessorCreated(string indexed processorId)",
-  "function getAllocations(string processorId) view returns (tuple(uint256 indexerId, uint256 timestamp, bool indexerReady)[])",
   `function getProcessor(string processorId) view returns (
     tuple(
       string id,
@@ -139225,12 +139231,18 @@ var PROCESSOR_REGISTRY_ABI = [
       string sdkVersion,
       tuple(string chainId, bool enableRpc, bool enableTrace)[] requireChains,
       tuple(uint8 sourceType, string ipfsCid) source,
-      tuple(uint256 indexerId, uint256 timestamp, bool indexerReady)[] allocations
+      tuple(uint256 indexerId, uint256 allocationTime, bool indexerReady, uint256 replicaIndex)[] allocations
     )
   )`,
   "function deleteProcessor(string processorId)"
 ];
-var CONTROLLER_ABI = ["function startProcessor(string processorId)", "function stopProcessor(string processorId)"];
+var CONTROLLER_ABI = [
+  "function startProcessor(string processorId)",
+  "function stopProcessor(string processorId)",
+  "function getAllocations(string processorId) view returns (tuple(uint256 indexerId, uint256 allocationTime, bool indexerReady, uint256 replicaIndex)[])"
+];
+var DATABASES_ABI = ["function getProcessorDatabases(string processorId) view returns (string[])"];
+var PERMISSIONS_ABI = ["function isOperator(address account, address operator) view returns (bool)"];
 var ERC20_ABI = [
   "function balanceOf(address account) view returns (uint256)",
   "function approve(address spender, uint256 amount) returns (bool)"
@@ -139240,7 +139252,9 @@ var ADDRESS_BOOK_KEYS = {
   processorRegistry: "processor_registry",
   controller: "controller",
   token: "sentio_token",
-  billing: "billing"
+  billing: "billing",
+  databases: "databases",
+  permissions: "permissions"
 };
 var cachedAddresses;
 async function resolveNetworkAddresses(config) {
@@ -139261,17 +139275,29 @@ async function resolveNetworkAddresses(config) {
       }
     }
   };
-  const [processorRegistry, controller, token, billing] = await Promise.all([
+  const [processorRegistry, controller, token, billing, databases, permissions] = await Promise.all([
     resolveAddress2(ADDRESS_BOOK_KEYS.processorRegistry),
     resolveAddress2(ADDRESS_BOOK_KEYS.controller),
     resolveAddress2(ADDRESS_BOOK_KEYS.token),
-    resolveAddress2(ADDRESS_BOOK_KEYS.billing)
+    resolveAddress2(ADDRESS_BOOK_KEYS.billing),
+    resolveAddress2(ADDRESS_BOOK_KEYS.databases),
+    resolveAddress2(ADDRESS_BOOK_KEYS.permissions)
   ]);
   console.log(source_default.gray(`ProcessorRegistry: ${processorRegistry}`));
   console.log(source_default.gray(`Controller:        ${controller}`));
   console.log(source_default.gray(`ST Token:          ${token}`));
   console.log(source_default.gray(`Billing:           ${billing}`));
-  cachedAddresses = { addressBook: addressBookAddr, processorRegistry, controller, token, billing };
+  console.log(source_default.gray(`Databases:         ${databases}`));
+  console.log(source_default.gray(`Permissions:       ${permissions}`));
+  cachedAddresses = {
+    addressBook: addressBookAddr,
+    processorRegistry,
+    controller,
+    token,
+    billing,
+    databases,
+    permissions
+  };
   return cachedAddresses;
 }
 function getWalletFromPrivateKey(privateKey) {
@@ -139307,6 +139333,11 @@ async function checkBillingBalance(config, addresses, walletAddress) {
     return 0n;
   }
 }
+async function isOperatorOnChain(config, addresses, owner, operator) {
+  const provider = new ethers_exports.JsonRpcProvider(config.rpcUrl);
+  const permissions = new ethers_exports.Contract(addresses.permissions, PERMISSIONS_ABI, provider);
+  return await permissions.isOperator(owner, operator);
+}
 async function uploadToIPFS(fileBuffer, ipfsUrl) {
   const formData = new FormData();
   const blob = new Blob([fileBuffer], { type: "application/octet-stream" });
@@ -139322,6 +139353,26 @@ async function uploadToIPFS(fileBuffer, ipfsUrl) {
   const result = await response.json();
   return result.Hash;
 }
+async function submitAndWait(explorerUrl, label, txPromise) {
+  let tx;
+  try {
+    tx = await txPromise;
+  } catch (err) {
+    throw new Error(`${label} failed to submit: ${err.shortMessage ?? err.message}`);
+  }
+  console.log(source_default.gray(`  Tx hash: ${explorerUrl}/tx/${tx.hash}`));
+  console.log(source_default.blue("Waiting for confirmation..."));
+  let receipt;
+  try {
+    receipt = await tx.wait();
+  } catch (err) {
+    throw new Error(`${label} failed: ${err.shortMessage ?? err.message}. Tx: ${explorerUrl}/tx/${tx.hash}`);
+  }
+  if (!receipt || receipt.status === 0) {
+    throw new Error(`${label} transaction reverted. Tx: ${explorerUrl}/tx/${tx.hash}`);
+  }
+  return tx;
+}
 async function getProcessorOnChain(config, addresses, processorId) {
   const provider = new ethers_exports.JsonRpcProvider(config.rpcUrl);
   const registry = new ethers_exports.Contract(addresses.processorRegistry, PROCESSOR_REGISTRY_ABI, provider);
@@ -139347,17 +139398,31 @@ async function deleteProcessorOnChain(config, addresses, wallet, processorId) {
   const signer = wallet.connect(provider);
   const registry = new ethers_exports.Contract(addresses.processorRegistry, PROCESSOR_REGISTRY_ABI, signer);
   console.log(source_default.blue("Deleting existing processor on-chain..."));
-  const tx = await registry.deleteProcessor(processorId);
-  console.log(source_default.gray(`  Tx hash: ${tx.hash}`));
-  console.log(source_default.blue("Waiting for confirmation..."));
-  const receipt = await tx.wait();
-  if (receipt.status === 0) {
-    throw new Error(`deleteProcessor transaction failed. Tx: ${config.explorerUrl}/tx/${tx.hash}`);
-  }
+  const tx = await submitAndWait(config.explorerUrl, "deleteProcessor", registry.deleteProcessor(processorId));
   console.log(source_default.green(`Processor deleted. Tx: ${config.explorerUrl}/tx/${tx.hash}`));
+  await waitForProcessorDatabaseCleanup(addresses, processorId, provider);
   return tx.hash;
 }
-async function createProcessorOnChain(config, addresses, wallet, processorId, ipfsCid, requiredChainIds, sdkVersion) {
+async function waitForProcessorDatabaseCleanup(addresses, processorId, provider, timeoutMs = 12e4, pollIntervalMs = 5e3) {
+  const databases = new ethers_exports.Contract(addresses.databases, DATABASES_ABI, provider);
+  const dbIds = await databases.getProcessorDatabases(processorId);
+  if (dbIds.length === 0) {
+    return;
+  }
+  console.log(source_default.blue(`Waiting for ${dbIds.length} replica database(s) to be cleaned up...`));
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+    const remaining = await databases.getProcessorDatabases(processorId);
+    if (remaining.length === 0) {
+      console.log(source_default.green("All replica databases cleaned up."));
+      return;
+    }
+    console.log(source_default.gray(`  ${remaining.length} replica database(s) still pending cleanup...`));
+  }
+  throw new Error(`Timeout: processor databases not cleaned up within ${timeoutMs / 1e3}s`);
+}
+async function createProcessorOnChain(config, addresses, wallet, processorId, ipfsCid, requiredChainIds, sdkVersion, ownerOverride) {
   const provider = new ethers_exports.JsonRpcProvider(config.rpcUrl);
   const signer = wallet.connect(provider);
   const registry = new ethers_exports.Contract(addresses.processorRegistry, PROCESSOR_REGISTRY_ABI, signer);
@@ -139376,13 +139441,22 @@ async function createProcessorOnChain(config, addresses, wallet, processorId, ip
   console.log(source_default.gray(`  IPFS CID:     ${ipfsCid}`));
   console.log(source_default.gray(`  Chains:        ${requiredChainIds.join(", ")}`));
   console.log(source_default.gray(`  SDK Version:   ${sdkVersion}`));
-  const tx = await registry.createProcessor(processorId, source, requireChains, sdkVersion);
-  console.log(source_default.gray(`  Tx hash: ${tx.hash}`));
-  console.log(source_default.blue("Waiting for confirmation..."));
-  const receipt = await tx.wait();
-  if (receipt.status === 0) {
-    throw new Error(`createProcessor transaction failed. Tx: ${config.explorerUrl}/tx/${tx.hash}`);
-  }
+  if (ownerOverride) {
+    console.log(source_default.gray(`  Owner:         ${ownerOverride} (operator: ${wallet.address})`));
+  }
+  const txPromise = ownerOverride ? registry["createProcessor(address,string,(uint8,string),(string,bool,bool)[],string)"](
+    ownerOverride,
+    processorId,
+    source,
+    requireChains,
+    sdkVersion
+  ) : registry["createProcessor(string,(uint8,string),(string,bool,bool)[],string)"](
+    processorId,
+    source,
+    requireChains,
+    sdkVersion
+  );
+  const tx = await submitAndWait(config.explorerUrl, "createProcessor", txPromise);
   console.log(source_default.green(`Processor created. Tx: ${config.explorerUrl}/tx/${tx.hash}`));
   return tx.hash;
 }
@@ -139391,13 +139465,7 @@ async function startProcessorOnChain(config, addresses, wallet, processorId) {
   const signer = wallet.connect(provider);
   const controller = new ethers_exports.Contract(addresses.controller, CONTROLLER_ABI, signer);
   console.log(source_default.blue("Starting processor on-chain..."));
-  const tx = await controller.startProcessor(processorId);
-  console.log(source_default.gray(`  Tx hash: ${tx.hash}`));
-  console.log(source_default.blue("Waiting for confirmation..."));
-  const receipt = await tx.wait();
-  if (receipt.status === 0) {
-    throw new Error(`startProcessor transaction failed. Tx: ${config.explorerUrl}/tx/${tx.hash}`);
-  }
+  const tx = await submitAndWait(config.explorerUrl, "startProcessor", controller.startProcessor(processorId));
   console.log(source_default.green(`Processor started. Tx: ${config.explorerUrl}/tx/${tx.hash}`));
   return tx.hash;
 }
@@ -139405,33 +139473,41 @@ async function stopProcessorOnChain(config, addresses, wallet, processorId) {
   const provider = new ethers_exports.JsonRpcProvider(config.rpcUrl);
   const signer = wallet.connect(provider);
   const controller = new ethers_exports.Contract(addresses.controller, CONTROLLER_ABI, signer);
-  console.log(source_default.blue("Stopping processor on-chain..."));
-  const tx = await controller.stopProcessor(processorId);
-  console.log(source_default.gray(`  Tx hash: ${tx.hash}`));
-  console.log(source_default.blue("Waiting for confirmation..."));
-  const receipt = await tx.wait();
-  if (receipt.status === 0) {
-    throw new Error(`stopProcessor transaction failed. Tx: ${config.explorerUrl}/tx/${tx.hash}`);
+  const allocations = await controller.getAllocations(processorId);
+  if (allocations.length === 0) {
+    console.log(source_default.gray("Processor has no allocations, skipping stopProcessor."));
+    return "";
   }
+  console.log(source_default.blue("Stopping processor on-chain..."));
+  const tx = await submitAndWait(config.explorerUrl, "stopProcessor", controller.stopProcessor(processorId));
   console.log(source_default.green(`Processor stopped. Tx: ${config.explorerUrl}/tx/${tx.hash}`));
   return tx.hash;
 }
-async function confirmNoPlatformUpload(walletAddress, stBalance, billingBalance, addresses, networkConfig) {
+async function confirmNoPlatformUpload(walletAddress, stBalance, billingBalance, addresses, networkConfig, ownerOverride) {
   const formattedST = ethers_exports.formatEther(stBalance);
   const formattedBilling = ethers_exports.formatEther(billingBalance);
   console.log();
   console.log(source_default.blue("=== Sentio Network Direct Upload (No Platform) ==="));
-  console.log(source_default.white(`  Address:         ${walletAddress}`));
+  if (ownerOverride) {
+    console.log(source_default.white(`  Owner:           ${ownerOverride}`));
+    console.log(source_default.white(`  Operator:        ${walletAddress}`));
+  } else {
+    console.log(source_default.white(`  Address:         ${walletAddress}`));
+  }
   console.log(source_default.white(`  ST Balance:      ${formattedST} ST`));
   console.log(source_default.white(`  Billing Balance: ${formattedBilling} ST`));
   if (billingBalance === 0n) {
+    const who = ownerOverride ? `the owner (${ownerOverride})` : "you";
+    const keyHint = ownerOverride ? "<owner's private key>" : "$PRIVATE_KEY";
     console.log();
     console.log(
       source_default.yellow(
-        `  \u26A0 Your Billing balance is 0. Indexing fees are charged from the Billing contract.
-    You must deposit ST tokens into the Billing contract before your processor can run.
-    Use: cast send ${addresses.token} "approve(address,uint256)" ${addresses.billing} <amount> --rpc-url ${networkConfig.rpcUrl} --private-key $PRIVATE_KEY
-         cast send ${addresses.billing} "deposit(uint256)" <amount> --rpc-url ${networkConfig.rpcUrl} --private-key $PRIVATE_KEY`
+        `  \u26A0 ${ownerOverride ? "Owner's" : "Your"} Billing balance is 0. Indexing fees are charged from the Billing contract.
+    ${who} must deposit ST tokens into the Billing contract before the processor can run.
+    Example (replace 100 with your desired ST amount):
+    export AMOUNT=$(cast to-wei 100 ether)
+    cast send ${addresses.token} "approve(address,uint256)" ${addresses.billing} $AMOUNT --rpc-url ${networkConfig.rpcUrl} --private-key ${keyHint}
+    cast send ${addresses.billing} "deposit(uint256)" $AMOUNT --rpc-url ${networkConfig.rpcUrl} --private-key ${keyHint}`
       )
     );
   }
@@ -139729,7 +139805,10 @@ function myParseInt(value, dummyPrevious) {
   return parsedValue;
 }
 function createUploadCommand() {
-  return new Command("upload").description("Upload processor to Sentio").option("--owner <owner>", "(Optional) Override Project owner").option("--name <name>", "(Optional) Override Project name").option(
+  return new Command("upload").description("Upload processor to Sentio").option(
+    "--owner <owner>",
+    "(Optional) Project owner. Platform mode: project owner username. --no-platform mode: on-chain owner address (0x...) \u2014 $PRIVATE_KEY then signs as an operator on the owner's behalf, requires Permissions.addOperator beforehand."
+  ).option("--name <name>", "(Optional) Override Project name").option(
     "--continue-from <version>",
     "(Optional) Continue processing data from the specific processor version which will keeping the old data from previous version and will STOP that version IMMEDIATELY.",
     myParseInt
@@ -139765,13 +139844,41 @@ async function runNoPlatformUpload(processorConfig, options) {
   const privateKey = requirePrivateKey();
   const wallet = getWalletFromPrivateKey(privateKey);
   const walletAddress = wallet.address;
+  let ownerOverride;
+  if (options.owner) {
+    if (!ethers_exports.isAddress(options.owner)) {
+      console.error(source_default.red(`Invalid --owner: "${options.owner}" is not a valid 0x-prefixed Ethereum address.`));
+      process.exit(1);
+    }
+    ownerOverride = ethers_exports.getAddress(options.owner);
+  }
+  const effectiveOwner = ownerOverride ?? walletAddress;
   console.log(source_default.blue("Resolving contract addresses from AddressBook..."));
   const addresses = await resolveNetworkAddresses(networkConfig);
+  if (ownerOverride) {
+    const isOp = await isOperatorOnChain(networkConfig, addresses, ownerOverride, walletAddress);
+    if (!isOp) {
+      console.error(
+        source_default.red(
+          `Operator ${walletAddress} is not authorized for owner ${ownerOverride}.
+The owner must call Permissions.addOperator(${walletAddress}) first.`
+        )
+      );
+      process.exit(1);
+    }
+  }
   const [stBalance, billingBalance] = await Promise.all([
-    checkSTBalance(networkConfig, addresses, walletAddress),
-    checkBillingBalance(networkConfig, addresses, walletAddress)
+    checkSTBalance(networkConfig, addresses, effectiveOwner),
+    checkBillingBalance(networkConfig, addresses, effectiveOwner)
   ]);
-  const confirmed = await confirmNoPlatformUpload(walletAddress, stBalance, billingBalance, addresses, networkConfig);
+  const confirmed = await confirmNoPlatformUpload(
+    walletAddress,
+    stBalance,
+    billingBalance,
+    addresses,
+    networkConfig,
+    ownerOverride
+  );
   if (!confirmed) {
     console.log("Upload cancelled.");
     process.exit(0);
@@ -139821,9 +139928,10 @@ async function runNoPlatformUpload(processorConfig, options) {
   const existingProcessor = await getProcessorOnChain(networkConfig, addresses, processorId);
   if (existingProcessor) {
     const existingOwner = existingProcessor.owner.toLowerCase();
-    const currentWallet = wallet.address.toLowerCase();
-    if (existingOwner === currentWallet) {
-      console.log(source_default.yellow(`Processor "${processorId}" already exists (owned by you).`));
+    const expectedOwner = effectiveOwner.toLowerCase();
+    if (existingOwner === expectedOwner) {
+      const ownedBy = ownerOverride ? `owned by ${ownerOverride}` : "owned by you";
+      console.log(source_default.yellow(`Processor "${processorId}" already exists (${ownedBy}).`));
       const shouldReplace = await confirm(`Replace existing processor "${processorId}"?`);
       if (!shouldReplace) {
         console.log("Upload cancelled.");
@@ -139832,9 +139940,10 @@ async function runNoPlatformUpload(processorConfig, options) {
       await stopProcessorOnChain(networkConfig, addresses, wallet, processorId);
       await deleteProcessorOnChain(networkConfig, addresses, wallet, processorId);
     } else {
+      const expectedLabel = ownerOverride ? `expected owner ${ownerOverride}` : `your wallet ${wallet.address}`;
       console.log(
         source_default.yellow(
-          `Processor "${processorId}" already exists and is owned by ${existingProcessor.owner} (not your wallet ${wallet.address}).`
+          `Processor "${processorId}" already exists and is owned by ${existingProcessor.owner} (not ${expectedLabel}).`
         )
       );
       const randomSuffix = Math.random().toString(36).substring(2, 8);
@@ -139850,7 +139959,16 @@ async function runNoPlatformUpload(processorConfig, options) {
       console.log(source_default.blue(`Using processor ID: ${processorId}`));
     }
   }
-  await createProcessorOnChain(networkConfig, addresses, wallet, processorId, cid, requiredChainIds, sdkVersion);
+  await createProcessorOnChain(
+    networkConfig,
+    addresses,
+    wallet,
+    processorId,
+    cid,
+    requiredChainIds,
+    sdkVersion,
+    ownerOverride
+  );
   await startProcessorOnChain(networkConfig, addresses, wallet, processorId);
   console.log();
   console.log(source_default.green("=== Upload Complete ==="));

package/package.json

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

package/src/commands/upload.ts

@@ -20,6 +20,7 @@ import {
   requirePrivateKey,
   checkSTBalance,
   checkBillingBalance,
+  isOperatorOnChain,
   uploadToIPFS,
   createProcessorOnChain,
   startProcessorOnChain,
@@ -28,6 +29,7 @@ import {
   getProcessorOnChain,
   deleteProcessorOnChain
 } from '../network.js'
+import { ethers } from 'ethers'
 import { Auth, DefaultBatchUploader, FileType, IPFSBatchUploader, WalrusBatchUploader } from '../uploader.js'
 export { type Auth } from '../uploader.js'
 
@@ -43,7 +45,10 @@ function myParseInt(value: string, dummyPrevious: number): number {
 export function createUploadCommand() {
   return new Command('upload')
     .description('Upload processor to Sentio')
-    .option('--owner <owner>', '(Optional) Override Project owner')
+    .option(
+      '--owner <owner>',
+      "(Optional) Project owner. Platform mode: project owner username. --no-platform mode: on-chain owner address (0x...) — $PRIVATE_KEY then signs as an operator on the owner's behalf, requires Permissions.addOperator beforehand."
+    )
     .option('--name <name>', '(Optional) Override Project name')
     .option(
       '--continue-from <version>',
@@ -102,21 +107,53 @@ async function runNoPlatformUpload(
   const network = options.sentioNetwork || 'testnet'
   const networkConfig = getSentioNetworkConfig(network)
 
-  // Step 1: Require PRIVATE_KEY
+  // Step 1: Require PRIVATE_KEY (operator key when --owner is set, otherwise the owner's own key)
   const privateKey = requirePrivateKey()
   const wallet = getWalletFromPrivateKey(privateKey)
   const walletAddress = wallet.address
 
+  // Operator mode: --owner is the on-chain owner address; PRIVATE_KEY signs as operator on its behalf.
+  let ownerOverride: string | undefined
+  if (options.owner) {
+    if (!ethers.isAddress(options.owner)) {
+      console.error(chalk.red(`Invalid --owner: "${options.owner}" is not a valid 0x-prefixed Ethereum address.`))
+      process.exit(1)
+    }
+    ownerOverride = ethers.getAddress(options.owner)
+  }
+  const effectiveOwner = ownerOverride ?? walletAddress
+
   // Step 2: Resolve contract addresses via AddressBook
   console.log(chalk.blue('Resolving contract addresses from AddressBook...'))
   const addresses = await resolveNetworkAddresses(networkConfig)
 
-  // Step 3: Check ST balance and Billing balance, then confirm
+  // Step 2.5: Pre-flight check that operator is registered for this owner.
+  if (ownerOverride) {
+    const isOp = await isOperatorOnChain(networkConfig, addresses, ownerOverride, walletAddress)
+    if (!isOp) {
+      console.error(
+        chalk.red(
+          `Operator ${walletAddress} is not authorized for owner ${ownerOverride}.\n` +
+            `The owner must call Permissions.addOperator(${walletAddress}) first.`
+        )
+      )
+      process.exit(1)
+    }
+  }
+
+  // Step 3: Check ST balance and Billing balance (always against the owner — operator just submits txs)
   const [stBalance, billingBalance] = await Promise.all([
-    checkSTBalance(networkConfig, addresses, walletAddress),
-    checkBillingBalance(networkConfig, addresses, walletAddress)
+    checkSTBalance(networkConfig, addresses, effectiveOwner),
+    checkBillingBalance(networkConfig, addresses, effectiveOwner)
   ])
-  const confirmed = await confirmNoPlatformUpload(walletAddress, stBalance, billingBalance, addresses, networkConfig)
+  const confirmed = await confirmNoPlatformUpload(
+    walletAddress,
+    stBalance,
+    billingBalance,
+    addresses,
+    networkConfig,
+    ownerOverride
+  )
   if (!confirmed) {
     console.log('Upload cancelled.')
     process.exit(0)
@@ -179,11 +216,13 @@ async function runNoPlatformUpload(
 
   if (existingProcessor) {
     const existingOwner = existingProcessor.owner.toLowerCase()
-    const currentWallet = wallet.address.toLowerCase()
+    const expectedOwner = effectiveOwner.toLowerCase()
 
-    if (existingOwner === currentWallet) {
-      // Same owner — prompt to replace
-      console.log(chalk.yellow(`Processor "${processorId}" already exists (owned by you).`))
+    if (existingOwner === expectedOwner) {
+      // Same owner — prompt to replace. In operator mode the operator is allowed to
+      // stop+delete via the contract's isProcessorAdmin check.
+      const ownedBy = ownerOverride ? `owned by ${ownerOverride}` : 'owned by you'
+      console.log(chalk.yellow(`Processor "${processorId}" already exists (${ownedBy}).`))
       const shouldReplace = await confirm(`Replace existing processor "${processorId}"?`)
       if (!shouldReplace) {
         console.log('Upload cancelled.')
@@ -194,9 +233,10 @@ async function runNoPlatformUpload(
       await deleteProcessorOnChain(networkConfig, addresses, wallet, processorId)
     } else {
       // Different owner — prompt to rename
+      const expectedLabel = ownerOverride ? `expected owner ${ownerOverride}` : `your wallet ${wallet.address}`
       console.log(
         chalk.yellow(
-          `Processor "${processorId}" already exists and is owned by ${existingProcessor.owner} (not your wallet ${wallet.address}).`
+          `Processor "${processorId}" already exists and is owned by ${existingProcessor.owner} (not ${expectedLabel}).`
         )
       )
       const randomSuffix = Math.random().toString(36).substring(2, 8)
@@ -215,7 +255,16 @@ async function runNoPlatformUpload(
   }
 
   // Step 8: Create processor on-chain
-  await createProcessorOnChain(networkConfig, addresses, wallet, processorId, cid, requiredChainIds, sdkVersion)
+  await createProcessorOnChain(
+    networkConfig,
+    addresses,
+    wallet,
+    processorId,
+    cid,
+    requiredChainIds,
+    sdkVersion,
+    ownerOverride
+  )
 
   // Step 9: Start processor on-chain
   await startProcessorOnChain(networkConfig, addresses, wallet, processorId)

package/src/network.ts

@@ -40,7 +40,7 @@ const ADDRESS_BOOK_ABI = [
   'function getAddress(bytes32 id) view returns (address)'
 ]
 
-// ProcessorRegistry: createProcessor, getProcessor, deleteProcessor
+// ProcessorRegistry: createProcessor (self + operator overloads), getProcessor, deleteProcessor
 const PROCESSOR_REGISTRY_ABI = [
   `function createProcessor(
     string id,
@@ -48,8 +48,14 @@ const PROCESSOR_REGISTRY_ABI = [
     tuple(string chainId, bool enableRpc, bool enableTrace)[] requireChains,
     string sdkVersion
   ) returns (string)`,
+  `function createProcessor(
+    address owner,
+    string id,
+    tuple(uint8 sourceType, string ipfsCid) source,
+    tuple(string chainId, bool enableRpc, bool enableTrace)[] requireChains,
+    string sdkVersion
+  ) returns (string)`,
   'event ProcessorCreated(string indexed processorId)',
-  'function getAllocations(string processorId) view returns (tuple(uint256 indexerId, uint256 timestamp, bool indexerReady)[])',
   `function getProcessor(string processorId) view returns (
     tuple(
       string id,
@@ -59,14 +65,24 @@ const PROCESSOR_REGISTRY_ABI = [
       string sdkVersion,
       tuple(string chainId, bool enableRpc, bool enableTrace)[] requireChains,
       tuple(uint8 sourceType, string ipfsCid) source,
-      tuple(uint256 indexerId, uint256 timestamp, bool indexerReady)[] allocations
+      tuple(uint256 indexerId, uint256 allocationTime, bool indexerReady, uint256 replicaIndex)[] allocations
     )
   )`,
   'function deleteProcessor(string processorId)'
 ]
 
-// Controller: startProcessor / stopProcessor
-const CONTROLLER_ABI = ['function startProcessor(string processorId)', 'function stopProcessor(string processorId)']
+// Controller: startProcessor / stopProcessor / getAllocations
+const CONTROLLER_ABI = [
+  'function startProcessor(string processorId)',
+  'function stopProcessor(string processorId)',
+  'function getAllocations(string processorId) view returns (tuple(uint256 indexerId, uint256 allocationTime, bool indexerReady, uint256 replicaIndex)[])'
+]
+
+// Databases:  getProcessorDatabases
+const DATABASES_ABI = ['function getProcessorDatabases(string processorId) view returns (string[])']
+
+// Permissions: isOperator (used to pre-check operator delegation before submitting tx)
+const PERMISSIONS_ABI = ['function isOperator(address account, address operator) view returns (bool)']
 
 // ERC20: balanceOf + approve
 const ERC20_ABI = [
@@ -84,7 +100,9 @@ const ADDRESS_BOOK_KEYS = {
   processorRegistry: 'processor_registry',
   controller: 'controller',
   token: 'sentio_token',
-  billing: 'billing'
+  billing: 'billing',
+  databases: 'databases',
+  permissions: 'permissions'
 } as const
 
 interface ResolvedAddresses {
@@ -93,6 +111,8 @@ interface ResolvedAddresses {
   controller: string
   token: string
   billing: string
+  databases: string
+  permissions: string
 }
 
 let cachedAddresses: ResolvedAddresses | undefined
@@ -122,19 +142,31 @@ export async function resolveNetworkAddresses(config: SentioNetworkConfig): Prom
     }
   }
 
-  const [processorRegistry, controller, token, billing] = await Promise.all([
+  const [processorRegistry, controller, token, billing, databases, permissions] = await Promise.all([
     resolveAddress(ADDRESS_BOOK_KEYS.processorRegistry),
     resolveAddress(ADDRESS_BOOK_KEYS.controller),
     resolveAddress(ADDRESS_BOOK_KEYS.token),
-    resolveAddress(ADDRESS_BOOK_KEYS.billing)
+    resolveAddress(ADDRESS_BOOK_KEYS.billing),
+    resolveAddress(ADDRESS_BOOK_KEYS.databases),
+    resolveAddress(ADDRESS_BOOK_KEYS.permissions)
   ])
 
   console.log(chalk.gray(`ProcessorRegistry: ${processorRegistry}`))
   console.log(chalk.gray(`Controller:        ${controller}`))
   console.log(chalk.gray(`ST Token:          ${token}`))
   console.log(chalk.gray(`Billing:           ${billing}`))
-
-  cachedAddresses = { addressBook: addressBookAddr, processorRegistry, controller, token, billing }
+  console.log(chalk.gray(`Databases:         ${databases}`))
+  console.log(chalk.gray(`Permissions:       ${permissions}`))
+
+  cachedAddresses = {
+    addressBook: addressBookAddr,
+    processorRegistry,
+    controller,
+    token,
+    billing,
+    databases,
+    permissions
+  }
   return cachedAddresses
 }
 
@@ -186,6 +218,17 @@ export async function checkBillingBalance(
   }
 }
 
+export async function isOperatorOnChain(
+  config: SentioNetworkConfig,
+  addresses: ResolvedAddresses,
+  owner: string,
+  operator: string
+): Promise<boolean> {
+  const provider = new ethers.JsonRpcProvider(config.rpcUrl)
+  const permissions = new ethers.Contract(addresses.permissions, PERMISSIONS_ABI, provider)
+  return await permissions.isOperator(owner, operator)
+}
+
 // --- IPFS Upload ---
 
 export async function uploadToIPFS(fileBuffer: Buffer, ipfsUrl: string): Promise<string> {
@@ -207,6 +250,37 @@ export async function uploadToIPFS(fileBuffer: Buffer, ipfsUrl: string): Promise
   return result.Hash
 }
 
+// --- Tx Helpers ---
+
+async function submitAndWait(
+  explorerUrl: string,
+  label: string,
+  txPromise: Promise<ethers.TransactionResponse>
+): Promise<ethers.TransactionResponse> {
+  let tx: ethers.TransactionResponse
+  try {
+    tx = await txPromise
+  } catch (err: any) {
+    throw new Error(`${label} failed to submit: ${err.shortMessage ?? err.message}`)
+  }
+
+  console.log(chalk.gray(`  Tx hash: ${explorerUrl}/tx/${tx.hash}`))
+  console.log(chalk.blue('Waiting for confirmation...'))
+
+  let receipt: ethers.TransactionReceipt | null
+  try {
+    receipt = await tx.wait()
+  } catch (err: any) {
+    throw new Error(`${label} failed: ${err.shortMessage ?? err.message}. Tx: ${explorerUrl}/tx/${tx.hash}`)
+  }
+
+  if (!receipt || receipt.status === 0) {
+    throw new Error(`${label} transaction reverted. Tx: ${explorerUrl}/tx/${tx.hash}`)
+  }
+
+  return tx
+}
+
 // --- Contract Interactions ---
 
 export interface OnChainProcessor {
@@ -260,17 +334,45 @@ export async function deleteProcessorOnChain(
   const registry = new ethers.Contract(addresses.processorRegistry, PROCESSOR_REGISTRY_ABI, signer)
 
   console.log(chalk.blue('Deleting existing processor on-chain...'))
-  const tx = await registry.deleteProcessor(processorId)
-  console.log(chalk.gray(`  Tx hash: ${tx.hash}`))
-  console.log(chalk.blue('Waiting for confirmation...'))
+  const tx = await submitAndWait(config.explorerUrl, 'deleteProcessor', registry.deleteProcessor(processorId))
+  console.log(chalk.green(`Processor deleted. Tx: ${config.explorerUrl}/tx/${tx.hash}`))
+  await waitForProcessorDatabaseCleanup(addresses, processorId, provider)
+
+  return tx.hash
+}
 
-  const receipt = await tx.wait()
-  if (receipt.status === 0) {
-    throw new Error(`deleteProcessor transaction failed. Tx: ${config.explorerUrl}/tx/${tx.hash}`)
+async function waitForProcessorDatabaseCleanup(
+  addresses: ResolvedAddresses,
+  processorId: string,
+  provider: ethers.JsonRpcProvider,
+  timeoutMs = 120_000,
+  pollIntervalMs = 5_000
+): Promise<void> {
+  const databases = new ethers.Contract(addresses.databases, DATABASES_ABI, provider)
+
+  // getProcessorDatabases has no active check — returns all db IDs still in storage.
+  // Only when this returns empty is it safe to recreate databases with the same IDs.
+  const dbIds: string[] = await databases.getProcessorDatabases(processorId)
+  if (dbIds.length === 0) {
+    return
   }
 
-  console.log(chalk.green(`Processor deleted. Tx: ${config.explorerUrl}/tx/${tx.hash}`))
-  return tx.hash
+  console.log(chalk.blue(`Waiting for ${dbIds.length} replica database(s) to be cleaned up...`))
+
+  const deadline = Date.now() + timeoutMs
+  while (Date.now() < deadline) {
+    await new Promise((resolve) => setTimeout(resolve, pollIntervalMs))
+
+    const remaining: string[] = await databases.getProcessorDatabases(processorId)
+    if (remaining.length === 0) {
+      console.log(chalk.green('All replica databases cleaned up.'))
+      return
+    }
+
+    console.log(chalk.gray(`  ${remaining.length} replica database(s) still pending cleanup...`))
+  }
+
+  throw new Error(`Timeout: processor databases not cleaned up within ${timeoutMs / 1000}s`)
 }
 
 export async function createProcessorOnChain(
@@ -280,7 +382,8 @@ export async function createProcessorOnChain(
   processorId: string,
   ipfsCid: string,
   requiredChainIds: string[],
-  sdkVersion: string
+  sdkVersion: string,
+  ownerOverride?: string
 ): Promise<string> {
   const provider = new ethers.JsonRpcProvider(config.rpcUrl)
   const signer = wallet.connect(provider)
@@ -303,16 +406,26 @@ export async function createProcessorOnChain(
   console.log(chalk.gray(`  IPFS CID:     ${ipfsCid}`))
   console.log(chalk.gray(`  Chains:        ${requiredChainIds.join(', ')}`))
   console.log(chalk.gray(`  SDK Version:   ${sdkVersion}`))
-
-  const tx = await registry.createProcessor(processorId, source, requireChains, sdkVersion)
-  console.log(chalk.gray(`  Tx hash: ${tx.hash}`))
-  console.log(chalk.blue('Waiting for confirmation...'))
-
-  const receipt = await tx.wait()
-  if (receipt.status === 0) {
-    throw new Error(`createProcessor transaction failed. Tx: ${config.explorerUrl}/tx/${tx.hash}`)
+  if (ownerOverride) {
+    console.log(chalk.gray(`  Owner:         ${ownerOverride} (operator: ${wallet.address})`))
   }
 
+  // ethers v6 disambiguates overloads by full signature when both are present.
+  const txPromise: Promise<ethers.TransactionResponse> = ownerOverride
+    ? registry['createProcessor(address,string,(uint8,string),(string,bool,bool)[],string)'](
+        ownerOverride,
+        processorId,
+        source,
+        requireChains,
+        sdkVersion
+      )
+    : registry['createProcessor(string,(uint8,string),(string,bool,bool)[],string)'](
+        processorId,
+        source,
+        requireChains,
+        sdkVersion
+      )
+  const tx = await submitAndWait(config.explorerUrl, 'createProcessor', txPromise)
   console.log(chalk.green(`Processor created. Tx: ${config.explorerUrl}/tx/${tx.hash}`))
   return tx.hash
 }
@@ -329,15 +442,7 @@ export async function startProcessorOnChain(
   const controller = new ethers.Contract(addresses.controller, CONTROLLER_ABI, signer)
 
   console.log(chalk.blue('Starting processor on-chain...'))
-  const tx = await controller.startProcessor(processorId)
-  console.log(chalk.gray(`  Tx hash: ${tx.hash}`))
-  console.log(chalk.blue('Waiting for confirmation...'))
-
-  const receipt = await tx.wait()
-  if (receipt.status === 0) {
-    throw new Error(`startProcessor transaction failed. Tx: ${config.explorerUrl}/tx/${tx.hash}`)
-  }
-
+  const tx = await submitAndWait(config.explorerUrl, 'startProcessor', controller.startProcessor(processorId))
   console.log(chalk.green(`Processor started. Tx: ${config.explorerUrl}/tx/${tx.hash}`))
   return tx.hash
 }
@@ -353,16 +458,15 @@ export async function stopProcessorOnChain(
 
   const controller = new ethers.Contract(addresses.controller, CONTROLLER_ABI, signer)
 
-  console.log(chalk.blue('Stopping processor on-chain...'))
-  const tx = await controller.stopProcessor(processorId)
-  console.log(chalk.gray(`  Tx hash: ${tx.hash}`))
-  console.log(chalk.blue('Waiting for confirmation...'))
-
-  const receipt = await tx.wait()
-  if (receipt.status === 0) {
-    throw new Error(`stopProcessor transaction failed. Tx: ${config.explorerUrl}/tx/${tx.hash}`)
+  // stopProcessor reverts with ProcessorNotAllocated if the processor has no active allocations
+  const allocations: unknown[] = await controller.getAllocations(processorId)
+  if (allocations.length === 0) {
+    console.log(chalk.gray('Processor has no allocations, skipping stopProcessor.'))
+    return ''
   }
 
+  console.log(chalk.blue('Stopping processor on-chain...'))
+  const tx = await submitAndWait(config.explorerUrl, 'stopProcessor', controller.stopProcessor(processorId))
   console.log(chalk.green(`Processor stopped. Tx: ${config.explorerUrl}/tx/${tx.hash}`))
   return tx.hash
 }
@@ -374,24 +478,34 @@ export async function confirmNoPlatformUpload(
   stBalance: bigint,
   billingBalance: bigint,
   addresses: ResolvedAddresses,
-  networkConfig: SentioNetworkConfig
+  networkConfig: SentioNetworkConfig,
+  ownerOverride?: string
 ): Promise<boolean> {
   const formattedST = ethers.formatEther(stBalance)
   const formattedBilling = ethers.formatEther(billingBalance)
   console.log()
   console.log(chalk.blue('=== Sentio Network Direct Upload (No Platform) ==='))
-  console.log(chalk.white(`  Address:         ${walletAddress}`))
+  if (ownerOverride) {
+    console.log(chalk.white(`  Owner:           ${ownerOverride}`))
+    console.log(chalk.white(`  Operator:        ${walletAddress}`))
+  } else {
+    console.log(chalk.white(`  Address:         ${walletAddress}`))
+  }
   console.log(chalk.white(`  ST Balance:      ${formattedST} ST`))
   console.log(chalk.white(`  Billing Balance: ${formattedBilling} ST`))
 
   if (billingBalance === 0n) {
+    const who = ownerOverride ? `the owner (${ownerOverride})` : 'you'
+    const keyHint = ownerOverride ? "<owner's private key>" : '$PRIVATE_KEY'
     console.log()
     console.log(
       chalk.yellow(
-        '  ⚠ Your Billing balance is 0. Indexing fees are charged from the Billing contract.\n' +
-          '    You must deposit ST tokens into the Billing contract before your processor can run.\n' +
-          `    Use: cast send ${addresses.token} "approve(address,uint256)" ${addresses.billing} <amount> --rpc-url ${networkConfig.rpcUrl} --private-key $PRIVATE_KEY\n` +
-          `         cast send ${addresses.billing} "deposit(uint256)" <amount> --rpc-url ${networkConfig.rpcUrl} --private-key $PRIVATE_KEY`
+        `  ⚠ ${ownerOverride ? "Owner's" : 'Your'} Billing balance is 0. Indexing fees are charged from the Billing contract.\n` +
+          `    ${who} must deposit ST tokens into the Billing contract before the processor can run.\n` +
+          `    Example (replace 100 with your desired ST amount):\n` +
+          `    export AMOUNT=$(cast to-wei 100 ether)\n` +
+          `    cast send ${addresses.token} "approve(address,uint256)" ${addresses.billing} $AMOUNT --rpc-url ${networkConfig.rpcUrl} --private-key ${keyHint}\n` +
+          `    cast send ${addresses.billing} "deposit(uint256)" $AMOUNT --rpc-url ${networkConfig.rpcUrl} --private-key ${keyHint}`
       )
     )
   }