@zkp2p/cash 0.1.8 → 0.2.0

package/AGENTS.md

@@ -54,6 +54,9 @@ const relayCaps = await cash.capabilities({ includeRelaySources: true });
 // 2. Estimate - idempotent, cacheable, no side effects. Includes rolling ETA.
 const est = await cash.estimate({ amount: usdc(500), currency: 'EUR' });
 
+// Progressive UI: do not let indexer-backed history hold up the oracle rate.
+const rateOnly = await cash.estimate({ amount: usdc(500), currency: 'EUR' }, { includeEta: false });
+
 // Optional: raw demand + speed evidence per offered platform:currency pair.
 const stats = await cash.fillStats();
 
@@ -106,7 +109,9 @@ console.log(routed.source?.transactions?.origin, routed.source?.transactions?.de
 - **Do not invent an ETA.** Use `estimate().eta`: `{ seconds, label }` backed
   by the same rolling 30-day, intent-attributed pair sample as `fillStats()`,
   measured from deposit creation to first fill. Use `order.explain()` for live
-  order state.
+  order state. For progressive UIs, call `estimate(..., { includeEta: false })`
+  and load `fillStats()["platform:CURRENCY"]` separately. The SDK caches the
+  raw snapshot for 15 minutes, but never substitutes another pair's data.
 - **Do not hardcode Relay source assets.** Use Relay SDK-backed EVM
   `capabilities({ includeRelaySources: true })` and `cashout({ source, ... })`.
   Destination is always Base USDC. Non-Base source chains require

package/README.md

@@ -34,6 +34,13 @@ const est = await cash.estimate({ amount: usdc(1000), currency: 'USD' });
 // { rate: 1, receiveAmount: 1000, kind: 'oracle-estimate', eta: { seconds, label } }
 // "≈", never a locked quote. Base USDC remains the default source.
 
+// Progressive UI: render rate/receive first, then resolve the exact pair ETA.
+const rateOnly = await cash.estimate(
+  { amount: usdc(1000), currency: 'USD' },
+  { includeEta: false },
+);
+const pairStats = (await cash.fillStats())['venmo:USD'];
+
 const { depositId } = await cash.cashout(
   {
     amount: usdc(1000),
@@ -76,10 +83,10 @@ console.log(source?.transactions?.origin, source?.transactions?.destination);
 | -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
 | `capabilities()`                                               | Sync discovery: Base USDC destination/default source, platforms × currencies × payee hints × amount bounds                      |
 | `capabilities({ includeRelaySources: true })`                  | Async discovery: adds live Relay SDK EVM source chains/tokens                                                                   |
-| `fillStats()`                                                  | Raw 30-day fill counts and median first-fill time per `platform:currency` pair                                                  |
+| `fillStats()`                                                  | Cached 30-day fill counts and median first-fill time per exact `platform:currency` pair                                         |
 | `quoteSource(input)` / `executeSourceQuote(quote, { signer })` | Relay SDK EVM source routing into Base USDC before cashout                                                                      |
 | `relayStatus(requestId)`                                       | Relay request status from the Relay SDK request path                                                                            |
-| `estimate({ amount, currency })`                               | Base USDC oracle estimate plus simple recent-fill ETA                                                                           |
+| `estimate({ amount, currency }, { includeEta? })`              | Base USDC oracle estimate; optionally skip the historical ETA for progressive rendering                                         |
 | `cashout(input, { signer })`                                   | Registers your payee, creates the protocol-held order, returns the `depositId`                                                  |
 | `order(depositId)` / `orders(owner)`                           | Resume any order from its id alone; list all orders for a wallet                                                                |
 | `watch(depositId)`                                             | Async iterator: yields on every state change until terminal, abort, or timeout                                                  |
@@ -99,9 +106,14 @@ cashout. Every Peer Cash transaction, including approves, carries ERC-8021
 attribution: `peer-cash` first, your own `referrer` code(s) after it.
 
 `capabilities()` presents Zelle as one platform. A cashout with
-`receive.platform: 'zelle'` automatically attaches the generic Zelle method
-and its Chase, Bank of America, and Citi buyer routes to the deposit; the payee
-handle and public API remain bank-agnostic.
+`receive.platform: 'zelle'` attaches only the generic Zelle payment method to
+the deposit. Bank-specific capture routing is outside this maker-side SDK and
+never changes the on-chain payment method.
+
+Order reads fail closed against the same active catalog. If any method on an
+indexed deposit is unsupported, `orders()` excludes the whole deposit and
+`order()` returns `ORDER_NOT_FOUND`; Peer Cash never partially reclassifies a
+mixed historical deposit.
 
 The default/minimal flow is unchanged: pass Base USDC base units to
 `estimate()` and `cashout()`. For any other source asset, pass `source` to
@@ -180,6 +192,9 @@ awaiting-buyer ──────────► matched ───────
 - **ETA is historical.** `estimate().eta` is just `{ seconds, label }`, backed
   by the same rolling 30-day, intent-attributed pair sampler as `fillStats()`,
   measured from deposit creation to the first fulfilled fill through the pair.
+  The raw snapshot is cached for 15 minutes per client and each ETA is still
+  resolved from its exact normalized `platform:currency` key. Use
+  `{ includeEta: false }` when rate and receive amount should render first.
 - **Availability thresholds belong to the consumer.** `fillStats()` returns raw
   evidence. A recommended gate is `fills >= 10 && medianFillSeconds <= 48h`.
   Fail open to the full `capabilities()` catalog when stats are unavailable or

package/dist/{createCashClient-BIzOLHjF.d.cts → createCashClient-CTEXn9FF.d.cts}

@@ -3,7 +3,7 @@ import { IndexerIntentStatus, Zkp2pClient, IndexerIntent, CurrencyType, Prepared
 import { Execute, RelayClient, RelayChain, ProgressData } from '@relayprotocol/relay-sdk';
 
 /**
- * Name-mapping shim over the published `@zkp2p/sdk` (^0.8).
+ * Name-mapping shim over the published `@zkp2p/sdk` (^0.9).
  *
  * The reference implementation imported these from internal SDK paths; the
  * published package exports them under indexer-prefixed names, and one type
@@ -97,8 +97,8 @@ interface CashPayoutPricing {
 }
 /** One payout leg reconstructed from the chain - platform, currency, payee hash, pricing. */
 interface CashPayoutInfo {
-    /** Decoded platform id, e.g. `'venmo'` (undefined if the catalog doesn't know the hash). */
-    platform?: string;
+    /** Decoded active platform id, e.g. `'venmo'`. */
+    platform: string;
     /** Raw payment method hash (bytes32). */
     platformHash: string;
     /** Decoded fiat currency code, e.g. `'USD'`. */
@@ -401,6 +401,13 @@ interface EstimateInput {
         tradeType?: 'EXACT_INPUT' | 'EXACT_OUTPUT' | 'EXPECTED_OUTPUT';
     };
 }
+interface EstimateOptions {
+    /**
+     * Include the historical indexer-backed ETA. Disable for progressive UIs
+     * that render the oracle rate first and load pair fill stats separately.
+     */
+    includeEta?: boolean;
+}
 interface CashEstimate {
     /** Always `'oracle-estimate'` - there is no committed quote in Peer Cash. */
     kind: 'oracle-estimate';
@@ -612,7 +619,7 @@ interface CashClient {
     /** Track Relay execution status by quote/request id. */
     relayStatus(requestId: string): Promise<RelayStatus>;
     /** 1 - Estimate: currency + amount only. No payee, no side effects, no expiry. */
-    estimate(input: EstimateInput): Promise<CashEstimate>;
+    estimate(input: EstimateInput, options?: EstimateOptions): Promise<CashEstimate>;
     /** 2 - Cash out: payee registration + deposit params + submission happen here. */
     cashout(input: CashoutInput, opts: CashoutOptions): Promise<CashoutResult>;
     /** 2b - Unsigned path: `txs[]` for agent wallets, AA, server keys, policy layers. */
@@ -655,4 +662,4 @@ interface CashClient {
 }
 declare function createCashClient(options: CashClientOptions): CashClient;
 
-export { type CashPlatformCapability as A, type CashPreparedStepKind as B, type CashPayoutInfo as C, type CashoutInput as D, type CashoutOptions as E, type CuratorPayeeDataInput as F, type EstimateInput as G, RECOMMENDED_MIN_CASHOUT_AMOUNT as H, type IntentStatus as I, type RelayOptions as J, type RelayQuoteInput as K, type RelaySourceInput as L, MIN_CASHOUT_AMOUNT as M, type RelayTransaction as N, type OrdersOptions as O, type PrepareResult as P, type WatchOptions as Q, type RelayExecutionResult as R, type SignerOptions as S, type TopUpResult as T, type WithdrawOptions as U, buildCapabilities as V, type WithdrawResult as W, createCashClient as X, type IntentEntity as a, type CashBuyerProfile as b, type CashDepositInput as c, type CreateDepositParamsArg as d, type CashOrder as e, type CashFill as f, type CashCapabilities as g, type CashoutResult as h, type CashEstimate as i, type CashFillStats as j, type CashPreparedStep as k, type RelayQuote as l, type RelayStatus as m, type CashSourceCapabilities as n, CASH_ATTRIBUTION_CODE as o, type CashAsset as p, type CashChain as q, type CashClient as r, type CashClientOptions as s, type CashFillEta as t, type CashLeg as u, type CashNextAction as v, type CashOrderState as w, type CashPairFillStats as x, type CashPayout as y, type CashPayoutPricing as z };
+export { type CashPlatformCapability as A, type CashPreparedStepKind as B, type CashPayoutInfo as C, type CashoutInput as D, type CashoutOptions as E, type CuratorPayeeDataInput as F, type EstimateInput as G, type EstimateOptions as H, type IntentStatus as I, RECOMMENDED_MIN_CASHOUT_AMOUNT as J, type RelayOptions as K, type RelayQuoteInput as L, MIN_CASHOUT_AMOUNT as M, type RelaySourceInput as N, type OrdersOptions as O, type PrepareResult as P, type RelayTransaction as Q, type RelayExecutionResult as R, type SignerOptions as S, type TopUpResult as T, type WatchOptions as U, type WithdrawOptions as V, type WithdrawResult as W, buildCapabilities as X, createCashClient as Y, type IntentEntity as a, type CashBuyerProfile as b, type CashDepositInput as c, type CreateDepositParamsArg as d, type CashOrder as e, type CashFill as f, type CashCapabilities as g, type CashoutResult as h, type CashEstimate as i, type CashFillStats as j, type CashPreparedStep as k, type RelayQuote as l, type RelayStatus as m, type CashSourceCapabilities as n, CASH_ATTRIBUTION_CODE as o, type CashAsset as p, type CashChain as q, type CashClient as r, type CashClientOptions as s, type CashFillEta as t, type CashLeg as u, type CashNextAction as v, type CashOrderState as w, type CashPairFillStats as x, type CashPayout as y, type CashPayoutPricing as z };

package/dist/{createCashClient-BIzOLHjF.d.ts → createCashClient-CTEXn9FF.d.ts}

@@ -3,7 +3,7 @@ import { IndexerIntentStatus, Zkp2pClient, IndexerIntent, CurrencyType, Prepared
 import { Execute, RelayClient, RelayChain, ProgressData } from '@relayprotocol/relay-sdk';
 
 /**
- * Name-mapping shim over the published `@zkp2p/sdk` (^0.8).
+ * Name-mapping shim over the published `@zkp2p/sdk` (^0.9).
  *
  * The reference implementation imported these from internal SDK paths; the
  * published package exports them under indexer-prefixed names, and one type
@@ -97,8 +97,8 @@ interface CashPayoutPricing {
 }
 /** One payout leg reconstructed from the chain - platform, currency, payee hash, pricing. */
 interface CashPayoutInfo {
-    /** Decoded platform id, e.g. `'venmo'` (undefined if the catalog doesn't know the hash). */
-    platform?: string;
+    /** Decoded active platform id, e.g. `'venmo'`. */
+    platform: string;
     /** Raw payment method hash (bytes32). */
     platformHash: string;
     /** Decoded fiat currency code, e.g. `'USD'`. */
@@ -401,6 +401,13 @@ interface EstimateInput {
         tradeType?: 'EXACT_INPUT' | 'EXACT_OUTPUT' | 'EXPECTED_OUTPUT';
     };
 }
+interface EstimateOptions {
+    /**
+     * Include the historical indexer-backed ETA. Disable for progressive UIs
+     * that render the oracle rate first and load pair fill stats separately.
+     */
+    includeEta?: boolean;
+}
 interface CashEstimate {
     /** Always `'oracle-estimate'` - there is no committed quote in Peer Cash. */
     kind: 'oracle-estimate';
@@ -612,7 +619,7 @@ interface CashClient {
     /** Track Relay execution status by quote/request id. */
     relayStatus(requestId: string): Promise<RelayStatus>;
     /** 1 - Estimate: currency + amount only. No payee, no side effects, no expiry. */
-    estimate(input: EstimateInput): Promise<CashEstimate>;
+    estimate(input: EstimateInput, options?: EstimateOptions): Promise<CashEstimate>;
     /** 2 - Cash out: payee registration + deposit params + submission happen here. */
     cashout(input: CashoutInput, opts: CashoutOptions): Promise<CashoutResult>;
     /** 2b - Unsigned path: `txs[]` for agent wallets, AA, server keys, policy layers. */
@@ -655,4 +662,4 @@ interface CashClient {
 }
 declare function createCashClient(options: CashClientOptions): CashClient;
 
-export { type CashPlatformCapability as A, type CashPreparedStepKind as B, type CashPayoutInfo as C, type CashoutInput as D, type CashoutOptions as E, type CuratorPayeeDataInput as F, type EstimateInput as G, RECOMMENDED_MIN_CASHOUT_AMOUNT as H, type IntentStatus as I, type RelayOptions as J, type RelayQuoteInput as K, type RelaySourceInput as L, MIN_CASHOUT_AMOUNT as M, type RelayTransaction as N, type OrdersOptions as O, type PrepareResult as P, type WatchOptions as Q, type RelayExecutionResult as R, type SignerOptions as S, type TopUpResult as T, type WithdrawOptions as U, buildCapabilities as V, type WithdrawResult as W, createCashClient as X, type IntentEntity as a, type CashBuyerProfile as b, type CashDepositInput as c, type CreateDepositParamsArg as d, type CashOrder as e, type CashFill as f, type CashCapabilities as g, type CashoutResult as h, type CashEstimate as i, type CashFillStats as j, type CashPreparedStep as k, type RelayQuote as l, type RelayStatus as m, type CashSourceCapabilities as n, CASH_ATTRIBUTION_CODE as o, type CashAsset as p, type CashChain as q, type CashClient as r, type CashClientOptions as s, type CashFillEta as t, type CashLeg as u, type CashNextAction as v, type CashOrderState as w, type CashPairFillStats as x, type CashPayout as y, type CashPayoutPricing as z };
+export { type CashPlatformCapability as A, type CashPreparedStepKind as B, type CashPayoutInfo as C, type CashoutInput as D, type CashoutOptions as E, type CuratorPayeeDataInput as F, type EstimateInput as G, type EstimateOptions as H, type IntentStatus as I, RECOMMENDED_MIN_CASHOUT_AMOUNT as J, type RelayOptions as K, type RelayQuoteInput as L, MIN_CASHOUT_AMOUNT as M, type RelaySourceInput as N, type OrdersOptions as O, type PrepareResult as P, type RelayTransaction as Q, type RelayExecutionResult as R, type SignerOptions as S, type TopUpResult as T, type WatchOptions as U, type WithdrawOptions as V, type WithdrawResult as W, buildCapabilities as X, createCashClient as Y, type IntentEntity as a, type CashBuyerProfile as b, type CashDepositInput as c, type CreateDepositParamsArg as d, type CashOrder as e, type CashFill as f, type CashCapabilities as g, type CashoutResult as h, type CashEstimate as i, type CashFillStats as j, type CashPreparedStep as k, type RelayQuote as l, type RelayStatus as m, type CashSourceCapabilities as n, CASH_ATTRIBUTION_CODE as o, type CashAsset as p, type CashChain as q, type CashClient as r, type CashClientOptions as s, type CashFillEta as t, type CashLeg as u, type CashNextAction as v, type CashOrderState as w, type CashPairFillStats as x, type CashPayout as y, type CashPayoutPricing as z };

package/dist/index.cjs

@@ -303,35 +303,41 @@ function toPricing(tuple) {
   };
 }
 function derivePayouts(paymentMethods, currencies, catalog) {
-  return paymentMethods.flatMap((method) => {
+  const payouts = [];
+  for (const method of paymentMethods) {
     const platformHash = method.paymentMethodHash ?? "";
     if (!platformHash) return [];
     let platform;
     try {
       platform = sdk.resolvePaymentMethodNameFromHash(platformHash, catalog);
     } catch {
-      platform = void 0;
+      return [];
     }
+    if (!platform) return [];
     const tuples = currencies.filter(
       (c) => (c.paymentMethodHash ?? "").toLowerCase() === platformHash.toLowerCase()
     );
     const base2 = {
-      ...platform !== void 0 ? { platform } : {},
+      platform,
       platformHash,
       payeeHash: method.payeeDetailsHash ?? "",
       active: method.active ?? true
     };
-    if (tuples.length === 0) return [{ ...base2, pricing: toPricing(void 0) }];
-    return tuples.map((tuple) => {
+    if (tuples.length === 0) {
+      payouts.push({ ...base2, pricing: toPricing(void 0) });
+      continue;
+    }
+    for (const tuple of tuples) {
       const currency = tuple.currencyCode != null ? sdk.getCurrencyCodeFromHash(tuple.currencyCode) : void 0;
-      return {
+      payouts.push({
         ...base2,
         ...currency !== void 0 ? { currency } : {},
         ...tuple.currencyCode != null ? { currencyHash: tuple.currencyCode } : {},
         pricing: toPricing(tuple)
-      };
-    });
-  });
+      });
+    }
+  }
+  return payouts;
 }
 
 // src/engine/buyerProfile.ts
@@ -403,26 +409,6 @@ function parseCompositeDepositId(compositeId) {
   const onchainDepositId = BigInt(rawDepositId);
   return { escrowAddress: canonicalEscrowAddress, onchainDepositId };
 }
-
-// src/client/platformGroups.ts
-var PLATFORM_METHOD_GROUPS = {
-  zelle: ["zelle", "zelle-chase", "zelle-bofa", "zelle-citi"]
-};
-var METHOD_TO_BASE_PLATFORM = new Map(
-  Object.entries(PLATFORM_METHOD_GROUPS).flatMap(
-    ([platform, methods]) => methods.map((method) => [method, platform])
-  )
-);
-function basePlatformForMethod(method) {
-  return METHOD_TO_BASE_PLATFORM.get(method) ?? method;
-}
-function paymentMethodsForPlatform(platform, catalog) {
-  const configured = PLATFORM_METHOD_GROUPS[platform];
-  const methods = configured ?? [platform];
-  return methods.filter((method) => catalog[method] !== void 0);
-}
-
-// src/client/capabilities.ts
 var MIN_CASHOUT_AMOUNT = 10000n;
 var RECOMMENDED_MIN_CASHOUT_AMOUNT = 1000000n;
 var PAYEE_HINTS = {
@@ -441,20 +427,13 @@ var PAYEE_HINTS = {
 var IDENTITY_ATTESTATION_PLATFORMS = /* @__PURE__ */ new Set(["wise", "paypal"]);
 function buildCapabilities(environment) {
   const catalog = sdk.getPaymentMethodsCatalog(BASE_CHAIN_ID, environment);
-  const currenciesByPlatform = /* @__PURE__ */ new Map();
-  for (const [method, entry] of Object.entries(catalog)) {
-    const platform = basePlatformForMethod(method);
+  const platforms = Object.entries(catalog).map(([platform, entry]) => {
     const currencies2 = (entry.currencies ?? []).map((hash) => sdk.getCurrencyCodeFromHash(hash)).filter(
       (code) => code != null && isMarketRateSupported(code)
     );
-    const aggregate = currenciesByPlatform.get(platform) ?? /* @__PURE__ */ new Set();
-    for (const currency of currencies2) aggregate.add(currency);
-    currenciesByPlatform.set(platform, aggregate);
-  }
-  const platforms = [...currenciesByPlatform.entries()].map(([platform, currencies2]) => {
     return {
       platform,
-      currencies: [...currencies2].sort(),
+      currencies: [...new Set(currencies2)].sort(),
       payeeHint: PAYEE_HINTS[platform] ?? "Your payment handle for this platform",
       requiresIdentityAttestation: IDENTITY_ATTESTATION_PLATFORMS.has(platform)
     };
@@ -896,7 +875,7 @@ function computeFillStatsSample(deposits, nowSeconds, environment) {
       }
       const currency = normalizeCurrencyCode(intent.fiatCurrency);
       if (!method || !currency) continue;
-      const pair = `${basePlatformForMethod(method)}:${currency}`;
+      const pair = `${method}:${currency}`;
       fillCounts.set(pair, (fillCounts.get(pair) ?? 0) + 1);
       if (createdAt === void 0 || createdAt < windowStart || fulfilledAt < createdAt) continue;
       const previousPairFill = firstFillByPair.get(pair);
@@ -959,18 +938,18 @@ async function readFillStatsSample(client, environment) {
   }
   return computeFillStatsSample(deposits, now, environment);
 }
-async function readFillStats(client, environment) {
-  return (await readFillStatsSample(client, environment)).stats;
-}
-async function readFillEta(client, input) {
-  const sample = await readFillStatsSample(client, input.environment);
+function fillEtaFromSample(sample, input) {
   const currency = input.currency.toUpperCase();
-  const seconds = input.platform ? sample.stats[`${basePlatformForMethod(input.platform)}:${currency}`]?.medianFillSeconds : sample.medianFillSecondsByCurrency.get(currency);
+  const seconds = input.platform ? sample.stats[`${input.platform}:${currency}`]?.medianFillSeconds : sample.medianFillSecondsByCurrency.get(currency);
   return {
     ...seconds !== void 0 ? { seconds } : {},
     label: etaLabel(seconds)
   };
 }
+async function readFillEta(client, input) {
+  const sample = await readFillStatsSample(client, input.environment);
+  return fillEtaFromSample(sample, input);
+}
 var RELAY_API_URL = relaySdk.MAINNET_RELAY_API;
 var NATIVE_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
 var BASE_USDC_ASSET = {
@@ -1506,13 +1485,18 @@ async function readEstimate(publicClient, input, context = {}) {
       }
     } : {}
   };
-  if (context.indexerClient && context.environment) {
+  if (context.includeEta !== false && context.environment) {
     try {
-      estimate.eta = await readFillEta(context.indexerClient, {
+      const etaInput = {
         environment: context.environment,
         currency,
         ...input.platform ? { platform: input.platform } : {}
-      });
+      };
+      if (context.etaReader) {
+        estimate.eta = await context.etaReader(etaInput);
+      } else if (context.indexerClient) {
+        estimate.eta = await readFillEta(context.indexerClient, etaInput);
+      }
     } catch {
     }
   }
@@ -1521,6 +1505,7 @@ async function readEstimate(publicClient, input, context = {}) {
 
 // src/client/createCashClient.ts
 var DEFAULT_RPC_URL = "https://mainnet.base.org";
+var FILL_STATS_CACHE_MS = 15 * 60 * 1e3;
 var CASH_ATTRIBUTION_CODE = "peer-cash";
 var DEFAULT_CURATOR_URLS = {
   preproduction: "https://api-preprod.zkp2p.xyz",
@@ -1619,6 +1604,25 @@ function createCashClient(options) {
     });
   }
   const readClient = buildSdkClient(viem.createWalletClient({ chain: chains.base, transport }));
+  let fillStatsCache = null;
+  let fillStatsRequest = null;
+  async function getFillStatsSample() {
+    if (fillStatsCache && fillStatsCache.expiresAt > Date.now()) {
+      return fillStatsCache.sample;
+    }
+    if (fillStatsRequest) return fillStatsRequest;
+    fillStatsRequest = readFillStatsSample(readClient, environment);
+    try {
+      const sample = await fillStatsRequest;
+      fillStatsCache = {
+        sample,
+        expiresAt: Date.now() + FILL_STATS_CACHE_MS
+      };
+      return sample;
+    } finally {
+      fillStatsRequest = null;
+    }
+  }
   const signingClients = /* @__PURE__ */ new WeakMap();
   async function signingClient(verb, opts) {
     const signer = opts?.signer;
@@ -1633,7 +1637,6 @@ function createCashClient(options) {
   }
   function validatePayout(input) {
     const { receive } = input;
-    const catalog = sdk.getPaymentMethodsCatalog(BASE_CHAIN_ID, environment);
     const platform = buildCapabilities(environment).platforms.find(
       (capability) => capability.platform === receive.platform
     );
@@ -1644,13 +1647,14 @@ function createCashClient(options) {
     if (!platform.currencies.includes(receive.currency)) {
       throw errors.unsupportedPlatformCurrency(receive.platform, receive.currency);
     }
-    const paymentMethods = paymentMethodsForPlatform(receive.platform, catalog);
     return {
-      payouts: paymentMethods.map((processorName) => ({
-        processorName,
-        currency: receive.currency,
-        payeeData: receive.payee
-      }))
+      payouts: [
+        {
+          processorName: receive.platform,
+          currency: receive.currency,
+          payeeData: receive.payee
+        }
+      ]
     };
   }
   function validateDepositInput(amount, input, payoutInput = validatePayout(input)) {
@@ -1667,6 +1671,9 @@ function createCashClient(options) {
       ...range ? { intentAmountRange: range } : {}
     };
   }
+  function isCashPayoutSet(payouts) {
+    return payouts.length === 1 && payouts.every((payout) => payout.pricing.marketRate && payout.pricing.spreadBps === 0);
+  }
   async function buildDepositParams(client, depositInput) {
     try {
       return await prepareCashDepositParams(client, depositInput);
@@ -1721,9 +1728,10 @@ function createCashClient(options) {
       deposit.currencies ?? [],
       sdk.getPaymentMethodsCatalog(BASE_CHAIN_ID, environment)
     );
+    if (!isCashPayoutSet(payouts)) throw errors.orderNotFound(compositeId);
     return deriveCashOrder(compositeId, deposit.intents ?? [], {
       ...depositOrderOptions(deposit),
-      ...payouts.length > 0 ? { payouts } : {}
+      payouts
     });
   }
   function escrowContext(depositId) {
@@ -1921,16 +1929,17 @@ function createCashClient(options) {
     async relayStatus(requestId) {
       return readRelayStatus(requestId, options.relay);
     },
-    async estimate(input) {
+    async estimate(input, estimateOptions) {
       return readEstimate(readClient.publicClient, input, {
-        indexerClient: readClient,
         environment,
+        ...estimateOptions?.includeEta !== void 0 ? { includeEta: estimateOptions.includeEta } : {},
+        etaReader: async (etaInput) => fillEtaFromSample(await getFillStatsSample(), etaInput),
         ...options.relay ? { relay: options.relay } : {}
       });
     },
     async fillStats() {
       try {
-        return await readFillStats(readClient, environment);
+        return (await getFillStatsSample()).stats;
       } catch (err) {
         throw errors.indexerUnavailable("fill stats", err);
       }
@@ -2169,7 +2178,7 @@ function createCashClient(options) {
           deposit.currencies ?? [],
           catalog
         );
-        if (payouts.length !== 1 || !payouts.every((payout) => payout.pricing.marketRate && payout.pricing.spreadBps === 0)) {
+        if (!isCashPayoutSet(payouts)) {
           return [];
         }
         return [
@@ -2438,7 +2447,7 @@ var cashPayoutPricingJsonSchema = zod.z.object({
   marketRate: zod.z.boolean()
 });
 var cashPayoutInfoJsonSchema = zod.z.object({
-  platform: zod.z.string().optional(),
+  platform: zod.z.string(),
   platformHash: zod.z.string(),
   currency: zod.z.string().optional(),
   currencyHash: zod.z.string().optional(),