mppx 0.5.12 → 0.5.14

package/src/tempo/server/Session.ts

@@ -37,6 +37,7 @@ import * as Store from '../../Store.js'
 import * as Client from '../../viem/Client.js'
 import * as Account from '../internal/account.js'
 import * as defaults from '../internal/defaults.js'
+import * as FeePayer from '../internal/fee-payer.js'
 import type * as types from '../internal/types.js'
 import * as Methods from '../Methods.js'
 import {
@@ -92,6 +93,7 @@ export function session<const parameters extends session.Parameters>(
     channelStateTtl = 5_000,
     currency = defaults.resolveCurrency(parameters),
     decimals = defaults.decimals,
+    feePayerPolicy,
     store: rawStore = Store.memory(),
     suggestedDeposit,
     unitType,
@@ -203,9 +205,10 @@ export function session<const parameters extends session.Parameters>(
             payload,
             methodDetails,
             resolvedFeePayer,
+            feePayerPolicy,
             waitForConfirmation,
           )
-          lastOnChainVerified.set(payload.channelId, Date.now())
+          lastOnChainVerified.set(sessionReceipt.channelId, Date.now())
           break
 
         case 'topUp':
@@ -216,8 +219,9 @@ export function session<const parameters extends session.Parameters>(
             payload,
             methodDetails,
             resolvedFeePayer,
+            feePayerPolicy,
           )
-          lastOnChainVerified.set(payload.channelId, Date.now())
+          lastOnChainVerified.set(sessionReceipt.channelId, Date.now())
           break
 
         case 'voucher':
@@ -293,9 +297,13 @@ export declare namespace session {
     'feePayer' | 'recipient'
   >
 
+  type FeePayerPolicy = Partial<FeePayer.Policy>
+
   type Parameters = {
     /** TTL in milliseconds for cached on-chain channel state. After this duration, the server re-queries on-chain state during voucher handling to detect forced close requests. @default 5_000 */
     channelStateTtl?: number | undefined
+    /** Override the fee-sponsor policy used for sponsored open/topUp transactions. */
+    feePayerPolicy?: FeePayerPolicy | undefined
     /** Minimum voucher delta to accept (numeric string, default: "0"). */
     minVoucherDelta?: string | undefined
     /**
@@ -561,13 +569,11 @@ async function handleOpen(
   payload: SessionCredentialPayload & { action: 'open' },
   methodDetails: SessionMethodDetails,
   feePayer: viem_Account | undefined,
+  feePayerPolicy: session.FeePayerPolicy | undefined,
   waitForConfirmation: boolean,
 ): Promise<SessionReceipt> {
-  const voucher = parseVoucherFromPayload(
-    payload.channelId,
-    payload.cumulativeAmount,
-    payload.signature,
-  )
+  const channelId = ChannelStore.normalizeChannelId(payload.channelId)
+  const voucher = parseVoucherFromPayload(channelId, payload.cumulativeAmount, payload.signature)
 
   const recipient = challenge.request.recipient as Address
   const currency = challenge.request.currency as Address
@@ -577,9 +583,11 @@ async function handleOpen(
     client,
     serializedTransaction: payload.transaction,
     escrowContract: methodDetails.escrowContract,
-    channelId: payload.channelId,
+    channelId,
     recipient,
     currency,
+    challengeExpires: challenge.expires,
+    feePayerPolicy,
     feePayer,
     waitForConfirmation,
   })
@@ -612,7 +620,7 @@ async function handleOpen(
     throw new InvalidSignatureError({ reason: 'invalid voucher signature' })
   }
 
-  const updated = await store.updateChannel(payload.channelId, (existing) => {
+  const updated = await store.updateChannel(channelId, (existing) => {
     if (existing) {
       if (voucher.cumulativeAmount <= existing.settledOnChain) {
         throw new VerificationFailedError({
@@ -644,7 +652,7 @@ async function handleOpen(
       }
     }
     return {
-      channelId: payload.channelId,
+      channelId,
       chainId: methodDetails.chainId,
       escrowContract: methodDetails.escrowContract,
       closeRequestedAt: onChain.closeRequestedAt,
@@ -667,7 +675,7 @@ async function handleOpen(
 
   return createSessionReceipt({
     challengeId: challenge.id,
-    channelId: payload.channelId,
+    channelId: updated.channelId,
     acceptedCumulative: updated.highestVoucherAmount,
     spent: updated.spent,
     units: updated.units,
@@ -689,8 +697,10 @@ async function handleTopUp(
   payload: SessionCredentialPayload & { action: 'topUp' },
   methodDetails: SessionMethodDetails,
   feePayer: viem_Account | undefined,
+  feePayerPolicy: session.FeePayerPolicy | undefined,
 ): Promise<SessionReceipt> {
-  const channel = await store.getChannel(payload.channelId)
+  const channelId = ChannelStore.normalizeChannelId(payload.channelId)
+  const channel = await store.getChannel(channelId)
   if (!channel) {
     throw new ChannelNotFoundError({ reason: 'channel not found' })
   }
@@ -701,21 +711,23 @@ async function handleTopUp(
     client,
     serializedTransaction: payload.transaction,
     escrowContract: methodDetails.escrowContract,
-    channelId: payload.channelId,
+    channelId,
     currency: challenge.request.currency as Address,
     declaredDeposit,
     previousDeposit: channel.deposit,
+    challengeExpires: challenge.expires,
+    feePayerPolicy,
     feePayer,
   })
 
-  const updated = await store.updateChannel(payload.channelId, (current) => {
+  const updated = await store.updateChannel(channelId, (current) => {
     if (!current) throw new ChannelNotFoundError({ reason: 'channel not found' })
     return { ...current, deposit: onChainDeposit }
   })
 
   return createSessionReceipt({
     challengeId: challenge.id,
-    channelId: payload.channelId,
+    channelId: updated?.channelId ?? channel.channelId,
     acceptedCumulative: updated?.highestVoucherAmount ?? channel.highestVoucherAmount,
     spent: updated?.spent ?? channel.spent,
     units: updated?.units ?? channel.units,
@@ -735,7 +747,8 @@ async function handleVoucher(
   channelStateTtl: number,
   lastOnChainVerified: Map<Hex, number>,
 ): Promise<SessionReceipt> {
-  const channel = await store.getChannel(payload.channelId)
+  const channelId = ChannelStore.normalizeChannelId(payload.channelId)
+  const channel = await store.getChannel(channelId)
   if (!channel) {
     throw new ChannelNotFoundError({ reason: 'channel not found' })
   }
@@ -743,11 +756,7 @@ async function handleVoucher(
     throw new ChannelClosedError({ reason: 'channel is finalized' })
   }
 
-  const voucher = parseVoucherFromPayload(
-    payload.channelId,
-    payload.cumulativeAmount,
-    payload.signature,
-  )
+  const voucher = parseVoucherFromPayload(channelId, payload.cumulativeAmount, payload.signature)
 
   // Use locally-stored channel state as a trusted cache instead of
   // reading on-chain for every voucher. The on-chain state is verified
@@ -759,7 +768,7 @@ async function handleVoucher(
   // To guard against the payer initiating a forced close while vouchers
   // are still being accepted, re-query on-chain state when the cache
   // exceeds the configured staleness TTL (default: 5s).
-  const lastVerified = lastOnChainVerified.get(payload.channelId) ?? 0
+  const lastVerified = lastOnChainVerified.get(channelId) ?? 0
   const isStale = Date.now() - lastVerified > channelStateTtl
 
   const onChain = await (async () => {
@@ -767,13 +776,13 @@ async function handleVoucher(
       const onChainChannel = await getOnChainChannel(
         client,
         methodDetails.escrowContract,
-        payload.channelId,
+        channelId,
       )
-      lastOnChainVerified.set(payload.channelId, Date.now())
+      lastOnChainVerified.set(channelId, Date.now())
       // Persist closeRequestedAt so the cached path detects force-close
       // between re-queries.
       if (onChainChannel.closeRequestedAt !== 0n) {
-        await store.updateChannel(payload.channelId, (current) =>
+        await store.updateChannel(channelId, (current) =>
           current ? { ...current, closeRequestedAt: onChainChannel.closeRequestedAt } : current,
         )
       }
@@ -796,7 +805,7 @@ async function handleVoucher(
     minVoucherDelta,
     challenge,
     channel,
-    channelId: payload.channelId,
+    channelId,
     voucher,
     onChain,
     methodDetails,
@@ -815,7 +824,8 @@ async function handleClose(
   account?: viem_Account,
   feePayer?: viem_Account,
 ): Promise<SessionReceipt> {
-  const channel = await store.getChannel(payload.channelId)
+  const channelId = ChannelStore.normalizeChannelId(payload.channelId)
+  const channel = await store.getChannel(channelId)
   if (!channel) {
     throw new ChannelNotFoundError({ reason: 'channel not found' })
   }
@@ -823,13 +833,9 @@ async function handleClose(
     throw new ChannelClosedError({ reason: 'channel is already finalized' })
   }
 
-  const voucher = parseVoucherFromPayload(
-    payload.channelId,
-    payload.cumulativeAmount,
-    payload.signature,
-  )
+  const voucher = parseVoucherFromPayload(channelId, payload.cumulativeAmount, payload.signature)
 
-  const onChain = await getOnChainChannel(client, methodDetails.escrowContract, payload.channelId)
+  const onChain = await getOnChainChannel(client, methodDetails.escrowContract, channelId)
 
   if (onChain.finalized) {
     throw new ChannelClosedError({ reason: 'channel is finalized on-chain' })
@@ -867,7 +873,7 @@ async function handleClose(
     ...(feePayer && account ? { feePayer, account } : { account }),
   })
 
-  const updated = await store.updateChannel(payload.channelId, (current) => {
+  const updated = await store.updateChannel(channelId, (current) => {
     if (!current) return null
     const updateVoucher = voucher.cumulativeAmount > current.highestVoucherAmount
     return {
@@ -883,7 +889,7 @@ async function handleClose(
 
   return createSessionReceipt({
     challengeId: challenge.id,
-    channelId: payload.channelId,
+    channelId: updated?.channelId ?? channel.channelId,
     acceptedCumulative: voucher.cumulativeAmount,
     spent: updated?.spent ?? channel.spent,
     units: updated?.units ?? channel.units,

package/src/tempo/server/internal/html/main.ts

@@ -73,8 +73,8 @@ const provider = Provider.create({
 })
 
 const button = document.createElement('button')
-button.innerHTML =
-  'Continue with <svg aria-label="Tempo" viewBox="0 0 107 25" role="img"><path d="M8.10464 23.7163H1.82475L7.64513 5.79356H0.201172L1.82475 0.540352H22.5637L20.9401 5.79356H13.8944L8.10464 23.7163Z"></path><path d="M31.474 23.7163H16.5861L24.0607 0.540352H38.8873L37.4782 4.95923H28.8701L27.3078 9.93433H35.6402L34.231 14.2914H25.8681L24.3057 19.2974H32.8525L31.474 23.7163Z"></path><path d="M38.2124 23.7163H33.2192L40.7244 0.540352H49.0567L48.781 13.0245L56.8989 0.540352H66.0277L58.5531 23.7163H52.3039L57.3584 7.86395L46.9736 23.7163H43.267L43.4201 7.80214L38.2124 23.7163Z"></path><path d="M73.057 4.83563L70.6369 12.3137H71.3108C72.8425 12.3137 74.1189 11.9532 75.14 11.2322C76.1612 10.4906 76.8249 9.43991 77.1312 8.08025C77.3967 6.90601 77.2538 6.07167 76.7023 5.57725C76.1509 5.08284 75.2319 4.83563 73.9453 4.83563H73.057ZM66.9915 23.7163H60.7116L68.1862 0.540352H75.814C77.5703 0.540352 79.0816 0.828764 80.3478 1.40559C81.6344 1.96181 82.5738 2.76524 83.166 3.81588C83.7787 4.84592 83.9829 6.05107 83.7787 7.43133C83.5132 9.2442 82.8189 10.8408 81.6956 12.221C80.5724 13.6013 79.1122 14.6725 77.315 15.4347C75.5383 16.1764 73.5471 16.5472 71.3415 16.5472H69.289L66.9915 23.7163Z"></path><path d="M98.747 22.233C96.664 23.4691 94.4481 24.0871 92.0996 24.0871H92.0383C89.9552 24.0871 88.1989 23.6236 86.7693 22.6965C85.3602 21.7489 84.3493 20.4717 83.7366 18.8648C83.1443 17.2579 83.0014 15.4966 83.3077 13.5807C83.6957 11.1704 84.5841 8.94549 85.9728 6.90601C87.3616 4.86653 89.0975 3.23906 91.1805 2.02361C93.2636 0.808164 95.4897 0.200439 97.8587 0.200439H97.9199C100.085 0.200439 101.872 0.663958 103.281 1.591C104.71 2.51803 105.701 3.78498 106.252 5.39185C106.824 6.97811 106.947 8.76008 106.62 10.7378C106.232 13.0657 105.343 15.2596 103.955 17.3197C102.566 19.3592 100.83 20.997 98.747 22.233ZM90.0777 18.2468C90.6292 19.2974 91.589 19.8227 92.9573 19.8227H93.0186C94.1418 19.8227 95.1833 19.4004 96.1432 18.5558C97.1235 17.6905 97.9506 16.5369 98.6245 15.0948C99.3189 13.6528 99.8294 12.0459 100.156 10.2742C100.463 8.54377 100.34 7.15322 99.7886 6.10257C99.2372 5.03133 98.2875 4.49571 96.9397 4.49571H96.8784C95.8369 4.49571 94.826 4.92833 93.8457 5.79356C92.8858 6.6588 92.0485 7.82274 91.3337 9.2854C90.6189 10.7481 90.0982 12.3343 89.7714 14.0442C89.4446 15.7747 89.5468 17.1755 90.0777 18.2468Z"></path></svg>'
+const buttonLabel = c.text.pay === 'Pay' ? 'Continue with' : c.text.pay
+button.innerHTML = `${buttonLabel} <svg aria-label="Tempo" viewBox="0 0 107 25" role="img"><path d="M8.10464 23.7163H1.82475L7.64513 5.79356H0.201172L1.82475 0.540352H22.5637L20.9401 5.79356H13.8944L8.10464 23.7163Z"></path><path d="M31.474 23.7163H16.5861L24.0607 0.540352H38.8873L37.4782 4.95923H28.8701L27.3078 9.93433H35.6402L34.231 14.2914H25.8681L24.3057 19.2974H32.8525L31.474 23.7163Z"></path><path d="M38.2124 23.7163H33.2192L40.7244 0.540352H49.0567L48.781 13.0245L56.8989 0.540352H66.0277L58.5531 23.7163H52.3039L57.3584 7.86395L46.9736 23.7163H43.267L43.4201 7.80214L38.2124 23.7163Z"></path><path d="M73.057 4.83563L70.6369 12.3137H71.3108C72.8425 12.3137 74.1189 11.9532 75.14 11.2322C76.1612 10.4906 76.8249 9.43991 77.1312 8.08025C77.3967 6.90601 77.2538 6.07167 76.7023 5.57725C76.1509 5.08284 75.2319 4.83563 73.9453 4.83563H73.057ZM66.9915 23.7163H60.7116L68.1862 0.540352H75.814C77.5703 0.540352 79.0816 0.828764 80.3478 1.40559C81.6344 1.96181 82.5738 2.76524 83.166 3.81588C83.7787 4.84592 83.9829 6.05107 83.7787 7.43133C83.5132 9.2442 82.8189 10.8408 81.6956 12.221C80.5724 13.6013 79.1122 14.6725 77.315 15.4347C75.5383 16.1764 73.5471 16.5472 71.3415 16.5472H69.289L66.9915 23.7163Z"></path><path d="M98.747 22.233C96.664 23.4691 94.4481 24.0871 92.0996 24.0871H92.0383C89.9552 24.0871 88.1989 23.6236 86.7693 22.6965C85.3602 21.7489 84.3493 20.4717 83.7366 18.8648C83.1443 17.2579 83.0014 15.4966 83.3077 13.5807C83.6957 11.1704 84.5841 8.94549 85.9728 6.90601C87.3616 4.86653 89.0975 3.23906 91.1805 2.02361C93.2636 0.808164 95.4897 0.200439 97.8587 0.200439H97.9199C100.085 0.200439 101.872 0.663958 103.281 1.591C104.71 2.51803 105.701 3.78498 106.252 5.39185C106.824 6.97811 106.947 8.76008 106.62 10.7378C106.232 13.0657 105.343 15.2596 103.955 17.3197C102.566 19.3592 100.83 20.997 98.747 22.233ZM90.0777 18.2468C90.6292 19.2974 91.589 19.8227 92.9573 19.8227H93.0186C94.1418 19.8227 95.1833 19.4004 96.1432 18.5558C97.1235 17.6905 97.9506 16.5369 98.6245 15.0948C99.3189 13.6528 99.8294 12.0459 100.156 10.2742C100.463 8.54377 100.34 7.15322 99.7886 6.10257C99.2372 5.03133 98.2875 4.49571 96.9397 4.49571H96.8784C95.8369 4.49571 94.826 4.92833 93.8457 5.79356C92.8858 6.6588 92.0485 7.82274 91.3337 9.2854C90.6189 10.7481 90.0982 12.3343 89.7714 14.0442C89.4446 15.7747 89.5468 17.1755 90.0777 18.2468Z"></path></svg>`
 button.onclick = async () => {
   try {
     c.error()