@waterx/sdk 4.3.2 → 4.3.3

package/dist/src/oracle/rules/waterx-rule.js

@@ -1,36 +1,60 @@
 /**
  * `WaterxRule` — `PriceUpdateRule` for the first-party WaterX quote-center
- * (Nautilus-TEE, ed25519), plus `feedWaterxRule`, the collector-feed leg
- * `aggregateTicker` appends per waterx-routed ticker. Pulls one enclave-signed
- * batch envelope covering every requested ticker from the quote-center
- * (`GET /v1/quotes/update?symbols=…`, endpoint from `host.waterx` — the
- * `waterxEndpoint`/`waterxFetch` create options — else its own `WATERX_INFRA`), then —
- * unlike Pyth Lazer, whose verify is a single shared PTB step — verifies AND
- * feeds in ONE `waterx_rule::collect_batch_latest` call per collector (the Move
- * API bundles the two). So `buildUpdateCalls` emits nothing and the signed
- * envelope is handed straight to the per-ticker feed leg.
+ * (Nautilus-TEE, ed25519), plus the collector-feed legs `aggregateTicker`
+ * appends per waterx-routed ticker. Endpoint comes from `host.waterx` (the
+ * `waterxEndpoint`/`waterxFetch` create options), else this source's own
+ * `WATERX_INFRA`. Unlike Pyth Lazer, whose verify is a single shared PTB step,
+ * the Move API bundles verify AND feed into ONE call per collector, so
+ * `buildUpdateCalls` emits nothing and the signed data is handed straight to
+ * the per-ticker feed leg.
  *
- * `collect_batch_latest` is the dual-rule path: it feeds the item matching
- * `collector.symbol()` WITHOUT aggregating, so a waterx-routed ticker composes
- * onto the same collector as Pyth/Supra (compose-then-aggregate). On-chain a
- * FRESHNESS miss ABSTAINS (the other weighted rules cover); a config/
- * integrity mismatch, bad signature, future timestamp — or a REPLAYED signed
- * timestamp — ABORTS (`EReplayedSignature`, audit F-014: a signed tuple is
- * single-use per symbol, enforced by a per-symbol high-water mark BEFORE any
- * weight arbitration). Consequence for concurrent builds: two PTBs carrying
- * the same envelope for the same symbol cannot both land — the second aborts
- * even if the rule is unweighted for that ticker. Never share one fetched
- * envelope across builds that may execute concurrently for the same symbol.
+ * TWO wire shapes carry the same prices, and this rule prefers the first:
+ *
+ * 1. **Merkle leaves** (default) — `GET /v1/quotes/leaves?symbols=…` returns one
+ *    `SignedLeaf` per symbol: the price fields, a Merkle `proof`, and the
+ *    enclave's signature over the snapshot ROOT (`MERKLE_ROOT_INTENT`). Fed via
+ *    {@link feedWaterxRuleWithProof} → `waterx_rule::collect_single_with_proof`,
+ *    which re-derives the root from the leaf + proof. One symbol costs ONE
+ *    `new_batch_item` plus ~log2(n) 32-byte proof hashes.
+ * 2. **Batch envelope** (fallback) — `GET /v1/quotes/update?symbols=…` returns
+ *    ONE signature over the whole item vector (`BATCH_PRICE_INTENT`). It is
+ *    indivisible: {@link feedWaterxRule} must rebuild EVERY item in-PTB for
+ *    `waterx_rule::collect_batch_latest` to re-verify, even to use one symbol's
+ *    price. With the 29-feed mainnet registry that is 58 extra moveCalls and
+ *    ~320 extra pure inputs on every trade, which is why it is no longer the
+ *    default. Used only when the quote-center has no leaf route yet (404),
+ *    and by callers that still push whole batches.
+ *
+ * Both collect entries are the dual-rule path: they feed `collector.symbol()`
+ * WITHOUT aggregating, so a waterx-routed ticker composes onto the same
+ * collector as Pyth/Supra (compose-then-aggregate). Their abort-vs-abstain
+ * disposition is identical: a config/integrity mismatch, a bad signature or a
+ * signed timestamp AHEAD of the on-chain `Clock` ABORTS; a freshness miss
+ * ABSTAINS so the other weighted rules cover a lagging TEE, and so does a
+ * REPLAYED signed timestamp (the per-symbol high-water mark of audit F-014 —
+ * already-recorded means the chain holds a price at least this fresh, so two
+ * PTBs carrying the same snapshot for the same symbol no longer kill each
+ * other; only the single-rule `feed_*` entries abort on a replay).
  */
 import { fromHex } from "@mysten/bcs";
