mppx 0.6.30 → 0.7.0

package/src/tempo/{server → legacy/server}/Session.test.ts

@@ -21,10 +21,8 @@ import { waitForTransactionReceipt } from 'viem/actions'
 import { Account as TempoAccount, Actions, Addresses } from 'viem/tempo'
 import { beforeAll, beforeEach, describe, expect, expectTypeOf, test } from 'vp/test'
 import { WebSocketServer } from 'ws'
-import { nodeEnv } from '~test/config.js'
+import { tempoNetwork } from '~test/config.js'
 import * as Http from '~test/Http.js'
-
-const isLocalnet = nodeEnv === 'localnet'
 import {
   closeChannelOnChain,
   deployEscrow,
@@ -32,7 +30,7 @@ import {
   signOpenChannel,
   signTopUpChannel,
   topUpChannel,
-} from '~test/tempo/session.js'
+} from '~test/tempo/legacy/session.js'
 import { accounts, asset, chain, client, fundAccount, http } from '~test/tempo/viem.js'
 
 import {
@@ -40,21 +38,22 @@ import {
   ChannelNotFoundError,
   InsufficientBalanceError,
   InvalidSignatureError,
-} from '../../Errors.js'
-import * as NodeRequest from '../../server/Request.js'
-import * as Store from '../../Store.js'
-import { sessionManager } from '../client/SessionManager.js'
+} from '../../../Errors.js'
+import * as NodeRequest from '../../../server/Request.js'
+import * as Store from '../../../Store.js'
 import {
   chainId as chainIdDefaults,
   escrowContract as escrowContractDefaults,
-} from '../internal/defaults.js'
-import type * as Methods from '../Methods.js'
+} from '../../internal/defaults.js'
+import type * as Methods from '../../Methods.js'
+import { deserializeSessionReceipt } from '../../session/precompile/Protocol.js'
+import { serializeSessionReceipt } from '../../session/precompile/Protocol.js'
+import type { SessionReceipt } from '../../session/precompile/Protocol.js'
+import * as TempoWs from '../../session/server/Ws.js'
+import { sessionManager } from '../client/SessionManager.js'
 import * as ChannelStore from '../session/ChannelStore.js'
-import { deserializeSessionReceipt } from '../session/Receipt.js'
-import { serializeSessionReceipt } from '../session/Receipt.js'
-import type { SessionCredentialPayload, SessionReceipt } from '../session/Types.js'
+import type { LegacySessionCredentialPayload } from '../session/Types.js'
 import { signVoucher } from '../session/Voucher.js'
-import * as TempoWs from '../session/Ws.js'
 import { charge, session, settle } from './Session.js'
 
 const payer = accounts[2]
@@ -62,6 +61,7 @@ const delegatedSigner = accounts[4]
 const recipientAccount = accounts[0]
 const recipient = accounts[0].address
 const currency = asset
+const isLocalnet = tempoNetwork === 'localnet'
 
 let escrowContract: Address
 let saltCounter = 0
