@dvmkit/sdk 0.12.0 → 0.14.0

package/dist/{chunk-RPUFWIT4.js → chunk-5JSPTVIK.js}

@@ -1,11 +1,13 @@
 import {
   computeResultHash,
   isDrainReceipt,
+  isDrawFundingReceipt,
   isFundingReceipt,
   verifyDrainReceipt,
+  verifyDrawFundingReceipt,
   verifyFundingReceipt,
   verifyReceipt
-} from "./chunk-5H7P3ORL.js";
+} from "./chunk-5UC7TOQC.js";
 import {
   DvmError
 } from "./chunk-BPYMEMQX.js";
@@ -30,7 +32,7 @@ function isX402SettlementReconciliationReason(value) {
 }
 
 // src/lib/credit-implicit.ts
-var IMPLICIT_CREDIT_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
+var IMPLICIT_CREDIT_TTL_MS = 90 * 24 * 60 * 60 * 1e3;
 
 // src/lib/payment-rails/tempo-wire.ts
 var TEMPO_SESSION_UPDATED_REASON = "Tempo session updated; attach the next voucher to fund this credit.";
@@ -1699,6 +1701,53 @@ function verifyFundingReceiptChain(args) {
     receipt: named
   };
 }
+function verifyDrawFundingReceiptChain(args) {
+  const named = isDrawFundingReceipt(args.receipt) ? args.receipt : void 0;
+  const check = (actual, expected) => expected === void 0 ? "unchecked" : actual === expected ? "ok" : "mismatch";
+  const checks = {
+    credit_id: check(named?.credit_id, args.expectedCreditId),
+    job_id: check(named?.job_id, args.expectedJobId),
+    draw_id: check(named?.draw_id, args.expectedDrawId),
+    fund_id: check(named?.fund_id, args.expectedFundId),
+    currency: check(named?.currency, args.expectedCurrency),
+    funded_micro: check(named?.funded_micro, args.expectedFundedMicro),
+    ledger_seq: check(named?.ledger_seq, args.expectedLedgerSeq),
+    caller_pubkey: check(named?.caller_pubkey, args.expectedCallerPubkey),
+    signature: named !== void 0 && verifyDrawFundingReceipt(named),
+    attestation: "absent"
+  };
+  const mismatch = [
+    ["credit_id", "credit_id_mismatch"],
+    ["job_id", "job_id_mismatch"],
+    ["draw_id", "draw_id_mismatch"],
+    ["fund_id", "fund_id_mismatch"],
+    ["currency", "funding_currency_mismatch"],
+    ["funded_micro", "funding_amount_mismatch"],
+    ["ledger_seq", "funding_ledger_seq_mismatch"],
+    ["caller_pubkey", "caller_pubkey_mismatch"]
+  ];
+  for (const [field, reason] of mismatch) {
+    if (checks[field] === "mismatch") return { status: "invalid", checks, reason, receipt: named };
+  }
+  if (!named || !checks.signature) {
+    return { status: "invalid", checks, reason: "signature_invalid", receipt: named };
+  }
+  checks.attestation = checkReceiptAttestation(named, args.builder);
+  if (checks.attestation === "invalid") {
+    return { status: "invalid", checks, reason: "attestation_invalid", receipt: named };
+  }
+  if (checks.attestation === "identity_mismatch") {
+    return { status: "invalid", checks, reason: "dvm_identity_mismatch", receipt: named };
+  }
+  if (checks.attestation === "key_mismatch") {
+    return { status: "invalid", checks, reason: "receipt_key_mismatch", receipt: named };
+  }
+  return {
+    status: checks.attestation === "ok" ? "verified" : "verified_unattested",
+    checks,
+    receipt: named
+  };
+}
 function weakestReceiptVerdict(statuses) {
   if (statuses.length === 0) return "absent";
   if (statuses.includes("invalid")) return "invalid";
@@ -1862,6 +1911,7 @@ export {
   checkReceiptAttestation,
   verifyDrainReceiptChain,
   verifyFundingReceiptChain,
+  verifyDrawFundingReceiptChain,
   weakestReceiptVerdict,
   isPublicRequestId,
   parseTraceparent,

package/dist/{chunk-5H7P3ORL.js → chunk-5UC7TOQC.js}

@@ -63,6 +63,25 @@ function verifyFundingReceipt(receipt) {
     return false;
   }
 }
+function signDrawFundingReceipt(unsigned, secretHex) {
+  const bytes = canonicaliseForSigning(unsigned);
+  const signature = bytesToHex(schnorr.sign(bytes, hexToBytes(secretHex)));
+  return { ...unsigned, signature };
+}
+function isDrawFundingReceipt(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const r = value;
+  return r.v === 1 && r.kind === "credit_draw_funding" && typeof r.credit_id === "string" && typeof r.job_id === "string" && typeof r.draw_id === "string" && typeof r.fund_id === "string" && (r.payment_seq === void 0 || typeof r.payment_seq === "number") && typeof r.currency === "string" && typeof r.funded_micro === "number" && typeof r.balance_after_micro === "number" && typeof r.ledger_seq === "number" && typeof r.issued_at === "number" && typeof r.caller_pubkey === "string" && typeof r.dvm_id === "string" && typeof r.dvm === "string" && typeof r.receipt_pubkey === "string" && typeof r.signature === "string";
+}
+function verifyDrawFundingReceipt(receipt) {
+  try {
+    const { signature, ...unsigned } = receipt;
+    const bytes = canonicaliseForSigning(unsigned);
+    return schnorr.verify(hexToBytes(signature), bytes, hexToBytes(receipt.receipt_pubkey));
+  } catch {
+    return false;
+  }
+}
 function isDrainReceipt(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return false;
   const r = value;
@@ -87,6 +106,9 @@ export {
   signFundingReceipt,
   isFundingReceipt,
   verifyFundingReceipt,
+  signDrawFundingReceipt,
+  isDrawFundingReceipt,
+  verifyDrawFundingReceipt,
   isDrainReceipt,
   verifyDrainReceipt
 };

package/dist/{chunk-2VGMZ7VF.js → chunk-A2YESDQM.js}

@@ -7,7 +7,7 @@ import {
 import {
   isSignedJobReceipt,
   verifyReceipt
-} from "./chunk-5H7P3ORL.js";
+} from "./chunk-5UC7TOQC.js";
 import {
   applyRetryToPool
 } from "./chunk-EP7OVWI5.js";
@@ -1345,7 +1345,11 @@ var CreditLedger = class {
       "caller_pubkey TEXT",
       "balance_after_micro BIGINT",
       "ledger_seq BIGINT",
-      "receipt JSONB"
+      "receipt JSONB",
+      // Mid-job draw funding bindings; null on opening and `/v1/credit` fundings.
+      "job_id TEXT",
+      "draw_id TEXT",
+      "payment_seq BIGINT"
     ]) {
       await this.pool.query(`ALTER TABLE credit_fundings ADD COLUMN IF NOT EXISTS ${column}`);
     }
@@ -1546,8 +1550,8 @@ var CreditLedger = class {
     );
   }
   /**
-   * Funding adds balance and overwrites expiry, reviving an expired credit. It is additive,
-   * not idempotent: the caller’s rail marker or funding record must prevent replay. Owner and
+   * Funding adds balance and extends expiry without shortening it, reviving an expired credit.
+   * It is additive, not idempotent: the caller’s rail marker or funding record must prevent replay. Owner and
    * currency must match; rail and reusable-channel bindings cannot be mixed with other
    * instruments. A legacy NULL rail adopts its first typed top-up.
    *
@@ -1616,7 +1620,7 @@ var CreditLedger = class {
        ON CONFLICT (credit_id) DO UPDATE
          SET balance_micro    = credits.balance_micro + EXCLUDED.balance_micro,
              last_funding_ledger_seq = credits.last_ledger_seq,
-             expiry_ms        = EXCLUDED.expiry_ms,
+             expiry_ms        = GREATEST(credits.expiry_ms, EXCLUDED.expiry_ms),
              rail             = COALESCE(credits.rail, EXCLUDED.rail),
              native_asset     = COALESCE(EXCLUDED.native_asset, credits.native_asset),
              mint             = COALESCE(EXCLUDED.mint, credits.mint),
@@ -2467,11 +2471,21 @@ var CreditLedger = class {
     });
     const nowMs = args.nowMs ?? Date.now();
     const { rows } = await q.query(
-      `INSERT INTO credit_fundings (credit_id, fund_id, amount_micro, rail, created_at)
-       VALUES ($1, $2, $3, $4, $5)
+      `INSERT INTO credit_fundings
+         (credit_id, fund_id, amount_micro, rail, created_at, job_id, draw_id, payment_seq)
+       VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
        ON CONFLICT (credit_id, fund_id) DO NOTHING
        RETURNING *`,
-      [args.creditId, args.fundId, args.amountMicro, args.rail ?? null, nowMs]
+      [
+        args.creditId,
+        args.fundId,
+        args.amountMicro,
+        args.rail ?? null,
+        nowMs,
+        args.jobId ?? null,
+        args.drawId ?? null,
+        args.paymentSeq ?? null
+      ]
     );
     if (rows.length === 0) {
       throw new CreditLedgerError(
@@ -2494,6 +2508,19 @@ var CreditLedger = class {
     );
     return rows.length > 0 ? fundingRecordFromRow(rows[0]) : void 0;
   }
+  /**
+   * Every funding accepted against one job's draw, oldest first. The order is
+   * stable across reads so a job read lists the same evidence each time.
+   */
+  async listDrawFundings(args) {
+    const { rows } = await this.pool.query(
+      `SELECT * FROM credit_fundings
+        WHERE credit_id = $1 AND draw_id = $2
+        ORDER BY created_at ASC, fund_id ASC`,
+      [args.creditId, args.drawId]
+    );
+    return rows.map(fundingRecordFromRow);
+  }
   /** Fix the funding-time receipt tuple inside the rail's open transaction. */
   async completeFunding(args) {
     const q = args.tx ?? this.pool;
@@ -2693,7 +2720,10 @@ var CreditLedger = class {
         [args.creditId, args.fundId, settledAt]
       );
       if (args.depositOutbox) {
-        await args.depositOutbox.enqueue(client, args.depositOutbox.payload);
+        await args.depositOutbox.enqueue(client, {
+          ...args.depositOutbox.payload,
+          expiryMs: credit.expiryMs
+        });
       }
       await client.query("COMMIT");
       return {
@@ -2864,7 +2894,10 @@ var CreditLedger = class {
         ]
       );
       if (args.depositOutbox) {
-        await args.depositOutbox.enqueue(client, args.depositOutbox.payload);
+        await args.depositOutbox.enqueue(client, {
+          ...args.depositOutbox.payload,
+          expiryMs: credit.expiryMs
+        });
       }
       await client.query("COMMIT");
       return {
@@ -4330,7 +4363,10 @@ function fundingRecordFromRow(row) {
     callerPubkey: row.caller_pubkey,
     balanceAfterMicro: row.balance_after_micro === null ? null : toSafeInt(row.balance_after_micro),
     ledgerSeq: row.ledger_seq === null ? null : toSafeInt(row.ledger_seq),
-    receipt: row.receipt
+    receipt: row.receipt,
+    jobId: row.job_id ?? null,
+    drawId: row.draw_id ?? null,
+    paymentSeq: row.payment_seq === null || row.payment_seq === void 0 ? null : toSafeInt(row.payment_seq)
   };
 }
 function invoiceRecordFromRow(row) {

package/dist/{chunk-WFCVS6QB.js → chunk-HULU2UVM.js}

@@ -4,7 +4,7 @@ import {
   signedRequestHeaderMatchesDomain,
   signedRequestStatementHeader,
   testOnlySignedRequestDomain
-} from "./chunk-HW2UCOOC.js";
+} from "./chunk-SXL44PL5.js";
 import {
   diagnosticConsole
 } from "./chunk-Z4FOPROB.js";