feat: make WarmStorage approvals infinite, focus only on deposit (#47)

Remove all of the complexity of dealing with approvals and rate limits by just
setting them to be infinite by default for WarmStorage (i.e. it's a trusted
service and your risk is managed by deposit). This lets us trim down the
UI for dealing with payments and simplifies the messaging.

Author: rvagg

src/add/add.ts

@@ -118,8 +118,9 @@ export async function runAdd(options: AddOptions): Promise<AddResult> {
 
     spinner.stop(`${pc.green('✓')} Connected to ${pc.bold(network)}`)
 
-    // Validate basic payment setup (actual CAR size will be checked later)
-    spinner.start('Validating payment setup (basic requirements)...')
+    // Check payment setup (may configure permissions if needed)
+    // Actual CAR size will be checked later
+    spinner.start('Checking payment setup...')
     await validatePaymentSetup(synapse, 0, spinner)
 
     // Create CAR from file or directory
@@ -144,8 +145,8 @@ export async function runAdd(options: AddOptions): Promise<AddResult> {
     const carSize = carData.length
     spinner.stop(`${pc.green('✓')} IPFS content loaded (${formatFileSize(carSize)})`)
 
-    // Validate payment setup with actual CAR size
-    spinner.start('Validating payment capacity for CAR size...')
+    // Validate payment capacity for actual file size
+    spinner.start('Checking payment capacity...')
     await validatePaymentSetup(synapse, carSize, spinner)
 
     // Create storage context

src/common/upload-flow.ts

@@ -10,7 +10,13 @@ import type { CID } from 'multiformats/cid'
 import pc from 'picocolors'
 import type { Logger } from 'pino'
 import { formatUSDFC, validatePaymentRequirements } from '../payments/setup.js'
-import { checkFILBalance, checkUSDFCBalance, validatePaymentCapacity } from '../synapse/payments.js'
+import {
+  checkAllowances,
+  checkFILBalance,
+  checkUSDFCBalance,
+  setMaxAllowances,
+  validatePaymentCapacity,
+} from '../synapse/payments.js'
 import { cleanupSynapseService, type SynapseService } from '../synapse/service.js'
 import { getDownloadURL, type SynapseUploadResult, uploadToSynapse } from '../synapse/upload.js'
 import { cancel, formatFileSize } from '../utils/cli-helpers.js'
@@ -87,7 +93,22 @@ export async function validatePaymentSetup(
     process.exit(1)
   }
 
-  // Check capacity for this specific file
+  // Check WarmStorage permissions and configure if needed
+  spinner?.message('Checking WarmStorage permissions...')
+  const checkResult = await checkAllowances(synapse)
+
+  if (checkResult.needsUpdate) {
+    spinner?.message('Configuring WarmStorage permissions (one-time setup)...')
+    const setResult = await setMaxAllowances(synapse)
+    spinner?.stop(`${pc.green('✓')} WarmStorage permissions configured`)
+    log.indent(pc.gray(`Transaction: ${setResult.transactionHash}`))
+    log.flush()
+    spinner?.start('Validating payment capacity...')
+  } else {
+    spinner?.message('Validating payment capacity...')
+  }
+
+  // Check capacity for this specific file (this also calls checkAndSetAllowances but will be a no-op now)
   const capacityCheck = await validatePaymentCapacity(synapse, fileSize)
 
   if (!capacityCheck.canUpload) {
@@ -119,30 +140,15 @@ function displayPaymentIssues(
   fileSize: number,
   spinner?: ReturnType<typeof import('../utils/cli-helpers.js').createSpinner>
 ): void {
-  spinner?.stop(`${pc.red('✗')} Insufficient payment capacity for this file`)
+  spinner?.stop(`${pc.red('✗')} Insufficient deposit for this file`)
   log.line('')
   log.line(pc.bold('File Requirements:'))
   log.indent(`File size: ${formatFileSize(fileSize)} (${capacityCheck.storageTiB.toFixed(4)} TiB)`)
   log.indent(`Storage cost: ${formatUSDFC(capacityCheck.required.rateAllowance)} USDFC/epoch`)
-  log.indent(`10-day lockup: ${formatUSDFC(capacityCheck.required.lockupAllowance)} USDFC`)
-  log.line('')
-
-  log.line(pc.bold(`${pc.red('Issues found:')}`))
-  if (capacityCheck.issues.insufficientDeposit) {
-    log.indent(
-      `${pc.red('✗')} Insufficient deposit (need ${formatUSDFC(capacityCheck.issues.insufficientDeposit)} more)`
-    )
-  }
-  if (capacityCheck.issues.insufficientRateAllowance) {
-    log.indent(
-      `${pc.red('✗')} Rate allowance too low (need ${formatUSDFC(capacityCheck.issues.insufficientRateAllowance)} more per epoch)`
-    )
-  }
-  if (capacityCheck.issues.insufficientLockupAllowance) {
-    log.indent(
-      `${pc.red('✗')} Lockup allowance too low (need ${formatUSDFC(capacityCheck.issues.insufficientLockupAllowance)} more)`
-    )
-  }
+  log.indent(
+    `Required deposit: ${formatUSDFC(capacityCheck.required.lockupAllowance + capacityCheck.required.lockupAllowance / 10n)} USDFC`
+  )
+  log.indent(pc.gray('(includes 10-day safety reserve)'))
   log.line('')
 
   log.line(pc.bold('Suggested actions:'))
@@ -151,20 +157,13 @@ function displayPaymentIssues(
   })
   log.line('')
 
-  // Calculate suggested parameters for payment setup
+  // Calculate suggested deposit
   const suggestedDeposit = capacityCheck.issues.insufficientDeposit
     ? formatUSDFC(capacityCheck.issues.insufficientDeposit)
     : '0'
-  const suggestedStorage = `${Math.ceil(capacityCheck.storageTiB * 10) / 10}TiB/month`
 
-  log.line(`${pc.yellow('⚠')} To fix these issues, run:`)
-  if (capacityCheck.issues.insufficientDeposit) {
-    log.indent(
-      pc.cyan(`filecoin-pin payments setup --deposit ${suggestedDeposit} --storage ${suggestedStorage} --auto`)
-    )
-  } else {
-    log.indent(pc.cyan(`filecoin-pin payments setup --storage ${suggestedStorage} --auto`))
-  }
+  log.line(`${pc.yellow('⚠')} To fix this, run:`)
+  log.indent(pc.cyan(`filecoin-pin payments setup --deposit ${suggestedDeposit} --auto`))
   log.flush()
 }
 

src/import/import.ts

@@ -189,8 +189,8 @@ export async function runCarImport(options: ImportOptions): Promise<ImportResult
 
     spinner.stop(`${pc.green('✓')} Connected to ${pc.bold(network)}`)
 
-    // Step 5: Validate payment setup
-    spinner.start('Validating payment setup...')
+    // Step 5: Validate payment setup (may configure permissions if needed)
+    spinner.start('Checking payment setup...')
     await validatePaymentSetup(synapse, fileStat.size, spinner)
 
     // Step 6: Create storage context now that payments are validated

src/payments/auto.ts

@@ -6,29 +6,24 @@
  * options to complete the setup without user interaction.
  */
 
-import { RPC_URLS, Synapse, TIME_CONSTANTS } from '@filoz/synapse-sdk'
+import { RPC_URLS, Synapse } from '@filoz/synapse-sdk'
 import { ethers } from 'ethers'
 import pc from 'picocolors'
+import { calculateDepositCapacity, checkAndSetAllowances } from '../synapse/payments.js'
 import { cleanupProvider } from '../synapse/service.js'
 import { cancel, createSpinner, intro, outro } from '../utils/cli-helpers.js'
 import { log } from '../utils/cli-logger.js'
 import {
-  calculateStorageAllowances,
-  calculateStorageFromUSDFC,
   checkFILBalance,
   checkUSDFCBalance,
   depositUSDFC,
   displayAccountInfo,
   displayDepositWarning,
-  displayPaymentSummary,
-  displayServicePermissions,
   formatUSDFC,
   getPaymentStatus,
-  parseStorageAllowance,
-  setServiceApprovals,
   validatePaymentRequirements,
 } from './setup.js'
-import type { PaymentSetupOptions, StorageAllowances } from './types.js'
+import type { PaymentSetupOptions } from './types.js'
 
 /**
  * Run automatic payment setup with defaults
@@ -67,27 +62,6 @@ export async function runAutoSetup(options: PaymentSetupOptions): Promise<void>
     process.exit(1)
   }
 
-  // 4. Parse storage allowance early to validate format
-  if (!options.rateAllowance) {
-    console.error(pc.red('Error: Storage allowance is required'))
-    process.exit(1)
-  }
-
-  let parsedTiB: number | null
-  let rawUsdfcPerEpoch: string | null = null
-  try {
-    parsedTiB = parseStorageAllowance(options.rateAllowance)
-    if (parsedTiB === null) {
-      // parseStorageAllowance already validated it's a valid USDFC amount
-      // (it would have thrown otherwise), so we can safely save it
-      rawUsdfcPerEpoch = options.rateAllowance
-    }
-  } catch (error) {
-    console.error(pc.red(`Error: Invalid storage allowance '${options.rateAllowance}'`))
-    console.error(pc.red(error instanceof Error ? error.message : String(error)))
-    process.exit(1)
-  }
-
   const spinner = createSpinner()
   spinner.start('Initializing connection...')
 
@@ -150,25 +124,23 @@ export async function runAutoSetup(options: PaymentSetupOptions): Promise<void>
     const storageInfo = await synapse.storage.getStorageInfo()
     const pricePerTiBPerEpoch = storageInfo.pricing.noCDN.perTiBPerEpoch
 
-    // Calculate storage allowances now that we have synapse
-    let allowances: StorageAllowances
-    if (parsedTiB !== null) {
-      // User specified TiB/month, calculate allowances
-      allowances = calculateStorageAllowances(parsedTiB, pricePerTiBPerEpoch)
-    } else if (rawUsdfcPerEpoch !== null) {
-      // User specified USDFC per epoch directly
-      const usdfcPerEpochBigint = ethers.parseUnits(rawUsdfcPerEpoch, 18)
-      const capacityTiB = calculateStorageFromUSDFC(usdfcPerEpochBigint, pricePerTiBPerEpoch)
-      allowances = calculateStorageAllowances(capacityTiB, pricePerTiBPerEpoch)
+    // Track if any changes were made
+    let actionsTaken = false
+    let actualDepositAmount = 0n
+
+    // Auto-set max allowances for WarmStorage
+    spinner.start('Configuring WarmStorage permissions...')
+    const allowanceResult = await checkAndSetAllowances(synapse)
+    if (allowanceResult.updated) {
+      spinner.stop(`${pc.green('✓')} WarmStorage permissions configured`)
+      log.line(pc.bold('Transaction:'))
+      log.indent(pc.gray(allowanceResult.transactionHash || 'Unknown'))
+      log.flush()
+      actionsTaken = true
     } else {
-      // This shouldn't happen due to earlier validation
-      throw new Error('Invalid storage allowance state')
+      spinner.stop(`${pc.green('✓')} WarmStorage permissions already configured`)
     }
 
-    // Handle deposits
-    let actualDepositAmount = 0n
-    let actionsTaken = false // Track if any changes were made
-
     if (status.depositedAmount < targetDeposit) {
       const depositAmount = targetDeposit - status.depositedAmount
       actualDepositAmount = depositAmount
@@ -199,83 +171,27 @@ export async function runAutoSetup(options: PaymentSetupOptions): Promise<void>
       spinner.stop(`${pc.green('✓')} Deposit already sufficient (${formatUSDFC(status.depositedAmount)} USDFC)`)
     }
 
-    // Set storage allowances
-    spinner.start(`Checking WarmStorage service allowances (${options.rateAllowance})...`)
-
-    // Check if we need to update allowances
-    const currentAllowances = status.currentAllowances
-    let needsUpdate = false
-
-    if (currentAllowances.rateAllowance < allowances.rateAllowance) {
-      needsUpdate = true
-    }
-
-    if (currentAllowances.lockupAllowance < allowances.lockupAllowance) {
-      needsUpdate = true
-    }
-
-    // Calculate total deposit for capacity display
+    // Calculate capacity for final summary
     const totalDeposit = status.depositedAmount + actualDepositAmount
+    const capacity = calculateDepositCapacity(totalDeposit, pricePerTiBPerEpoch)
 
-    if (needsUpdate) {
-      spinner.message('Setting WarmStorage service approvals...')
-      const approvalTx = await setServiceApprovals(synapse, allowances.rateAllowance, allowances.lockupAllowance)
-      spinner.stop(`${pc.green('✓')} WarmStorage service approvals updated`)
-      actionsTaken = true
-
-      log.line(pc.bold('Transaction:'))
-      log.indent(pc.gray(approvalTx))
-      log.flush()
-
-      // Display new permissions with capacity info
-      const monthlyRate = allowances.rateAllowance * TIME_CONSTANTS.EPOCHS_PER_MONTH
-      displayServicePermissions(
-        'New WarmStorage Service Limits:',
-        monthlyRate,
-        allowances.lockupAllowance,
-        totalDeposit,
-        pricePerTiBPerEpoch
-      )
-    } else {
-      spinner.stop(`${pc.green('✓')} WarmStorage service permissions already sufficient`)
-
-      // Display current permissions with capacity info
-      const monthlyRate = currentAllowances.rateAllowance * TIME_CONSTANTS.EPOCHS_PER_MONTH
-      displayServicePermissions(
-        'Your Current WarmStorage Service Limits:',
-        monthlyRate,
-        currentAllowances.lockupAllowance,
-        totalDeposit,
-        pricePerTiBPerEpoch
-      )
-    }
+    // Final summary
+    spinner.start('Completing setup...')
+    spinner.stop('━━━ Configuration Summary ━━━')
 
-    // Get final values
-    let finalRateAllowance: bigint
-    let finalLockupAllowance: bigint
+    log.line(`Network: ${pc.bold(network)}`)
+    log.line(`Deposit: ${formatUSDFC(totalDeposit)} USDFC`)
 
-    if (needsUpdate) {
-      finalRateAllowance = allowances.rateAllowance
-      finalLockupAllowance = allowances.lockupAllowance
-    } else {
-      finalRateAllowance = currentAllowances.rateAllowance
-      finalLockupAllowance = currentAllowances.lockupAllowance
+    if (capacity.gibPerMonth > 0) {
+      const capacityStr =
+        capacity.gibPerMonth >= 1024
+          ? `${(capacity.gibPerMonth / 1024).toFixed(1)} TiB`
+          : `${capacity.gibPerMonth.toFixed(1)} GiB`
+      log.line(`Storage: ~${capacityStr} for 1 month`)
     }
 
-    // Final summary
-    spinner.start('Completing setup...')
-    spinner.stop('━━━ Setup Complete ━━━')
-
-    displayPaymentSummary(
-      network,
-      filStatus.balance,
-      filStatus.isCalibnet,
-      usdfcBalance,
-      totalDeposit,
-      finalRateAllowance,
-      finalLockupAllowance,
-      pricePerTiBPerEpoch
-    )
+    log.line(`Status: ${pc.green('Ready to upload')}`)
+    log.flush()
 
     // Show deposit warning if needed
     displayDepositWarning(totalDeposit, status.currentAllowances.lockupUsed)
@@ -284,7 +200,7 @@ export async function runAutoSetup(options: PaymentSetupOptions): Promise<void>
     if (actionsTaken) {
       outro('Payment setup completed successfully')
     } else {
-      outro('Payment setup already configured - no changes needed')
+      outro('Payment setup already configured - ready to use')
     }
   } catch (error) {
     spinner.stop() // Stop spinner without message