@zkp2p/sdk 0.11.0-rc.5 → 0.11.0-rc.6

package/dist/index.cjs

@@ -55606,12 +55606,15 @@ var ContractRouter = class {
       this.escrowV2Address ?? this.escrowAddress,
       primaryOrchestratorAddress
     );
+    const pairedOrchestratorAddresses = this.orchestratorAddresses.filter(
+      (address) => !isSameAddress(address, this.orchestratorV3Address)
+    );
     const configuredPairCount = Math.min(
       this.escrowAddresses.length,
-      this.orchestratorAddresses.length
+      pairedOrchestratorAddresses.length
     );
     for (let index = 0; index < configuredPairCount; index += 1) {
-      addEscrowOrchestratorPair(this.escrowAddresses[index], this.orchestratorAddresses[index]);
+      addEscrowOrchestratorPair(this.escrowAddresses[index], pairedOrchestratorAddresses[index]);
     }
     const resolveOrchestratorAbi = (address) => this.getOrchestratorContextByAddress(address)?.abi ?? (isSameAddress(address, this.orchestratorV3Address) ? this.orchestratorV3Abi : isSameAddress(address, this.orchestratorV2Address) ? this.orchestratorV2Abi ?? this.orchestratorAbi : this.orchestratorAbi ?? this.orchestratorV2Abi);
     const uniqueOrchestratorAddresses = /* @__PURE__ */ new Set();
