mppx 0.6.26 → 0.6.28

package/src/tempo/session/Chain.test.ts

@@ -498,10 +498,12 @@ describe.runIf(isLocalnet)('on-chain', () => {
           { to: currency, data: approveData },
           { to: escrowContract, data: openData },
         ],
-        feePayer: true,
         feeToken: currency,
+        nonceKey: 'expiring',
+        validBefore: Math.floor(Date.now() / 1_000) + 25,
       } as never)
-      prepared.gas = prepared.gas! + 5_000n
+      prepared.gas = (prepared.gas ?? 0n) + 5_000n
+      ;(prepared as Record<string, unknown>).feePayer = true
       const serializedTransaction = await signTransaction(client, prepared as never)
 
       await broadcastOpenTransaction({
@@ -561,10 +563,12 @@ describe.runIf(isLocalnet)('on-chain', () => {
           { to: escrowContract, data: openData },
           { to: escrowContract, data: smuggledOpenData },
         ],
-        feePayer: true,
         feeToken: currency,
+        nonceKey: 'expiring',
+        validBefore: Math.floor(Date.now() / 1_000) + 25,
       } as never)
-      prepared.gas = prepared.gas! + 5_000n
+      prepared.gas = (prepared.gas ?? 0n) + 5_000n
+      ;(prepared as Record<string, unknown>).feePayer = true
 
       const serializedTransaction = await signTransaction(client, prepared as never)
 
@@ -1006,10 +1010,12 @@ describe.runIf(isLocalnet)('on-chain', () => {
           { to: currency, data: approveData },
           { to: escrowContract, data: topUpData },
         ],
-        feePayer: true,
         feeToken: currency,
+        nonceKey: 'expiring',
+        validBefore: Math.floor(Date.now() / 1_000) + 25,
       } as never)
