@provex/react 1.9.2 → 1.10.0-rc.20260912192040.fdbb8fc

package/dist/index.cjs

@@ -13,6 +13,7 @@ var reputation = require('@provex/utils/reputation');
 var contracts = require('@provex/utils/contracts');
 var proving = require('@provex/proving');
 var utils = require('@provex/utils');
+var deposit = require('@provex/utils/deposit');
 var fees = require('@provex/utils/fees');
 var abis = require('@provex/abis');
 var chain = require('@provex/utils/chain');
@@ -115,22 +116,9 @@ function getRate({
   currency
 }) {
   if (!deposit) return 0n;
-  const paymentConfig = payment.providerConfigs(deposit.chainId)[paymentMethod];
-  const candidateKeys = [
-    paymentMethod,
-    ...Array.from(paymentConfig?.subProviders ?? []).map((sp) => sp.key)
-  ];
-  let minRate = null;
-  for (const key of candidateKeys) {
-    const contractId = payment.providerKeyToContractId(key).toLowerCase();
-    const value = deposit.conversionRates.get(contractId)?.get(currency.contractId.toLowerCase());
-    if (value) {
-      if (minRate === null || value < minRate) {
-        minRate = value;
-      }
-    }
-  }
-  return minRate ?? 0n;
+  const contractId = payment.providerKeyToContractId(paymentMethod).toLowerCase();
+  const value = deposit.conversionRates.get(contractId)?.get(currency.contractId.toLowerCase());
+  return value ?? 0n;
 }
 function toDepositInfo(deposit) {
   return {
@@ -163,11 +151,7 @@ function useDeposits(options) {
     const paymentConfig = payment.providerConfigs(token.chainId)[paymentMethod];
     return /* @__PURE__ */ new Set([
       payment.providerKeyToContractId(paymentMethod).toLowerCase(),
-      ...paymentConfig.v2Verifiers.map((v) => v.toLowerCase()),
-      ...Array.from(paymentConfig.subProviders).flatMap((subProvider) => [
-        payment.providerKeyToContractId(subProvider.key).toLowerCase(),
-        ...subProvider.v2Verifiers(token.chainId).map((v) => v.toLowerCase())
-      ])
+      ...paymentConfig.v2Verifiers.map((v) => v.toLowerCase())
     ]);
   }, [token.chainId, paymentMethod]);
   const depositsQuery = reactQuery.useQuery({
@@ -401,82 +385,85 @@ var ProveXClient = class {
     this.onSlowSync = config.onSlowSync;
     this.apiUrl = config.apiUrl ?? defaults?.apiUrl ?? "https://app.provex.com";
     this.createDepositRaw = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "createDeposit",
-      argsMapper: (params) => [params]
+      argsMapper: (params) => [{
+        ...params,
+        currencies: params.currencies.map((perMethod) => deposit.toEscrowCurrencies(perMethod, this.getEscrowGeneration()))
+      }]
     });
     this.addFunds = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "addFunds",
       argsMapper: (params) => [params.depositId, params.amount]
     });
     this.removeFunds = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "removeFunds",
       argsMapper: (params) => [params.depositId, params.amount]
     });
     this.withdrawDeposit = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "withdrawDeposit",
       argsMapper: (params) => [params.depositId]
     });
     this.pruneExpiredIntents = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "pruneExpiredIntents",
       argsMapper: (params) => [params.depositId]
     });
     this.setAcceptingIntents = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "setAcceptingIntents",
       argsMapper: (params) => [params.depositId, params.accepting]
     });
     this.setRetainOnEmpty = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "setRetainOnEmpty",
       argsMapper: (params) => [params.depositId, params.retain]
     });
     this.setIntentRange = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "setIntentRange",
       argsMapper: (params) => [params.depositId, { min: params.min, max: params.max }]
     });
     this.setPaymentMethodActive = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "setPaymentMethodActive",
       argsMapper: (params) => [params.depositId, params.paymentMethod, params.active]
     });
     this.setCurrencyMinRate = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "setCurrencyMinRate",
       argsMapper: (params) => [params.depositId, params.paymentMethod, params.currency, params.rate]
     });
     this.addCurrencies = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "addCurrencies",