@@ -56990,8 +56993,8 @@ var IntentOperations = class {
     return this.config.getRuntimeEnv() === "staging" ? "https://attestation-service-staging.zkp2p.xyz" : "https://attestation-service.zkp2p.xyz";
   }
   async getFulfillIntentInputs(intentHash, options) {
-    const isCurrentOrchestrator = !options?.orchestratorAddress || options.orchestratorAddress.toLowerCase() === this.config.getOrchestratorV2Address()?.toLowerCase();
-    if (isCurrentOrchestrator) {
+    const isProtocolViewerOrchestrator = !options?.orchestratorAddress || options.orchestratorAddress.toLowerCase() === this.config.getOrchestratorV2Address()?.toLowerCase() || options.orchestratorAddress.toLowerCase() === this.config.getOrchestratorV3Address()?.toLowerCase();
+    if (isProtocolViewerOrchestrator) {
       try {
         if (this.config.getProtocolViewerAddress() && this.config.getProtocolViewerAbi()) {
           const view = await this.config.host.getPvIntent(intentHash);
@@ -57708,7 +57711,7 @@ var ProtocolViewerReader = class {
       return left.intent.timestamp < right.intent.timestamp ? -1 : 1;
     });
   }
-  async getPvIntent(intentHash) {
+  async getPvIntentWithContext(intentHash) {
     const protocolViewerEntries = this.config.getProtocolViewerEntries();
     if (protocolViewerEntries.length === 0) {
       throw new Error("ProtocolViewer not available for this network");
@@ -57739,7 +57742,7 @@ var ProtocolViewerReader = class {
             });
             const parsed = parseIntentView2(raw);
             if (this.config.host.isProtocolViewerIntentPopulated(parsed)) {
-              return parsed;
+              return { view: parsed, context };
             }
             lastError = new Error("Intent not found");
           } catch (readError) {
@@ -57756,7 +57759,7 @@ var ProtocolViewerReader = class {
           });
           const parsed = parseIntentView2(raw);
           if (this.config.host.isProtocolViewerIntentPopulated(parsed)) {
-            return parsed;
+            return { view: parsed };
           }
           lastError = new Error("Intent not found");
         } catch (readError) {
@@ -57766,6 +57769,9 @@ var ProtocolViewerReader = class {
     }
     throw lastError ?? new Error("Intent not found");
   }
+  async getPvIntent(intentHash) {
+    return (await this.getPvIntentWithContext(intentHash)).view;
+  }
 };
 
 // src/adapters/api.ts
@@ -63392,13 +63398,12 @@ var Zkp2pClient = class {
       throw new Error(`Failed to resolve intent routing for ${intentHash}: ${message}`);
     }
   }
-  async lookupIntentEscrowOnchain(intentHash) {
-    try {
-      const view = await this.getPvIntent(intentHash);
-      return this.normalizeAddress(view.intent.escrow);
-    } catch {
-      return void 0;
-    }
+  async lookupIntentRoutingOnchain(intentHash) {
+    const result = await this._pvReader.getPvIntentWithContext(intentHash);
+    return {
+      orchestratorAddress: this.normalizeAddress(result.context?.orchestrator),
+      escrowAddress: this.normalizeAddress(result.context?.escrow) ?? this.normalizeAddress(result.view.intent.escrow)
+    };
   }
   warnOrchestratorFallback(intentHash, source, error) {
     const message = error instanceof Error ? error.message : "Unknown routing error";
@@ -63410,31 +63415,22 @@ var Zkp2pClient = class {
     const explicit = this.getOrchestratorContextByAddress(options?.orchestratorAddress);
     if (explicit) return explicit;
     if (options?.orchestratorAddress) {
-      const addr = options.orchestratorAddress;
-      const abi = this.orchestratorV2Abi ?? this.orchestratorAbi;
-      if (!abi) throw new Error("Orchestrator not available");
-      return { address: addr, abi, version: "v2" };
+      throw new Error(`Unsupported orchestrator address: ${options.orchestratorAddress}`);
     }
     if (options?.intentHash) {
       try {
         const routing = await this.lookupIntentRouting(options.intentHash);
         const fromIntent = this.getOrchestratorContextByAddress(routing.orchestratorAddress);
         if (fromIntent) return fromIntent;
-        if (routing.escrowAddress) {
-          const fromIntentEscrow = this.resolveOrchestratorForEscrow(routing.escrowAddress);
-          if (fromIntentEscrow) return fromIntentEscrow;
-        }
       } catch (error) {
         this.warnOrchestratorFallback(options.intentHash, "Indexer intent routing lookup", error);
       }
       try {
-        const onchainEscrow = await this.lookupIntentEscrowOnchain(options.intentHash);
-        if (onchainEscrow) {
-          const fromOnchainEscrow = this.resolveOrchestratorForEscrow(onchainEscrow);
-          if (fromOnchainEscrow) return fromOnchainEscrow;
-        }
+        const routing = await this.lookupIntentRoutingOnchain(options.intentHash);
+        const fromIntent = this.getOrchestratorContextByAddress(routing.orchestratorAddress);
+        if (fromIntent) return fromIntent;
       } catch (error) {
-        this.warnOrchestratorFallback(options.intentHash, "On-chain intent escrow lookup", error);
+        this.warnOrchestratorFallback(options.intentHash, "On-chain intent routing lookup", error);
       }
     }
     if (options?.escrowAddress) {
@@ -63442,19 +63438,9 @@ var Zkp2pClient = class {
       if (fromEscrow) return fromEscrow;
     }
     if (options?.intentHash) {
-      const primaryAddress = this.orchestratorV2Address ?? this.orchestratorAddress;
-      const primaryContext = this.getOrchestratorContextByAddress(primaryAddress);
-      if (primaryContext) return primaryContext;
-      if (primaryAddress) {
-        const primaryAbi = this.orchestratorV2Abi ?? this.orchestratorAbi;
-        if (primaryAbi) {
-          return {
-            address: primaryAddress,
-            abi: primaryAbi,
-            version: "v2"
-          };
-        }
-      }
+      throw new Error(
+        `Unable to resolve orchestrator for intent ${options.intentHash}; indexer and on-chain routing did not identify a configured orchestrator`
+      );
     }
     const fallback = this.resolveOrchestratorForEscrow();
     if (fallback) return fallback;