@@ -112,7 +112,7 @@ describe.runIf(isLocalnet)('session', () => {
   function createHandler(overrides: Partial<session.Parameters> = {}) {
     return Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: rawStore,
           getClient: () => client,
           account: recipientAccount,
@@ -486,7 +486,7 @@ describe.runIf(isLocalnet)('session', () => {
           },
           request: makeRequest(),
         }),
-      ).rejects.toThrow('voucher amount is below settled on-chain amount')
+      ).rejects.toThrow('voucher amount is at or below settled on-chain amount')
     })
 
     test('zero signer fallback uses payer', async () => {
@@ -698,27 +698,128 @@ describe.runIf(isLocalnet)('session', () => {
       ).rejects.toThrow(InvalidSignatureError)
     })
 
-    test('rejects non-increasing voucher replay', async () => {
+    test('accepts lower voucher replay idempotently', async () => {
       const { channelId, serializedTransaction } = await createSignedOpenTransaction(10000000n)
       const server = createServer()
       await openServerChannel(server, channelId, serializedTransaction)
 
+      const before = await store.getChannel(channelId)
+
+      // A non-advancing voucher (below highest, above settled) is accepted
+      // idempotently with the current highest amount, per the session spec.
+      const receipt = (await server.verify({
+        credential: {
+          challenge: makeChallenge({ id: 'challenge-2', channelId }),
+          payload: {
+            action: 'voucher' as const,
+            channelId,
+            cumulativeAmount: '500000',
+            signature: await signTestVoucher(channelId, 500000n),
+          },
+        },
+        request: makeRequest(),
+      })) as SessionReceipt
+
+      expect(receipt.status).toBe('success')
+      expect(receipt.acceptedCumulative).toBe('1000000')
+
+      // Channel state is unchanged - no advance, no additional charge.
+      const after = await store.getChannel(channelId)
+      expect(after).toEqual(before)
+    })
+
+    test('accepts lower replay after a higher voucher has advanced the channel', async () => {
+      const { channelId, serializedTransaction } = await createSignedOpenTransaction(10000000n)
+      const server = createServer()
+      await openServerChannel(server, channelId, serializedTransaction)
+
+      // Advance the channel from the opening 1000000 to 5000000.
+      await server.verify({
+        credential: {
+          challenge: makeChallenge({ id: 'challenge-advance', channelId }),
+          payload: {
+            action: 'voucher' as const,
+            channelId,
+            cumulativeAmount: '5000000',
+            signature: await signTestVoucher(channelId, 5000000n),
+          },
+        },
+        request: makeRequest(),
+      })
+
+      const before = await store.getChannel(channelId)
+
+      // A lower (but above-settled) voucher returns the current highest
+      // without rewinding state.
+      const receipt = (await server.verify({
+        credential: {
+          challenge: makeChallenge({ id: 'challenge-lower', channelId }),
+          payload: {
+            action: 'voucher' as const,
+            channelId,
+            cumulativeAmount: '3000000',
+            signature: await signTestVoucher(channelId, 3000000n),
+          },
+        },
+        request: makeRequest(),
+      })) as SessionReceipt
+
+      expect(receipt.status).toBe('success')
+      expect(receipt.acceptedCumulative).toBe('5000000')
+
+      const after = await store.getChannel(channelId)
+      expect(after).toEqual(before)
+    })
+
+    test('accepts lower voucher replay even when below minVoucherDelta', async () => {
+      const { channelId, serializedTransaction } = await createSignedOpenTransaction(10000000n)
+      // Non-advancing replay must short-circuit before the delta check.
+      const server = createServer({ minVoucherDelta: '2' })
+      await openServerChannel(server, channelId, serializedTransaction)
+
+      const before = await store.getChannel(channelId)
+
+      const receipt = (await server.verify({
+        credential: {
+          challenge: makeChallenge({ id: 'challenge-lower-delta', channelId }),
+          payload: {
+            action: 'voucher' as const,
+            channelId,
+            cumulativeAmount: '500000',
+            signature: await signTestVoucher(channelId, 500000n),
+          },
+        },
+        request: makeRequest(),
+      })) as SessionReceipt
+
+      expect(receipt.status).toBe('success')
+      expect(receipt.acceptedCumulative).toBe('1000000')
+
+      const after = await store.getChannel(channelId)
+      expect(after).toEqual(before)
+    })
+
+    test('rejects lower voucher replay signed by the wrong signer', async () => {
+      const { channelId, serializedTransaction } = await createSignedOpenTransaction(10000000n)
+      const server = createServer()
+      await openServerChannel(server, channelId, serializedTransaction)
+
+      // A valid signature from a different account must NOT be treated as an
+      // idempotent replay.
       await expect(
         server.verify({
           credential: {
-            challenge: makeChallenge({ id: 'challenge-2', channelId }),
+            challenge: makeChallenge({ id: 'challenge-wrong-signer', channelId }),
             payload: {
               action: 'voucher' as const,
               channelId,
               cumulativeAmount: '500000',
-              signature: await signTestVoucher(channelId, 500000n),
+              signature: await signTestVoucher(channelId, 500000n, accounts[3]),
             },
           },
           request: makeRequest(),
         }),
-      ).rejects.toThrow(
-        'voucher cumulativeAmount must be strictly greater than highest accepted voucher',
-      )
+      ).rejects.toThrow(InvalidSignatureError)
     })
 
     test('rejects replay of settled voucher', async () => {
@@ -743,7 +844,7 @@ describe.runIf(isLocalnet)('session', () => {
           },
           request: makeRequest(),
         }),
-      ).rejects.toThrow('voucher cumulativeAmount is below on-chain settled amount')
+      ).rejects.toThrow('voucher cumulativeAmount is at or below on-chain settled amount')
     })
 
     test('rejects voucher exceeding deposit', async () => {
@@ -820,17 +921,15 @@ describe.runIf(isLocalnet)('session', () => {
             payload: {
               action: 'voucher' as const,
               channelId,
-              // Attacker submits cumulativeAmount=500000, which is <= highestVoucherAmount (1000000)
-              // but > settled (0). Rejected by non-increasing cumulative amount check before signature validation.
+              // Forged signature for a non-advancing amount (500000 <= highest
+              // 1000000, > settled 0). Rejected by signature verification.
               cumulativeAmount: '500000',
               signature: `0x${'ab'.repeat(65)}` as Hex,
             },
           },
           request: makeRequest(),
         }),
-      ).rejects.toThrow(
-        'voucher cumulativeAmount must be strictly greater than highest accepted voucher',
-      )
+      ).rejects.toThrow('invalid voucher signature')
     })
 
     test('rejects forged voucher with valid amount but invalid signature', async () => {
@@ -967,7 +1066,7 @@ describe.runIf(isLocalnet)('session', () => {
           },
           request: makeRequest(),
         }),
-      ).rejects.toThrow('voucher cumulativeAmount is below on-chain settled amount')
+      ).rejects.toThrow('voucher cumulativeAmount is at or below on-chain settled amount')
     })
 
     test('rejects leaked voucher used in open action with mismatched channel', async () => {
@@ -2186,7 +2285,7 @@ describe.runIf(isLocalnet)('session', () => {
           })
         }
 
-        const credential = Credential.deserialize<SessionCredentialPayload>(authorization)
+        const credential = Credential.deserialize<LegacySessionCredentialPayload>(authorization)
         if (credential.payload.action === 'open') {
           return new Response('ok', {
             status: 200,
@@ -2510,7 +2609,7 @@ describe.runIf(isLocalnet)('session', () => {
           },
           request: makeRequest(),
         }),
-      ).rejects.toThrow('voucher cumulativeAmount is below on-chain settled amount')
+      ).rejects.toThrow('voucher cumulativeAmount is at or below on-chain settled amount')
     })
 
     test('close after recovery respects on-chain settled as minimum', async () => {
@@ -4102,7 +4201,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4144,7 +4243,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4187,7 +4286,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4237,7 +4336,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4282,7 +4381,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('behavior: withReceipt accepts async generator and returns Response', async () => {
       const handler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             account: accounts[0],
             currency: asset,
             escrowContract,
@@ -4302,7 +4401,7 @@ describe.runIf(isLocalnet)('session', () => {
 
       if (result.status === 200) {
         // async generator function should be accepted and return Response
-        const response = result.withReceipt(async function* (_stream) {
+        const response = result.withReceipt(async function* (_stream: unknown) {
           yield 'token'
         })
         expectTypeOf(response).toEqualTypeOf<Response>()
@@ -4327,7 +4426,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('behavior: non-SSE session withReceipt only accepts Response', async () => {
       const handler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             account: accounts[0],
             currency: asset,
             escrowContract,
@@ -4354,7 +4453,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4385,11 +4484,11 @@ describe.runIf(isLocalnet)('session', () => {
         if (result.status === 402) return result.challenge
 
         if (action === 'voucher') {
-          return new Response(null, { status: 200 })
+          return result.withReceipt()
         }
 
         if (request.headers.get('Accept')?.includes('text/event-stream')) {
-          return result.withReceipt(async function* (stream) {
+          return result.withReceipt(async function* (stream: { charge(): Promise<void> }) {
             await stream.charge()
             yield 'chunk-1'
             await stream.charge()
@@ -4432,7 +4531,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4463,7 +4562,7 @@ describe.runIf(isLocalnet)('session', () => {
         if (result.status === 402) return result.challenge
 
         if (action === 'voucher') {
-          return new Response(null, { status: 200 })
+          return result.withReceipt()
         }
 
         if (request.headers.get('Accept')?.includes('text/event-stream')) {
@@ -4517,7 +4616,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const route = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4600,7 +4699,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4631,11 +4730,11 @@ describe.runIf(isLocalnet)('session', () => {
         if (result.status === 402) return result.challenge
 
         if (action === 'voucher') {
-          return new Response(null, { status: 200 })
+          return result.withReceipt()
         }
 
         if (request.headers.get('Accept')?.includes('text/event-stream')) {
-          return result.withReceipt(async function* (stream) {
+          return result.withReceipt(async function* (stream: { charge(): Promise<void> }) {
             await stream.charge()
             yield 'chunk-1'
             await stream.charge()
@@ -4674,7 +4773,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4694,7 +4793,7 @@ describe.runIf(isLocalnet)('session', () => {
         if (result.status === 402) return result.challenge
 
         if (request.headers.get('Accept')?.includes('text/event-stream')) {
-          return result.withReceipt(async function* (stream) {
+          return result.withReceipt(async function* (stream: { charge(): Promise<void> }) {
             await stream.charge()
             yield 'chunk-1'
             await stream.charge()
@@ -4746,7 +4845,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4859,7 +4958,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -4972,7 +5071,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -5082,7 +5181,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('rejects websocket receipts bound to a different channel', async () => {
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: Store.memory(),
             getClient: () => client,
             account: recipientAccount,
@@ -5169,7 +5268,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -5262,7 +5361,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('rejects close-ready receipts beyond local voucher state', async () => {
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: Store.memory(),
             getClient: () => client,
             account: recipientAccount,
@@ -5371,7 +5470,7 @@ describe.runIf(isLocalnet)('session', () => {
       const backingStore = Store.memory()
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: backingStore,
             getClient: () => client,
             account: recipientAccount,
@@ -5473,7 +5572,7 @@ describe.runIf(isLocalnet)('session', () => {
     test('rejects tx-bearing open receipts replayed during websocket close', async () => {
       const routeHandler = Mppx_server.create({
         methods: [
-          tempo_server.session({
+          tempo_server.sessionLegacy({
             store: Store.memory(),
             getClient: () => client,
             account: recipientAccount,
@@ -5592,7 +5691,7 @@ describe('monotonicity and TOCTOU (unit tests)', () => {
 
   function seedChannel(
     store: ChannelStore.ChannelStore,
-    overrides: Partial<ChannelStore.State> = {},
+    overrides: Partial<ChannelStore.BaseState & ChannelStore.LegacyContractBackendState> = {},
   ) {
     return store.updateChannel(testChannelId, () => ({
       channelId: testChannelId,
@@ -5932,7 +6031,7 @@ describe('session default currency resolution', () => {
   test('challenge contains USDC currency (mainnet default)', async () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockMainnetClient,
           account: mockAccount,
@@ -5959,7 +6058,7 @@ describe('session default currency resolution', () => {
   test('challenge contains pathUSD currency when testnet: true', async () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockTestnetClient,
           account: mockAccount,
@@ -5986,7 +6085,7 @@ describe('session default currency resolution', () => {
   test('challenge contains pathUSD currency (unknown chain)', async () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockTestnetClient,
           account: mockAccount,
@@ -6012,7 +6111,7 @@ describe('session default currency resolution', () => {
   test('explicit currency in challenge overrides testnet default', async () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockClient,
           account: mockAccount,
@@ -6041,7 +6140,7 @@ describe('session default currency resolution', () => {
   test('handler.session throws for zero-amount routes', () => {
     const handler = Mppx_server.create({
       methods: [
-        tempo_server.session({
+        tempo_server.sessionLegacy({
           store: Store.memory(),
           getClient: () => mockClient,
           account: mockAccount,