-      argsMapper: (params) => [params.depositId, params.paymentMethod, params.currencies]
+      argsMapper: (params) => [params.depositId, params.paymentMethod, deposit.toEscrowCurrencies(params.currencies, this.getEscrowGeneration())]
     });
     this.deactivateCurrency = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "deactivateCurrency",
       argsMapper: (params) => [params.depositId, params.paymentMethod, params.currencyCode]
     });
     this.addPaymentMethods = this.buildWritableMethod({
-      abi: abis.V3EscrowAbi,
+      abi: () => this.getEscrowAbi(),
       contractResolver: () => this.getEscrowAddress(),
       functionName: "addPaymentMethods",
-      argsMapper: (params) => [params.depositId, params.paymentMethods, params.paymentMethodData, params.currencies]
+      argsMapper: (params) => [params.depositId, params.paymentMethods, params.paymentMethodData, params.currencies.map((perMethod) => deposit.toEscrowCurrencies(perMethod, this.getEscrowGeneration()))]
     });
     this.cancelIntent = this.buildWritableMethod({
       abi: abis.OrchestratorAbi,
@@ -511,17 +498,66 @@ var ProveXClient = class {
     });
   }
   // ─── Address Resolution ──────────────────────────────────────────────────
-  /** Get the V3 escrow address for this client's chain. */
+  /**
+   * The escrow this client acts on.
+   *
+   * Callers that touch a specific deposit MUST construct the client with
+   * `escrowAddress: deposit.escrow` — the fallback below is only correct for a
+   * client that has no deposit in hand, and silently sends every write to the
+   * wrong escrow otherwise.
+   *
+   * That fallback follows the chain's current generation rather than a pinned
+   * v3. The only writes that reach it are ones with no existing deposit to
+   * name — `createDeposit` above all — and those belong on the generation the
+   * protocol is actually running, not the one it has moved off.
+   */
   getEscrowAddress() {
     if (this.escrowOverride) return this.escrowOverride;
-    const addr = contracts.getLatestContract(this.chainId, "escrow", "v3");
-    if (!addr) throw new ProveXError("VALIDATION_ERROR", `No V3 escrow found for chain ${this.chainId}`);
+    const addr = contracts.getLatestContract(this.chainId, "escrow", contracts.getLatestConfiguredVersion(this.chainId));
+    if (!addr) throw new ProveXError("VALIDATION_ERROR", `No escrow configured for chain ${this.chainId}`);
     return addr;
   }