-      prepared.gas = prepared.gas! + 5_000n
+      prepared.gas = (prepared.gas ?? 0n) + 5_000n
+      ;(prepared as Record<string, unknown>).feePayer = true
       const serializedTransaction = await signTransaction(client, prepared as never)
 
       await broadcastTopUpTransaction({
@@ -1069,10 +1075,12 @@ describe.runIf(isLocalnet)('on-chain', () => {
           { to: escrowContract, data: topUpData },
           { to: escrowContract, data: smuggledTopUpData },
         ],
-        feePayer: true,
         feeToken: currency,
+        nonceKey: 'expiring',
+        validBefore: Math.floor(Date.now() / 1_000) + 25,
       } as never)
-      prepared.gas = prepared.gas! + 5_000n
+      prepared.gas = (prepared.gas ?? 0n) + 5_000n
+      ;(prepared as Record<string, unknown>).feePayer = true
 
       const serializedTransaction = await signTransaction(client, prepared as never)
 

package/src/tempo/session/Chain.ts

@@ -258,9 +258,14 @@ async function sendFeePayerTx(
   const prepared = await prepareTransactionRequest(client, {
     account,
     calls: [{ to, data }],
-    feePayer: true,
     ...(feeToken ? { feeToken } : {}),
+    nonceKey: 'expiring',
+    validBefore: Math.floor(Date.now() / 1_000) + 25,
   } as never)
+  // Estimate before enabling fee-payer mode so Tempo includes sender
+  // signature verification costs in the gas budget.
+  prepared.gas = (prepared.gas ?? 0n) + 5_000n
+  ;(prepared as Record<string, unknown>).feePayer = true
 
   const serialized = (await signTransaction(client, {
     ...prepared,

package/src/tempo/session/ChannelStore.test.ts

@@ -117,6 +117,27 @@ describe('channelStore', () => {
       expect(typeof loaded!.createdAt).toBe('string')
     })
 
+    test('prefixes backing store keys when configured', async () => {
+      const rawStore = Store.memory()
+      const cs = ChannelStore.fromStore(Store.from(rawStore, { keyPrefix: 'tenant:' }))
+      await cs.updateChannel(channelId, () => makeChannel())
+
+      expect(await rawStore.get(`tenant:${channelId}`)).not.toBeNull()
+      expect(await rawStore.get(channelId)).toBeNull()
+      expect((await cs.getChannel(channelId))?.channelId).toBe(channelId)
+    })
+
+    test('isolates prefixed store wrappers', async () => {
+      const rawStore = Store.memory()
+      const first = ChannelStore.fromStore(Store.from(rawStore, { keyPrefix: 'tenant-a:' }))
+      const second = ChannelStore.fromStore(Store.from(rawStore, { keyPrefix: 'tenant-b:' }))
+      await first.updateChannel(channelId, () => makeChannel())
+
+      expect(await second.getChannel(channelId)).toBeNull()
+      expect(await rawStore.get(`tenant-a:${channelId}`)).not.toBeNull()
+      expect(await rawStore.get(`tenant-b:${channelId}`)).toBeNull()
+    })
+
     test('treats case-variant channelIds as the same record', async () => {
       const cs = ChannelStore.fromStore(Store.memory())
       await cs.updateChannel(mixedCaseAliasChannelId, () =>

package/src/tempo/subscription/Store.test.ts

@@ -26,6 +26,61 @@ function createRecord(overrides: Partial<SubscriptionRecord> = {}): Subscription
 }
 
 describe('tempo subscription store', () => {
+  test('prefixes all backing store keys when configured', async () => {
+    const rawStore = Store.memory()
+    const store = fromStore(Store.from(rawStore, { keyPrefix: 'tenant:' }))
+    let finishActivation!: () => void
+    const pendingActivation = new Promise<void>((resolve) => {
+      finishActivation = resolve
+    })
+    let activationStarted!: () => void
+    const activationStartedPromise = new Promise<void>((resolve) => {
+      activationStarted = resolve
+    })
+
+    const activation = store.activate({
+      challengeId: 'challenge-1',
+      create: async () => {
+        activationStarted()
+        await pendingActivation
+        return { subscription: createRecord() }
+      },
+      lookupKey: 'user-1:plan:pro',
+    })
+    await activationStartedPromise
+
+    expect(await rawStore.get('tenant:tempo:subscription:credential:challenge-1')).not.toBeNull()
+    expect(
+      await rawStore.get('tenant:tempo:subscription:activation:user-1:plan:pro'),
+    ).not.toBeNull()
+    expect(await rawStore.get('tempo:subscription:credential:challenge-1')).toBeNull()
+
+    finishActivation()
+    expect((await activation).status).toBe('activated')
+    await store.getOrCreateAccessKey('user-1:plan:pro')
+
+    expect(await rawStore.get(`tenant:tempo:subscription:record:${subscriptionId}`)).not.toBeNull()
+    expect(await rawStore.get('tenant:tempo:subscription:key:user-1:plan:pro')).toBe(subscriptionId)
+    expect(
+      await rawStore.get('tenant:tempo:subscription:access-key:user-1:plan:pro'),
+    ).not.toBeNull()
+    expect(await rawStore.get(`tempo:subscription:record:${subscriptionId}`)).toBeNull()
+  })
+
+  test('combines store prefix with custom key family prefixes', async () => {
+    const rawStore = Store.memory()
+    const store = fromStore(Store.from(rawStore, { keyPrefix: 'tenant:' }), {
+      keyPrefix: 'lookup:',
+      recordPrefix: 'record:',
+    })
+
+    await store.put(createRecord())
+
+    expect(await rawStore.get(`tenant:record:${subscriptionId}`)).not.toBeNull()
+    expect(await rawStore.get('tenant:lookup:user-1:plan:pro')).toBe(subscriptionId)
+    expect(await rawStore.get(`record:${subscriptionId}`)).toBeNull()
+  })
+
   test('rejects a replayed activation challenge', async () => {
     const store = fromStore(Store.memory())
 

package/src/viem/Account.test.ts

@@ -1,6 +1,6 @@
 import { createClient, http } from 'viem'
 import { privateKeyToAccount } from 'viem/accounts'
-import { mainnet } from 'viem/chains'
+import { tempo as mainnet } from 'viem/tempo/chains'
 import { describe, expect, test } from 'vp/test'
 
 import * as Account from './Account.js'

package/src/viem/Client.test.ts

@@ -1,8 +1,8 @@
 import { createClient, custom, defineChain, type Hex } from 'viem'
 import { privateKeyToAccount } from 'viem/accounts'
 import { signTransaction } from 'viem/actions'
-import { tempoLocalnet } from 'viem/chains'
 import { Account as TempoAccount, Transaction } from 'viem/tempo'
+import { tempoLocalnet } from 'viem/tempo/chains'
 import { describe, expect, test } from 'vp/test'
 
 import * as Client from './Client.js'