@dvmkit/sdk 0.1.5-rc.8 → 0.1.5-rc.9

package/dist/{chunk-UB5FZ43T.js → chunk-5PBOA25N.js}

@@ -3049,6 +3049,26 @@ function msatsToMethodAmount(msats, methodName, btcUsd) {
   const usd = msatsToUsd(msats, btcUsd);
   return usd.toFixed(decimalsFor(methodName));
 }
+function fiatMicroToMethodAmount(amountMicro, methodName) {
+  if (!Number.isSafeInteger(amountMicro) || amountMicro < 0) {
+    throw new Error("mpp-units: fiat amount must be a non-negative safe integer");
+  }
+  const decimals = decimalsFor(methodName);
+  const microDecimals = 6;
+  let atomic = BigInt(amountMicro);
+  if (decimals < microDecimals) {
+    const divisor = 10n ** BigInt(microDecimals - decimals);
+    if (atomic % divisor !== 0n) {
+      throw new Error(
+        `mpp-units: fiat microunits cannot be represented exactly with ${decimals} decimals`
+      );
+    }
+    atomic /= divisor;
+  } else if (decimals > microDecimals) {
+    atomic *= 10n ** BigInt(decimals - microDecimals);
+  }
+  return methodNativeAmountToDecimal(atomic, methodName);
+}
 function methodNativeAsset(methodName) {
   switch (methodName) {
     case "tempo":
@@ -3287,7 +3307,7 @@ var PAYMENT_PROOF_KEYS = ["cashu_token", "x402_payment", "tempo_credential"];
 function hasPaymentProof(content) {
   return PAYMENT_PROOF_KEYS.some((key) => Boolean(content[key]));
 }
-async function issueUpfrontChallenges(mpp, requiredMsats, resourcePath, btcUsdRate, sessionIssuable = true, allowOneShotStablecoin = false) {
+async function issueUpfrontChallenges(mpp, requiredMsats, resourcePath, btcUsdRate, sessionIssuable = true, allowOneShotStablecoin = false, priceFiat) {
   return loggers.tempo.span(
     "tempo.issue_challenges",
     {
@@ -3305,7 +3325,7 @@ async function issueUpfrontChallenges(mpp, requiredMsats, resourcePath, btcUsdRa
         if (creditSurface && meta.intent === "charge" && !stablecoinCreditInstrumentAllowed(allowOneShotStablecoin, "tempo_charge")) {
           continue;
         }
-        const amount = msatsToMethodAmount(requiredMsats, meta.name, btcUsdRate);
+        const amount = priceFiat?.currency === "usd" ? fiatMicroToMethodAmount(priceFiat.amountMicro, meta.name) : msatsToMethodAmount(requiredMsats, meta.name, btcUsdRate);
         const ch = await mpp.issueChallenge(meta.name, meta.intent, {
           amount,
           ...meta.intent === "session" && { suggestedDeposit: amount, unitType: "request" },
@@ -3783,13 +3803,14 @@ async function verifyUpfrontPayment(opts) {
                 resourcePath ?? "/v1/job",
                 rate,
                 sessionIssuable,
-                opts.fundOnly?.allowOneShotStablecoin
+                opts.fundOnly?.allowOneShotStablecoin,
+                opts.priceFiat
               )
             }
           };
         }
       }
-      const expectedAmount = msatsToMethodAmount(requiredMsats, cred.challenge.method, rate);
+      const expectedAmount = opts.priceFiat?.currency === "usd" ? fiatMicroToMethodAmount(opts.priceFiat.amountMicro, cred.challenge.method) : msatsToMethodAmount(requiredMsats, cred.challenge.method, rate);
       const sessionBasis = mppSessionBasis(cred);
       let tempoReceipt;
       const broadcast = async () => {
@@ -3862,7 +3883,8 @@ async function verifyUpfrontPayment(opts) {
           resourcePath ?? "/v1/job",
           rate,
           sessionIssuable,
-          opts.fundOnly?.allowOneShotStablecoin
+          opts.fundOnly?.allowOneShotStablecoin,
+          opts.priceFiat
         );
         return {
           paidMsats: 0,
@@ -3886,7 +3908,8 @@ async function verifyUpfrontPayment(opts) {
             resourcePath ?? "/v1/job",
             rate,
             sessionIssuable,
-            opts.fundOnly?.allowOneShotStablecoin
+            opts.fundOnly?.allowOneShotStablecoin,
+            opts.priceFiat
           );
           return {
             paidMsats: 0,
@@ -3952,7 +3975,8 @@ async function verifyUpfrontPayment(opts) {
         resourcePath ?? "/v1/job",
         rate,
         sessionIssuable,
-        opts.fundOnly?.allowOneShotStablecoin
+        opts.fundOnly?.allowOneShotStablecoin,
+        opts.priceFiat
       );
       return {
         paidMsats: 0,
@@ -4015,7 +4039,8 @@ async function verifyUpfrontPayment(opts) {
       resourcePath ?? "/v1/job",
       rate,
       sessionIssuable,
-      opts.fundOnly?.allowOneShotStablecoin
+      opts.fundOnly?.allowOneShotStablecoin,
+      opts.priceFiat
     ) : void 0;
     return {
       paidMsats: 0,
@@ -4696,7 +4721,10 @@ async function verifyIncomingPayment(body, opts, snapshot) {
           }
         };
       }
-      const expectedAmount = msatsToMethodAmount(expectedMsats, credential.challenge.method, rate);
+      const expectedAmount = snapshot.pendingPaymentFiatCurrency === "usd" && snapshot.pendingPaymentFiatMicro !== void 0 ? fiatMicroToMethodAmount(
+        snapshot.pendingPaymentFiatMicro,
+        credential.challenge.method
+      ) : msatsToMethodAmount(expectedMsats, credential.challenge.method, rate);
       const expectedMeta = challengeMeta(credential.challenge);
       const creditNative = methodNativeAmountFromDecimal(
         expectedAmount,
@@ -5041,7 +5069,7 @@ async function processIncomingPayment(job, body, opts) {
           status: 402
         };
       }
-      const expectedAmount = msatsToMethodAmount(expectedMsats, credential.challenge.method, rate);
+      const expectedAmount = job.pendingPaymentFiatCurrency === "usd" && job.pendingPaymentFiatMicro !== void 0 ? fiatMicroToMethodAmount(job.pendingPaymentFiatMicro, credential.challenge.method) : msatsToMethodAmount(expectedMsats, credential.challenge.method, rate);
       const expectedMeta = challengeMeta(credential.challenge);
       await loggers.tempo.span(
         "tempo.verify_credential",
@@ -9494,7 +9522,7 @@ function buildContext(job, opts) {
         for (const m of opts.mpp.methods) {
           const meta = m;
           if (meta.intent === "session") continue;
-          const amount2 = msatsToMethodAmount(amountMsats, meta.name, rate);
+          const amount2 = pendingFiat?.currency === "usd" ? fiatMicroToMethodAmount(pendingFiat.amountMicro, meta.name) : msatsToMethodAmount(amountMsats, meta.name, rate);
           const ch = await opts.mpp.issueChallenge(meta.name, meta.intent, {
             amount: amount2,
             description: reason

package/dist/{credit-menu-s5HmGCqx.d.ts → credit-menu-enwMbn55.d.ts}

@@ -2174,7 +2174,7 @@ declare function hasPaymentProof(content: Record<string, unknown>): boolean;
  * suppresses it unless the builder accepts the manual-refund obligation; job
  * surfaces always keep charge.
  */
-declare function issueUpfrontChallenges(mpp: MppxServer, requiredMsats: number, resourcePath: string, btcUsdRate: number, sessionIssuable?: boolean, allowOneShotStablecoin?: unknown): Promise<Challenge.Challenge[]>;
+declare function issueUpfrontChallenges(mpp: MppxServer, requiredMsats: number, resourcePath: string, btcUsdRate: number, sessionIssuable?: boolean, allowOneShotStablecoin?: unknown, priceFiat?: PriceFiat): Promise<Challenge.Challenge[]>;
 /** Verify an upfront payment on job submission (Cashu, x402, or MPP). */
 declare function verifyUpfrontPayment(opts: UpfrontPaymentOpts): Promise<PaymentResult>;
 /**

package/dist/internal/server.d.ts

@@ -6,8 +6,8 @@ import { Env, BlankSchema } from 'hono/types';
 import { Pool } from 'pg';
 export { Pool } from 'pg';
 import { g as getWallet } from '../wallet-CJC8lwxx.js';
-import { A as AccumulatorPool, a as AccumulatorQuerier, C as ConsumedCredentialStore } from '../credit-menu-s5HmGCqx.js';
-export { b as AppEnv, c as CreditFundingReport, F as FiatDenomination, d as FiatDenominationFailure, e as FundOnlyRequest, I as IncomingPaymentOpts, J as JobCancelledError, M as MintHealthTracker, P as PAYMENT_PROOF_KEYS, f as PaymentErrorCode, g as PaymentErrorDetail, h as PaymentInfo, R as ReporterBannerOpts, i as ResolvedFx, j as RevenueBootCheckOpts, S as SDKServerOpts, k as ServerJob, l as ShortPayForfeit, T as TempoChannelReport, m as TempoObserverHealth, n as TempoSessionChannelMismatchError, U as UpfrontPaymentOpts, V as VerifiedIncomingPayment, o as VerifyIncomingSnapshot, X as X402BatchChannelObservation, p as X402FacilitatorHealth, q as X402SettlementEvidenceOutcome, r as X402SettlementRepair, s as X402SettlementRepairRefusal, t as X402SettlementRepaired, u as X402WedgedSettlement, v as X402WedgedSettlementPage, w as X402_BATCH_SETTLEMENT_MAINNET_NETWORK, x as abortJob, y as applyPaymentInfoToJob, z as assertRevenueReporterReady, B as buildPaymentErrorResponse, D as clearAccumulatorForDvm, E as createDVMServer, G as creditDepositPayload, H as derivedFundCreditId, K as devModeSkipsPaymentVerification, L as fromJobRecord, N as fundedMicroFor, O as hasPaymentProof, Q as hashLockKey, W as implicitCreditId, Y as initWalletAccumulatorTable, Z as insertAccumulatorRows, _ as isDerivedCreditId, $ as isTerminal, a0 as isYieldMessage, a1 as issueUpfrontChallenges, a2 as msatsToFiatMicro, a3 as paymentErrorBody, a4 as pinAskFiat, a5 as priceFiatMicro, a6 as processIncomingPayment, a7 as providerMessage, a8 as repairX402ExactSettlementEffect, a9 as resolveFxSnapshot, aa as resolvePriceFiat, ab as revenueReporterBannerState, ac as toCreditTerms, ad as toJobRecord, ae as unknownRouteNotFound, af as verifyIncomingPayment, ag as verifyTempoSessionManagementCredential, ah as verifyUpfrontPayment, ai as x402RequiredUsdcMicro, aj as x402SettledShare } from '../credit-menu-s5HmGCqx.js';
+import { A as AccumulatorPool, a as AccumulatorQuerier, C as ConsumedCredentialStore } from '../credit-menu-enwMbn55.js';
+export { b as AppEnv, c as CreditFundingReport, F as FiatDenomination, d as FiatDenominationFailure, e as FundOnlyRequest, I as IncomingPaymentOpts, J as JobCancelledError, M as MintHealthTracker, P as PAYMENT_PROOF_KEYS, f as PaymentErrorCode, g as PaymentErrorDetail, h as PaymentInfo, R as ReporterBannerOpts, i as ResolvedFx, j as RevenueBootCheckOpts, S as SDKServerOpts, k as ServerJob, l as ShortPayForfeit, T as TempoChannelReport, m as TempoObserverHealth, n as TempoSessionChannelMismatchError, U as UpfrontPaymentOpts, V as VerifiedIncomingPayment, o as VerifyIncomingSnapshot, X as X402BatchChannelObservation, p as X402FacilitatorHealth, q as X402SettlementEvidenceOutcome, r as X402SettlementRepair, s as X402SettlementRepairRefusal, t as X402SettlementRepaired, u as X402WedgedSettlement, v as X402WedgedSettlementPage, w as X402_BATCH_SETTLEMENT_MAINNET_NETWORK, x as abortJob, y as applyPaymentInfoToJob, z as assertRevenueReporterReady, B as buildPaymentErrorResponse, D as clearAccumulatorForDvm, E as createDVMServer, G as creditDepositPayload, H as derivedFundCreditId, K as devModeSkipsPaymentVerification, L as fromJobRecord, N as fundedMicroFor, O as hasPaymentProof, Q as hashLockKey, W as implicitCreditId, Y as initWalletAccumulatorTable, Z as insertAccumulatorRows, _ as isDerivedCreditId, $ as isTerminal, a0 as isYieldMessage, a1 as issueUpfrontChallenges, a2 as msatsToFiatMicro, a3 as paymentErrorBody, a4 as pinAskFiat, a5 as priceFiatMicro, a6 as processIncomingPayment, a7 as providerMessage, a8 as repairX402ExactSettlementEffect, a9 as resolveFxSnapshot, aa as resolvePriceFiat, ab as revenueReporterBannerState, ac as toCreditTerms, ad as toJobRecord, ae as unknownRouteNotFound, af as verifyIncomingPayment, ag as verifyTempoSessionManagementCredential, ah as verifyUpfrontPayment, ai as x402RequiredUsdcMicro, aj as x402SettledShare } from '../credit-menu-enwMbn55.js';
 import { g as LockPubkey } from '../lightning-backend-BozcevPZ.js';
 export { t as lockPubkeyStoreToLockPubkey } from '../lightning-backend-BozcevPZ.js';
 export { O as OutgoingMessage, S as StaleJobReapable, i as isStaleJobReapable } from '../job-store-BUGqvCfL.js';

package/dist/internal/server.js

@@ -65,7 +65,7 @@ import {
   verifyUpfrontPayment,
   x402RequiredUsdcMicro,
   x402SettledShare
-} from "../chunk-UB5FZ43T.js";
+} from "../chunk-5PBOA25N.js";
 import "../chunk-DMNLFNTW.js";
 import {
   settleWithFacilitator,

package/dist/server/index.d.ts

@@ -1,8 +1,8 @@
 import { ab as CashuMode, bK as CreditDrainEnqueue, R as ResolvedCreditConfig, bL as DVMAuthScheme, z as SignedRequestDomain, bM as CreditLedgerLike, bN as X402RefundSettlementGate, bO as CreditSnapshot, bP as DrawResult, bQ as X402SettlementStatus, bR as X402UnresolvedRefund, bS as GrownDrawResult, bT as DrawResolution, bU as FundingRecord, X as FundingReceipt, bV as CreditInvoiceRecord, bW as InvoiceSettlement, bX as BlockedInvoiceCursor, bY as InvoiceReconciliation, bZ as InvoiceWriteOff, b_ as DrawRecord, b$ as StalePendingDrawCursor, c0 as TempoCreditLossEvidence, c1 as CreditLedgerQuerier, c2 as TempoCreditLoss, c3 as X402CreditLossEvidence, c4 as X402CreditLoss, c5 as DrainMethod, c6 as DrainRequestResult, c7 as BitcoinDepositLiability, bo as FundingLot, c8 as CreditDrainRecord, c9 as ChannelDrainCursor, ca as DrainWriteOff, cb as DrainReleaseResult, cc as DrainFulfilment, cd as DrainTransitionResult, Y as JobReceipt, a1 as Message, K as KVStore, F as SignedRequestReplayStore, Z as ZodLike, a as DVMDescriptor } from '../step-cache-5dljDqrQ.js';
 export { ce as CLIENT_COMPATIBILITY_HEADERS, d as CanonicalEnvelope, cf as ClientCompatibility, cg as ClientCompatibilityEnv, ch as ClientCompatibilityGate, ci as ClientCompatibilityRequirement, cj as ClientSemVer, e as CreateSignedRequestVerifierOpts, ck as CreditFundingBasis, cl as CreditInvoiceStatus, cm as CreditLedger, cn as CreditLedgerError, co as CreditLedgerErrorCode, cp as CreditLedgerErrorDetails, cq as CreditLedgerPool, cr as CreditStatus, cs as DRAIN_DELIVERY_RESERVE_SATS, ct as DVM_PROTOCOL_VERSION, cu as DrainConflictReason, cv as DrawRailValue, cw as DrawStatus, cx as JobCostReportPayload, cy as PostgresX402ChannelStorage, cz as ReplayStoreBackend, cA as RevenueSkippedNoRailPayload, cB as RevenueSkippedNoRailReason, w as SIGNED_REQUEST_AUTH_ID, x as SIGNED_REQUEST_STATEMENT_VERSION, cC as Secp256k1AuthOpts, y as SignedRequestAudience, B as SignedRequestError, E as SignedRequestFailure, G as SignedRequestSignOpts, H as SignedRequestStatementHeader, M as SignedRequestVerifier, cD as X402ChannelStorageOpts, cE as X402RelayLockHolder, cF as X402RelaySubmissionLock, cG as X402RelaySubmissionLockError, cH as allocateDrawValue, cI as clientCompatibilityAttributes, cJ as clientCompatibilityMiddleware, cK as clientUpgradeRequired, N as createSignedRequestVerifier, cL as parseClientCapabilities, cM as parseClientCompatibility, cN as parseDvmClient, cO as parseProtocolVersion, cP as requireClientCompatibility, cQ as secp256k1Auth, cR as signedRequestInput, T as signedRequestStatementHeader } from '../step-cache-5dljDqrQ.js';
 import { Pool } from 'pg';
-import { ak as CreditMenu, b as AppEnv, U as UpfrontPaymentOpts, h as PaymentInfo, al as ReceiptIssuer, am as LightningReceive, an as TempoSettlementReadiness, ao as DVMHostOpts, ap as DVMServeResult } from '../credit-menu-s5HmGCqx.js';
-export { aq as BuildCreditMenuArgs, ar as BuilderIdentity, as as CREDIT_ENVELOPE_KEYS, C as ConsumedCredentialStore, at as CreateX402BatchSettlementServerOpts, au as CreditEnvelope, av as CreditEnvelopeError, aw as CreditFundCommitment, ax as CreditTerms, ay as DEFAULT_INVOICE_TTL_SECONDS, az as DVMHost, aA as JobManager, aB as JobManagerOpts, aC as LightningReceiveConfig, aD as MIN_INVOICE_TTL_SECONDS, aE as MemoryConsumedCredentialStore, aF as MemoryConsumedCredentialStoreOpts, aG as MemoryProcessedPaymentStore, aH as MemoryX402ExactSettlementStore, aI as MountOpts, aJ as OwnerDisplay, aK as PaidJobCompletion, aL as PaymentMode, aM as PlatformReporterOpts, aN as PostgresProcessedPaymentStore, aO as PostgresX402ExactSettlementStore, aP as PriceFiat, aQ as ProcessedPaymentQuerier, aR as ProcessedPaymentRail, aS as ProcessedPaymentRecord, aT as ProcessedPaymentReplayError, aU as ProcessedPaymentStore, aV as X402BatchAcceptance, aW as X402BatchFunding, aX as X402BatchRefusal, aY as X402BatchSettlementServer, aZ as X402ExactAcceptance, a_ as X402ExactIntentConflictError, a$ as X402ExactSettlementAttempt, b0 as X402ExactSettlementChainEvidence, b1 as X402ExactSettlementEffect, b2 as X402ExactSettlementEvidenceMissingError, b3 as X402ExactSettlementEvidenceReader, b4 as X402ExactSettlementIntent, b5 as X402ExactSettlementNotReadyError, b6 as X402ExactSettlementServer, b7 as X402ExactSettlementServerOpts, b8 as X402ExactSettlementStatus, b9 as X402ExactSettlementStore, ba as X402SettlementChainEvidence, bb as X402SettlementEvidenceReader, bc as X402SettlementSubmissionError, bd as X402_BATCH_AUTO_SETTLEMENT, be as X402_BATCH_MIN_WITHDRAW_DELAY_SECONDS, bf as X402_BATCH_SETTLEMENT_NETWORK, bg as attachCreditMenu, bh as buildCreditMenu, bi as createDVMHost, bj as createX402BatchSettlementServer, bk as creditEnvelopeIgnoreFields, bl as drawSettlementRef, bm as extractCreditEnvelope, bn as fundingCommitment, bo as selectPrimaryCredit, bp as stripCreditEnvelope, bq as toCreditView } from '../credit-menu-s5HmGCqx.js';
+import { ak as CreditMenu, b as AppEnv, U as UpfrontPaymentOpts, h as PaymentInfo, al as ReceiptIssuer, am as LightningReceive, an as TempoSettlementReadiness, ao as DVMHostOpts, ap as DVMServeResult } from '../credit-menu-enwMbn55.js';
+export { aq as BuildCreditMenuArgs, ar as BuilderIdentity, as as CREDIT_ENVELOPE_KEYS, C as ConsumedCredentialStore, at as CreateX402BatchSettlementServerOpts, au as CreditEnvelope, av as CreditEnvelopeError, aw as CreditFundCommitment, ax as CreditTerms, ay as DEFAULT_INVOICE_TTL_SECONDS, az as DVMHost, aA as JobManager, aB as JobManagerOpts, aC as LightningReceiveConfig, aD as MIN_INVOICE_TTL_SECONDS, aE as MemoryConsumedCredentialStore, aF as MemoryConsumedCredentialStoreOpts, aG as MemoryProcessedPaymentStore, aH as MemoryX402ExactSettlementStore, aI as MountOpts, aJ as OwnerDisplay, aK as PaidJobCompletion, aL as PaymentMode, aM as PlatformReporterOpts, aN as PostgresProcessedPaymentStore, aO as PostgresX402ExactSettlementStore, aP as PriceFiat, aQ as ProcessedPaymentQuerier, aR as ProcessedPaymentRail, aS as ProcessedPaymentRecord, aT as ProcessedPaymentReplayError, aU as ProcessedPaymentStore, aV as X402BatchAcceptance, aW as X402BatchFunding, aX as X402BatchRefusal, aY as X402BatchSettlementServer, aZ as X402ExactAcceptance, a_ as X402ExactIntentConflictError, a$ as X402ExactSettlementAttempt, b0 as X402ExactSettlementChainEvidence, b1 as X402ExactSettlementEffect, b2 as X402ExactSettlementEvidenceMissingError, b3 as X402ExactSettlementEvidenceReader, b4 as X402ExactSettlementIntent, b5 as X402ExactSettlementNotReadyError, b6 as X402ExactSettlementServer, b7 as X402ExactSettlementServerOpts, b8 as X402ExactSettlementStatus, b9 as X402ExactSettlementStore, ba as X402SettlementChainEvidence, bb as X402SettlementEvidenceReader, bc as X402SettlementSubmissionError, bd as X402_BATCH_AUTO_SETTLEMENT, be as X402_BATCH_MIN_WITHDRAW_DELAY_SECONDS, bf as X402_BATCH_SETTLEMENT_NETWORK, bg as attachCreditMenu, bh as buildCreditMenu, bi as createDVMHost, bj as createX402BatchSettlementServer, bk as creditEnvelopeIgnoreFields, bl as drawSettlementRef, bm as extractCreditEnvelope, bn as fundingCommitment, bo as selectPrimaryCredit, bp as stripCreditEnvelope, bq as toCreditView } from '../credit-menu-enwMbn55.js';
 import { Context } from 'hono';
 import { z } from 'zod';
 import { F as FxFetcher } from '../fx-D860pZvP.js';

package/dist/server/index.js

@@ -78,7 +78,7 @@ import {
   stripProtocolEnvelope,
   toCreditView,
   unknownRouteNotFound
-} from "../chunk-UB5FZ43T.js";
+} from "../chunk-5PBOA25N.js";
 import {
   MemoryProcessedPaymentStore,
   PostgresProcessedPaymentStore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvmkit/sdk",
-  "version": "0.1.5-rc.8",
+  "version": "0.1.5-rc.9",
   "description": "SDK for building accountless, pay-per-use Digital Vending Machines",
   "license": "Apache-2.0",
   "repository": {