mppx 0.6.26 → 0.6.28

package/src/tempo/client/ChannelOps.ts

@@ -157,6 +157,7 @@ export async function createOpenPayload(
     functionName: 'open',
     args: [payee, currency, deposit, salt, authorizedSigner],
   })
+  const validBefore = Math.floor(Date.now() / 1_000) + 25
 
   const prepared = await prepareTransactionRequest(client, {
     account,
@@ -164,10 +165,13 @@ export async function createOpenPayload(
       { to: currency, data: approveData },
       { to: escrowContract, data: openData },
     ],
-    ...(feePayer && { feePayer: true }),
     feeToken: currency,
+    ...(feePayer ? { nonceKey: 'expiring', validBefore } : {}),
   } as never)
-  prepared.gas = prepared.gas! + 5_000n
+  // Estimate before enabling fee-payer mode so Tempo includes sender
+  // signature and access-key verification costs in the gas budget.
+  prepared.gas = (prepared.gas ?? 0n) + 5_000n
+  if (feePayer) (prepared as Record<string, unknown>).feePayer = true
   const transaction = (await signTransaction(client, prepared as never)) as Hex.Hex
 
   const signature = await signVoucher(

package/src/tempo/client/Charge.ts

@@ -6,8 +6,8 @@ import {
   signTypedData,
   signTransaction,
 } from 'viem/actions'
-import { tempo as tempo_chain } from 'viem/chains'
 import { Actions } from 'viem/tempo'
+import { tempo as tempo_chain } from 'viem/tempo/chains'
 
 import * as Credential from '../../Credential.js'
 import * as Method from '../../Method.js'
@@ -163,12 +163,13 @@ export function charge(parameters: charge.Parameters = {}) {
       const prepared = await prepareTransactionRequest(client, {
         account,
         calls,
-        ...(methodDetails?.feePayer && { feePayer: true }),
         nonceKey: 'expiring',
         validBefore,
       } as never)
-      // FIXME: figure out gas estimation issue for fee payer tx
-      prepared.gas = prepared.gas! + 5_000n
+      // Estimate before enabling fee-payer mode so Tempo includes sender
+      // signature and access-key verification costs in the gas budget.
+      prepared.gas = (prepared.gas ?? 0n) + 5_000n
+      if (methodDetails?.feePayer) (prepared as Record<string, unknown>).feePayer = true
       const signature = await signTransaction(client, prepared as never)
 
       return Credential.serialize({

package/src/tempo/client/Session.ts

@@ -1,6 +1,6 @@
 import type { Hex } from 'ox'
 import { type Address, parseUnits, type Account as viem_Account } from 'viem'
-import { tempo as tempo_chain } from 'viem/chains'
+import { tempo as tempo_chain } from 'viem/tempo/chains'
 
 import type * as Challenge from '../../Challenge.js'
 import * as Method from '../../Method.js'

package/src/tempo/client/Subscription.ts

@@ -1,7 +1,7 @@
 import { Hex } from 'ox'
 import { KeyAuthorization } from 'ox/tempo'
 import { isAddressEqual, type Address } from 'viem'
-import { tempo as tempo_chain } from 'viem/chains'
+import { tempo as tempo_chain } from 'viem/tempo/chains'
 
 import * as Credential from '../../Credential.js'
 import type { MaybePromise } from '../../internal/types.js'

package/src/tempo/server/Charge.test.ts

@@ -286,6 +286,7 @@ describe('tempo', () => {
     })
 
     test('behavior: rejects replayed transaction hash', async () => {
+      const dedupStore = Store.memory()
       const dedupServer = Mppx_server.create({
         methods: [
           tempo_server.charge({
@@ -294,7 +295,8 @@ describe('tempo', () => {
             },
             currency: asset,
             account: accounts[0],
-            store: Store.memory(),
+            store: dedupStore,
+            storeKeyPrefix: 'tenant:',
           }),
         ],
         realm,
@@ -336,6 +338,8 @@ describe('tempo', () => {
         })
         expect(response.status).toBe(200)
       }
+      expect(await dedupStore.get(`tenant:mppx:charge:${receipt.transactionHash}`)).not.toBeNull()
+      expect(await dedupStore.get(`mppx:charge:${receipt.transactionHash}`)).toBeNull()
 
       const response2 = await fetch(httpServer.url)
       expect(response2.status).toBe(402)
@@ -1616,6 +1620,7 @@ describe('tempo', () => {
             currency: asset,
             account: accounts[0],
             store: sponsoredStore,
+            storeKeyPrefix: 'tenant:',
           }),
         ],
         realm,
@@ -1661,6 +1666,16 @@ describe('tempo', () => {
 
       const first = fetch(httpServer.url, { headers: { Authorization: credential1 } })
       await simulationStarted
+      expect(
+        await sponsoredStore.get(
+          `tenant:mppx:charge:sponsor:${chain.id}:${accounts[1].address.toLowerCase()}`,
+        ),
+      ).not.toBeNull()
+      expect(
+        await sponsoredStore.get(
+          `mppx:charge:sponsor:${chain.id}:${accounts[1].address.toLowerCase()}`,
+        ),
+      ).toBeNull()
       const second = fetch(httpServer.url, { headers: { Authorization: credential2 } })
 
       try {
@@ -2870,6 +2885,7 @@ describe('tempo', () => {
 
     test('behavior: store keys proof replay protection by challenge ID', async () => {
       const replayStore = Store.memory()
+      const storeKeyPrefix = 'tenant:'
       const server_ = Mppx_server.create({
         methods: [
           tempo_server.charge({
@@ -2879,6 +2895,7 @@ describe('tempo', () => {
             currency: asset,
             account: accounts[0],
             store: replayStore,
+            storeKeyPrefix,
           }),
         ],
         realm,
@@ -2918,6 +2935,10 @@ describe('tempo', () => {
         headers: { Authorization: Credential.serialize(credential1) },
       })
       expect(response2.status).toBe(200)
+      expect(
+        await replayStore.get(`${storeKeyPrefix}mppx:charge:proof:${challenge1.id}`),
+      ).not.toBeNull()
+      expect(await replayStore.get(`mppx:charge:proof:${challenge1.id}`)).toBeNull()
 
       const response3 = await fetch(httpServer.url)
       expect(response3.status).toBe(402)

package/src/tempo/server/Charge.ts

@@ -15,8 +15,8 @@ import {
   verifyTypedData,
   call as viem_call,
 } from 'viem/actions'
-import { tempo as tempo_chain } from 'viem/chains'
 import { Abis, Actions, Transaction } from 'viem/tempo'
+import { tempo as tempo_chain } from 'viem/tempo/chains'
 
 import { PaymentError, VerificationFailedError } from '../../Errors.js'
 import * as Expires from '../../Expires.js'
@@ -66,8 +66,16 @@ export function charge<const parameters extends charge.Parameters>(
     validateSender,
     waitForConfirmation = true,
   } = parameters
-  const store = (parameters.store ?? Store.memory()) as Store.AtomicStore<charge.StoreItemMap>
-  const proofStore = parameters.store as Store.AtomicStore<charge.StoreItemMap> | undefined
+  const storeKeyPrefix = parameters.storeKeyPrefix ?? ''
+  const store = Store.from(
+    (parameters.store ?? Store.memory()) as Store.AtomicStore<charge.StoreItemMap>,
+    { keyPrefix: storeKeyPrefix },
+  )
+  const proofStore = parameters.store
+    ? Store.from(parameters.store as Store.AtomicStore<charge.StoreItemMap>, {
+        keyPrefix: storeKeyPrefix,
+      })
+    : undefined
 
   const { recipient, feePayer, feePayerUrl } = Account.resolve(parameters)
 
@@ -539,6 +547,12 @@ export declare namespace charge {
      * memo binding, transaction success, and replay protection.
      */
     validateSender?: ValidateSender | undefined
+    /**
+     * Prefix prepended to charge replay-protection store keys.
+     *
+     * By default, no prefix is applied.
+     */
+    storeKeyPrefix?: string | undefined
     /**
      * Whether to wait for the charge transaction to confirm on-chain before
      * responding. @default true

package/src/tempo/server/Session.ts

@@ -18,7 +18,7 @@ import {
   type Account as viem_Account,
   type Client as viem_Client,
 } from 'viem'
-import { tempo as tempo_chain } from 'viem/chains'
+import { tempo as tempo_chain } from 'viem/tempo/chains'
 
 import {
   AmountExceedsDepositError,
@@ -104,7 +104,9 @@ export function session<const parameters extends session.Parameters>(
 
   const lastOnChainVerified = new Map<Hex, number>()
 
-  const store = ChannelStore.fromStore(rawStore)
+  const store = ChannelStore.fromStore(
+    Store.from(rawStore, { keyPrefix: parameters.storeKeyPrefix }),
+  )
 
   const { account, recipient, feePayer, feePayerUrl } = Account.resolve(parameters)
 
@@ -357,6 +359,12 @@ export declare namespace session {
      * local single-process usage.
      */
     store?: Store.AtomicStore | undefined
+    /**
+     * Prefix prepended to channel state store keys.
+     *
+     * By default, no prefix is applied.
+     */
+    storeKeyPrefix?: string | undefined
     /**
      * Enable SSE streaming.
      *

package/src/tempo/server/Subscription.test.ts

@@ -3,7 +3,7 @@ import { Mppx } from 'mppx/server'
 import { KeyAuthorization } from 'ox/tempo'
 import { createClient, custom } from 'viem'
 import { privateKeyToAccount } from 'viem/accounts'
-import { tempo as tempo_chain } from 'viem/chains'
+import { tempo as tempo_chain } from 'viem/tempo/chains'
 import { describe, expect, test } from 'vp/test'
 
 import * as Store from '../../Store.js'

package/src/tempo/server/Subscription.ts

@@ -8,8 +8,8 @@ import {
   sendRawTransactionSync,
   signTransaction,
 } from 'viem/actions'
-import { tempo as tempo_chain } from 'viem/chains'
 import { Abis, Account as TempoAccount, Transaction } from 'viem/tempo'
+import { tempo as tempo_chain } from 'viem/tempo/chains'
 
 import { VerificationFailedError } from '../../Errors.js'
 import type { LooseOmit, MaybePromise, NoExtraKeys } from '../../internal/types.js'
@@ -72,7 +72,7 @@ export function subscription<const parameters extends subscription.Parameters>(
 
   const { recipient } = Account.resolve(parameters)
   const context = createContext(parameters, {
-    store: rawStore,
+    store: Store.from(rawStore, { keyPrefix: parameters.storeKeyPrefix }),
     options: {
       activationTimeoutMs: parameters.activationTimeoutMs,
       renewalTimeoutMs: parameters.renewalTimeoutMs,
@@ -1110,6 +1110,12 @@ export declare namespace subscription {
         subscription: SubscriptionRecord
       }) => Promise<RenewalResult>
       store?: Store.AtomicStore<Record<string, unknown>> | undefined
+      /**
+       * Prefix prepended to all subscription store keys.
+       *
+       * By default, no prefix is applied.
+       */
+      storeKeyPrefix?: string | undefined
       testnet?: boolean | undefined
       waitForConfirmation?: boolean | undefined
     } & Defaults

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

@@ -1,6 +1,6 @@
 import { local, Provider } from 'accounts'
 import { createClient, custom, http } from 'viem'
-import { tempoModerato, tempoLocalnet } from 'viem/chains'
+import { tempoModerato, tempoLocalnet } from 'viem/tempo/chains'
 
 import { tempo } from '../../../../client/index.js'
 import * as Html from '../../../../Html.js'

package/src/tempo/server/internal/html/package.json

@@ -5,6 +5,6 @@
   "dependencies": {
     "accounts": "0.10.2",
     "mppx": "workspace:*",
-    "viem": "2.47.5"
+    "viem": "2.50.4"
   }
 }