@zkp2p/sdk 0.1.1 → 0.2.0

package/dist/index.cjs

@@ -257,14 +257,6 @@ function uniqueAddresses(...values) {
 function addressesEqual(left, right) {
   return Boolean(left && right && left.toLowerCase() === right.toLowerCase());
 }
-function firstDistinctAddress(candidates, current) {
-  for (const candidate of candidates) {
-    if (!isValidAddress(candidate)) continue;
-    if (addressesEqual(candidate, current)) continue;
-    return candidate;
-  }
-  return void 0;
-}
 function readRuntimeEnv(key) {
   try {
     const meta = ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)) });
@@ -313,14 +305,12 @@ function getContracts(chainId, env = "production") {
       escrowV2: pickAddress(baseContracts, ["EscrowV2", "Escrow_V2"]),
       escrowAddresses: uniqueAddresses(
         pickAddress(baseContracts, ["EscrowV2", "Escrow_V2"]),
-        pickAddress(baseContracts, ["Escrow"]),
         ...exports.HISTORICAL_ESCROW_ADDRESSES.base
       ),
       orchestrator: pickAddress(baseContracts, ["OrchestratorV2", "Orchestrator_V2"]) ?? pickAddress(baseContracts, ["Orchestrator"]),
       orchestratorV2: pickAddress(baseContracts, ["OrchestratorV2", "Orchestrator_V2"]),
       orchestratorAddresses: uniqueAddresses(
         pickAddress(baseContracts, ["OrchestratorV2", "Orchestrator_V2"]),
-        pickAddress(baseContracts, ["Orchestrator"]),
         ...HISTORICAL_ORCHESTRATOR_ADDRESSES.base
       ),
       unifiedPaymentVerifier: pickAddress(baseContracts, [
@@ -380,35 +370,25 @@ function getContracts(chainId, env = "production") {
       "VITE_ESCROW_V2_ADDRESS"
     ]);
     const stagingEscrowCurrent = stagingEscrowV2Override ?? pickAddress(sc, ["EscrowV2", "Escrow_V2"]) ?? pickAddress(sc, ["Escrow"]) ?? STAGING_ESCROW_V2_FALLBACK;
-    const stagingEscrowLegacy = firstDistinctAddress(
-      [pickAddress(sc, ["Escrow"]), ...exports.HISTORICAL_ESCROW_ADDRESSES.base_staging],
-      stagingEscrowCurrent
-    );
     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 stagingOrchestratorLegacy = firstDistinctAddress(
-      [pickAddress(sc, ["Orchestrator"]), ...HISTORICAL_ORCHESTRATOR_ADDRESSES.base_staging],
-      stagingOrchestratorCurrent
-    );
     const stagingRateManagerV1 = pickAddress(sc, ["RateManagerV1", "DepositRateManagerRegistryV1"]);
     return {
       addresses: {
-        escrow: stagingEscrowCurrent ?? stagingEscrowLegacy ?? "",
+        escrow: stagingEscrowCurrent,
         escrowV2: stagingEscrowCurrent,
         escrowAddresses: uniqueAddresses(
           stagingEscrowCurrent,
-          stagingEscrowLegacy,
           ...exports.HISTORICAL_ESCROW_ADDRESSES.base_staging
         ),
-        orchestrator: stagingOrchestratorCurrent ?? stagingOrchestratorLegacy,
+        orchestrator: stagingOrchestratorCurrent,
         orchestratorV2: stagingOrchestratorCurrent,
         orchestratorAddresses: uniqueAddresses(
           stagingOrchestratorCurrent,
-          stagingOrchestratorLegacy,
           ...HISTORICAL_ORCHESTRATOR_ADDRESSES.base_staging
         ),
         unifiedPaymentVerifier: pickAddress(sc, [
@@ -1291,19 +1271,14 @@ var ContractRouter = class {
     this._orchestratorContextsByAddress = /* @__PURE__ */ new Map();
     this.escrowAddress = config.escrowAddress;
     this.escrowAbi = config.escrowAbi;
-    this.legacyEscrowAddress = config.legacyEscrowAddress;
-    this.legacyEscrowAbi = config.legacyEscrowAbi;
     this.escrowV2Address = config.escrowV2Address;
     this.escrowV2Abi = config.escrowV2Abi;
     this.escrowAddresses = config.escrowAddresses;
     this.orchestratorAddress = config.orchestratorAddress;
     this.orchestratorAbi = config.orchestratorAbi;
-    this.legacyOrchestratorAddress = config.legacyOrchestratorAddress;
-    this.legacyOrchestratorAbi = config.legacyOrchestratorAbi;
     this.orchestratorV2Address = config.orchestratorV2Address;
     this.orchestratorV2Abi = config.orchestratorV2Abi;
     this.orchestratorAddresses = config.orchestratorAddresses;
-    this._defaultPreferV2 = config.defaultPreferV2;
     this._registerContexts();
   }
   _registerContexts() {
@@ -1311,17 +1286,20 @@ var ContractRouter = class {
       if (!context?.address || !context.abi) return;
       this._orchestratorContextsByAddress.set(context.address.toLowerCase(), context);
     };
+    const registerEscrow = (context) => {
+      if (!context?.address || !context.abi) return;
+      this._escrowContextsByAddress.set(context.address.toLowerCase(), context);
+    };
+    const primaryOrchestratorAddress = this.orchestratorV2Address ?? this.orchestratorAddress;
+    const primaryEscrowAbi = this.escrowV2Abi ?? this.escrowAbi;
     const escrowToOrchestrator = /* @__PURE__ */ new Map();
-    const addEscrowOrchestratorPair = (escrow, orchestrator, overwrite = true) => {
+    const addEscrowOrchestratorPair = (escrow, orchestrator) => {
       if (!escrow || !orchestrator) return;
-      const key = escrow.toLowerCase();
-      if (!overwrite && escrowToOrchestrator.has(key)) return;
-      escrowToOrchestrator.set(key, orchestrator);
+      escrowToOrchestrator.set(escrow.toLowerCase(), orchestrator);
     };
-    addEscrowOrchestratorPair(this.legacyEscrowAddress, this.legacyOrchestratorAddress);
     addEscrowOrchestratorPair(
-      this.escrowV2Address,
-      this.orchestratorV2Address ?? this.orchestratorAddress
+      this.escrowV2Address ?? this.escrowAddress,
+      primaryOrchestratorAddress
     );
     const configuredPairCount = Math.min(
       this.escrowAddresses.length,
@@ -1330,81 +1308,45 @@ var ContractRouter = class {
     for (let index = 0; index < configuredPairCount; index += 1) {
       addEscrowOrchestratorPair(this.escrowAddresses[index], this.orchestratorAddresses[index]);
     }
-    for (const address of this.escrowAddresses) {
-      if (escrowToOrchestrator.has(address.toLowerCase())) continue;
-      const version = isSameAddress(address, this.escrowV2Address) ? "v2" : "legacy";
-      const orchestrator = version === "v2" ? this.orchestratorV2Address ?? this.orchestratorAddress : this.legacyOrchestratorAddress ?? this.orchestratorAddress;
-      if (orchestrator) {
-        addEscrowOrchestratorPair(address, orchestrator, false);
-      }
-    }
-    const resolveOrchestratorAbi = (address) => {
-      if (isSameAddress(address, this.orchestratorV2Address)) {
-        return this.orchestratorV2Abi ?? this.orchestratorAbi ?? this.legacyOrchestratorAbi;
-      }
-      if (isSameAddress(address, this.legacyOrchestratorAddress)) {
-        return this.legacyOrchestratorAbi ?? this.orchestratorAbi ?? this.orchestratorV2Abi;
-      }
-      return this.orchestratorAbi ?? this.orchestratorV2Abi ?? this.legacyOrchestratorAbi;
-    };
-    const resolveOrchestratorVersion = (address) => {
-      if (isSameAddress(address, this.legacyOrchestratorAddress)) return "legacy";
-      if (isSameAddress(address, this.orchestratorV2Address)) return "v2";
-      return this.orchestratorV2Abi ? "v2" : "legacy";
-    };
-    for (const address of this.orchestratorAddresses) {
-      const abi = resolveOrchestratorAbi(address);
+    const resolveOrchestratorAbi = (address) => this.getOrchestratorContextByAddress(address)?.abi ?? (isSameAddress(address, this.orchestratorV2Address) ? this.orchestratorV2Abi ?? this.orchestratorAbi : this.orchestratorAbi ?? this.orchestratorV2Abi);
+    const uniqueOrchestratorAddresses = /* @__PURE__ */ new Set();
+    for (const address of [
+      primaryOrchestratorAddress,
+      this.orchestratorAddress,
+      this.orchestratorV2Address,
+      ...this.orchestratorAddresses
+    ]) {
+      if (!address) continue;
+      const key = address.toLowerCase();
+      if (uniqueOrchestratorAddresses.has(key)) continue;
+      uniqueOrchestratorAddresses.add(key);
+      const abi = isSameAddress(address, this.orchestratorV2Address) ? this.orchestratorV2Abi ?? this.orchestratorAbi : this.orchestratorAbi ?? this.orchestratorV2Abi;
       if (!abi) continue;
       registerOrchestrator({
         address,
         abi,
-        version: resolveOrchestratorVersion(address)
+        version: "v2"
       });
     }
-    const registerEscrow = (context) => {
-      if (!context?.address || !context.abi) return;
-      this._escrowContextsByAddress.set(context.address.toLowerCase(), context);
-    };
-    const resolveEscrowVersion = (address) => {
-      if (isSameAddress(address, this.legacyEscrowAddress)) return "legacy";
-      if (isSameAddress(address, this.escrowV2Address)) return "v2";
-      const pairedOrchestrator = escrowToOrchestrator.get(address.toLowerCase());
-      if (isSameAddress(pairedOrchestrator, this.legacyOrchestratorAddress)) return "legacy";
-      if (isSameAddress(pairedOrchestrator, this.orchestratorV2Address)) return "v2";
-      return this.escrowV2Abi ? "v2" : "legacy";
-    };
-    const resolveEscrowAbi = (version) => version === "legacy" ? this.legacyEscrowAbi ?? this.escrowAbi ?? this.escrowV2Abi : this.escrowV2Abi ?? this.escrowAbi ?? this.legacyEscrowAbi;
-    const resolveEscrowOrchestratorAddress = (escrowAddress, version) => escrowToOrchestrator.get(escrowAddress.toLowerCase()) ?? (version === "legacy" ? this.legacyOrchestratorAddress ?? this.orchestratorAddress : this.orchestratorV2Address ?? this.orchestratorAddress);
-    const resolveEscrowOrchestratorAbi = (orchestratorAddress, version) => this.getOrchestratorContextByAddress(orchestratorAddress)?.abi ?? (version === "legacy" ? this.legacyOrchestratorAbi ?? this.orchestratorAbi ?? this.orchestratorV2Abi : this.orchestratorV2Abi ?? this.orchestratorAbi ?? this.legacyOrchestratorAbi);
-    for (const address of this.escrowAddresses) {
-      const version = resolveEscrowVersion(address);
-      const abi = resolveEscrowAbi(version);
-      const orchAddress = resolveEscrowOrchestratorAddress(address, version);
-      const orchAbi = resolveEscrowOrchestratorAbi(orchAddress, version);
-      if (!abi) continue;
+    const uniqueEscrowAddresses = /* @__PURE__ */ new Set();
+    for (const address of [
+      this.escrowV2Address ?? this.escrowAddress,
+      this.escrowAddress,
+      ...this.escrowAddresses
+    ]) {
+      if (!address) continue;
+      const key = address.toLowerCase();
+      if (uniqueEscrowAddresses.has(key)) continue;
+      uniqueEscrowAddresses.add(key);
+      const orchestratorAddress = escrowToOrchestrator.get(key) ?? primaryOrchestratorAddress ?? this.orchestratorAddress;
       registerEscrow({
         address,
-        abi,
-        version,
-        orchestratorAddress: orchAddress,
-        orchestratorAbi: orchAbi
+        abi: isSameAddress(address, this.escrowV2Address) ? primaryEscrowAbi : this.escrowAbi,
+        orchestratorAddress,
+        orchestratorAbi: resolveOrchestratorAbi(orchestratorAddress),
+        version: "v2"
       });
     }
-    const primaryEscrowVersion = resolveEscrowVersion(this.escrowAddress);
-    const primaryEscrowOrchestratorAddress = resolveEscrowOrchestratorAddress(
-      this.escrowAddress,
-      primaryEscrowVersion
-    );
-    registerEscrow({
-      address: this.escrowAddress,
-      abi: this.escrowAbi,
-      version: primaryEscrowVersion,
-      orchestratorAddress: primaryEscrowOrchestratorAddress,
-      orchestratorAbi: resolveEscrowOrchestratorAbi(
-        primaryEscrowOrchestratorAddress,
-        primaryEscrowVersion
-      )
-    });
   }
   getEscrowContextByAddress(address) {
     if (!address) return void 0;
@@ -1419,33 +1361,21 @@ var ContractRouter = class {
     if (explicitEscrow) {
       const explicitContext = this.getEscrowContextByAddress(explicitEscrow);
       if (explicitContext) return explicitContext;
-      const isExplicitV2 = !!this.escrowV2Address && explicitEscrow.toLowerCase() === this.escrowV2Address.toLowerCase();
-      const isExplicitLegacy = !!this.legacyEscrowAddress && explicitEscrow.toLowerCase() === this.legacyEscrowAddress.toLowerCase();
-      const inferredVersion = isExplicitV2 ? "v2" : isExplicitLegacy ? "legacy" : options?.preferV2 === false ? "legacy" : options?.preferV2 === true ? "v2" : this.escrowV2Abi ? "v2" : "legacy";
+      const fallbackOrchestrator = this.resolveOrchestratorForEscrow(explicitEscrow);
       return {
         address: explicitEscrow,
-        abi: inferredVersion === "legacy" ? this.legacyEscrowAbi ?? this.escrowAbi : this.escrowV2Abi ?? this.escrowAbi,
-        orchestratorAddress: inferredVersion === "legacy" ? this.legacyOrchestratorAddress ?? this.orchestratorAddress : this.orchestratorV2Address ?? this.orchestratorAddress,
-        orchestratorAbi: inferredVersion === "legacy" ? this.legacyOrchestratorAbi ?? this.orchestratorAbi : this.orchestratorV2Abi ?? this.orchestratorAbi,
-        version: inferredVersion
+        abi: this.escrowV2Abi ?? this.escrowAbi,
+        orchestratorAddress: fallbackOrchestrator?.address ?? this.orchestratorV2Address ?? this.orchestratorAddress,
+        orchestratorAbi: fallbackOrchestrator?.abi ?? this.orchestratorV2Abi ?? this.orchestratorAbi,
+        version: "v2"
       };
     }
-    if (options?.preferV2 === false) {
-      const legacyContext = this.getEscrowContexts().find(
-        (context) => context.version === "legacy"
-      );
-      if (legacyContext) return legacyContext;
-    }
-    if (options?.preferV2) {
-      const v2Context = this.getEscrowContexts().find((context) => context.version === "v2");
-      if (v2Context) return v2Context;
-    }
     return this.getEscrowContextByAddress(this.escrowAddress) ?? {
       address: this.escrowAddress,
       abi: this.escrowAbi,
-      orchestratorAddress: this.orchestratorAddress,
-      orchestratorAbi: this.orchestratorAbi,
-      version: this.escrowV2Address && this.escrowAddress.toLowerCase() === this.escrowV2Address.toLowerCase() ? "v2" : "legacy"
+      orchestratorAddress: this.orchestratorV2Address ?? this.orchestratorAddress,
+      orchestratorAbi: this.orchestratorV2Abi ?? this.orchestratorAbi,
+      version: "v2"
     };
   }
   getEscrowContexts() {
@@ -1455,26 +1385,21 @@ var ContractRouter = class {
       {
         address: this.escrowAddress,
         abi: this.escrowAbi,
-        orchestratorAddress: this.orchestratorAddress,
-        orchestratorAbi: this.orchestratorAbi,
-        version: "legacy"
+        orchestratorAddress: this.orchestratorV2Address ?? this.orchestratorAddress,
+        orchestratorAbi: this.orchestratorV2Abi ?? this.orchestratorAbi,
+        version: "v2"
       }
     ];
   }
-  resolveOrchestratorForEscrow(escrowAddress, preferV2 = false) {
+  resolveOrchestratorForEscrow(escrowAddress, _preferV2 = false) {
     if (escrowAddress) {
       const escrowContext = this.getEscrowContextByAddress(escrowAddress);
       const fromEscrow = this.getOrchestratorContextByAddress(escrowContext?.orchestratorAddress);
       if (fromEscrow) return fromEscrow;
     }
-    if (preferV2) {
-      const v2 = Array.from(this._orchestratorContextsByAddress.values()).find(
-        (context) => context.version === "v2"
-      );
-      if (v2) return v2;
-    } else {
-      const legacyPrimary = this.getOrchestratorContextByAddress(this.legacyOrchestratorAddress);
-      if (legacyPrimary) return legacyPrimary;
+    if (this.orchestratorV2Address) {
+      const primary = this.getOrchestratorContextByAddress(this.orchestratorV2Address);
+      if (primary) return primary;
     }
     if (this.orchestratorAddress) {
       const primary = this.getOrchestratorContextByAddress(this.orchestratorAddress);
@@ -1484,13 +1409,6 @@ var ContractRouter = class {
       const context = this.getOrchestratorContextByAddress(address);
       if (context) return context;
     }
-    if (this.legacyOrchestratorAddress && this.legacyOrchestratorAbi) {
-      return {
-        address: this.legacyOrchestratorAddress,
-        abi: this.legacyOrchestratorAbi,
-        version: "legacy"
-      };
-    }
     if (this.orchestratorV2Address && this.orchestratorV2Abi) {
       return {
         address: this.orchestratorV2Address,
@@ -1498,6 +1416,13 @@ var ContractRouter = class {
         version: "v2"
       };
     }
+    if (this.orchestratorAddress && this.orchestratorAbi) {
+      return {
+        address: this.orchestratorAddress,
+        abi: this.orchestratorAbi,
+        version: "v2"
+      };
+    }
     return void 0;
   }
   buildProtocolViewerContexts(options) {
@@ -1512,17 +1437,18 @@ var ContractRouter = class {
     };
     add(options?.escrowAddress, options?.orchestratorAddress);
     if (options?.escrowAddress && !options?.orchestratorAddress) {
-      const resolved = this.resolveOrchestratorForEscrow(options.escrowAddress, true)?.address ?? this.resolveOrchestratorForEscrow(options.escrowAddress, false)?.address;
-      add(options.escrowAddress, resolved);
+      add(options.escrowAddress, this.resolveOrchestratorForEscrow(options.escrowAddress)?.address);
     }
     for (const context of this.getEscrowContexts()) {
-      const fallbackOrchestrator = this.resolveOrchestratorForEscrow(context.address, context.version === "v2")?.address ?? this.resolveOrchestratorForEscrow(context.address)?.address ?? context.orchestratorAddress;
-      add(context.address, context.orchestratorAddress ?? fallbackOrchestrator);
+      add(
+        context.address,
+        context.orchestratorAddress ?? this.resolveOrchestratorForEscrow(context.address)?.address
+      );
     }
     return contexts;
   }
   get defaultPreferV2() {
-    return this._defaultPreferV2;
+    return true;
   }
 };
 
@@ -3989,6 +3915,20 @@ var RATE_MANAGER_FIELDS = `
   createdAt
   updatedAt
 `;
+var LEGACY_RATE_MANAGER_FIELDS = `
+  id
+  chainId
+  rateManagerAddress
+  rateManagerId
+  manager
+  feeRecipient
+  maxFee
+  fee
+  name
+  uri
+  createdAt
+  updatedAt
+`;
 var RATE_MANAGER_AGGREGATE_FIELDS = `
   id
   chainId
@@ -4004,6 +3944,20 @@ var RATE_MANAGER_AGGREGATE_FIELDS = `
   firstSeenAt
   updatedAt
 `;
+var LEGACY_RATE_MANAGER_AGGREGATE_FIELDS = `
+  id
+  chainId
+  rateManagerId
+  manager
+  totalFilledVolume
+  totalFeeAmount
+  totalPnlUsdCents
+  fulfilledIntents
+  currentDelegatedBalance
+  currentDelegatedDeposits
+  firstSeenAt
+  updatedAt
+`;
 var RATE_MANAGER_RATE_FIELDS = `
   id
   chainId
@@ -4019,9 +3973,7 @@ var DEPOSIT_DELEGATION_FIELDS = `
   chainId
   rateManagerId
   rateManagerAddress
-  depositId: id
   delegatedAt
-  createdAt: delegatedAt
   updatedAt
 `;
 var LEGACY_RATE_MANAGER_DELEGATION_FIELDS = `
@@ -4097,6 +4049,7 @@ var RATE_MANAGER_LIST_QUERY = (
   `
   query VaultList(
     $where: RateManager_bool_exp
+    $aggregateWhere: ManagerAggregateStats_bool_exp
     $order_by: [RateManager_order_by!]
     $limit: Int
     $offset: Int
@@ -4104,12 +4057,31 @@ var RATE_MANAGER_LIST_QUERY = (
     RateManager(where: $where, order_by: $order_by, limit: $limit, offset: $offset) {
       ${RATE_MANAGER_FIELDS}
     }
-    ManagerAggregateStats {
+    ManagerAggregateStats(where: $aggregateWhere) {
       ${RATE_MANAGER_AGGREGATE_FIELDS}
     }
   }
 `
 );
+var LEGACY_RATE_MANAGER_LIST_QUERY = (
+  /* GraphQL */
+  `
+  query VaultList(
+    $where: RateManager_bool_exp
+    $aggregateWhere: ManagerAggregateStats_bool_exp
+    $order_by: [RateManager_order_by!]
+    $limit: Int
+    $offset: Int
+  ) {
+    RateManager(where: $where, order_by: $order_by, limit: $limit, offset: $offset) {
+      ${LEGACY_RATE_MANAGER_FIELDS}
+    }
+    ManagerAggregateStats(where: $aggregateWhere) {
+      ${LEGACY_RATE_MANAGER_AGGREGATE_FIELDS}
+    }
+  }
+`
+);
 var RATE_MANAGER_DETAIL_QUERY = (
   /* GraphQL */
   `
@@ -4156,13 +4128,13 @@ var LEGACY_RATE_MANAGER_DETAIL_QUERY = (
     $statsLimit: Int
   ) {
     RateManager(where: $managerWhere) {
-      ${RATE_MANAGER_FIELDS}
+      ${LEGACY_RATE_MANAGER_FIELDS}
     }
     RateManagerRate(where: $rateWhere) {
       ${RATE_MANAGER_RATE_FIELDS}
     }
     ManagerAggregateStats(where: $aggregateWhere) {
-      ${RATE_MANAGER_AGGREGATE_FIELDS}
+      ${LEGACY_RATE_MANAGER_AGGREGATE_FIELDS}
     }
     ManagerStats(
       where: $statsWhere
@@ -5195,6 +5167,25 @@ function extractEscrowAddressFromCompositeDepositId(compositeDepositId) {
   const [escrowAddress] = compositeDepositId.split("_");
   return escrowAddress?.startsWith("0x") ? escrowAddress.toLowerCase() : null;
 }
+function parseRateManagerFilterIds(rateManagerIds) {
+  const bare = /* @__PURE__ */ new Set();
+  const scoped = /* @__PURE__ */ new Map();
+  for (const value of rateManagerIds) {
+    const scopedRateManager = parseScopedRateManagerFilterId(value);
+    if (scopedRateManager) {
+      scoped.set(
+        getManagerScopeKey(scopedRateManager.rateManagerId, scopedRateManager.rateManagerAddress),
+        scopedRateManager
+      );
+      continue;
+    }
+    const normalizedRateManagerId = normalizeRateManagerId(value);
+    if (normalizedRateManagerId) {
+      bare.add(normalizedRateManagerId);
+    }
+  }
+  return { bare, scoped };
+}
 function buildDepositScopeKey(scope) {
   return `${scope.escrow}:${scope.depositIdOnContract}`;
 }
@@ -5273,6 +5264,29 @@ var IndexerRateManagerService = class {
   constructor(client) {
     this.client = client;
   }
+  buildRateManagerScopeWhere(rateManagerIds) {
+    if (!rateManagerIds?.length) return void 0;
+    const { bare, scoped } = parseRateManagerFilterIds(rateManagerIds);
+    const scopeConditions = [];
+    if (bare.size > 0) {
+      scopeConditions.push({
+        rateManagerId: { _in: [...bare] }
+      });
+    }
+    for (const scopedRateManager of scoped.values()) {
+      scopeConditions.push({
+        rateManagerId: { _eq: scopedRateManager.rateManagerId },
+        rateManagerAddress: { _eq: scopedRateManager.rateManagerAddress }
+      });
+    }
+    if (scopeConditions.length === 1) {
+      return scopeConditions[0];
+    }
+    if (scopeConditions.length > 1) {
+      return { _or: scopeConditions };
+    }
+    return void 0;
+  }
   buildWhere(filter) {
     if (!filter) return void 0;
     const where = {};
@@ -5285,46 +5299,44 @@ var IndexerRateManagerService = class {
     if (filter.maxFee) {
       where.maxFee = { _lte: filter.maxFee };
     }
-    if (filter.rateManagerIds?.length) {
-      const bareRateManagerIds = /* @__PURE__ */ new Set();
-      const scopedRateManagers = /* @__PURE__ */ new Map();
-      for (const value of filter.rateManagerIds) {
-        const scopedRateManager = parseScopedRateManagerFilterId(value);
-        if (scopedRateManager) {
-          scopedRateManagers.set(
-            getManagerScopeKey(
-              scopedRateManager.rateManagerId,
-              scopedRateManager.rateManagerAddress
-            ),
-            scopedRateManager
-          );
-          continue;
-        }
-        const normalizedRateManagerId = normalizeRateManagerId(value);
-        if (normalizedRateManagerId) {
-          bareRateManagerIds.add(normalizedRateManagerId);
-        }
-      }
-      const scopeConditions = [];
-      if (bareRateManagerIds.size > 0) {
-        scopeConditions.push({
-          rateManagerId: { _in: [...bareRateManagerIds] }
-        });
-      }
-      for (const scopedRateManager of scopedRateManagers.values()) {
-        scopeConditions.push({
-          rateManagerId: { _eq: scopedRateManager.rateManagerId },
-          rateManagerAddress: { _eq: scopedRateManager.rateManagerAddress }
-        });
-      }
-      if (scopeConditions.length === 1) {
-        Object.assign(where, scopeConditions[0]);
-      } else if (scopeConditions.length > 1) {
-        where._or = scopeConditions;
-      }
+    const scopeWhere = this.buildRateManagerScopeWhere(filter.rateManagerIds);
+    if (scopeWhere) {
+      Object.assign(where, scopeWhere);
     }
     return Object.keys(where).length ? where : void 0;
   }
+  buildAggregateWhere(filter) {
+    return this.buildRateManagerScopeWhere(filter?.rateManagerIds) ?? {};
+  }
+  buildLegacyAggregateWhere(filter) {
+    const rateManagerIds = filter?.rateManagerIds;
+    if (!rateManagerIds?.length) return {};
+    const { bare, scoped } = parseRateManagerFilterIds(rateManagerIds);
+    const scopeConditions = [];
+    if (bare.size > 0) {
+      scopeConditions.push({
+        rateManagerId: { _in: [...bare] }
+      });
+    }
+    for (const scopedRateManager of scoped.values()) {
+      scopeConditions.push({
+        rateManagerId: { _eq: scopedRateManager.rateManagerId },
+        id: {
+          _ilike: buildRateManagerAddressScopedIdPattern(
+            scopedRateManager.rateManagerId,
+            scopedRateManager.rateManagerAddress
+          )
+        }
+      });
+    }
+    if (scopeConditions.length === 1) {
+      return scopeConditions[0] ?? {};
+    }
+    if (scopeConditions.length > 1) {
+      return { _or: scopeConditions };
+    }
+    return {};
+  }
   buildOrderBy(pagination) {
     const rawField = pagination?.orderBy ?? "createdAt";
     const field = isAggregateOrderField(rawField) ? "createdAt" : rawField;
@@ -5350,11 +5362,21 @@ var IndexerRateManagerService = class {
     if (hasHook === void 0) return rows;
     return hasHook ? [] : rows;
   }
-  async queryRateManagerList(variables) {
-    return this.client.query({
-      query: RATE_MANAGER_LIST_QUERY,
-      variables
-    });
+  async queryRateManagerList(variables, legacyVariables) {
+    try {
+      return await this.client.query({
+        query: RATE_MANAGER_LIST_QUERY,
+        variables
+      });
+    } catch (error) {
+      if (!isSchemaCompatibilityError(error)) {
+        throw error;
+      }
+      return this.client.query({
+        query: LEGACY_RATE_MANAGER_LIST_QUERY,
+        variables: legacyVariables
+      });
+    }
   }
   buildDelegationOrderBy(pagination) {
     const rawField = pagination?.orderBy ?? "updatedAt";
@@ -5449,11 +5471,21 @@ var IndexerRateManagerService = class {
     const limit = pagination?.limit ?? DEFAULT_LIMIT2;
     const offset = pagination?.offset ?? 0;
     const where = this.buildWhere(filter);
+    const aggregateWhere = this.buildAggregateWhere(filter);
+    const legacyAggregateWhere = this.buildLegacyAggregateWhere(filter);
     if (isAggregateOrderField(orderBy)) {
-      const result2 = await this.queryRateManagerList({
-        where,
-        order_by: [{ createdAt: "desc" }]
-      });
+      const result2 = await this.queryRateManagerList(
+        {
+          where,
+          aggregateWhere,
+          order_by: [{ createdAt: "desc" }]
+        },
+        {
+          where,
+          aggregateWhere: legacyAggregateWhere,
+          order_by: [{ createdAt: "desc" }]
+        }
+      );
       const scopedRows = this.applyHookFilter(this.toRateManagerListItems(result2), filter?.hasHook);
       const sorted = scopedRows.sort((a, b) => {
         const av = orderBy === "currentDelegatedBalance" ? toSafeBigInt(a.aggregate?.currentDelegatedBalance) : toSafeBigInt(a.aggregate?.totalFilledVolume);
@@ -5470,12 +5502,22 @@ var IndexerRateManagerService = class {
       });
       return sorted.slice(offset, offset + limit);
     }
-    const result = await this.queryRateManagerList({
-      where,
-      order_by: this.buildOrderBy(pagination),
-      limit,
-      offset
-    });
+    const result = await this.queryRateManagerList(
+      {
+        where,
+        aggregateWhere,
+        order_by: this.buildOrderBy(pagination),
+        limit,
+        offset
+      },
+      {
+        where,
+        aggregateWhere: legacyAggregateWhere,
+        order_by: this.buildOrderBy(pagination),
+        limit,
+        offset
+      }
+    );
     return this.applyHookFilter(this.toRateManagerListItems(result), filter?.hasHook);
   }
   async fetchRateManagerDetail(rateManagerId, options) {
@@ -7037,58 +7079,32 @@ var Zkp2pClient = class {
       }
       return out;
     };
-    const isSameAddress2 = (left, right) => !!left && !!right && left.toLowerCase() === right.toLowerCase();
-    this.legacyEscrowAddress = toAddress(addresses.escrow);
-    this.legacyEscrowAbi = abis.escrow;
-    this.escrowV2Address = toAddress(addresses.escrowV2);
+    this.escrowV2Address = toAddress(addresses.escrowV2 ?? addresses.escrow);
     this.escrowV2Abi = abis.escrowV2 ?? abis.escrow;
-    this.legacyOrchestratorAddress = toAddress(addresses.orchestrator);
-    this.legacyOrchestratorAbi = abis.orchestrator;
-    this.orchestratorV2Address = toAddress(addresses.orchestratorV2);
+    this.orchestratorV2Address = toAddress(
+      addresses.orchestratorV2 ?? addresses.orchestrator
+    );
     this.orchestratorV2Abi = abis.orchestratorV2 ?? abis.orchestrator;
     const configuredEscrowAddresses = (addresses.escrowAddresses ?? []).map((value) => toAddress(value)).filter(Boolean);
     const configuredOrchestratorAddresses = (addresses.orchestratorAddresses ?? []).map((value) => toAddress(value)).filter(Boolean);
-    const inferLegacyAddress = (legacyAddress, v2Address, configuredAddresses) => {
-      if (legacyAddress && (!v2Address || !isSameAddress2(legacyAddress, v2Address))) {
-        return legacyAddress;
-      }
-      return configuredAddresses.find(
-        (candidate) => !v2Address || !isSameAddress2(candidate, v2Address)
-      ) ?? legacyAddress;
-    };
-    this.legacyEscrowAddress = inferLegacyAddress(
-      this.legacyEscrowAddress,
-      this.escrowV2Address,
-      configuredEscrowAddresses
-    );
-    this.legacyOrchestratorAddress = inferLegacyAddress(
-      this.legacyOrchestratorAddress,
-      this.orchestratorV2Address,
-      configuredOrchestratorAddresses
-    );
-    const defaultPreferV2 = opts.preferV2ByDefault !== void 0 ? opts.preferV2ByDefault : this.runtimeEnv === "staging";
-    const preferredEscrowAddress = defaultPreferV2 ? this.escrowV2Address : this.legacyEscrowAddress;
-    const fallbackEscrowAddress = defaultPreferV2 ? this.legacyEscrowAddress : this.escrowV2Address;
-    const preferredOrchestratorAddress = defaultPreferV2 ? this.orchestratorV2Address : this.legacyOrchestratorAddress;
-    const fallbackOrchestratorAddress = defaultPreferV2 ? this.legacyOrchestratorAddress : this.orchestratorV2Address;
     this.escrowAddresses = uniqAddresses([
-      preferredEscrowAddress,
-      fallbackEscrowAddress,
+      this.escrowV2Address ?? toAddress(addresses.escrow),
       ...configuredEscrowAddresses
     ]);
-    this.orchestratorAddresses = uniqAddresses([
-      preferredOrchestratorAddress,
-      fallbackOrchestratorAddress,
-      ...configuredOrchestratorAddresses
-    ]);
-    this.escrowAddress = preferredEscrowAddress ?? fallbackEscrowAddress ?? this.escrowAddresses[0];
-    this.escrowAbi = defaultPreferV2 ? this.escrowV2Abi ?? this.legacyEscrowAbi ?? abis.escrow : this.legacyEscrowAbi ?? this.escrowV2Abi ?? abis.escrow;
+    this.escrowAddress = this.escrowV2Address ?? toAddress(addresses.escrow) ?? this.escrowAddresses[0];
+    this.escrowAbi = this.escrowV2Abi ?? abis.escrow;
     if (!this.escrowAddress || !this.escrowAbi) {
       throw new Error("Escrow not available for this chain/environment");
     }
-    this.orchestratorAddress = preferredOrchestratorAddress ?? fallbackOrchestratorAddress ?? this.orchestratorAddresses[0];
-    this.orchestratorAbi = defaultPreferV2 ? this.orchestratorV2Abi ?? this.legacyOrchestratorAbi ?? abis.orchestrator : this.legacyOrchestratorAbi ?? this.orchestratorV2Abi ?? abis.orchestrator;
-    this.unifiedPaymentVerifier = toAddress(addresses.unifiedPaymentVerifier);
+    this.orchestratorAddresses = uniqAddresses([
+      this.orchestratorV2Address ?? toAddress(addresses.orchestrator),
+      ...configuredOrchestratorAddresses
+    ]);
+    this.orchestratorAddress = this.orchestratorV2Address ?? toAddress(addresses.orchestrator) ?? this.orchestratorAddresses[0];
+    this.orchestratorAbi = this.orchestratorV2Abi ?? abis.orchestrator;
+    this.unifiedPaymentVerifier = toAddress(
+      addresses.unifiedPaymentVerifierV2 ?? addresses.unifiedPaymentVerifier
+    );
     this.protocolViewerAddress = toAddress(addresses.protocolViewer);
     this.protocolViewerAbi = abis.protocolViewer;
     const resolvedPvEntries = addresses.protocolViewerEntries;
@@ -7127,19 +7143,14 @@ var Zkp2pClient = class {
     this._router = new ContractRouter({
       escrowAddress: this.escrowAddress,
       escrowAbi: this.escrowAbi,
-      legacyEscrowAddress: this.legacyEscrowAddress,
-      legacyEscrowAbi: this.legacyEscrowAbi,
       escrowV2Address: this.escrowV2Address,
       escrowV2Abi: this.escrowV2Abi,
       escrowAddresses: this.escrowAddresses,
       orchestratorAddress: this.orchestratorAddress,
       orchestratorAbi: this.orchestratorAbi,
-      legacyOrchestratorAddress: this.legacyOrchestratorAddress,
-      legacyOrchestratorAbi: this.legacyOrchestratorAbi,
       orchestratorV2Address: this.orchestratorV2Address,
       orchestratorV2Abi: this.orchestratorV2Abi,
-      orchestratorAddresses: this.orchestratorAddresses,
-      defaultPreferV2
+      orchestratorAddresses: this.orchestratorAddresses
     });
     const maybeUsdc = addresses.usdc;
     if (maybeUsdc) this._usdcAddress = maybeUsdc;
@@ -7268,7 +7279,7 @@ var Zkp2pClient = class {
     const resolved = escrowAddress ?? this.parseEscrowAddressFromCompositeDepositId(depositId);
     if (resolved) return resolved;
     if (options?.preferV2 !== void 0) {
-      return this.resolveEscrowContext({ preferV2: options.preferV2 }).address;
+      return this.resolveEscrowContext().address;
     }
     throw new Error(`${methodName} requires escrowAddress or composite depositId`);
   }
@@ -7306,7 +7317,10 @@ var Zkp2pClient = class {
     return this._router.getOrchestratorContextByAddress(address);
   }
   resolveEscrowContext(options) {
-    return this._router.resolveEscrowContext(options);
+    return this._router.resolveEscrowContext({
+      escrowAddress: options?.escrowAddress,
+      depositId: options?.depositId
+    });
   }
   async resolveEscrowContextForDepositWrite(options) {
     const explicitEscrow = options?.escrowAddress ?? (options?.depositId !== void 0 ? this.parseEscrowAddressFromCompositeDepositId(options.depositId) : void 0);
@@ -7409,21 +7423,9 @@ var Zkp2pClient = class {
     if (explicit) return explicit;
     if (options?.orchestratorAddress) {
       const addr = options.orchestratorAddress;
-      const isSame = (a, b) => !!a && !!b && a.toLowerCase() === b.toLowerCase();
-      let version;
-      let abi;
-      if (isSame(addr, this.orchestratorV2Address)) {
-        version = "v2";
-        abi = this.orchestratorV2Abi ?? this.orchestratorAbi;
-      } else if (isSame(addr, this.legacyOrchestratorAddress)) {
-        version = "legacy";
-        abi = this.legacyOrchestratorAbi ?? this.orchestratorAbi;
-      } else {
-        version = this.orchestratorV2Abi ? "v2" : "legacy";
-        abi = this.orchestratorAbi ?? this.orchestratorV2Abi ?? this.legacyOrchestratorAbi;
-      }
+      const abi = this.orchestratorV2Abi ?? this.orchestratorAbi;
       if (!abi) throw new Error("Orchestrator not available");
-      return { address: addr, abi, version };
+      return { address: addr, abi, version: "v2" };
     }
     if (options?.intentHash) {
       try {
@@ -7458,30 +7460,16 @@ var Zkp2pClient = class {
       if (fromEscrow) return fromEscrow;
     }
     if (options?.intentHash) {
-      const preferV2 = options.preferV2 ?? this._router.defaultPreferV2;
-      const primaryAddress = preferV2 ? this.orchestratorV2Address : this.legacyOrchestratorAddress;
-      const secondaryAddress = preferV2 ? this.legacyOrchestratorAddress : this.orchestratorV2Address;
+      const primaryAddress = this.orchestratorV2Address ?? this.orchestratorAddress;
       const primaryContext = this.getOrchestratorContextByAddress(primaryAddress);
       if (primaryContext) return primaryContext;
-      const secondaryContext = this.getOrchestratorContextByAddress(secondaryAddress);
-      if (secondaryContext) return secondaryContext;
       if (primaryAddress) {
-        const primaryAbi = preferV2 ? this.orchestratorV2Abi ?? this.orchestratorAbi : this.legacyOrchestratorAbi ?? this.orchestratorAbi;
+        const primaryAbi = this.orchestratorV2Abi ?? this.orchestratorAbi;
         if (primaryAbi) {
           return {
             address: primaryAddress,
             abi: primaryAbi,
-            version: preferV2 ? "v2" : "legacy"
-          };
-        }
-      }
-      if (secondaryAddress) {
-        const secondaryAbi = preferV2 ? this.legacyOrchestratorAbi ?? this.orchestratorAbi : this.orchestratorV2Abi ?? this.orchestratorAbi;
-        if (secondaryAbi) {
-          return {
-            address: secondaryAddress,
-            abi: secondaryAbi,
-            version: preferV2 ? "legacy" : "v2"
+            version: "v2"
           };
         }
       }
@@ -8616,11 +8604,9 @@ var Zkp2pClient = class {
       escrow: this.escrowAddress,
       escrowV2: this.escrowV2Address,
       escrowAddresses: this.escrowAddresses,
-      legacyEscrow: this.legacyEscrowAddress,
       orchestrator: this.orchestratorAddress,
       orchestratorV2: this.orchestratorV2Address,
       orchestratorAddresses: this.orchestratorAddresses,
-      legacyOrchestrator: this.legacyOrchestratorAddress,
       protocolViewer: this.protocolViewerAddress,
       protocolViewerEntries: this._protocolViewerEntries.map((e) => e.address),
       unifiedPaymentVerifier: this.unifiedPaymentVerifier,
@@ -8870,23 +8856,7 @@ var classifyDelegationState = (currentRateManagerId, currentRegistry, targetRate
   }
   return "delegated_elsewhere";
 };
-var getDelegationRoute = (client, escrow) => {
-  const escrowLower = escrow.toLowerCase();
-  const legacyLower = client.legacyEscrowAddress?.toLowerCase();
-  if (legacyLower && escrowLower === legacyLower) return "legacy";
-  if (client.escrowAddresses && client.escrowAddresses.length > 0) {
-    const v2Candidates = client.escrowAddresses.filter(
-      (addr) => !legacyLower || addr.toLowerCase() !== legacyLower
-    );
-    if (v2Candidates.some((addr) => addr.toLowerCase() === escrowLower)) {
-      return "v2";
-    }
-  }
-  if (client.escrowV2Address && escrowLower === client.escrowV2Address.toLowerCase()) {
-    return "v2";
-  }
-  return "legacy";
-};
+var getDelegationRoute = (_client, _escrow) => "v2";
 
 exports.BASE_BUILDER_CODE = BASE_BUILDER_CODE;
 exports.CHAINLINK_ORACLE_ADAPTER = CHAINLINK_ORACLE_ADAPTER;
@@ -8919,6 +8889,7 @@ exports.appendAttributionToCalldata = appendAttributionToCalldata;
 exports.asciiToBytes32 = asciiToBytes32;
 exports.assertValidReferrerFeeConfig = assertValidReferrerFeeConfig;
 exports.classifyDelegationState = classifyDelegationState;
+exports.compareEventCursorIdsByRecency = compareEventCursorIdsByRecency;
 exports.convertDepositsForLiquidity = convertDepositsForLiquidity;
 exports.convertIndexerDepositToEscrowView = convertIndexerDepositToEscrowView;
 exports.convertIndexerIntentsToEscrowViews = convertIndexerIntentsToEscrowViews;