mtok-relay 0.2.5 → 0.2.7

package/dist/mtok-relay.mjs

@@ -5295,9 +5295,9 @@ function createOnchainVerifier({
       if (requestHash != null && lc(event.requestHash) !== lc(requestHash)) return { ok: false, reason: "request_hash_mismatch" };
       if (BigInt(event.sellerUsdAtomic) < BigInt(minSellerAtomic)) return { ok: false, reason: "amount_too_low" };
       const maxAge = Number(maxPaidAgeMs);
+      let paidAtMs = null;
       if (Number.isFinite(maxAge) && maxAge > 0) {
         const bn = matchedLog?.blockNumber ?? got.receipt.blockNumber;
-        let paidAtMs = null;
         if (bn != null) {
           for (let i = 0; i <= receiptRetries; i++) {
             try {
@@ -5330,11 +5330,37 @@ function createOnchainVerifier({
         feeTransfer = findUsdcTransfer(got.receipt, { to: feeRecipient, minAtomic: BigInt(event.feeUsdAtomic), from: event.buyer, consumed });
         if (!feeTransfer.ok) return { ok: false, reason: "fee_transfer_" + feeTransfer.reason };
       }
-      return { ok: true, event, from: sellerTransfer?.from ?? feeTransfer?.from ?? null };
+      return { ok: true, event, paidAtMs, from: sellerTransfer?.from ?? feeTransfer?.from ?? null };
     }
   };
 }
 
+// core/fee-policy.js
+function normalizeFeeSchedule(schedule) {
+  if (!Array.isArray(schedule) || !schedule.length || schedule.length > 64) throw new TypeError("fee schedule must contain 1..64 activation records");
+  let previous = -1;
+  return schedule.map(({ effectiveAtMs, feeBps }, index) => {
+    if (!Number.isSafeInteger(effectiveAtMs) || effectiveAtMs <= previous || index === 0 && effectiveAtMs !== 0) {
+      throw new TypeError("fee activations must start at 0 and increase in integer milliseconds");
+    }
+    if (!Number.isSafeInteger(feeBps) || feeBps < 0 || feeBps > 1e4) throw new TypeError("feeBps must be an integer from 0 to 10000");
+    previous = effectiveAtMs;
+    return { effectiveAtMs, feeBps };
+  });
+}
+function feeBpsAt(schedule, timeMs) {
+  if (!Number.isSafeInteger(timeMs) || timeMs < 0) throw new TypeError("verified payment time is required for fee policy");
+  return schedule.findLast((entry) => entry.effectiveAtMs <= timeMs).feeBps;
+}
+function paymentFeeBpsAt(schedule, paidAtMs) {
+  const start = Math.max(0, paidAtMs - 6e4);
+  let minimum = Math.min(feeBpsAt(schedule, paidAtMs), feeBpsAt(schedule, start));
+  for (const entry of schedule) {
+    if (entry.effectiveAtMs > start && entry.effectiveAtMs <= paidAtMs) minimum = Math.min(minimum, entry.feeBps);
+  }
+  return minimum;
+}
+
 // bridge/serve-core.mjs
 var BALANCE_EPSILON = 1e-6;
 var REQUEST_NONCE_RE = /^0x[0-9a-fA-F]{32}$/;
@@ -5489,7 +5515,6 @@ function createServeCore({
   maxOutputTokens
 }) {
   const serve = async (body) => {
-    const currentFeeBps = typeof feeBps === "function" ? feeBps() : feeBps;
     const currentFeeRecipient = typeof feeRecipient === "function" ? feeRecipient() : feeRecipient;
     const { bookingId, n, buyerId, request, requestNonce, drawPaidTxHash } = body;
     const hasRequestNonce = Object.hasOwn(body, "requestNonce");
@@ -5507,19 +5532,20 @@ function createServeCore({
     const requestHash = hasRequestNonce ? await hash32({ request, requestNonce }) : await hash32(request);
     const cacheKey = `${requestHashScheme}:${bookingId}:${n}:${requestHash}`;
     const oldLegacyKey = hasRequestNonce ? null : `${bookingId}:${n}:${requestHash}`;
+    const redemptionContext = { claimKey: cacheKey };
     if (!dripContractAddress) {
       return { status: 402, body: { error: "contract_mode_required", detail: "this relay only serves contract-mode draws; the platform is not reporting a dripContractAddress" } };
     }
     if (!drawPaidTxHash) return { status: 402, body: { error: "draw_payment_required", detail: "contract mode requires drawPaidTxHash before upstream delivery" } };
     let storedKey = cacheKey;
-    let redemptionState = await redemption.state(storedKey);
+    let redemptionState = await redemption.state(storedKey, redemptionContext);
     if (!redemptionState && oldLegacyKey) {
-      const oldLegacyState = await redemption.state(oldLegacyKey);
+      const oldLegacyState = await redemption.state(oldLegacyKey, redemptionContext);
       if (oldLegacyState) {
         storedKey = oldLegacyKey;
         redemptionState = oldLegacyState;
       } else {
-        redemptionState = await redemption.state(cacheKey);
+        redemptionState = await redemption.state(cacheKey, redemptionContext);
       }
     }
     let paid;
@@ -5536,9 +5562,9 @@ function createServeCore({
         requestHash,
         sellerWallet,
         feeRecipient: currentFeeRecipient,
-        // A known completion spends no new inference. New claims need a verified
+        // A known claim spends no new inference. New claims need a verified
         // age because both payload and claim markers expire after retention.
-        maxPaidAgeMs: redemptionState === "complete" ? void 0 : redemption.retentionMs
+        maxPaidAgeMs: redemptionState === "complete" || redemptionState === "pending" ? void 0 : redemption.retentionMs
       });
     } catch (e) {
       if (e.name === "TimeoutError") return { status: 503, body: { error: "relay_timeout", _bookingId: bookingId } };
@@ -5546,14 +5572,6 @@ function createServeCore({
     }
     if (paid?.reason === "payment_age_unavailable") return { status: 503, body: { error: "payment_age_unavailable", detail: "payment age could not be verified; retry this same paid draw", _bookingId: bookingId } };
     if (!paid?.ok) return { status: 402, body: { error: "payment_unverified", detail: paid?.reason || "unknown" } };
-    const expectedFee = configuredFeeAtomic({
-      sellerUsdAtomic: paid.event.sellerUsdAtomic,
-      feeAddress: currentFeeRecipient,
-      feeBps: currentFeeBps
-    });
-    if (BigInt(paid.event.feeUsdAtomic || 0) < expectedFee) {
-      return { status: 402, body: { error: "payment_unverified", detail: "fee_amount_too_low" } };
-    }
     if (screenPayer) {
       try {
         if (await screenPayer(String(paid.from || "").toLowerCase())) {
@@ -5563,10 +5581,25 @@ function createServeCore({
         return { status: 403, body: { error: "payer_denied", detail: "payer screening failed: " + e.message } };
       }
     }
-    if (redemptionState === "complete") return { status: 200, body: await redemption.get(storedKey) };
+    if (redemptionState === "complete") {
+      const payload2 = await redemption.get(storedKey, redemptionContext);
+      if (payload2 == null) return { status: 503, body: { error: "redemption_unavailable", detail: "saved completion is no longer readable; retry this same paid draw", _bookingId: bookingId } };
+      return { status: 200, body: payload2 };
+    }
     if (redemptionState === "pending") {
       return { status: 409, body: { error: "draw_pending", detail: "this paid draw was already claimed; refusing to run upstream again", _bookingId: bookingId } };
     }
+    let currentFeeBps;
+    try {
+      currentFeeBps = typeof feeBps === "function" ? await feeBps(paid) : feeBps ?? 0;
+      if (!Number.isSafeInteger(currentFeeBps) || currentFeeBps < 0 || currentFeeBps > 1e4) throw new TypeError("invalid fee rate");
+    } catch {
+      return { status: 503, body: { error: "fee_policy_unavailable", detail: "fee policy could not be verified; retry this same paid draw", _bookingId: bookingId } };
+    }
+    const expectedFee = configuredFeeAtomic({ sellerUsdAtomic: paid.event.sellerUsdAtomic, feeAddress: currentFeeRecipient, feeBps: currentFeeBps });
+    if (BigInt(paid.event.feeUsdAtomic || 0) < expectedFee) {
+      return { status: 402, body: { error: "payment_unverified", detail: "fee_amount_too_low" } };
+    }
     const paidEvent = paid.event;
     const remainingUsd = Number(paid.event.sellerUsdAtomic || 0) / 1e6;
     if (remainingUsd < BALANCE_EPSILON) {
@@ -5583,7 +5616,7 @@ function createServeCore({
     }
     const safeRequest = { ...checked.safeRequest, model, max_tokens: bound.maxTok };
     try {
-      if (!await redemption.claim(cacheKey, oldLegacyKey ?? cacheKey)) {
+      if (!await redemption.claim(cacheKey, oldLegacyKey ?? cacheKey, { paidAtMs: paid.paidAtMs })) {
         return { status: 409, body: { error: "draw_pending", detail: "this paid draw was already claimed; refusing to run upstream again", _bookingId: bookingId } };
       }
     } catch (e) {
@@ -5660,23 +5693,24 @@ async function createRelayRuntime(config) {
   const served = createRedemptionStore({ file: config.redemptionFile, log: config.log });
   const drawLocks = /* @__PURE__ */ new Map();
   const platform = await fetchPlatformConfig(config);
-  const bootFeeBps = platform.feeBps;
   const FEE_REFRESH_MS = 6e4;
   let lastConfigFetch = Date.now();
-  const refreshPlatformFee = async () => {
-    lastConfigFetch = Date.now();
-    try {
-      const fresh = await fetchPlatformConfig(config);
-      platform.feeBps = fresh.feeBps;
-      return true;
-    } catch (e) {
-      (config.log ?? console).error?.(`mtok relay: platform config refresh failed (${e.message}); keeping last-known fee rate`);
-      return false;
-    }
-  };
-  const refreshPlatformFeeIfStale = async () => {
-    if (Date.now() - lastConfigFetch < FEE_REFRESH_MS) return;
-    await refreshPlatformFee();
+  let refreshing;
+  const refreshPlatformFee = () => {
+    if (!refreshing) refreshing = (async () => {
+      try {
+        const fresh = await fetchPlatformConfig(config);
+        platform.feeSchedule = fresh.feeSchedule;
+        lastConfigFetch = Date.now();
+        return true;
+      } catch (e) {
+        (config.log ?? console).error?.(`mtok relay: platform config refresh failed (${e.message}); new claims require current policy`);
+        return false;
+      }
+    })().finally(() => {
+      refreshing = null;
+    });
+    return refreshing;
   };
   const verifier = createOnchainVerifier({ rpcUrls: rpcUrlsFor(platform.chainId, config.rpcFlag), usdcAddress: platform.usdcAddress, expectedChainId: platform.chainId });
   if (!verifier.configured) throw new Error("onchain verifier not configured (missing usdcAddress in /api/config)");
@@ -5701,11 +5735,11 @@ async function createRelayRuntime(config) {
     sellerAgentId: config.sellerAgentId,
     sellerWallet: config.settlementAddr,
     dripContractAddress: platform.dripContractAddress,
-    // #654: the fee floor is min(boot, current) so neither a fee increase nor a
-    // decrease can over-demand and strand an honest already-paid draw; the recipient
-    // stays pinned to the boot address (exact-match verify, see the note above).
     feeRecipient: platform.feeAddress,
-    feeBps: () => Math.min(bootFeeBps, platform.feeBps),
+    feeBps: async ({ paidAtMs }) => {
+      if (Date.now() - lastConfigFetch >= FEE_REFRESH_MS && !await refreshPlatformFee()) throw new Error("fee policy refresh failed");
+      return paymentFeeBpsAt(platform.feeSchedule, paidAtMs);
+    },
     // #654: per-relay output sanity ceiling (unset => the shared generous default).
     maxOutputTokens: config.maxOutputTokens,
     screenPayer: payerDenied
@@ -5734,10 +5768,9 @@ async function createRelayRuntime(config) {
     active++;
     try {
       return await withBookingLock(String(body?.bookingId ?? ""), async () => {
-        await refreshPlatformFeeIfStale();
         let out = await core.serve(body);
-        if (out.status === 402 && out.body?.detail === "fee_amount_too_low" && await refreshPlatformFee()) {
-          out = await core.serve(body);
+        if (out.status === 402 && out.body?.detail === "fee_amount_too_low") {
+          out = await refreshPlatformFee() ? await core.serve(body) : { status: 503, body: { error: "fee_policy_unavailable", _bookingId: body.bookingId } };
         }
         return send(res, out.status, out.body);
       });
@@ -5753,7 +5786,7 @@ async function fetchPlatformConfig(config) {
   const body = await r.json();
   return {
     feeAddress: body.feeAddress,
-    feeBps: body.feeBps,
+    feeSchedule: normalizeFeeSchedule(body.feeSchedule ?? [{ effectiveAtMs: 0, feeBps: body.feeBps ?? (body.feeAddress ? void 0 : 0) }]),
     dustThresholdUsd: Number(body.dustThresholdUsd) || 1e-3,
     chainId: Number(body.chainId ?? 8453),
     usdcAddress: body.usdcAddress,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mtok-relay",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Reference seller relay for mtok.market — accepts on-chain-prepaid chunk draws and serves inference from an upstream you control.",
   "type": "module",
   "bin": {