@dvmkit/sdk 0.5.0-rc.1 → 0.7.0-rc.1

package/dist/{chunk-TUA7PYH7.js → chunk-KMED3H3A.js}

@@ -8,7 +8,7 @@ import {
   verifyDrainReceipt,
   verifyFundingReceipt,
   verifyReceipt
-} from "./chunk-PAIM66YA.js";
+} from "./chunk-NFMOPYBA.js";
 import {
   AGENT_MNEMONIC_FILE,
   BUILDER_CONFIG_DIR,
@@ -16,7 +16,7 @@ import {
   BUILDER_KEY_FILE,
   WALLET_FILE,
   ensureConfigDir
-} from "./chunk-CZULM42S.js";
+} from "./chunk-CXCQLOOK.js";
 import {
   canonicaliseForSigning
 } from "./chunk-OFVV37XC.js";
@@ -25,7 +25,7 @@ import {
 } from "./chunk-66HGCPBU.js";
 import {
   DvmError
-} from "./chunk-LIRAHP7B.js";
+} from "./chunk-BPYMEMQX.js";
 import {
   diagnosticConsole
 } from "./chunk-ETXDTUJO.js";
@@ -40,6 +40,9 @@ function isX402SettlementReconciliationReason(value) {
   return value === "settlement_not_on_chain" || value === "chain_unreachable" || value === "settlement_unbookmarked" || value === "facilitator_channel_state_unavailable";
 }
 
