@zkp2p/sdk 0.2.0 → 0.2.3

package/dist/index.cjs

@@ -305,13 +305,12 @@ function getContracts(chainId, env = "production") {
       escrowV2: pickAddress(baseContracts, ["EscrowV2", "Escrow_V2"]),
       escrowAddresses: uniqueAddresses(
         pickAddress(baseContracts, ["EscrowV2", "Escrow_V2"]),
-        ...exports.HISTORICAL_ESCROW_ADDRESSES.base
+        pickAddress(baseContracts, ["Escrow"])
       ),
       orchestrator: pickAddress(baseContracts, ["OrchestratorV2", "Orchestrator_V2"]) ?? pickAddress(baseContracts, ["Orchestrator"]),
       orchestratorV2: pickAddress(baseContracts, ["OrchestratorV2", "Orchestrator_V2"]),
       orchestratorAddresses: uniqueAddresses(
-        pickAddress(baseContracts, ["OrchestratorV2", "Orchestrator_V2"]),
-        ...HISTORICAL_ORCHESTRATOR_ADDRESSES.base
+        pickAddress(baseContracts, ["OrchestratorV2", "Orchestrator_V2"])
       ),
       unifiedPaymentVerifier: pickAddress(baseContracts, [
         "UnifiedPaymentVerifierV2",
@@ -369,28 +368,22 @@ function getContracts(chainId, env = "production") {
       "VITE_BASE_STAGING_ESCROW_V2_ADDRESS",
       "VITE_ESCROW_V2_ADDRESS"
     ]);
-    const stagingEscrowCurrent = stagingEscrowV2Override ?? pickAddress(sc, ["EscrowV2", "Escrow_V2"]) ?? pickAddress(sc, ["Escrow"]) ?? STAGING_ESCROW_V2_FALLBACK;
+    const stagingEscrowCurrent = stagingEscrowV2Override ?? pickAddress(sc, ["EscrowV2", "Escrow_V2"]) ?? pickAddress(sc, ["Escrow"]);
     const stagingOrchestratorV2Override = resolveRuntimeAddressOverride([
       "VITE_BASE_STAGING_ORCHESTRATOR_V2_ADDRESS",
       "VITE_ORCHESTRATOR_V2_ADDRESS",
       "VITE_ORCHESTRATORV2_ADDRESS"
     ]);
-    const stagingOrchestratorCurrent = stagingOrchestratorV2Override ?? pickAddress(sc, ["OrchestratorV2", "Orchestrator_V2"]) ?? pickAddress(sc, ["Orchestrator"]) ?? STAGING_ORCHESTRATOR_V2_FALLBACK;
+    const stagingOrchestratorCurrent = stagingOrchestratorV2Override ?? pickAddress(sc, ["OrchestratorV2", "Orchestrator_V2"]) ?? pickAddress(sc, ["Orchestrator"]);
     const stagingRateManagerV1 = pickAddress(sc, ["RateManagerV1", "DepositRateManagerRegistryV1"]);
     return {
       addresses: {
         escrow: stagingEscrowCurrent,
         escrowV2: stagingEscrowCurrent,
-        escrowAddresses: uniqueAddresses(
-          stagingEscrowCurrent,
-          ...exports.HISTORICAL_ESCROW_ADDRESSES.base_staging
-        ),
+        escrowAddresses: uniqueAddresses(stagingEscrowCurrent),
         orchestrator: stagingOrchestratorCurrent,
         orchestratorV2: stagingOrchestratorCurrent,
-        orchestratorAddresses: uniqueAddresses(
-          stagingOrchestratorCurrent,
-          ...HISTORICAL_ORCHESTRATOR_ADDRESSES.base_staging
-        ),
+        orchestratorAddresses: uniqueAddresses(stagingOrchestratorCurrent),
         unifiedPaymentVerifier: pickAddress(sc, [
           "UnifiedPaymentVerifierV2",
           "UnifiedPaymentVerifier"
@@ -466,10 +459,7 @@ function getPaymentMethodsCatalog(_chainId, env = "production") {
   const methods = src?.methods ?? {};
   return methods;
 }
-function getGatingServiceAddress(_chainId, env = "production") {
-  if (env === "staging") {
-    return "0x396D31055Db28C0C6f36e8b36f18FE7227248a97";
-  }
+function getGatingServiceAddress(_chainId, _env = "production") {
   return "0x396D31055Db28C0C6f36e8b36f18FE7227248a97";
 }
 function getRateManagerContracts(chainId, env = "production") {
@@ -492,41 +482,9 @@ function getRateManagerContracts(chainId, env = "production") {
     }
   };
 }
-exports.HISTORICAL_ESCROW_ADDRESSES = void 0; var HISTORICAL_ORCHESTRATOR_ADDRESSES, STAGING_ESCROW_V2_FALLBACK, STAGING_ORCHESTRATOR_V2_FALLBACK, ZERO_ADDRESS2, baseAddresses, baseStagingAddresses, basePaymentMethods, baseStagingPaymentMethods, baseConstants, baseStagingConstants;
+var ZERO_ADDRESS2, baseAddresses, baseStagingAddresses, basePaymentMethods, baseStagingPaymentMethods, baseConstants, baseStagingConstants;
 var init_contracts = __esm({
   "src/contracts.ts"() {
-    exports.HISTORICAL_ESCROW_ADDRESSES = {
-      base: [
-        "0x2f121CDDCA6d652f35e8B3E560f9760898888888"
-        // EscrowV2 production (contracts-v2 0.2.0-rc.6)
-      ],
-      base_staging: [
-        "0x5C2a8D9246777eE4501B6C426a8B8C7635C7b5b5",
-        // EscrowV2 staging (contracts-v2 0.2.0-rc.5)
-        "0x18EAcBf3FF19528ABe8035CF5cA266F31A2e3f14",
-        // EscrowV2 staging (contracts-v2 0.1.11-rc.3)
-        "0x07Cc97c254A5Fb0957553E9F58E4040699357f28",
-        // EscrowV2 staging (contracts-v2 0.1.11-rc.2)
-        "0x8455b9a31041125C785044f45458eCf2cbB12eF7",
-        // v2.1 staging Escrow (2025-10-18, PR #83)
-        "0x21f007107269ea1c8Fe0730736548090F4945736"
-        // v2.1 staging Escrow (2025-10-04, PR #71)
-      ]
-    };
-    HISTORICAL_ORCHESTRATOR_ADDRESSES = {
-      base: [
-        "0x88888883Ed048FF0a415271B28b2F52d431810D0"
-        // OrchestratorV2 production (contracts-v2 0.2.0-rc.6)
-      ],
-      base_staging: [
-        "0xF9b9CD27Deea496B960b3cb5221b514705fCaF5e",
-        // OrchestratorV2 staging (contracts-v2 0.2.0-rc.5)
-        "0xC0389b3d7A4E6B823e361e562C4a29F04B6C4fB5"
-        // OrchestratorV2 staging (contracts-v2 0.1.11-rc.3)
-      ]
-    };
-    STAGING_ESCROW_V2_FALLBACK = "0x77e8f808FE201075e0bD651CD46fdF239fc83265";
-    STAGING_ORCHESTRATOR_V2_FALLBACK = "0xc17a59227B136c45fAa153086a15EF87ED14bE00";
     ZERO_ADDRESS2 = "0x0000000000000000000000000000000000000000";
     baseAddresses = unwrapAddresses(baseAddressesRaw__default.default);
     baseStagingAddresses = unwrapAddresses(baseStagingAddressesRaw__default.default);
@@ -1391,7 +1349,7 @@ var ContractRouter = class {
       }
     ];
   }
-  resolveOrchestratorForEscrow(escrowAddress, _preferV2 = false) {
+  resolveOrchestratorForEscrow(escrowAddress) {
     if (escrowAddress) {
       const escrowContext = this.getEscrowContextByAddress(escrowAddress);
       const fromEscrow = this.getOrchestratorContextByAddress(escrowContext?.orchestratorAddress);
@@ -1447,9 +1405,6 @@ var ContractRouter = class {
     }
     return contexts;
   }
-  get defaultPreferV2() {
-    return true;
-  }
 };
 
 // src/adapters/verification.ts
@@ -1503,9 +1458,9 @@ function createHeaders(apiKey, authorizationToken) {
     headers2["Authorization"] = authorizationToken.startsWith("Bearer ") ? authorizationToken : `Bearer ${authorizationToken}`;
   return headers2;
 }
-async function postSignIntentWithRetry(endpoint, request, opts) {
-  const url = `${opts.baseApiUrl.replace(/\/$/, "")}${endpoint}`;
-  return withRetry(
+async function apiSignIntentV3(request, opts) {
+  const url = `${opts.baseApiUrl.replace(/\/$/, "")}/v3/intent`;
+  const json = await withRetry(
     async () => {
       let res;
       try {
@@ -1515,7 +1470,10 @@ async function postSignIntentWithRetry(endpoint, request, opts) {
           body: JSON.stringify(request)
         });
       } catch (error) {
-        throw new exports.NetworkError("Failed to connect to API server", { endpoint, error });
+        throw new exports.NetworkError("Failed to connect to API server", {
+          endpoint: "/v3/intent",
+          error
+        });
       }
       if (!res.ok) {
         const text = await res.text().catch(() => "");
@@ -1527,9 +1485,6 @@ async function postSignIntentWithRetry(endpoint, request, opts) {
     1e3,
     opts.timeoutMs
   );
-}
-async function apiSignIntentV3(request, opts) {
-  const json = await postSignIntentWithRetry("/v3/intent", request, opts);
   const sig = json?.responseObject?.signedIntent;
   const expStr = json?.responseObject?.intentData?.signatureExpiration ?? json?.responseObject?.signatureExpiration;
   const preIntentHookData = json?.responseObject?.intentData?.preIntentHookData ?? json?.responseObject?.preIntentHookData;
@@ -1540,22 +1495,6 @@ async function apiSignIntentV3(request, opts) {
     preIntentHookData
   };
 }
-async function apiSignIntentV2(request, opts) {
-  const json = await postSignIntentWithRetry(
-    "/v2/verify/intent",
-    request,
-    opts
-  );
-  const sig = json?.responseObject?.signedIntent;
-  const expStr = json?.responseObject?.intentData?.signatureExpiration ?? json?.responseObject?.signatureExpiration;
-  const preIntentHookData = json?.responseObject?.intentData?.preIntentHookData ?? json?.responseObject?.preIntentHookData;
-  if (!sig || !expStr) throw new Error("verify/intent missing signature or expiration");
-  return {
-    signature: sig,
-    signatureExpiration: BigInt(expStr),
-    preIntentHookData
-  };
-}
 
 // src/adapters/attestation.ts
 init_errors();
@@ -1951,44 +1890,6 @@ function resolvePlatformAttestationConfig(platformName) {
   return config;
 }
 
-// src/utils/logger.ts
-var currentLevel = "info";
-function setLogLevel(level) {
-  currentLevel = level;
-}
-function shouldLog(level) {
-  switch (currentLevel) {
-    case "debug":
-      return true;
-    case "info":
-      return level !== "debug";
-    case "error":
-      return level === "error";
-    default:
-      return true;
-  }
-}
-var logger = {
-  debug: (...args) => {
-    if (shouldLog("debug")) {
-      console.log("[DEBUG]", ...args);
-    }
-  },
-  info: (...args) => {
-    if (shouldLog("info")) {
-      console.log("[INFO]", ...args);
-    }
-  },
-  warn: (...args) => {
-    if (shouldLog("info")) {
-      console.warn("[WARN]", ...args);
-    }
-  },
-  error: (...args) => {
-    console.error("[ERROR]", ...args);
-  }
-};
-
 // src/client/IntentOperations.ts
 var IntentOperations = class {
   constructor(config) {
@@ -2004,16 +1905,13 @@ var IntentOperations = class {
         "signalIntent referrerFeeConfig cannot be combined with referralFees, referrer, or referrerFee."
       );
     }
-    const preferV2 = this.config.getDefaultPreferV2();
     const escrowContext = this.config.host.resolveEscrowContext({
       escrowAddress: params.escrowAddress,
-      depositId: params.depositId,
-      preferV2
+      depositId: params.depositId
     });
     const orchestratorContext = await this.config.host.resolveOrchestratorContext({
       orchestratorAddress: params.orchestratorAddress,
-      escrowAddress: escrowContext.address,
-      preferV2
+      escrowAddress: escrowContext.address
     });
     const catalog = getPaymentMethodsCatalog(this.config.getChainId(), this.config.getRuntimeEnv());
     const paymentMethod = resolvePaymentMethodHashFromCatalog(params.processorName, catalog);
@@ -2033,28 +1931,25 @@ var IntentOperations = class {
     const apiKey = this.config.getApiKey();
     const authorizationToken = this.config.getAuthorizationToken();
     if ((!gatingServiceSignature || !signatureExpiration) && baseApiUrl && (apiKey || authorizationToken)) {
-      const baseRequest = {
-        processorName: params.processorName,
-        payeeDetails: params.payeeDetails,
-        depositId: depositId.toString(),
-        amount: amount.toString(),
-        toAddress: params.toAddress,
-        paymentMethod,
-        fiatCurrency,
-        conversionRate: conversionRate.toString(),
-        chainId: this.config.getChainId().toString(),
-        orchestratorAddress: orchestratorContext.address,
-        escrowAddress: escrowContext.address
-      };
       const apiOpts = {
         baseApiUrl,
         apiKey,
         authorizationToken,
         timeoutMs: this.config.getApiTimeoutMs()
       };
-      const response = orchestratorContext.version === "v2" ? await apiSignIntentV3(
+      const response = await apiSignIntentV3(
         {
-          ...baseRequest,
+          processorName: params.processorName,
+          payeeDetails: params.payeeDetails,
+          depositId: depositId.toString(),
+          amount: amount.toString(),
+          toAddress: params.toAddress,
+          paymentMethod,
+          fiatCurrency,
+          conversionRate: conversionRate.toString(),
+          chainId: this.config.getChainId().toString(),
+          orchestratorAddress: orchestratorContext.address,
+          escrowAddress: escrowContext.address,
           callerAddress: this.config.getWalletClient().account.address,
           referralFees: referralFees.map((referralFee) => ({
             recipient: referralFee.recipient,
@@ -2062,7 +1957,7 @@ var IntentOperations = class {
           }))
         },
         apiOpts
-      ) : await apiSignIntentV2(baseRequest, apiOpts);
+      );
       gatingServiceSignature = response.signature;
       signatureExpiration = response.signatureExpiration;
       preIntentHookData = response.preIntentHookData ?? preIntentHookData;
@@ -2070,31 +1965,22 @@ var IntentOperations = class {
     if (!gatingServiceSignature || !signatureExpiration) {
       throw new Error("Missing gatingServiceSignature/signatureExpiration");
     }
-    const commonFields = {
-      escrow: escrowContext.address,
-      depositId,
-      amount,
-      to: params.toAddress,
-      paymentMethod,
-      fiatCurrency,
-      conversionRate,
-      gatingServiceSignature,
-      signatureExpiration: typeof signatureExpiration === "bigint" ? signatureExpiration : BigInt(signatureExpiration),
-      postIntentHook: params.postIntentHook ?? ZERO_ADDRESS,
-      data: params.data ?? "0x"
-    };
-    const args = orchestratorContext.version === "v2" ? [
+    const args = [
       {
-        ...commonFields,
+        escrow: escrowContext.address,
+        depositId,
+        amount,
+        to: params.toAddress,
+        paymentMethod,
+        fiatCurrency,
+        conversionRate,
+        gatingServiceSignature,
+        signatureExpiration: typeof signatureExpiration === "bigint" ? signatureExpiration : BigInt(signatureExpiration),
+        postIntentHook: params.postIntentHook ?? ZERO_ADDRESS,
+        data: params.data ?? "0x",
         referralFees,
         preIntentHookData: preIntentHookData ?? "0x"
       }
-    ] : [
-      {
-        ...commonFields,
-        referrer: referralFees[0]?.recipient ?? ZERO_ADDRESS,
-        referrerFee: referralFees[0]?.fee ?? 0n
-      }
     ];
     const { referrer } = params.txOverrides ?? {};
     const data = encodeWithAttribution(
@@ -2118,8 +2004,7 @@ var IntentOperations = class {
   async prepareCancelIntent(params) {
     const orchestratorContext = await this.config.host.resolveOrchestratorContext({
       orchestratorAddress: params.orchestratorAddress,
-      intentHash: params.intentHash,
-      preferV2: this.config.getDefaultPreferV2()
+      intentHash: params.intentHash
     });
     const args = [params.intentHash];
     const { referrer } = params.txOverrides ?? {};
@@ -2144,8 +2029,7 @@ var IntentOperations = class {
   async prepareReleaseFundsToPayer(params) {
     const orchestratorContext = await this.config.host.resolveOrchestratorContext({
       orchestratorAddress: params.orchestratorAddress,
-      intentHash: params.intentHash,
-      preferV2: this.config.getDefaultPreferV2()
+      intentHash: params.intentHash
     });
     const args = [params.intentHash];
     const { referrer } = params.txOverrides ?? {};
@@ -2171,13 +2055,11 @@ var IntentOperations = class {
     const escrowAddress = this.config.host.resolveEscrowAddressOrThrow(
       params.escrowAddress,
       params.depositId,
-      "setDepositPreIntentHook",
-      { preferV2: this.config.getDefaultPreferV2() }
+      "setDepositPreIntentHook"
     );
     const orchestratorContext = await this.config.host.resolveOrchestratorContext({
       orchestratorAddress: params.orchestratorAddress,
-      escrowAddress,
-      preferV2: this.config.getDefaultPreferV2()
+      escrowAddress
     });
     return this.config.host.prepareResolvedOrchestratorTransaction({
       orchestrator: orchestratorContext,
@@ -2190,13 +2072,11 @@ var IntentOperations = class {
     const escrowAddress = this.config.host.resolveEscrowAddressOrThrow(
       params.escrowAddress,
       params.depositId,
-      "setDepositWhitelistHook",
-      { preferV2: this.config.getDefaultPreferV2() }
+      "setDepositWhitelistHook"
     );
     const orchestratorContext = await this.config.host.resolveOrchestratorContext({
       orchestratorAddress: params.orchestratorAddress,
-      escrowAddress,
-      preferV2: this.config.getDefaultPreferV2()
+      escrowAddress
     });
     return this.config.host.prepareResolvedOrchestratorTransaction({
       orchestrator: orchestratorContext,
@@ -2208,8 +2088,7 @@ var IntentOperations = class {
   async prepareCleanupOrphanedIntents(params) {
     const orchestratorContext = await this.config.host.resolveOrchestratorContext({
       orchestratorAddress: params.orchestratorAddress,
-      escrowAddress: params.escrowAddress,
-      preferV2: this.config.getDefaultPreferV2()
+      escrowAddress: params.escrowAddress
     });
     return this.config.host.prepareResolvedOrchestratorTransaction({
       orchestrator: orchestratorContext,
@@ -2222,13 +2101,11 @@ var IntentOperations = class {
     const escrowAddress = this.config.host.resolveEscrowAddressOrThrow(
       options?.escrowAddress,
       depositId,
-      "getDepositPreIntentHook",
-      { preferV2: this.config.getDefaultPreferV2() }
+      "getDepositPreIntentHook"
     );
     const orchestratorContext = await this.config.host.resolveOrchestratorContext({
       orchestratorAddress: options?.orchestratorAddress,
-      escrowAddress,
-      preferV2: this.config.getDefaultPreferV2()
+      escrowAddress
     });
     const functionName = resolveAbiFunctionName(orchestratorContext.abi, [
       "getDepositPreIntentHook"
@@ -2244,13 +2121,11 @@ var IntentOperations = class {
     const escrowAddress = this.config.host.resolveEscrowAddressOrThrow(
       options?.escrowAddress,
       depositId,
-      "getDepositWhitelistHook",
-      { preferV2: this.config.getDefaultPreferV2() }
+      "getDepositWhitelistHook"
     );
     const orchestratorContext = await this.config.host.resolveOrchestratorContext({
       orchestratorAddress: options?.orchestratorAddress,
-      escrowAddress,
-      preferV2: this.config.getDefaultPreferV2()
+      escrowAddress
     });
     const functionName = resolveAbiFunctionName(orchestratorContext.abi, [
       "getDepositWhitelistHook"
@@ -2266,8 +2141,7 @@ var IntentOperations = class {
     const intentHash = params.intentHash;
     const orchestratorContext = await this.config.host.resolveOrchestratorContext({
       orchestratorAddress: params.orchestratorAddress,
-      intentHash,
-      preferV2: this.config.getDefaultPreferV2()
+      intentHash
     });
     const precomputed = params.precomputedAttestation;
     let paymentProof;
@@ -2280,7 +2154,9 @@ var IntentOperations = class {
       verificationData = precomputed.verificationData;
     } else {
       const attestationServiceUrl = params.attestationServiceUrl ?? this.defaultAttestationService();
-      const inputs = await this.config.host.getFulfillIntentInputs(intentHash);
+      const inputs = await this.config.host.getFulfillIntentInputs(intentHash, {
+        orchestratorAddress: orchestratorContext.address
+      });
       const paymentMethodHash = inputs.paymentMethodHash || "0x";
       const catalog = getPaymentMethodsCatalog(
         this.config.getChainId(),
@@ -2350,31 +2226,30 @@ var IntentOperations = class {
   defaultAttestationService() {
     return this.config.getRuntimeEnv() === "staging" ? "https://attestation-service-staging.zkp2p.xyz" : "https://attestation-service.zkp2p.xyz";
   }
-  async getFulfillIntentInputs(intentHash) {
-    try {
-      if (this.config.getProtocolViewerAddress() && this.config.getProtocolViewerAbi()) {
-        const view = await this.config.host.getPvIntent(intentHash);
-        const paymentMethodHash = view.intent.paymentMethod.toLowerCase();
-        const matched = (view.deposit.paymentMethods || []).find(
-          (pm) => pm.paymentMethod?.toLowerCase?.() === paymentMethodHash
-        );
-        const payee2 = matched?.verificationData?.payeeDetails;
-        if (payee2) {
-          return {
-            amount: view.intent.amount.toString(),
-            fiatCurrency: view.intent.fiatCurrency,
-            conversionRate: view.intent.conversionRate.toString(),
-            payeeDetails: payee2,
-            intentTimestampMs: (BigInt(view.intent.timestamp) * 1000n).toString(),
-            paymentMethodHash: view.intent.paymentMethod
-          };
+  async getFulfillIntentInputs(intentHash, options) {
+    const isCurrentOrchestrator = !options?.orchestratorAddress || options.orchestratorAddress.toLowerCase() === this.config.getOrchestratorV2Address()?.toLowerCase();
+    if (isCurrentOrchestrator) {
+      try {
+        if (this.config.getProtocolViewerAddress() && this.config.getProtocolViewerAbi()) {
+          const view = await this.config.host.getPvIntent(intentHash);
+          const paymentMethodHash = view.intent.paymentMethod.toLowerCase();
+          const matched = (view.deposit.paymentMethods || []).find(
+            (pm) => pm.paymentMethod?.toLowerCase?.() === paymentMethodHash
+          );
+          const payee2 = matched?.verificationData?.payeeDetails;
+          if (payee2) {
+            return {
+              amount: view.intent.amount.toString(),
+              fiatCurrency: view.intent.fiatCurrency,
+              conversionRate: view.intent.conversionRate.toString(),
+              payeeDetails: payee2,
+              intentTimestampMs: (BigInt(view.intent.timestamp) * 1000n).toString(),
+              paymentMethodHash: view.intent.paymentMethod
+            };
+          }
         }
+      } catch {
       }
-    } catch (error) {
-      logger.debug("ProtocolViewer lookup failed, falling back to indexer", {
-        intentHash,
-        error: error instanceof Error ? error.message : String(error)
-      });
     }
     const response = await this.config.getIndexerClient().query({
       query: (
@@ -3089,8 +2964,7 @@ var VaultOperations = class {
   }
   supportsInlineOracleRateConfig(params) {
     const escrowContext = this.config.host.resolveEscrowContext({
-      escrowAddress: params?.escrowAddress,
-      preferV2: params?.preferV2
+      escrowAddress: params?.escrowAddress
     });
     return escrowCurrencyHasOracleConfig(escrowContext.abi);
   }
@@ -3207,8 +3081,7 @@ var VaultOperations = class {
   prepareSetOracleRateConfigTransaction(params) {
     const escrowContext = this.config.host.resolveEscrowContext({
       escrowAddress: params.escrowAddress,
-      depositId: params.depositId,
-      preferV2: true
+      depositId: params.depositId
     });
     if (escrowContext.version !== "v2") {
       throw new Error("setOracleRateConfig requires EscrowV2");
@@ -3230,8 +3103,7 @@ var VaultOperations = class {
   prepareRemoveOracleRateConfigTransaction(params) {
     const escrowContext = this.config.host.resolveEscrowContext({
       escrowAddress: params.escrowAddress,
-      depositId: params.depositId,
-      preferV2: true
+      depositId: params.depositId
     });
     if (escrowContext.version !== "v2") {
       throw new Error("removeOracleRateConfig requires EscrowV2");
@@ -3248,8 +3120,7 @@ var VaultOperations = class {
   prepareSetOracleRateConfigBatchTransaction(params) {
     const escrowContext = this.config.host.resolveEscrowContext({
       escrowAddress: params.escrowAddress,
-      depositId: params.depositId,
-      preferV2: true
+      depositId: params.depositId
     });
     if (escrowContext.version !== "v2") {
       throw new Error("setOracleRateConfigBatch requires EscrowV2");
@@ -3271,8 +3142,7 @@ var VaultOperations = class {
   prepareUpdateCurrencyConfigBatchTransaction(params) {
     const escrowContext = this.config.host.resolveEscrowContext({
       escrowAddress: params.escrowAddress,
-      depositId: params.depositId,
-      preferV2: true
+      depositId: params.depositId
     });
     if (escrowContext.version !== "v2") {
       throw new Error("updateCurrencyConfigBatch requires EscrowV2");
@@ -3300,8 +3170,7 @@ var VaultOperations = class {
   prepareDeactivateCurrenciesBatchTransaction(params) {
     const escrowContext = this.config.host.resolveEscrowContext({
       escrowAddress: params.escrowAddress,
-      depositId: params.depositId,
-      preferV2: true
+      depositId: params.depositId
     });
     if (escrowContext.version !== "v2") {
       throw new Error("deactivateCurrenciesBatch requires EscrowV2");
@@ -5106,6 +4975,7 @@ var IndexerDepositService = class {
 init_bigint();
 var DEFAULT_LIMIT2 = 50;
 var RATE_MANAGER_HISTORY_PAGE_SIZE = 250;
+var EVM_ADDRESS_REGEX = /^0x[a-f0-9]{40}$/;
 function normalizeRateManagerId(value) {
   if (!value) return "";
   return value.toLowerCase();
@@ -5114,6 +4984,9 @@ function normalizeAddress3(value) {
   if (!value) return "";
   return value.toLowerCase();
 }
+function escapeLikePatternLiteral(value) {
+  return value.replace(/\\/g, "\\\\").replace(/%/g, "\\%").replace(/_/g, "\\_");
+}
 function parseScopedRateManagerFilterId(value) {
   const trimmed = value.trim().toLowerCase();
   if (!trimmed) return null;
@@ -5121,7 +4994,7 @@ function parseScopedRateManagerFilterId(value) {
   if (separatorIndex <= 0) return null;
   const rateManagerAddress = normalizeAddress3(trimmed.slice(0, separatorIndex));
   const rateManagerId = normalizeRateManagerId(trimmed.slice(separatorIndex + 1));
-  if (!rateManagerAddress.startsWith("0x") || !rateManagerId) {
+  if (!EVM_ADDRESS_REGEX.test(rateManagerAddress) || !rateManagerId) {
     return null;
   }
   return { rateManagerAddress, rateManagerId };
@@ -5139,12 +5012,14 @@ function extractRateManagerAddressFromScopedId(id) {
   return rateManagerAddress.startsWith("0x") ? rateManagerAddress.toLowerCase() : null;
 }
 function buildRateManagerAddressScopedIdPattern(rateManagerId, rateManagerAddress) {
-  const normalizedId = normalizeRateManagerId(rateManagerId);
-  const normalizedRateManagerAddress = normalizeAddress3(rateManagerAddress);
-  return `%_${normalizedRateManagerAddress}_${normalizedId}`;
+  const normalizedId = escapeLikePatternLiteral(normalizeRateManagerId(rateManagerId));
+  const normalizedRateManagerAddress = escapeLikePatternLiteral(
+    normalizeAddress3(rateManagerAddress)
+  );
+  return `%\\_${normalizedRateManagerAddress}\\_${normalizedId}`;
 }
 function buildRateManagerScopedIdPattern(rateManagerId, rateManagerAddress) {
-  return `${buildRateManagerAddressScopedIdPattern(rateManagerId, rateManagerAddress)}_%`;
+  return `${buildRateManagerAddressScopedIdPattern(rateManagerId, rateManagerAddress)}\\_%`;
 }
 function normalizeCompositeDepositId(depositId, escrowAddress) {
   const normalizedDepositId = depositId.trim().toLowerCase();
@@ -5179,6 +5054,9 @@ function parseRateManagerFilterIds(rateManagerIds) {
       );
       continue;
     }
+    if (value.includes(":")) {
+      continue;
+    }
     const normalizedRateManagerId = normalizeRateManagerId(value);
     if (normalizedRateManagerId) {
       bare.add(normalizedRateManagerId);
@@ -5717,21 +5595,12 @@ var IndexerRateManagerService = class {
   async fetchManualRateUpdates(rateManagerId, options) {
     if (!rateManagerId) return [];
     const normalizedId = normalizeRateManagerId(rateManagerId);
-    const normalizedRateManagerAddress = normalizeAddress3(options?.rateManagerAddress);
     try {
       const result = await this.client.query({
         query: MANUAL_RATE_UPDATES_QUERY,
         variables: {
           where: {
-            rateManagerId: { _eq: normalizedId },
-            ...normalizedRateManagerAddress ? {
-              id: {
-                _ilike: buildRateManagerScopedIdPattern(
-                  normalizedId,
-                  normalizedRateManagerAddress
-                )
-              }
-            } : {}
+            rateManagerId: { _eq: normalizedId }
           },
           order_by: [{ id: "desc" }],
           limit: options?.limit ?? 100
@@ -5805,15 +5674,7 @@ var IndexerRateManagerService = class {
         query: LEGACY_ORACLE_CONFIG_UPDATES_QUERY,
         variables: {
           where: {
-            rateManagerId: { _eq: normalizedId },
-            ...normalizedRateManagerAddress ? {
-              id: {
-                _ilike: buildRateManagerScopedIdPattern(
-                  normalizedId,
-                  normalizedRateManagerAddress
-                )
-              }
-            } : {}
+            rateManagerId: { _eq: normalizedId }
           },
           order_by: [{ id: "desc" }],
           limit
@@ -7101,7 +6962,7 @@ var Zkp2pClient = class {
       ...configuredOrchestratorAddresses
     ]);
     this.orchestratorAddress = this.orchestratorV2Address ?? toAddress(addresses.orchestrator) ?? this.orchestratorAddresses[0];
-    this.orchestratorAbi = this.orchestratorV2Abi ?? abis.orchestrator;
+    this.orchestratorAbi = abis.orchestrator ?? this.orchestratorV2Abi;
     this.unifiedPaymentVerifier = toAddress(
       addresses.unifiedPaymentVerifierV2 ?? addresses.unifiedPaymentVerifier
     );
@@ -7218,13 +7079,13 @@ var Zkp2pClient = class {
       getProtocolViewerAbi: () => this.protocolViewerAbi,
       getIndexerClient: () => this._indexerClient,
       getIndexerService: () => this._indexerService,
-      getDefaultPreferV2: () => this._router.defaultPreferV2,
+      getOrchestratorV2Address: () => this.orchestratorV2Address,
       host: {
         resolveEscrowContext: (options) => this.resolveEscrowContext(options),
         resolveOrchestratorContext: (options) => this.resolveOrchestratorContext(options),
-        resolveEscrowAddressOrThrow: (escrowAddress, depositId, methodName, options) => this.resolveEscrowAddressOrThrow(escrowAddress, depositId, methodName, options),
+        resolveEscrowAddressOrThrow: (escrowAddress, depositId, methodName) => this.resolveEscrowAddressOrThrow(escrowAddress, depositId, methodName),
         prepareResolvedOrchestratorTransaction: (tx) => this.prepareResolvedOrchestratorTransaction(tx),
-        getFulfillIntentInputs: (intentHash) => this.getFulfillIntentInputs(intentHash),
+        getFulfillIntentInputs: (intentHash, options) => this.getFulfillIntentInputs(intentHash, options),
         getPvIntent: (intentHash) => this.getPvIntent(intentHash)
       }
     });
@@ -7256,8 +7117,7 @@ var Zkp2pClient = class {
   }
   supportsInlineOracleRateConfig(params) {
     return this._vaultOps.supportsInlineOracleRateConfig({
-      escrowAddress: params?.escrowAddress,
-      preferV2: params?.preferV2 ?? this._router.defaultPreferV2
+      escrowAddress: params?.escrowAddress
     });
   }
   parseManagerFeeFromRead(result) {
@@ -7275,13 +7135,10 @@ var Zkp2pClient = class {
   abiFunctionHasInput(abi, functionName, inputName) {
     return abiFunctionHasInput(abi, functionName, inputName);
   }
-  resolveEscrowAddressOrThrow(escrowAddress, depositId, methodName, options) {
+  resolveEscrowAddressOrThrow(escrowAddress, depositId, _methodName) {
     const resolved = escrowAddress ?? this.parseEscrowAddressFromCompositeDepositId(depositId);
     if (resolved) return resolved;
-    if (options?.preferV2 !== void 0) {
-      return this.resolveEscrowContext().address;
-    }
-    throw new Error(`${methodName} requires escrowAddress or composite depositId`);
+    return this.resolveEscrowContext().address;
   }
   prepareCreateRateManagerTransaction(params) {
     return this._vaultOps.prepareCreateRateManagerTransaction(params);
@@ -7369,8 +7226,8 @@ var Zkp2pClient = class {
   getEscrowContexts() {
     return this._router.getEscrowContexts();
   }
-  resolveOrchestratorForEscrow(escrowAddress, preferV2 = false) {
-    return this._router.resolveOrchestratorForEscrow(escrowAddress, preferV2);
+  resolveOrchestratorForEscrow(escrowAddress) {
+    return this._router.resolveOrchestratorForEscrow(escrowAddress);
   }
   async lookupIntentRouting(intentHash) {
     try {
@@ -7404,12 +7261,8 @@ var Zkp2pClient = class {
     try {
       const view = await this.getPvIntent(intentHash);
       return this.normalizeAddress(view?.intent?.escrow);
-    } catch (error) {
-      if (error instanceof Error && error.message === "Intent not found") {
-        return void 0;
-      }
-      const message = error instanceof Error ? error.message : "Unknown on-chain routing error";
-      throw new Error(`Failed to resolve intent escrow on-chain for ${intentHash}: ${message}`);
+    } catch {
+      return void 0;
     }
   }
   warnOrchestratorFallback(intentHash, source, error) {
@@ -7433,10 +7286,7 @@ var Zkp2pClient = class {
         const fromIntent = this.getOrchestratorContextByAddress(routing.orchestratorAddress);
         if (fromIntent) return fromIntent;
         if (routing.escrowAddress) {
-          const fromIntentEscrow = this.resolveOrchestratorForEscrow(
-            routing.escrowAddress,
-            options.preferV2
-          );
+          const fromIntentEscrow = this.resolveOrchestratorForEscrow(routing.escrowAddress);
           if (fromIntentEscrow) return fromIntentEscrow;
         }
       } catch (error) {
@@ -7445,10 +7295,7 @@ var Zkp2pClient = class {
       try {
         const onchainEscrow = await this.lookupIntentEscrowOnchain(options.intentHash);
         if (onchainEscrow) {
-          const fromOnchainEscrow = this.resolveOrchestratorForEscrow(
-            onchainEscrow,
-            options.preferV2
-          );
+          const fromOnchainEscrow = this.resolveOrchestratorForEscrow(onchainEscrow);
           if (fromOnchainEscrow) return fromOnchainEscrow;
         }
       } catch (error) {
@@ -7456,7 +7303,7 @@ var Zkp2pClient = class {
       }
     }
     if (options?.escrowAddress) {
-      const fromEscrow = this.resolveOrchestratorForEscrow(options.escrowAddress, options.preferV2);
+      const fromEscrow = this.resolveOrchestratorForEscrow(options.escrowAddress);
       if (fromEscrow) return fromEscrow;
     }
     if (options?.intentHash) {
@@ -7474,7 +7321,7 @@ var Zkp2pClient = class {
         }
       }
     }
-    const fallback = this.resolveOrchestratorForEscrow(void 0, options?.preferV2);
+    const fallback = this.resolveOrchestratorForEscrow();
     if (fallback) return fallback;
     throw new Error("Orchestrator not available");
   }
@@ -7694,8 +7541,7 @@ var Zkp2pClient = class {
       async (params) => {
         const orchestratorContext = await this.resolveOrchestratorContext({
           orchestratorAddress: params.orchestratorAddress,
-          escrowAddress: params.escrowAddress,
-          preferV2: params.preferV2
+          escrowAddress: params.escrowAddress
         });
         const prepared = this.prepareOrchestratorTransaction({
           functionName,
@@ -7711,8 +7557,7 @@ var Zkp2pClient = class {
         prepare: async (params) => {
           const orchestratorContext = await this.resolveOrchestratorContext({
             orchestratorAddress: params.orchestratorAddress,
-            escrowAddress: params.escrowAddress,
-            preferV2: params.preferV2
+            escrowAddress: params.escrowAddress
           });
           const prepared = this.prepareOrchestratorTransaction({
             functionName,
@@ -8047,7 +7892,6 @@ var Zkp2pClient = class {
    * @param params.amount - Minimum required allowance amount
    * @param params.spender - Spender address override
    * @param params.escrowAddress - Escrow context used for default spender resolution
-   * @param params.preferV2 - Prefer EscrowV2 for default spender resolution
    * @param params.maxApprove - If true, approves MaxUint256 instead of exact amount
    * @param params.txOverrides - Optional viem transaction overrides
    * @returns Object with `hadAllowance` (true if no approval needed) and optional `hash`
@@ -8070,8 +7914,7 @@ var Zkp2pClient = class {
     const owner = this.walletClient.account?.address;
     if (!owner) throw new Error("Wallet client is missing account");
     const spender = params.spender ?? this.resolveEscrowContext({
-      escrowAddress: params.escrowAddress,
-      preferV2: params.preferV2 ?? this._router.defaultPreferV2
+      escrowAddress: params.escrowAddress
     }).address;
     const allowance = await this.publicClient.readContract({
       address: params.token,
@@ -8305,8 +8148,7 @@ var Zkp2pClient = class {
       currencies = mapConversionRatesToOnchainMinRate2(normalized, paymentMethods.length);
     }
     const escrowContext = this.resolveEscrowContext({
-      escrowAddress: params.escrowAddress,
-      preferV2: this._router.defaultPreferV2
+      escrowAddress: params.escrowAddress
     });
     const normalizedCurrencies = currencies.map(
       (group) => this.normalizeCurrencyTuples(group, escrowContext.abi)
@@ -8626,8 +8468,8 @@ var Zkp2pClient = class {
    * @returns Intent parameters needed for fulfillment
    * @throws Error if intent not found or payee details cannot be resolved
    */
-  async getFulfillIntentInputs(intentHash) {
-    return this._intentOps.getFulfillIntentInputs(intentHash);
+  async getFulfillIntentInputs(intentHash, options) {
+    return this._intentOps.getFulfillIntentInputs(intentHash, options);
   }
 };
 
@@ -8829,6 +8671,46 @@ init_paymentResolution();
 init_contracts();
 init_bytes32();
 init_protocolViewerParsers();
+
+// src/utils/logger.ts
+var currentLevel = "info";
+function setLogLevel(level) {
+  currentLevel = level;
+}
+function shouldLog(level) {
+  switch (currentLevel) {
+    case "debug":
+      return true;
+    case "info":
+      return level !== "debug";
+    case "error":
+      return level === "error";
+    default:
+      return true;
+  }
+}
+var logger = {
+  debug: (...args) => {
+    if (shouldLog("debug")) {
+      console.log("[DEBUG]", ...args);
+    }
+  },
+  info: (...args) => {
+    if (shouldLog("info")) {
+      console.log("[INFO]", ...args);
+    }
+  },
+  warn: (...args) => {
+    if (shouldLog("info")) {
+      console.warn("[WARN]", ...args);
+    }
+  },
+  error: (...args) => {
+    console.error("[ERROR]", ...args);
+  }
+};
+
+// src/index.ts
 init_errors();
 
 // src/react/hooks/vaultUtils.ts