-  /** Get the orchestrator address (cached after first read). */
+  /**
+   * The escrow's generation, used to pick the matching interface.
+   *
+   * An unrecognised address is not an error: callers may point the client at a
+   * fork or a local deployment through `escrowAddress`. Those fall back to v3,
+   * which is what this client assumed for every escrow before generations were
+   * resolved at all — so an override that worked before still works.
+   */
+  getEscrowGeneration() {
+    return contracts.getEscrowVersion(this.getEscrowAddress(), this.chainId) ?? "v3";
+  }
+  /**
+   * The escrow interface matching this client's escrow generation.
+   *
+   * EscrowV2 is not signature-compatible with the v3 escrow for every maker
+   * write — `createDeposit`, `addPaymentMethods` and `addCurrencies` each gain
+   * an oracle rate config in their currency tuple, which changes the selector.
+   * Binding one generation's interface to whatever address we resolved
+   * produces a call the contract cannot decode, and since these writes are not
+   * simulated the maker signs and pays gas for a certain revert.
+   */
+  getEscrowAbi() {
+    return abis.escrowAbiByVersion[this.getEscrowGeneration()];
+  }
+  /**
+   * Get the orchestrator address (cached after first read).
+   *
+   * Generation decides where this comes from. v2 and v3 escrows expose
+   * `orchestrator()`; EscrowV2 authorizes through an `OrchestratorRegistry`
+   * and exposes no such function, so reading it reverts and the address has to
+   * come from configuration. Probing on-chain first would therefore break
+   * every v4 flow before the wallet ever opens.
+   */
   async getOrchestratorAddress() {
     if (this.cachedOrchestratorAddress) return this.cachedOrchestratorAddress;
     const escrow = this.getEscrowAddress();
+    const configured = contracts.getConfiguredOrchestratorForEscrow(escrow);
+    if (configured) {
+      this.cachedOrchestratorAddress = configured;
+      return configured;
+    }
     const result = await this.readContract({
       address: escrow,
       abi: abis.V3EscrowAbi,
@@ -671,34 +707,16 @@ var ProveXClient = class {
   }
   /**
    * Convert human-readable deposit params to raw contract params.
-   * Handles provider expansion, hashing, gating service encoding, and defaults.
+   * Handles rail collapsing, hashing, gating service encoding, and defaults.
    */
   buildCreateDepositRawParams(params) {
-    const expanded = [];
-    const configs = payment.providerConfigs(this.chainId);
-    for (const pm of params.paymentMethods) {
-      const hash = payment.computePayeeDetailsHash(pm.payeeId);
-      const config = configs[pm.provider];
-      if (config?.subProviders && config.subProviders.size > 0) {
-        for (const sub of config.subProviders) {
-          expanded.push({
-            providerKey: sub.key,
-            payeeDetailsHash: hash,
-            currencies: pm.currencies,
-            intentGatingService: pm.intentGatingService,
-            data: pm.data
-          });
-        }
-      } else {
-        expanded.push({
-          providerKey: pm.provider,
-          payeeDetailsHash: hash,
-          currencies: pm.currencies,
-          intentGatingService: pm.intentGatingService,
-          data: pm.data
-        });
-      }
-    }
+    const collapsed = params.paymentMethods.map((pm) => ({
+      providerKey: payment.resolveRailProviderKey(pm.provider),
+      payeeDetailsHash: payment.computePayeeDetailsHash(pm.payeeId),
+      currencies: pm.currencies,
+      intentGatingService: pm.intentGatingService,
+      data: pm.data
+    }));
     const defaultGatingData = viem.encodeAbiParameters(
       viem.parseAbiParameters(["address[]"]),
       [[contracts.reclaimSigners.peerWitnessSigner, contracts.reclaimSigners.reclaimWitnessSigner]]
@@ -711,13 +729,13 @@ var ProveXClient = class {
         min: params.intentRange?.min ?? 1000000n,
         max: params.intentRange?.max ?? params.amount
       },
-      paymentMethods: expanded.map((p) => payment.providerKeyToContractId(p.providerKey)),
-      paymentMethodData: expanded.map((p) => ({
+      paymentMethods: collapsed.map((p) => payment.providerKeyToContractId(p.providerKey)),
+      paymentMethodData: collapsed.map((p) => ({
         intentGatingService: p.intentGatingService ?? defaultGatingService,
         payeeDetails: p.payeeDetailsHash,
         data: p.data ?? defaultGatingData
       })),
-      currencies: expanded.map(
+      currencies: collapsed.map(
         (p) => p.currencies.map((c) => ({
           code: currencies.tickerToContractId(c.code),
           minConversionRate: c.minRate
@@ -1028,7 +1046,7 @@ var ProveXClient = class {
       const to = await contractResolver(params);
       const args = argsMapper(params);
       const data = viem.encodeFunctionData({
-        abi,
+        abi: typeof abi === "function" ? abi() : abi,
         functionName,
         args
       });
@@ -1519,16 +1537,34 @@ function useOrchestratorAddress({
   chainId,
   enabled = true
 }) {
-  return useContractRead({
+  const configuredOrchestrator = react.useMemo(
+    () => escrowAddress ? contracts.getConfiguredOrchestratorForEscrow(escrowAddress) : null,
+    [escrowAddress]
+  );
+  const query = useContractRead({
     address: escrowAddress,
     abi: abis.V3EscrowAbi,
     functionName: "orchestrator",
     chainId,
     query: {
-      enabled: enabled && !!escrowAddress,
+      enabled: enabled && !!escrowAddress && !configuredOrchestrator,
       staleTime: Infinity
     }
   });
+  return react.useMemo(() => {
+    if (!configuredOrchestrator) return query;
+    return {
+      ...query,
+      data: configuredOrchestrator,
+      isLoading: false,
+      isPending: false,
+      isFetching: false,
+      isSuccess: true,
+      isError: false,
+      error: null,
+      status: "success"
+    };
+  }, [query, configuredOrchestrator]);
 }
 var FEE_CACHE_STALE_TIME = 60 * 60 * 1e3;
 function useProtocolFees({
@@ -1847,7 +1883,7 @@ function useProvexBuy({
   );
   const attestationBaseUrl = config.apiUrl;
   const verifyingContract = react.useMemo(
-    () => contracts.getLatestContract(chainId, "unifiedPaymentVerifier", "v3"),
+    () => contracts.getPaymentAttestationVerifier(chainId),
     [chainId]
   );
   const captureRequest = react.useMemo(() => {
@@ -2787,7 +2823,7 @@ var useV3Escrow = ({
   const escrow = react.useMemo(() => {
     if (escrowAddress) return escrowAddress;
     if (!chainId) return null;
-    return contracts.getLatestContract(chainId, "escrow", "v3");
+    return contracts.getLatestContract(chainId, "escrow", contracts.getLatestConfiguredVersion(chainId));
   }, [chainId, escrowAddress]);
   const isLoading = react.useMemo(
     () => status === "prompt_wallet_confirm" || status === "writing_tx" || status === "confirming" || status === "syncing",