+// src/lib/payment-rails/tempo-wire.ts
+var TEMPO_SESSION_UPDATED_REASON = "Tempo session updated; attach the next voucher to fund this credit.";
+
 // src/lib/mints.ts
 var RECOMMENDED_MINTS = [
   {
@@ -204,6 +207,9 @@ var DEFAULT_LOCK_RETRY_INTERVAL_MS = 1e3;
 var WALLET_VERSION = 9;
 var RECENT_SPENDS_CAP = 10;
 var DEFAULT_AGENT_MINT_URL = "https://mint.coinos.io";
+function loadWalletConfiguredMints() {
+  return loadAgentWallet()?.mints ?? [];
+}
 function loadAgentWallet() {
   if (!existsSync3(WALLET_FILE)) return null;
   const raw = readFileSync3(WALLET_FILE, "utf-8");
@@ -953,6 +959,112 @@ function generateEphemeralReceiptKey() {
   return { secret: bytesToHex(secretKey), pubkey: bytesToHex(publicKey) };
 }
 
+// src/lib/wallet-agent/keypair.ts
+import { secp256k1 as secp256k12 } from "@noble/curves/secp256k1.js";
+var PRIVKEY_HEX_RE = /^[0-9a-f]{64}$/i;
+function derivePubkeyFromPrivkey(privkey) {
+  if (!PRIVKEY_HEX_RE.test(privkey)) {
+    throw new DvmError(
+      "invalid_privkey",
+      "Privkey must be 64 hex characters (32 bytes).",
+      "Provide a valid secp256k1 private key as a 64-char hex string."
+    );
+  }
+  const bytes = hexToBytes2(privkey);
+  if (!secp256k12.utils.isValidSecretKey(bytes)) {
+    throw new DvmError(
+      "invalid_privkey",
+      "Privkey is not a valid secp256k1 scalar (zero or out of curve order).",
+      "Generate a fresh key with: dvm wallet init"
+    );
+  }
+  const pub = secp256k12.getPublicKey(bytes);
+  return bytesToHex2(pub);
+}
+function bytesToHex2(bytes) {
+  return Buffer.from(bytes).toString("hex");
+}
+function hexToBytes2(hex) {
+  return Uint8Array.from(Buffer.from(hex, "hex"));
+}
+
+// src/lib/wallet-agent/sign.ts
+import { schnorr as schnorr2 } from "@noble/curves/secp256k1.js";
+var PUBKEY_COMPRESSED_HEX_RE = /^0[23][0-9a-f]{64}$/i;
+var PUBKEY_XONLY_HEX_RE = /^[0-9a-f]{64}$/i;
+var SIG_HEX_RE = /^[0-9a-f]{128}$/i;
+function signChallenge(privkeyHex, challenge) {
+  if (!PRIVKEY_HEX_RE.test(privkeyHex)) {
+    throw new DvmError(
+      "invalid_privkey",
+      "Privkey must be 64 hex characters (32 bytes).",
+      "Provide a valid secp256k1 private key as a 64-char hex string."
+    );
+  }
+  if (challenge.length !== 32) {
+    throw new DvmError(
+      "invalid_challenge",
+      `Challenge must be exactly 32 bytes; got ${challenge.length}.`,
+      "Pass the SHA-256 digest output (32 bytes)."
+    );
+  }
+  const sig = schnorr2.sign(challenge, hexToBytes3(privkeyHex));
+  return bytesToHex3(sig);
+}
+function verifyChallenge(pubkeyHex, challenge, sigHex) {
+  if (!SIG_HEX_RE.test(sigHex)) return false;
+  if (challenge.length !== 32) return false;
+  let xonly;
+  if (PUBKEY_COMPRESSED_HEX_RE.test(pubkeyHex)) {
+    xonly = hexToBytes3(pubkeyHex.slice(2));
+  } else if (PUBKEY_XONLY_HEX_RE.test(pubkeyHex)) {
+    xonly = hexToBytes3(pubkeyHex);
+  } else {
+    return false;
+  }
+  try {
+    return schnorr2.verify(hexToBytes3(sigHex), challenge, xonly);
+  } catch {
+    return false;
+  }
+}
+function hexToBytes3(hex) {
+  return Uint8Array.from(Buffer.from(hex, "hex"));
+}
+function bytesToHex3(bytes) {
+  return Buffer.from(bytes).toString("hex");
+}
+
+// src/lib/cashu/admin-auth.ts
+import { randomBytes } from "crypto";
+import { sha256 as sha2562 } from "@noble/hashes/sha2.js";
+var ADMIN_AUTH_NONCE_TTL_SECONDS = 300;
+var ADMIN_AUTH_CLOCK_SKEW_SECONDS = 30;
+var ADMIN_STATE_UNAVAILABLE = "admin_state_unavailable";
+function buildAdminChallenge(args) {
+  const msg = `dvmkit-admin:${args.method}:${args.path}:${args.dvmId}:${args.nonceHex}:${args.unixSeconds}`;
+  return sha2562(new TextEncoder().encode(msg));
+}
+function buildAdminAuthHeader(args) {
+  const nowMs = args.now ? args.now() : Date.now();
+  const unixSeconds = Math.floor(nowMs / 1e3);
+  const nonceBytes = args.randomNonce ? args.randomNonce() : Uint8Array.from(randomBytes(16));
+  const nonceHex = Buffer.from(nonceBytes).toString("hex");
+  const challenge = buildAdminChallenge({
+    method: args.method,
+    path: args.path,
+    dvmId: args.dvmId,
+    nonceHex,
+    unixSeconds
+  });
+  const sigHex = signChallenge(args.privkeyHex, challenge);
+  return {
+    header: `P2PK ${nonceHex}.${unixSeconds}.${sigHex}`,
+    nonceHex,
+    unixSeconds
+  };
+}
+
 // src/lib/builder-identity.ts
 import {
   chmodSync as chmodSync3,
@@ -964,8 +1076,8 @@ import {
   unlinkSync as unlinkSync4,
   writeFileSync as writeFileSync5
 } from "fs";
-import { schnorr as schnorr2 } from "@noble/curves/secp256k1.js";
-import { sha256 as sha2562 } from "@noble/hashes/sha2.js";
+import { schnorr as schnorr3 } from "@noble/curves/secp256k1.js";
+import { sha256 as sha2563 } from "@noble/hashes/sha2.js";
 
 // src/lib/builder-store.ts
 import {
@@ -1070,8 +1182,8 @@ function migrateV1Store(parsed) {
 
 // src/lib/builder-identity.ts
 function generateIdentity() {
-  const { secretKey, publicKey } = schnorr2.keygen();
-  return { pubkey: bytesToHex2(publicKey), secret: bytesToHex2(secretKey) };
+  const { secretKey, publicKey } = schnorr3.keygen();
+  return { pubkey: bytesToHex4(publicKey), secret: bytesToHex4(secretKey) };
 }
 function loadIdentitySecret() {
   if (!existsSync5(BUILDER_KEY_FILE)) return null;
@@ -1114,7 +1226,7 @@ function writeIdentity(keypair, opts = {}) {
   setIdentityPubkey(keypair.pubkey);
 }
 function hashCapabilities(capabilities) {
-  return bytesToHex2(sha2562(canonicaliseForSigning(capabilities)));
+  return bytesToHex4(sha2563(canonicaliseForSigning(capabilities)));
 }
 function buildAttestation(args) {
   return {
@@ -1127,14 +1239,14 @@ function buildAttestation(args) {
   };
 }
 function signAttestation(payload, secretHex) {
-  const secretBytes = hexToBytes2(secretHex);
+  const secretBytes = hexToBytes4(secretHex);
   const canonicalBytes = canonicaliseForSigning(payload);
-  return bytesToHex2(schnorr2.sign(canonicalBytes, secretBytes));
+  return bytesToHex4(schnorr3.sign(canonicalBytes, secretBytes));
 }
 function verifyAttestation(payload, signatureHex, pubkeyHex) {
   try {
     const canonicalBytes = canonicaliseForSigning(payload);
-    return schnorr2.verify(hexToBytes2(signatureHex), canonicalBytes, hexToBytes2(pubkeyHex));
+    return schnorr3.verify(hexToBytes4(signatureHex), canonicalBytes, hexToBytes4(pubkeyHex));
   } catch {
     return false;
   }
@@ -1157,12 +1269,12 @@ function warnAndTightenLooseKeyMode() {
   } catch {
   }
 }
-function bytesToHex2(bytes) {
+function bytesToHex4(bytes) {
   let s = "";
   for (const b of bytes) s += b.toString(16).padStart(2, "0");
   return s;
 }
-function hexToBytes2(hex) {
+function hexToBytes4(hex) {
   if (hex.length % 2 !== 0) {
     throw new Error(`hex string has odd length: ${String(hex.length)}`);
   }
@@ -1462,112 +1574,6 @@ function parseTraceparent(header) {
   return { traceId, parentSpanId, flags: parseInt(flagsHex, 16) };
 }
 
-// src/lib/wallet-agent/keypair.ts
-import { secp256k1 as secp256k12 } from "@noble/curves/secp256k1.js";
-var PRIVKEY_HEX_RE = /^[0-9a-f]{64}$/i;
-function derivePubkeyFromPrivkey(privkey) {
-  if (!PRIVKEY_HEX_RE.test(privkey)) {
-    throw new DvmError(
-      "invalid_privkey",
-      "Privkey must be 64 hex characters (32 bytes).",
-      "Provide a valid secp256k1 private key as a 64-char hex string."
-    );
-  }
-  const bytes = hexToBytes3(privkey);
-  if (!secp256k12.utils.isValidSecretKey(bytes)) {
-    throw new DvmError(
-      "invalid_privkey",
-      "Privkey is not a valid secp256k1 scalar (zero or out of curve order).",
-      "Generate a fresh key with: dvm wallet init"
-    );
-  }
-  const pub = secp256k12.getPublicKey(bytes);
-  return bytesToHex3(pub);
-}
-function bytesToHex3(bytes) {
-  return Buffer.from(bytes).toString("hex");
-}
-function hexToBytes3(hex) {
-  return Uint8Array.from(Buffer.from(hex, "hex"));
-}
-
-// src/lib/wallet-agent/sign.ts
-import { schnorr as schnorr3 } from "@noble/curves/secp256k1.js";
-var PUBKEY_COMPRESSED_HEX_RE = /^0[23][0-9a-f]{64}$/i;
-var PUBKEY_XONLY_HEX_RE = /^[0-9a-f]{64}$/i;
-var SIG_HEX_RE = /^[0-9a-f]{128}$/i;
-function signChallenge(privkeyHex, challenge) {
-  if (!PRIVKEY_HEX_RE.test(privkeyHex)) {
-    throw new DvmError(
-      "invalid_privkey",
-      "Privkey must be 64 hex characters (32 bytes).",
-      "Provide a valid secp256k1 private key as a 64-char hex string."
-    );
-  }
-  if (challenge.length !== 32) {
-    throw new DvmError(
-      "invalid_challenge",
-      `Challenge must be exactly 32 bytes; got ${challenge.length}.`,
-      "Pass the SHA-256 digest output (32 bytes)."
-    );
-  }
-  const sig = schnorr3.sign(challenge, hexToBytes4(privkeyHex));
-  return bytesToHex4(sig);
-}
-function verifyChallenge(pubkeyHex, challenge, sigHex) {
-  if (!SIG_HEX_RE.test(sigHex)) return false;
-  if (challenge.length !== 32) return false;
-  let xonly;
-  if (PUBKEY_COMPRESSED_HEX_RE.test(pubkeyHex)) {
-    xonly = hexToBytes4(pubkeyHex.slice(2));
-  } else if (PUBKEY_XONLY_HEX_RE.test(pubkeyHex)) {
-    xonly = hexToBytes4(pubkeyHex);
-  } else {
-    return false;
-  }
-  try {
-    return schnorr3.verify(hexToBytes4(sigHex), challenge, xonly);
-  } catch {
-    return false;
-  }
-}
-function hexToBytes4(hex) {
-  return Uint8Array.from(Buffer.from(hex, "hex"));
-}
-function bytesToHex4(bytes) {
-  return Buffer.from(bytes).toString("hex");
-}
-
-// src/lib/cashu/admin-auth.ts
-import { randomBytes } from "crypto";
-import { sha256 as sha2563 } from "@noble/hashes/sha2.js";
-var ADMIN_AUTH_NONCE_TTL_SECONDS = 300;
-var ADMIN_AUTH_CLOCK_SKEW_SECONDS = 30;
-var ADMIN_STATE_UNAVAILABLE = "admin_state_unavailable";
-function buildAdminChallenge(args) {
-  const msg = `dvmkit-admin:${args.method}:${args.path}:${args.dvmId}:${args.nonceHex}:${args.unixSeconds}`;
-  return sha2563(new TextEncoder().encode(msg));
-}
-function buildAdminAuthHeader(args) {
-  const nowMs = args.now ? args.now() : Date.now();
-  const unixSeconds = Math.floor(nowMs / 1e3);
-  const nonceBytes = args.randomNonce ? args.randomNonce() : Uint8Array.from(randomBytes(16));
-  const nonceHex = Buffer.from(nonceBytes).toString("hex");
-  const challenge = buildAdminChallenge({
-    method: args.method,
-    path: args.path,
-    dvmId: args.dvmId,
-    nonceHex,
-    unixSeconds
-  });
-  const sigHex = signChallenge(args.privkeyHex, challenge);
-  return {
-    header: `P2PK ${nonceHex}.${unixSeconds}.${sigHex}`,
-    nonceHex,
-    unixSeconds
-  };
-}
-
 // src/lib/monotonic-clock.ts
 function createMonotonicClock() {
   let anchorWallMs = Date.now();
@@ -1620,9 +1626,6 @@ function normaliseMintUrl(url) {
   }
 }
 
-// src/lib/payment-rails/tempo-wire.ts
-var TEMPO_SESSION_UPDATED_REASON = "Tempo session updated; attach the next voucher to fund this credit.";
-
 export {
   toLockPubkey,
   isX402SettlementReconciliationReason,
@@ -1644,6 +1647,7 @@ export {
   WALLET_VERSION,
   RECENT_SPENDS_CAP,
   DEFAULT_AGENT_MINT_URL,
+  loadWalletConfiguredMints,
   loadAgentWallet,
   saveAgentWallet,
   walletExists,
@@ -1662,6 +1666,14 @@ export {
   receiptPubkeyFromSecret,
   deriveReceiptKeypair,
   generateEphemeralReceiptKey,
+  PRIVKEY_HEX_RE,
+  derivePubkeyFromPrivkey,
+  verifyChallenge,
+  ADMIN_AUTH_NONCE_TTL_SECONDS,
+  ADMIN_AUTH_CLOCK_SKEW_SECONDS,
+  ADMIN_STATE_UNAVAILABLE,
+  buildAdminChallenge,
+  buildAdminAuthHeader,
   generateIdentity,
   loadIdentitySecret,
   writeIdentity,
@@ -1685,13 +1697,5 @@ export {
   receiptFailureDetail,
   isPublicRequestId,
   parseTraceparent,
-  PRIVKEY_HEX_RE,
-  derivePubkeyFromPrivkey,
-  verifyChallenge,
-  ADMIN_AUTH_NONCE_TTL_SECONDS,
-  ADMIN_AUTH_CLOCK_SKEW_SECONDS,
-  ADMIN_STATE_UNAVAILABLE,
-  buildAdminChallenge,
-  buildAdminAuthHeader,
   createMonotonicClock
 };

package/dist/{chunk-Z4KLECAC.js → chunk-N5RZ5HVB.js}

@@ -4,7 +4,7 @@ import {
   signedRequestHeaderMatchesDomain,
   signedRequestStatementHeader,
   testOnlySignedRequestDomain
-} from "./chunk-A4YFWZ7R.js";
+} from "./chunk-RCM3P2HE.js";
 import {
   diagnosticConsole
 } from "./chunk-ETXDTUJO.js";

package/dist/{chunk-PAIM66YA.js → chunk-NFMOPYBA.js}

@@ -1,7 +1,7 @@
 import {
   BTC_RATE_FILE,
   ensureConfigSubdir
-} from "./chunk-CZULM42S.js";
+} from "./chunk-CXCQLOOK.js";
 import {
   canonicaliseForSigning
 } from "./chunk-OFVV37XC.js";
@@ -12,6 +12,47 @@ import {
 // src/lib/credit-implicit.ts
 var IMPLICIT_CREDIT_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
 
+// src/lib/payment-amounts.ts
+function msatsToUsd(msats, rate) {
+  return msats / 1e11 * rate;
+}
+function usdToMsats(usd, rate) {
+  return Math.round(usd / rate * 1e11);
+}
+function msatsToUsdCents(msats, btcPriceUsd) {
+  const usd = msatsToUsd(msats, btcPriceUsd);
+  return Math.round(usd * 100);
+}
+function msatsToUsdc(msats, btcUsdRate) {
+  if (!Number.isSafeInteger(msats) || msats < 0) {
+    throw new RangeError("msats must be a non-negative safe integer");
+  }
+  if (!Number.isFinite(btcUsdRate) || btcUsdRate <= 0) {
+    throw new RangeError("BTC/USD rate must be finite and positive");
+  }
+  const [mantissa, exponent = "0"] = btcUsdRate.toString().split("e");
+  const decimalPlaces = mantissa.split(".")[1]?.length ?? 0;
+  const shift = Number(exponent) - decimalPlaces;
+  let numerator = BigInt(msats) * BigInt(mantissa.replace(".", ""));
+  let denominator = 100000n;
+  if (shift > 0) numerator *= 10n ** BigInt(shift);
+  else if (shift < 0) denominator *= 10n ** BigInt(-shift);
+  const micro = (numerator + denominator - 1n) / denominator;
+  if (micro > BigInt(Number.MAX_SAFE_INTEGER)) {
+    throw new RangeError("USDC micro-unit amount exceeds the safe integer range");
+  }
+  return Number(micro);
+}
+function usdcToMsats(usdc, btcUsdRate) {
+  return usdToMsats(usdc, btcUsdRate);
+}
+function msatsToMicro(msats, btcRate) {
+  return Math.round(msatsToUsd(msats, btcRate) * 1e6);
+}
+function microToSats(micro, btcRate) {
+  return Math.ceil(usdToMsats(micro / 1e6, btcRate) / 1e3);
+}
+
 // src/lib/fx-coingecko.ts
 var COINGECKO_SIMPLE_PRICE_URL = "https://api.coingecko.com/api/v3/simple/price?ids=bitcoin,usd-coin&vs_currencies=usd";
 var COINGECKO_BTC_USD_URL = "https://api.coingecko.com/api/v3/simple/price?ids=bitcoin&vs_currencies=usd";
@@ -58,39 +99,6 @@ function isPositiveNumber(v) {
 // src/lib/currency.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { dirname } from "path";
-function msatsToUsd(msats, rate) {
-  return msats / 1e11 * rate;
-}
-function usdToMsats(usd, rate) {
-  return Math.round(usd / rate * 1e11);
-}
-function msatsToUsdCents(msats, btcPriceUsd) {
-  const usd = msatsToUsd(msats, btcPriceUsd);
-  return Math.round(usd * 100);
-}
-function msatsToUsdc(msats, btcUsdRate) {
-  if (!Number.isSafeInteger(msats) || msats < 0) {
-    throw new RangeError("msats must be a non-negative safe integer");
-  }
-  if (!Number.isFinite(btcUsdRate) || btcUsdRate <= 0) {
-    throw new RangeError("BTC/USD rate must be finite and positive");
-  }
-  const [mantissa, exponent = "0"] = btcUsdRate.toString().split("e");
-  const decimalPlaces = mantissa.split(".")[1]?.length ?? 0;
-  const shift = Number(exponent) - decimalPlaces;
-  let numerator = BigInt(msats) * BigInt(mantissa.replace(".", ""));
-  let denominator = 100000n;
-  if (shift > 0) numerator *= 10n ** BigInt(shift);
-  else if (shift < 0) denominator *= 10n ** BigInt(-shift);
-  const micro = (numerator + denominator - 1n) / denominator;
-  if (micro > BigInt(Number.MAX_SAFE_INTEGER)) {
-    throw new RangeError("USDC micro-unit amount exceeds the safe integer range");
-  }
-  return Number(micro);
-}
-function usdcToMsats(usdc, btcUsdRate) {
-  return usdToMsats(usdc, btcUsdRate);
-}
 function formatSats(msats) {
   if (msats === 0) return "0 sats";
   if (msats < 1e3) return `${msats.toLocaleString("en-US")} msats`;
@@ -313,14 +321,16 @@ function verifyDrainReceipt(receipt) {
 
 export {
   IMPLICIT_CREDIT_TTL_MS,
-  COINGECKO_SIMPLE_PRICE_URL,
-  fetchCoinGeckoSpot,
-  fetchCoinGeckoBtcUsd,
   msatsToUsd,
   usdToMsats,
   msatsToUsdCents,
   msatsToUsdc,
   usdcToMsats,
+  msatsToMicro,
+  microToSats,
+  COINGECKO_SIMPLE_PRICE_URL,
+  fetchCoinGeckoSpot,
+  fetchCoinGeckoBtcUsd,
   formatSats,
   formatAmount,
   formatPaymentAmount,

package/dist/{chunk-B2IROPQF.js → chunk-O2OTZ5GP.js}

@@ -1,14 +1,14 @@
 import {
   IMPLICIT_CREDIT_TTL_MS,
   isDrainReceipt
-} from "./chunk-PAIM66YA.js";
+} from "./chunk-NFMOPYBA.js";
 import {
   CREDITS_FILE,
   ensureConfigDir
-} from "./chunk-CZULM42S.js";
+} from "./chunk-CXCQLOOK.js";
 import {
   DvmError
-} from "./chunk-LIRAHP7B.js";
+} from "./chunk-BPYMEMQX.js";
 
 // src/lib/payment-rails/types.ts
 var RAIL_FLAGS = ["cashu", "tempo", "x402"];
@@ -1449,33 +1449,58 @@ function isObjectRecord(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function mergeDuplicateCredits(credits) {
-  const merged = [];
+  const groups = [];
   const byCredit = /* @__PURE__ */ new Map();
   let changed = false;
   for (const record of credits) {
     if (typeof record.creditId !== "string" || typeof record.callerPubkey !== "string") {
-      merged.push(record);
+      groups.push([record]);
       continue;
     }
     const key = `${record.callerPubkey}\0${record.creditId}`;
-    const index = byCredit.get(key);
-    if (index === void 0) {
-      byCredit.set(key, merged.length);
-      merged.push(record);
-      continue;
+    let group = byCredit.get(key);
+    if (group === void 0) {
+      group = [];
+      byCredit.set(key, group);
+      groups.push(group);
     }
-    merged[index] = mergeCreditRecords(merged[index], record);
-    changed = true;
+    let combined = record;
+    let index = group.findIndex((candidate) => compatibleCreditLocations(candidate, combined));
+    while (index !== -1) {
+      combined = mergeCreditRecords(group[index], combined);
+      group.splice(index, 1);
+      changed = true;
+      index = group.findIndex((candidate) => compatibleCreditLocations(candidate, combined));
+    }
+    group.push(combined);
   }
-  return { credits: merged, changed };
+  return { credits: groups.flat(), changed };
+}
+function compatibleCreditLocations(left, right) {
+  const leftIdentity = dvmLocationIdentity(left);
+  const rightIdentity = dvmLocationIdentity(right);
+  if (leftIdentity && rightIdentity) {
+    return matchesDvmIdentity(left, rightIdentity);
+  }
+  if (leftIdentity) {
+    return dvmLocationOrigins(left).some((origin) => matchesDvmOrigin(right, origin, leftIdentity));
+  }
+  if (rightIdentity) {
+    return dvmLocationOrigins(right).some((origin) => matchesDvmOrigin(left, origin, rightIdentity));
+  }
+  return dvmLocationOrigins(left).some((origin) => matchesDvmOrigin(right, origin, void 0));
 }
 function mergeCreditRecords(left, right) {
   const leftUpdated = Number.isFinite(left.updatedAt) ? left.updatedAt : 0;
   const rightUpdated = Number.isFinite(right.updatedAt) ? right.updatedAt : 0;
   const [newer, older] = rightUpdated >= leftUpdated ? [right, left] : [left, right];
   const record = { ...newer };
-  if (record.dvmId === void 0 && older.dvmId !== void 0) record.dvmId = older.dvmId;
-  if (record.attestedBuilderPubkey === void 0 && older.attestedBuilderPubkey !== void 0 && record.dvmId === older.dvmId) {
+  const identity = dvmLocationIdentity(newer) ?? dvmLocationIdentity(older);
+  if (identity) {
+    record.dvmId = identity.dvmId;
+    record.attestedBuilderPubkey = identity.builderPubkey;
+  } else if (record.dvmId === void 0 && record.attestedBuilderPubkey === void 0) {
+    record.dvmId = older.dvmId;
     record.attestedBuilderPubkey = older.attestedBuilderPubkey;
   }
   if (record.rail === void 0 && older.rail !== void 0) record.rail = older.rail;

package/dist/{chunk-FYRR2UEZ.js → chunk-OML32F6I.js}

@@ -15,7 +15,7 @@ import {
   lotOwedSats,
   netOwedSats,
   x402SettlementPending
-} from "./chunk-JH3SX3LY.js";
+} from "./chunk-6XF3RVVX.js";
 
 // src/sdk/server/memory-credit-ledger.ts
 import { randomUUID } from "crypto";

package/dist/{chunk-6DOGTAHA.js → chunk-QR2EF2NI.js}

@@ -10,39 +10,6 @@ import {
   projectSpanRow
 } from "./chunk-ETXDTUJO.js";
 
-// src/sdk/step-cache.ts
-var StepCache = class _StepCache {
-  cache = /* @__PURE__ */ new Map();
-  has(id) {
-    return this.cache.has(id);
-  }
-  get(id) {
-    return this.getRecord(id).value;
-  }
-  getRecord(id) {
-    const record = this.cache.get(id);
-    if (record === void 0) throw new Error(`StepCache: no cached result for step "${id}"`);
-    return record;
-  }
-  set(id, value, costs) {
-    this.cache.set(id, {
-      id,
-      value,
-      ...costs !== void 0 && costs.length > 0 ? { costs: costs.map(({ amount, currency }) => ({ amount, currency })) } : {}
-    });
-  }
-  serialize() {
-    return [...this.cache.values()];
-  }
-  static deserialize(records) {
-    const cache = new _StepCache();
-    for (const { id, value, costs } of records) {
-      cache.set(id, value, costs);
-    }
-    return cache;
-  }
-};
-
 // src/sdk/logger.ts
 function createConsoleLogger(_jobId) {
   return {
@@ -373,15 +340,15 @@ async function withSpan(opts, fn) {
 
 // src/observability/datasets.ts
 var SPANS_DATASETS = [
-  { name: "platform", retentionDays: 90 },
-  { name: "cashu", retentionDays: 90 },
-  { name: "lightning", retentionDays: 90 },
-  { name: "stripe", retentionDays: 90 },
-  { name: "x402", retentionDays: 90 },
-  { name: "tempo", retentionDays: 90 },
-  { name: "isolate", retentionDays: 90 },
-  { name: "audit", retentionDays: 365 },
-  { name: "cron", retentionDays: 30 }
+  { name: "platform", retentionDays: 730 },
+  { name: "cashu", retentionDays: 730 },
+  { name: "lightning", retentionDays: 730 },
+  { name: "stripe", retentionDays: 730 },
+  { name: "x402", retentionDays: 730 },
+  { name: "tempo", retentionDays: 730 },
+  { name: "isolate", retentionDays: 730 },
+  { name: "audit", retentionDays: 730 },
+  { name: "cron", retentionDays: 730 }
 ];
 var DATASET_NAMES = new Set(SPANS_DATASETS.map((d) => d.name));
 
@@ -485,7 +452,6 @@ function buildNoopLoggers() {
 }
 
 export {
-  StepCache,
   createConsoleLogger,
   createStdoutLogger,
   createNoopLogger,