chore: update to synapse@next tag, fix test failures & update more lockup mismatches

Author: rvagg

package.json

@@ -95,11 +95,10 @@
   "homepage": "https://github.com/FilOzone/filecoin-pin#readme",
   "dependencies": {
     "@clack/prompts": "^0.11.0",
-    "@filoz/synapse-sdk": "^0.33.0",
+    "@filoz/synapse-sdk": "^0.35.0-dev.1",
     "@helia/unixfs": "^6.0.1",
     "@ipld/car": "^5.4.2",
     "commander": "^14.0.1",
-    "ethers": "^6.15.0",
     "fastify": "^5.6.0",
     "helia": "^6.0.1",
     "it-to-buffer": "^4.0.10",

src/common/upload-flow.ts

@@ -9,7 +9,7 @@ import type { Synapse } from '@filoz/synapse-sdk'
 import type { CID } from 'multiformats/cid'
 import pc from 'picocolors'
 import type { Logger } from 'pino'
-import type { PaymentCapacityCheck } from '../core/payments/index.js'
+import { DEFAULT_LOCKUP_DAYS, type PaymentCapacityCheck } from '../core/payments/index.js'
 import { cleanupSynapseService, type SynapseService } from '../core/synapse/index.js'
 import { checkUploadReadiness, executeUpload, getDownloadURL, type SynapseUploadResult } from '../core/upload/index.js'
 import { formatUSDFC } from '../core/utils/format.js'
@@ -207,7 +207,7 @@ function displayPaymentIssues(capacityCheck: PaymentCapacityCheck, fileSize: num
   log.indent(
     `Required deposit: ${formatUSDFC(capacityCheck.required.lockupAllowance + capacityCheck.required.lockupAllowance / 10n)} USDFC`
   )
-  log.indent(pc.gray('(includes 10-day safety reserve)'))
+  log.indent(pc.gray(`(includes ${DEFAULT_LOCKUP_DAYS}-day safety reserve)`))
   log.line('')
 
   log.line(pc.bold('Suggested actions:'))

src/core/payments/index.ts

@@ -537,9 +537,9 @@ export function calculateStorageAllowances(storageTiB: number, pricePerTiBPerEpo
   // Calculate rate allowance (per epoch payment)
   const rateAllowance = (pricePerTiBPerEpoch * BigInt(scaledStorage)) / BigInt(scale)
 
-  // Calculate lockup allowance (30 days worth)
-  const epochsIn10Days = BigInt(DEFAULT_LOCKUP_DAYS) * TIME_CONSTANTS.EPOCHS_PER_DAY
-  const lockupAllowance = rateAllowance * epochsIn10Days
+  // Calculate lockup allowance
+  const epochsInLockupDays = BigInt(DEFAULT_LOCKUP_DAYS) * TIME_CONSTANTS.EPOCHS_PER_DAY
+  const lockupAllowance = rateAllowance * epochsInLockupDays
 
   return {
     rateAllowance,
@@ -580,7 +580,7 @@ export function calculateActualCapacity(rateAllowance: bigint, pricePerTiBPerEpo
  * Calculate storage capacity from USDFC amount
  *
  * Determines how much storage can be purchased with a given USDFC amount,
- * accounting for the 10-day lockup period.
+ * accounting for the 30-day lockup period.
  *
  * @param usdfcAmount - Amount of USDFC in its smallest unit
  * @param pricePerTiBPerEpoch - Current pricing from storage service
@@ -589,9 +589,9 @@ export function calculateActualCapacity(rateAllowance: bigint, pricePerTiBPerEpo
 export function calculateStorageFromUSDFC(usdfcAmount: bigint, pricePerTiBPerEpoch: bigint): number {
   if (pricePerTiBPerEpoch === 0n) return 0
 
-  // Calculate how much this covers for 30 days
-  const epochsIn10Days = BigInt(DEFAULT_LOCKUP_DAYS) * TIME_CONSTANTS.EPOCHS_PER_DAY
-  const ratePerEpoch = usdfcAmount / epochsIn10Days
+  // Calculate how much this covers for lockup
+  const epochsInLockupDays = BigInt(DEFAULT_LOCKUP_DAYS) * TIME_CONSTANTS.EPOCHS_PER_DAY
+  const ratePerEpoch = usdfcAmount / epochsInLockupDays
 
   return calculateActualCapacity(ratePerEpoch, pricePerTiBPerEpoch)
 }
@@ -808,7 +808,7 @@ export function computeAdjustmentForExactDaysWithFile(
  * treating WarmStorage as fully trusted with max allowances, i.e. not
  * accounting for allowance limits. If usage limits need to be accounted for
  * then the capacity can be capped by either deposit or allowances.
- * This function accounts for the 10-day lockup requirement.
+ * This function accounts for the 30-day lockup requirement.
  *
  * @param depositAmount - Amount deposited in USDFC
  * @param pricePerTiBPerEpoch - Current pricing from storage service
@@ -838,21 +838,21 @@ export function calculateDepositCapacity(
 
   // With infinite allowances, deposit is the only limiting factor
   // Deposit needs to cover: lockup (30 days) + at least some buffer
-  const epochsIn10Days = BigInt(DEFAULT_LOCKUP_DAYS) * TIME_CONSTANTS.EPOCHS_PER_DAY
+  const epochsInLockupDays = BigInt(DEFAULT_LOCKUP_DAYS) * TIME_CONSTANTS.EPOCHS_PER_DAY
   const epochsPerMonth = TIME_CONSTANTS.EPOCHS_PER_MONTH
 
   // Maximum storage we can support with this deposit
   // Reserve 10% for buffer beyond the lockup
   // Calculate max rate per epoch we can afford with deposit
-  const maxRatePerEpoch = (depositAmount * BUFFER_DENOMINATOR) / (epochsIn10Days * BUFFER_NUMERATOR)
+  const maxRatePerEpoch = (depositAmount * BUFFER_DENOMINATOR) / (epochsInLockupDays * BUFFER_NUMERATOR)
 
   // Convert to storage capacity
   const tibPerMonth = calculateActualCapacity(maxRatePerEpoch, pricePerTiBPerEpoch)
   const gibPerMonth = tibPerMonth * 1024
 
   // Calculate the actual costs for this capacity
   const monthlyPayment = maxRatePerEpoch * epochsPerMonth
-  const requiredLockup = maxRatePerEpoch * epochsIn10Days
+  const requiredLockup = maxRatePerEpoch * epochsInLockupDays
   const totalRequired = withBuffer(requiredLockup)
 
   return {

src/payments/fund.ts

@@ -17,6 +17,7 @@ import {
   computeAdjustmentForExactDays,
   computeAdjustmentForExactDaysWithFile,
   computeAdjustmentForExactDeposit,
+  DEFAULT_LOCKUP_DAYS,
   depositUSDFC,
   getPaymentStatus,
   validatePaymentRequirements,
@@ -31,7 +32,7 @@ import { cancel, createSpinner, intro, isInteractive, outro } from '../utils/cli
 import { isTTY, log } from '../utils/cli-logger.js'
 import type { AutoFundOptions, FundingAdjustmentResult, FundOptions } from './types.js'
 
-// Helper: confirm/warn or bail when target implies < 10-day runway
+// Helper: confirm/warn or bail when target implies < lockup-days runway
 async function ensureBelowThirtyDaysAllowed(opts: {
   spinner: Spinner
   warningLine1: string
@@ -43,7 +44,7 @@ async function ensureBelowThirtyDaysAllowed(opts: {
     console.error(pc.red(warningLine1))
     console.error(pc.red(warningLine2))
     cancel('Fund adjustment aborted')
-    throw new Error('Unsafe target below 10-day baseline')
+    throw new Error(`Unsafe target below ${DEFAULT_LOCKUP_DAYS}-day baseline`)
   }
 
   log.line(pc.yellow('⚠ Warning'))

src/payments/interactive.ts

@@ -15,6 +15,7 @@ import {
   checkAllowances,
   checkFILBalance,
   checkUSDFCBalance,
+  DEFAULT_LOCKUP_DAYS,
   depositUSDFC,
   getPaymentStatus,
   setMaxAllowances,
@@ -227,7 +228,7 @@ export async function runInteractiveSetup(options: PaymentSetupOptions): Promise
       log.indent(`100 GiB capacity: ~${formatUSDFC((pricePerGiBPerMonth * 100n * 11n) / 10n)} USDFC`)
       log.indent(`1 TiB capacity:   ~${formatUSDFC((pricePerTiBPerMonth * 11n) / 10n)} USDFC`)
       log.indent(`10 TiB capacity:  ~${formatUSDFC((pricePerTiBPerMonth * 10n * 11n) / 10n)} USDFC`)
-      log.indent(pc.gray('(deposit covers 1 month + 10-day safety reserve)'))
+      log.indent(pc.gray(`(deposit covers 1 month + ${DEFAULT_LOCKUP_DAYS}-day safety reserve)`))
       log.flush()
 
       const amountStr = await text({
@@ -298,7 +299,7 @@ export async function runInteractiveSetup(options: PaymentSetupOptions): Promise
           ? `${(finalCapacity.gibPerMonth / 1024).toFixed(1)} TiB`
           : `${finalCapacity.gibPerMonth.toFixed(1)} GiB`
       log.indent(`Capacity: ~${capacityStr} for 1 month`)
-      log.indent(pc.gray('(includes 10-day safety reserve)'))
+      log.indent(pc.gray(`(includes ${DEFAULT_LOCKUP_DAYS}-day safety reserve)`))
     }
     log.flush()
 

src/test/unit/payments-setup.test.ts

@@ -110,9 +110,9 @@ describe('Payment Setup Tests', () => {
         getStorageInfo: vi.fn().mockResolvedValue({
           pricing: {
             noCDN: {
-              perTiBPerEpoch: ethers.parseUnits('0.0000565', 18),
-              perTiBPerDay: ethers.parseUnits('0.16272', 18),
-              perTiBPerMonth: ethers.parseUnits('4.8816', 18),
+              perTiBPerEpoch: ethers.parseUnits('0.00002893519', 18), // 2.5 USDFC/TiB/month
+              perTiBPerDay: ethers.parseUnits('0.08333333', 18),
+              perTiBPerMonth: ethers.parseUnits('2.5', 18),
             },
           },
         }),
@@ -196,7 +196,7 @@ describe('Payment Setup Tests', () => {
         '0xwarmstorage',
         rateAllowance,
         lockupAllowance,
-        86400, // 30 days * 2880 epochs/day
+        86400n, // 30 days * 2880 epochs/day (bigint)
         'USDFC'
       )
     })
@@ -387,11 +387,12 @@ describe('Payment Setup Tests', () => {
       expect(capacityTiB).toBe(0)
     })
 
-    // simple testcase to show what the pricePerTibPerEpoch would need to be to get 1TiB/month with 1USDFC
-    // feel free to skip/delete this testcase if it becomes irrelevant
+    // Verify pricePerTibPerEpoch needed to get 1TiB/month with 1USDFC given 30-day lockup
+    // With 30-day lockup: 1 USDFC / (30 days * 2880 epochs/day) = 1 USDFC / 86400 epochs
+    // For 1 TiB capacity: pricePerTiBPerEpoch = 1 / 86400 = 0.000011574074 USDFC
     it('should return capacity of 1 when pricePerTibPerEpoch is low', () => {
       const usdfcAmount = ethers.parseUnits('1', 18)
-      const pricePerTiBPerEpoch = ethers.parseUnits('0.000034722219', 18)
+      const pricePerTiBPerEpoch = ethers.parseUnits('0.000011574074', 18)
       const capacityTiB = calculateStorageFromUSDFC(usdfcAmount, pricePerTiBPerEpoch)
       // within 10 decimal places accuracy of 1
       expect(capacityTiB).toBeCloseTo(1, 10)

src/test/unit/payments.compute.test.ts

@@ -85,14 +85,14 @@ describe('computeAdjustmentForExactDays', () => {
   it('returns positive delta when more deposit needed (includes 1-hour safety)', () => {
     const rateUsed = 1_000_000_000_000_000_000n // 1 USDFC/epoch
     const perDay = rateUsed * TIME_CONSTANTS.EPOCHS_PER_DAY
-    const days = 10
-    const available = perDay * 30n // exactly 30 days
+    const days = 30
+    const available = perDay * 30n // exactly 30 days (no safety buffer)
     const status = makeStatus({ depositedAmount: available, lockupUsed: 0n, rateUsed })
     const res = computeAdjustmentForExactDays(status, days)
     const perHour = perDay / 24n
     const safety = perHour > 0n ? perHour : 1n
     expect(res.delta).toBe(safety)
-    expect(res.targetAvailable).toBe(perDay * 10n + safety)
+    expect(res.targetAvailable).toBe(perDay * 30n + safety)
   })
 
   it('returns negative delta when withdrawal possible', () => {