-import { collectBatchLatest, newBatchItem, newBatchPayload, pushBatchItem, } from "../../generated/waterx_rule/waterx_rule.js";
+import { collectBatchLatest, collectSingleWithProof, newBatchItem, newBatchPayload, pushBatchItem, } from "../../generated/waterx_rule/waterx_rule.js";
 import { ownEntry } from "../../utils/record.js";
 import { assertRuleUpdateData, } from "../price-update-rule.js";
 import { FetchPolicyError, fetchWithPolicy, joinEndpointPath, } from "../update-fetch.js";
-/** The single signing intent the quote-center emits — exported so read-plane
- *  consumers can mirror the rule's own envelope intent check (a mispointed
- *  endpoint must be rejected by reads exactly as tx-builds reject it). */
+/** Intent the quote-center signs a whole BATCH payload under — exported so
+ *  read-plane consumers can mirror the rule's own envelope intent check (a
+ *  mispointed endpoint must be rejected by reads exactly as tx-builds reject it). */
 export const BATCH_PRICE_INTENT = 1;
+/**
+ * Intent the quote-center signs a snapshot's Merkle ROOT under
+ * (`waterx_rule::MERKLE_ROOT_INTENT`). Distinct from
+ * {@link BATCH_PRICE_INTENT} on purpose: the intent byte is the first field of
+ * the signed `IntentMessage`, so a batch signature can never be replayed as a
+ * root signature or vice versa. Leaves carry no `intent` field of their own —
+ * they are only ever submitted through `collect_single_with_proof`, which pins
+ * the intent on-chain — so this exists to name the scheme, not to gate a parse.
+ */
+export const MERKLE_ROOT_INTENT = 2;
 /**
  * WaterX quote-center external infra — owned by THIS source, by network.
  * Mirrors `PYTH_CORE_INFRA` (oracle/pyth.ts) and `LAZER_INFRA`
@@ -58,12 +82,7 @@ export const WATERX_INFRA = {
 export function waterxQuoteCenterEndpoint(network) {
     return WATERX_INFRA[network].endpoint;
 }
-/**
- * Shape check ONLY — the `kind` discriminant is checked separately by the
- * caller before this runs (mirrors the other rules' guard split), so a
- * same-shaped payload from a different rule can never silently pass.
- */
-function isWaterxUpdatePayloadShape(payload) {
+function isWaterxEnvelopePayloadShape(payload) {
     const env = payload?.envelope;
     return (typeof env === "object" &&
         env !== null &&
@@ -71,33 +90,156 @@ function isWaterxUpdatePayloadShape(payload) {
         typeof env.timestamp_ms === "bigint" &&
         Array.isArray(env.payload?.items));
 }
+function isWaterxLeafPayloadShape(payload) {
+    const leaves = payload?.leaves;
+    return Array.isArray(leaves) && leaves.every(isSignedLeafShape);
+}
+/** Every u64 field of a leaf — each one is signed, so each must be present and exact. */
+const LEAF_U64_FIELDS = [
+    "price_timestamp_ms",
+    "price_n",
+    "price_scale",
+    "confidence_n",
+    "confidence_scale",
+    "max_source_deviation_bps",
+    "signed_timestamp_ms",
+];
 /**
- * Parse a quote-center `/v1/quotes/update` response body into a
- * {@link WaterxSignedEnvelope} with the u64 fields decoded as `bigint`, exact.
+ * FULL structural check on a leaf, not just the fields the feed leg happens to
+ * touch first.
  *
- * The signature is over `BCS(IntentMessage<BatchPricePayload>)`, so every u64
- * the SDK rebuilds in-PTB must equal the enclave's byte-for-byte or
- * `collect_batch_latest` aborts the whole trade PTB (bad signature — not an
- * abstain). A plain `JSON.parse` yields IEEE-754 doubles that lose precision
- * above 2^53, so instead we recover each integer's exact source literal via the
- * ES2023 reviver `context.source` (Node 21+ / modern browsers) and `BigInt()`
- * it. On an older runtime that passes no `context`, a value within 2^53 is
- * still exact (`BigInt(number)`); a value ABOVE it throws loudly here rather
- * than silently corrupting the payload into an on-chain abort. `num_sources`
- * (u8) and `intent` are coerced back to `number` — both are tiny.
+ * Every field here is either part of the BCS bytes the enclave signed (so a
+ * missing one means the rebuilt item cannot match) or the signature/proof
+ * material itself. A partial guard let a 200 that omitted, say, `ticker` pass as
+ * a valid leaf and fail LATER, mid-PTB-build, as `Parameter ticker is required`
+ * — after `assertCoverage` had already declared the response good, and while the
+ * caller's `tx` was already being mutated. `parseSignedLeaves` promises to reject
+ * a malformed leaf before any PTB is touched; this is what makes that true.
  */
-export function parseSignedEnvelope(text) {
-    const raw = JSON.parse(text, (_key, value, context) => {
-        if (typeof value !== "number" || !Number.isInteger(value))
+/** Hex characters only. Length is checked separately — see {@link isHexOfBytes}. */
+const HEX_ONLY = /^[0-9a-fA-F]*$/;
+/**
+ * `true` iff `hex` (± `0x`) is exactly `bytes` bytes of hex.
+ *
+ * A static pattern plus an explicit length compare, deliberately not a computed
+ * `new RegExp(`…{${bytes * 2}}`)`: that recompiles on every call and semgrep
+ * blocks it as `detect-non-literal-regexp`.
+ */
+function isHexOfBytes(hex, bytes) {
+    if (typeof hex !== "string")
+        return false;
+    const body = hex.startsWith("0x") ? hex.slice(2) : hex;
+    return body.length === bytes * 2 && HEX_ONLY.test(body);
+}
+function isSignedLeafShape(leaf) {
+    const l = leaf;
+    if (typeof l !== "object" || l === null)
+        return false;
+    if (typeof l.symbol !== "string" || l.symbol === "")
+        return false;
+    if (typeof l.ticker !== "string" || l.ticker === "")
+        return false;
+    if (typeof l.method !== "string" || l.method === "")
+        return false;
+    // `num_sources` is a u8, and this guard runs at TWO stages: on the freshly
+    // revived object (where every JSON integer, including this one, is a bigint)
+    // and again on a normalized payload from `narrowUpdateData` / a consumer cache
+    // (where `parseSignedLeaves` has coerced it to a number). Both are valid here;
+    // only the domain matters.
+    const n = l.num_sources;
+    if (typeof n === "bigint") {
+        if (n < 0n || n > 255n)
+            return false;
+    }
+    else if (typeof n === "number") {
+        if (!Number.isInteger(n) || n < 0 || n > 255)
+            return false;
+    }
+    else {
+        return false;
+    }
+    // `sources` is a vector<u64>: exact bigints, like every other signed integer.
+    if (!Array.isArray(l.sources) || l.sources.length === 0)
+        return false;
+    if (l.sources.some((s) => typeof s !== "bigint" || s < 0n))
+        return false;
+    for (const field of LEAF_U64_FIELDS) {
+        const v = l[field];
+        if (typeof v !== "bigint" || v < 0n)
+            return false;
+    }
+    // ed25519 is always 64 bytes and the root is always a 32-byte keccak256; a
+    // wrong-length signature is an on-chain abort, so it is rejected here.
+    if (!isHexOfBytes(l.signature, 64))
+        return false;
+    if (!isHexOfBytes(l.root, 32))
+        return false;
+    if (!Array.isArray(l.proof) || l.proof.some((p) => typeof p !== "string"))
+        return false;
+    return true;
+}
+/**
+ * Shape check ONLY — the `kind` discriminant is checked separately by the
+ * caller before this runs (mirrors the other rules' guard split), so a
+ * same-shaped payload from a different rule can never silently pass. Accepts
+ * either variant; the accessors below pick one out.
+ */
+function isWaterxUpdatePayloadShape(payload) {
+    return isWaterxLeafPayloadShape(payload) || isWaterxEnvelopePayloadShape(payload);
+}
+/** A JSON number token that is lexically an integer: no `.`, no `e`/`E`. */
+const INTEGER_TOKEN = /^-?\d+$/;
+/**
+ * `JSON.parse` with every integer decoded as an exact `bigint`.
+ *
+ * The signature is over `BCS(IntentMessage<…>)`, so every u64 the SDK rebuilds
+ * in-PTB must equal the enclave's byte-for-byte or the on-chain verify fails and
+ * ABORTS the whole trade PTB (a bad signature is not an abstain). A plain
+ * `JSON.parse` yields IEEE-754 doubles that lose precision above 2^53, so
+ * instead we recover each integer's exact source literal via the ES2023 reviver
+ * `context.source` (Node 21+ / modern browsers) and `BigInt()` it. On an older
+ * runtime that passes no `context`, a value within 2^53 is still exact
+ * (`BigInt(number)`); a value ABOVE it throws loudly here rather than silently
+ * corrupting the payload into an on-chain abort.
+ *
+ * Integrality is decided from the SOURCE TOKEN, never from the parsed value: a
+ * display float can be lexically `0.0` while `JSON.parse` hands back the number
+ * `0`, which `Number.isInteger` accepts — and `BigInt("0.0")` throws
+ * `SyntaxError`. The leaf endpoint really does emit that (Rust `f64` serializes
+ * a whole number as `0.0`), so keying off the value crashed every fetch that
+ * included, say, a `confidence: 0.0` leaf. Exponent tokens (`1e3`) throw the
+ * same way. Only `-?\d+` becomes a `bigint`; every other numeric token stays a
+ * number, which is right for the display-only `price` / `confidence` fields —
+ * they are not part of any signed byte string.
+ */
+function parseWithExactIntegers(text, what) {
+    return JSON.parse(text, (_key, value, context) => {
+        if (typeof value !== "number")
+            return value;
+        const token = context?.source;
+        if (token !== undefined) {
+            return INTEGER_TOKEN.test(token) ? BigInt(token) : value;
+        }
+        // No JSON source access on this runtime: fall back to the parsed value.
+        // A display float that happens to be whole (`0.0` → `0`) becomes a bigint
+        // here, which is harmless — no signed field is read off those two.
+        if (!Number.isInteger(value))
             return value;
-        if (context?.source !== undefined)
-            return BigInt(context.source);
         if (!Number.isSafeInteger(value)) {
-            throw new Error("waterx envelope carries an integer above 2^53 and this runtime lacks JSON " +
+            throw new Error(`waterx ${what} carries an integer above 2^53 and this runtime lacks JSON ` +
                 "source access — cannot preserve u64 precision for the signed payload");
         }
         return BigInt(value);
     });
+}
+/**
+ * Parse a quote-center `/v1/quotes/update` response body into a
+ * {@link WaterxSignedEnvelope} with the u64 fields decoded as `bigint`, exact
+ * (see {@link parseWithExactIntegers}). `num_sources` (u8) and `intent` are
+ * coerced back to `number` — both are tiny.
+ */
+export function parseSignedEnvelope(text) {
+    const raw = parseWithExactIntegers(text, "envelope");
     if (typeof raw.signature !== "string" || !Array.isArray(raw.payload?.items)) {
         throw new Error("WaterX quote-center returned a malformed signed envelope");
     }
@@ -110,6 +252,47 @@ export function parseSignedEnvelope(text) {
         },
     };
 }
+/**
+ * A Merkle proof element must be a 32-byte keccak256 hash, and nothing else.
+ *
+ * The chain would only reject a malformed one at SUBMISSION, and opaquely: a
+ * short/long/garbage sibling folds to a root the enclave never signed, which
+ * surfaces as `EInvalidSignature` from `verify_merkle_root` — at that point
+ * indistinguishable from a genuinely forged signature. So it is checked twice,
+ * at both doors a leaf can come through: on the wire ({@link parseSignedLeaves})
+ * and again in the feed leg ({@link feedWaterxRuleWithProof}), which is the last
+ * gate for a leaf handed in by a consumer's prefetch cache instead of parsed
+ * here. Same reason the keeper's Rust builder checks the length.
+ */
+function assertHash32(symbol, sibling) {
+    if (!isHexOfBytes(sibling, 32)) {
+        throw new Error(`WaterX leaf for ${symbol} carries a proof element that is not a 32-byte hex hash: ` +
+            `'${sibling}'`);
+    }
+}
+/**
+ * Parse a quote-center `/v1/quotes/leaves` response body (`{ leaves: [...] }`)
+ * into {@link WaterxSignedLeaf}s, u64s exact as `bigint`, rejecting a malformed
+ * leaf or proof element on the wire — before any PTB is touched.
+ */
+export function parseSignedLeaves(text) {
+    const raw = parseWithExactIntegers(text, "leaf");
+    if (!Array.isArray(raw.leaves)) {
+        throw new Error("WaterX quote-center returned a malformed leaf response (expected { leaves })");
+    }
+    return raw.leaves.map((leaf, i) => {
+        if (!isSignedLeafShape(leaf)) {
+            // Name the leaf when it carried a usable symbol — a coverage gap and a
+            // malformed field read very differently to whoever is paging through this.
+            const named = leaf?.symbol;
+            const which = typeof named === "string" && named !== "" ? `'${named}'` : `at index ${i}`;
+            throw new Error(`WaterX quote-center returned a malformed signed leaf ${which}`);
+        }
+        for (const sibling of leaf.proof)
+            assertHash32(leaf.symbol, sibling);
+        return { ...leaf, num_sources: Number(leaf.num_sources) };
+    });
+}
 /** The `waterx_rule` deployment entry; throws when the config carries none. */
 function requireWaterxPackage(host) {
     const entry = host.config.packages.waterx_rule;
@@ -148,75 +331,207 @@ function resolveWaterxInfra(host) {
  * `https://app.example/v1/quotes/update`, bypassing the proxy). Same footgun
  * that 404'd every Pyth Pro feed by dropping its `/hermes` prefix.
  */
-async function fetchWaterxSignedUpdate(endpoint, symbols, fetchOpts) {
-    const url = joinEndpointPath(endpoint, "v1/quotes/update");
+async function fetchQuoteCenter(endpoint, path, symbols, what, fetchOpts) {
+    const url = joinEndpointPath(endpoint, path);
     url.searchParams.set("symbols", symbols.join(","));
-    let res;
     try {
-        res = await fetchWithPolicy(url.toString(), { method: "GET" }, { ...fetchOpts });
+        return await fetchWithPolicy(url.toString(), { method: "GET" }, { ...fetchOpts });
     }
     catch (err) {
         if (err instanceof FetchPolicyError && err.status !== undefined) {
             const body = err.bodySnippet ? ` ${err.bodySnippet}` : "";
-            throw new Error(`WaterX quote-center fetch failed: ${err.status}${body} (retries exhausted after ${err.attempts} attempts)`, { cause: err });
+            throw new Error(`WaterX quote-center ${what} failed: ${err.status}${body} (retries exhausted after ${err.attempts} attempts)`, { cause: err });
         }
         throw err;
     }
+}
+/**
+ * Pull one enclave-signed batch envelope covering `symbols`. `fellBackFrom`, when
+ * set, names the leaf-route failure that sent us here, so a deployment whose
+ * quote-center serves NEITHER route reports both statuses instead of only the
+ * second one.
+ */
+async function fetchWaterxSignedUpdate(endpoint, symbols, fetchOpts, fellBackFrom) {
+    const context = fellBackFrom ? ` (fell back from ${fellBackFrom})` : "";
+    const res = await fetchQuoteCenter(endpoint, "v1/quotes/update", symbols, "fetch", fetchOpts);
     if (!res.ok) {
-        throw new Error(`WaterX quote-center fetch failed: ${res.status} ${await res.text()}`);
+        throw new Error(`WaterX quote-center fetch failed: ${res.status} ${await res.text()}${context}`);
     }
     // Parse from raw text (not res.json()) so the u64 fields are decoded exact as
     // bigint — see parseSignedEnvelope. Malformed-shape check lives there.
     const envelope = parseSignedEnvelope(await res.text());
     if (envelope.intent !== BATCH_PRICE_INTENT) {
-        throw new Error(`WaterX quote-center returned intent ${envelope.intent}, expected BATCH_PRICE_INTENT ${BATCH_PRICE_INTENT}`);
+        throw new Error(`WaterX quote-center returned intent ${envelope.intent}, expected BATCH_PRICE_INTENT ${BATCH_PRICE_INTENT}${context}`);
     }
     return envelope;
 }
-/** Narrow a `RuleUpdateData` to its `WaterxSignedEnvelope`, or `null`. */
+/**
+ * Pull per-symbol signed Merkle leaves — the DEFAULT update-data shape (see the
+ * module header for why it beats the indivisible batch envelope on a trade path).
+ *
+ * Returns `{ unavailable }` on `404` — and ONLY on 404, the one status that
+ * means "this route isn't here": a quote-center older than `/v1/quotes/leaves`
+ * has no handler registered for the path. That is the version-skew case the
+ * caller answers by falling back to the batch envelope, so the SDK and the
+ * quote-center can be deployed in either order.
+ *
+ * Everything else THROWS rather than falling back, INCLUDING 5xx (`501` among
+ * them — `fetchWithPolicy` classifies every 5xx as retryable and has already
+ * spent its retry budget by the time one surfaces here). A degraded or
+ * unreachable quote-center would fail the envelope route the same way — same
+ * service, same enclave behind it — so falling back would only double the
+ * latency of an already-failing money-path build, and would report an outage as
+ * a version skew.
+ *
+ * A 404 can ALSO mean "unknown symbol" (the quote-center 404s a symbol missing
+ * from its feed registry). That is config drift between this SDK's `feeds` and
+ * the quote-center's registry, and the fallback surfaces it honestly: the
+ * envelope route 404s on the same symbol, and its error names both attempts.
+ */
+async function fetchWaterxSignedLeaves(endpoint, symbols, fetchOpts) {
+    const res = await fetchQuoteCenter(endpoint, "v1/quotes/leaves", symbols, "leaf fetch", fetchOpts);
+    if (res.status === 404) {
+        return { unavailable: `GET /v1/quotes/leaves → 404 ${(await res.text()).trim()}`.trim() };
+    }
+    if (!res.ok) {
+        throw new Error(`WaterX quote-center leaf fetch failed: ${res.status} ${await res.text()}`);
+    }
+    // Raw text, not res.json(): u64s must survive as exact bigints.
+    return { leaves: parseSignedLeaves(await res.text()) };
+}
+/**
+ * Every requested ticker must be covered by what came back. A 200 whose items
+ * omit a requested symbol is a valid, well-signed response — nothing downstream
+ * would reject it, and the build would emit a collect call that abstains for the
+ * missing symbol, surfacing as an on-chain `EMissingPriceSource` (or a silently
+ * thinner weighted set) much later. Same coverage rule
+ * {@link WaterxRule.narrowUpdateData} enforces on a cached payload; the
+ * difference is disposition — a cache miss falls back to a live fetch, whereas
+ * the live source itself coming up short has no fallback left, so it throws.
+ */
+function assertCoverage(what, tickers, covered) {
+    const have = new Set(covered);
+    const missing = tickers.filter((t) => !have.has(t));
+    if (missing.length > 0) {
+        throw new Error(`WaterX quote-center ${what} does not cover ticker(s): ${missing.join(", ")} ` +
+            `(requested ${tickers.join(", ")}; served ${[...have].join(", ") || "none"})`);
+    }
+}
+/**
+ * Narrow a `RuleUpdateData` to this rule's payload (either variant), or `null`.
+ * Kind/shape mismatches throw — see {@link assertRuleUpdateData}.
+ */
+function waterxPayloadOf(data) {
+    return assertRuleUpdateData(data, "waterx_rule", isWaterxUpdatePayloadShape, "{ leaves: [...] } or { envelope: { intent, timestamp_ms, payload: { items }, signature } }");
+}
+/**
+ * Narrow a `RuleUpdateData` to its per-symbol {@link WaterxSignedLeaf}s, or
+ * `null` when it carries a batch envelope instead (the fallback shape).
+ */
+export function waterxLeavesOf(data) {
+    const payload = waterxPayloadOf(data);
+    return payload && "leaves" in payload ? payload.leaves : null;
+}
+/**
+ * Narrow a `RuleUpdateData` to its `WaterxSignedEnvelope`, or `null` when it
+ * carries per-symbol leaves instead (the default shape).
+ */
 export function waterxEnvelopeOf(data) {
-    const payload = assertRuleUpdateData(data, "waterx_rule", isWaterxUpdatePayloadShape, "{ envelope: { intent, timestamp_ms, payload: { items }, signature } }");
-    return payload?.envelope ?? null;
+    const payload = waterxPayloadOf(data);
+    return payload && "envelope" in payload ? payload.envelope : null;
 }
 /** Strip an optional `0x` prefix, then decode hex → bytes. */
-function decodeSig(hex) {
+function decodeHex(hex) {
     return fromHex(hex.startsWith("0x") ? hex.slice(2) : hex);
 }
+/**
+ * `new_batch_item` with the item fields passed through VERBATIM: the u64s are
+ * already exact bigints (see {@link parseWithExactIntegers}), so the BCS the
+ * chain rebuilds matches the bytes the enclave signed — whether it re-verifies
+ * them as one item of a batch payload or as a Merkle leaf.
+ */
+function newItemArg(tx, pkg, item) {
+    return newBatchItem({
+        package: pkg,
+        arguments: {
+            symbol: item.symbol,
+            ticker: item.ticker,
+            sources: item.sources,
+            method: item.method,
+            priceTimestampMs: item.price_timestamp_ms,
+            priceN: item.price_n,
+            priceScale: item.price_scale,
+            confidenceN: item.confidence_n,
+            confidenceScale: item.confidence_scale,
+            maxSourceDeviationBps: item.max_source_deviation_bps,
+            numSources: item.num_sources,
+        },
+    })(tx);
+}
+/**
+ * `waterx_rule::collect_single_with_proof(collector, config, clock,
+ * enclave_config, enclave, timestamp_ms, item, proof, sig)` — the DEFAULT feed
+ * leg. Rebuilds ONE item in-PTB and hands it over with its Merkle proof; on-chain
+ * the leaf is hashed, folded through the proof, and the enclave's signature over
+ * the resulting root is verified before the price reaches the collector.
+ *
+ * Cost is what makes this the default: one item + `proof.length` 32-byte hashes
+ * (~log2 of the snapshot width — 4 to 5 for the 29-feed mainnet registry),
+ * against {@link feedWaterxRule}'s obligation to rebuild every item the batch
+ * signature covers.
+ *
+ * Abort vs abstain is identical to the batch path (see the module header): a
+ * mismatched root, a bad signature, a future signed timestamp, or a config
+ * mismatch ABORTS; a freshness miss or a replayed signed timestamp abstains. One
+ * extra abort of its own — `ECollectorSymbolMismatch` if the leaf's symbol isn't
+ * the collector's — which `aggregateTicker` prevents by construction, since it
+ * looks the leaf up BY the ticker it just built the collector for.
+ */
+export function feedWaterxRuleWithProof(tx, host, collector, leaf) {
+    const wr = requireWaterxPackage(host);
+    const pkg = wr.published_at;
+    const item = newItemArg(tx, pkg, leaf);
+    collectSingleWithProof({
+        package: pkg,
+        arguments: {
+            collector,
+            config: tx.object(wr.config),
+            enclaveConfig: tx.object(wr.enclave_config),
+            enclave: tx.object(wr.enclave),
+            timestampMs: leaf.signed_timestamp_ms,
+            item,
+            // vector<vector<u8>>: sibling hashes in fold order, each re-checked as a
+            // 32-byte hash (see assertHash32 — a cached leaf never passed the parser).
+            proof: leaf.proof.map((sibling) => {
+                assertHash32(leaf.symbol, sibling);
+                return Array.from(decodeHex(sibling));
+            }),
+            sig: Array.from(decodeHex(leaf.signature)),
+        },
+    })(tx);
+}
 /**
  * `waterx_rule::collect_batch_latest(collector, config, clock, enclave_config,
- * enclave, timestamp_ms, payload, sig)` — rebuild the enclave-signed batch
- * payload in-PTB (`new_batch_payload` + one `new_batch_item`/`push_batch_item`
- * per item, the exact shape the enclave signed) and contribute the price for
- * `collector.symbol()` to the collector. One collect call re-verifies the batch
- * signature and picks this collector's symbol out of the batch; on-chain it
- * abstains (records `none`) when the symbol is stale or absent from the batch,
- * but ABORTS `EReplayedSignature` when the symbol's signed timestamp was
- * already accepted (per-symbol high-water mark, audit F-014) — see the module
- * header for the concurrent-build consequence.
+ * enclave, timestamp_ms, payload, sig)` — the FALLBACK feed leg, for a
+ * quote-center with no leaf route (and for callers that hold a whole batch).
+ * Rebuilds the enclave-signed batch payload in-PTB (`new_batch_payload` + one
+ * `new_batch_item`/`push_batch_item` per item, the exact shape the enclave
+ * signed) and contributes the price for `collector.symbol()` to the collector.
+ *
+ * Every item must be rebuilt, not just this collector's: the signature covers
+ * `BCS(IntentMessage)` over the whole vector, so a missing item is a failed
+ * verify. That is the cost {@link feedWaterxRuleWithProof} exists to avoid.
+ *
+ * On-chain it abstains (records `none`) when the symbol is stale, absent from the
+ * batch, or already recorded at this signed timestamp; it ABORTS on a bad
+ * signature, a signed timestamp ahead of the `Clock`, or a config mismatch.
  */
 export function feedWaterxRule(tx, host, collector, envelope) {
     const wr = requireWaterxPackage(host);
     const pkg = wr.published_at;
     const payload = newBatchPayload({ package: pkg })(tx);
     for (const item of envelope.payload.items) {
-        // u64 fields are already exact bigints (see parseSignedEnvelope) — passed
-        // through verbatim so the rebuilt BCS matches the enclave's signed bytes.
-        const itemArg = newBatchItem({
-            package: pkg,
-            arguments: {
-                symbol: item.symbol,
-                ticker: item.ticker,
-                sources: item.sources,
-                method: item.method,
-                priceTimestampMs: item.price_timestamp_ms,
-                priceN: item.price_n,
-                priceScale: item.price_scale,
-                confidenceN: item.confidence_n,
-                confidenceScale: item.confidence_scale,
-                maxSourceDeviationBps: item.max_source_deviation_bps,
-                numSources: item.num_sources,
-            },
-        })(tx);
+        const itemArg = newItemArg(tx, pkg, item);
         pushBatchItem({ package: pkg, arguments: { payload, item: itemArg } })(tx);
     }
     collectBatchLatest({
@@ -228,7 +543,7 @@ export function feedWaterxRule(tx, host, collector, envelope) {
             enclave: tx.object(wr.enclave),
             timestampMs: envelope.timestamp_ms,
             payload,
-            sig: Array.from(decodeSig(envelope.signature)),
+            sig: Array.from(decodeHex(envelope.signature)),
         },
     })(tx);
 }
@@ -242,17 +557,11 @@ export const WaterxRule = {
         return Object.keys(host.config.packages.waterx_rule?.feeds ?? {});
     },
     /**
-     * Pulls one enclave-signed batch envelope covering `tickers` from the
-     * quote-center, and only returns it when it actually covers ALL of them.
-     *
-     * A 200 whose `items` omit a requested symbol is a valid, well-signed
-     * envelope — nothing downstream would reject it, and the build would emit a
-     * `collect_batch_latest` that abstains for the missing symbol, surfacing as
-     * an on-chain `EMissingPriceSource` (or a silently thinner weighted set) much
-     * later. Same coverage rule the cached path enforces in
-     * {@link WaterxRule.narrowUpdateData}; the difference is disposition — a
-     * cache miss falls back to this live fetch, whereas the live source itself
-     * coming up short has no fallback left, so it throws deterministically here.
+     * Pulls per-symbol Merkle leaves for `tickers`, falling back to one batch
+     * envelope only when this quote-center has no leaf route (see
+     * {@link fetchWaterxSignedLeaves} for exactly which statuses mean that, and
+     * why nothing else falls back). Either way, returns only what covers ALL of
+     * `tickers` — see {@link assertCoverage}.
      */
     async fetchUpdateData(host, tickers) {
         if (tickers.length === 0)
@@ -268,25 +577,48 @@ export const WaterxRule = {
             }
         }
         const { endpoint, fetch: fetchOpts } = resolveWaterxInfra(host);
-        const envelope = await fetchWaterxSignedUpdate(endpoint, tickers, fetchOpts);
-        const covered = new Set(envelope.payload.items.map((i) => i.symbol));
-        const missing = tickers.filter((t) => !covered.has(t));
-        if (missing.length > 0) {
-            throw new Error(`WaterX quote-center envelope does not cover ticker(s): ${missing.join(", ")} ` +
-                `(requested ${tickers.join(", ")}; served ${[...covered].join(", ") || "none"})`);
+        const pulled = await fetchWaterxSignedLeaves(endpoint, tickers, fetchOpts);
+        if ("leaves" in pulled) {
+            assertCoverage("leaves", tickers, pulled.leaves.map((l) => l.symbol));
+            return { kind: "waterx_rule", payload: { leaves: pulled.leaves } };
         }
+        const envelope = await fetchWaterxSignedUpdate(endpoint, tickers, fetchOpts, pulled.unavailable);
+        assertCoverage("envelope", tickers, envelope.payload.items.map((i) => i.symbol));
         return { kind: "waterx_rule", payload: { envelope } };
     },
     /**
-     * One signed batch envelope carries a single ed25519 signature over its whole
-     * `payload` — it is indivisible: it can only be served whole (re-verified from
-     * the full item set). Returns the whole payload iff every requested ticker's
-     * item is present in THIS envelope; any coverage gap → `null` (miss), never a
+     * Divisibility differs by variant, which is the whole reason this method
+     * belongs to the rule and not to its consumers:
+     *
+     * - **Leaves** are per-symbol and independently verifiable (each carries its
+     *   own proof + root signature), so a wider payload — e.g. a whole-universe
+     *   prefetch cache — is SUBSET to exactly `tickers`. A trade then carries one
+     *   leaf instead of the whole cached snapshot.
+     * - **A batch envelope** carries a single signature over its whole `payload`
+     *   and is indivisible: it is returned whole, or not at all.
+     *
+     * Either way a ticker this payload cannot serve → `null` (miss), never a
      * silent partial.
      */
     narrowUpdateData(_host, data, tickers) {
+        if (tickers.length === 0)
+            return null;
+        const leaves = waterxLeavesOf(data);
+        if (leaves) {
+            // Indexed by symbol, then walked in REQUESTED order: a `filter` would let
+            // a payload that repeats one symbol and omits another pass on count alone.
+            const bySymbol = new Map(leaves.map((l) => [l.symbol, l]));
+            const subset = [];
+            for (const ticker of tickers) {
+                const leaf = bySymbol.get(ticker);
+                if (!leaf)
+                    return null;
+                subset.push(leaf);
+            }
+            return { kind: "waterx_rule", payload: { leaves: subset } };
+        }
         const envelope = waterxEnvelopeOf(data);
-        if (!envelope || tickers.length === 0)
+        if (!envelope)
             return null;
         const covered = new Set(envelope.payload.items.map((i) => i.symbol));
         for (const ticker of tickers) {
@@ -296,11 +628,12 @@ export const WaterxRule = {
         return { kind: "waterx_rule", payload: { envelope } };
     },
     /**
-     * No shared verify step: `waterx_rule::collect_batch_latest` bundles verify
-     * AND feed into one per-collector call, appended by {@link feedWaterxRule} in
-     * the per-ticker aggregate leg. So this emits nothing and returns `void` — the
-     * signed envelope reaches the feed leg via `aggregate.ts`'s per-ticker map
-     * (built from the group's fetched data), not a `RuleUpdateHandle`.
+     * No shared verify step: both `waterx_rule` collect entries bundle verify AND
+     * feed into one per-collector call, appended by
+     * {@link feedWaterxRuleWithProof} / {@link feedWaterxRule} in the per-ticker
+     * aggregate leg. So this emits nothing and returns `void` — the signed data
+     * reaches the feed leg via `aggregate.ts`'s per-ticker map (built from the
+     * group's fetched data), not a `RuleUpdateHandle`.
      */
     buildUpdateCalls(_tx, _host, _data, _opts) {
         return;