mppx 0.4.12 → 0.5.0

package/src/server/Mppx.test.ts

@@ -422,6 +422,92 @@ describe('request handler', () => {
     `)
     expect((body as { detail: string }).detail).toContain('Payment expired at')
   })
+  test('returns 402 when credential challenge has no expires (fail-closed)', async () => {
+    const handle = Mppx.create({ methods: [method], realm, secretKey }).charge({
+      amount: '1000',
+      currency: asset,
+      expires: new Date(Date.now() + 60_000).toISOString(),
+      recipient: accounts[0].address,
+    })
+
+    // Get a valid challenge from the server to capture the exact request shape
+    const firstResult = await handle(new Request('https://example.com/resource'))
+    expect(firstResult.status).toBe(402)
+    if (firstResult.status !== 402) throw new Error()
+
+    const serverChallenge = Challenge.fromResponse(firstResult.challenge)
+
+    // Re-create the same challenge WITHOUT expires, with a valid HMAC
+    const { expires: _, ...rest } = serverChallenge
+    const challengeNoExpires = Challenge.from({
+      secretKey,
+      realm: rest.realm,
+      method: rest.method,
+      intent: rest.intent,
+      request: rest.request,
+      ...(rest.opaque && { meta: rest.opaque }),
+    })
+
+    const credential = Credential.from({
+      challenge: challengeNoExpires,
+      payload: { signature: '0x123', type: 'transaction' },
+    })
+
+    const result = await handle(
+      new Request('https://example.com/resource', {
+        headers: { Authorization: Credential.serialize(credential) },
+      }),
+    )
+
+    expect(result.status).toBe(402)
+    if (result.status !== 402) throw new Error()
+
+    const body = (await result.challenge.json()) as { title: string; detail: string }
+    expect(body.title).toBe('Invalid Challenge')
+    expect(body.detail).toContain('missing required expires')
+  })
+  test('returns 402 when credential challenge has malformed expires', async () => {
+    const handle = Mppx.create({ methods: [method], realm, secretKey }).charge({
+      amount: '1000',
+      currency: asset,
+      expires: new Date(Date.now() + 60_000).toISOString(),
+      recipient: accounts[0].address,
+    })
+
+    // Get a valid challenge from the server to capture the exact request shape
+    const firstResult = await handle(new Request('https://example.com/resource'))
+    expect(firstResult.status).toBe(402)
+    if (firstResult.status !== 402) throw new Error()
+
+    const serverChallenge = Challenge.fromResponse(firstResult.challenge)
+
+    // Re-create the challenge with a valid HMAC but inject a malformed expires
+    // by patching the challenge object after construction (bypasses zod at build time).
+    const challengeMalformed = {
+      ...serverChallenge,
+      expires: 'not-a-timestamp',
+    }
+
+    const credential = Credential.from({
+      challenge: challengeMalformed as any,
+      payload: { signature: '0x123', type: 'transaction' },
+    })
+
+    // Credential.serialize does not re-validate, so the malformed expires
+    // reaches the server. Deserialization rejects it via zod schema.
+    const result = await handle(
+      new Request('https://example.com/resource', {
+        headers: { Authorization: Credential.serialize(credential) },
+      }),
+    )
+
+    expect(result.status).toBe(402)
+    if (result.status !== 402) throw new Error()
+
+    const body = (await result.challenge.json()) as { title: string; detail: string }
+    expect(body.title).toBe('Malformed Credential')
+  })
+
   test('returns 402 when payload schema validation fails', async () => {
     const handle = Mppx.create({ methods: [method], realm, secretKey }).charge({
       amount: '1000',

package/src/server/Mppx.ts

@@ -418,14 +418,14 @@ function createMethodFn(parameters: createMethodFn.Parameters): createMethodFn.R
           }
         }
 
-        // Reject expired credentials
-        if (credential.challenge.expires && new Date(credential.challenge.expires) < new Date()) {
+        // Reject credentials without expires (fail-closed) or with expired timestamp
+        try {
+          Expires.assert(credential.challenge.expires, credential.challenge.id)
+        } catch (error) {
           const response = await transport.respondChallenge({
             challenge,
             input,
-            error: new Errors.PaymentExpiredError({
-              expires: credential.challenge.expires,
-            }),
+            error: error as Errors.PaymentError,
           })
           return { challenge: response, status: 402 }
         }

package/src/stripe/server/Charge.ts

@@ -1,9 +1,6 @@
 import type * as Credential from '../../Credential.js'
-import {
-  PaymentActionRequiredError,
-  PaymentExpiredError,
-  VerificationFailedError,
-} from '../../Errors.js'
+import { PaymentActionRequiredError, VerificationFailedError } from '../../Errors.js'
+import * as Expires from '../../Expires.js'
 import type { LooseOmit, OneOf } from '../../internal/types.js'
 import * as Method from '../../Method.js'
 import type { StripeClient } from '../internal/types.js'
@@ -66,8 +63,7 @@ export function charge<const parameters extends charge.Parameters>(parameters: p
       const { challenge } = credential
       const { request } = challenge
 
-      if (challenge.expires && new Date(challenge.expires) < new Date())
-        throw new PaymentExpiredError({ expires: challenge.expires })
+      Expires.assert(challenge.expires, challenge.id)
 
       const parsed = Methods.charge.schema.credential.payload.safeParse(credential.payload)
       if (!parsed.success) throw new Error('Invalid credential payload: missing or malformed spt')

package/src/tempo/Methods.test.ts

@@ -130,6 +130,32 @@ describe('charge', () => {
     expect(result.success).toBe(false)
   })
 
+  test('schema: rejects zero-amount with splits', () => {
+    const result = Methods.charge.schema.request.safeParse({
+      amount: '0',
+      currency: '0x20c0000000000000000000000000000000000001',
+      decimals: 6,
+      recipient: '0x1234567890abcdef1234567890abcdef12345678',
+      splits: [
+        {
+          amount: '0.1',
+          recipient: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd',
+        },
+      ],
+    })
+    expect(result.success).toBe(false)
+  })
+
+  test('schema: accepts zero-amount without splits', () => {
+    const result = Methods.charge.schema.request.safeParse({
+      amount: '0',
+      currency: '0x20c0000000000000000000000000000000000001',
+      decimals: 6,
+      recipient: '0x1234567890abcdef1234567890abcdef12345678',
+    })
+    expect(result.success).toBe(true)
+  })
+
   test('schema: rejects invalid request', () => {
     const result = Methods.charge.schema.request.safeParse({
       amount: '1',

package/src/tempo/Methods.ts

@@ -26,6 +26,7 @@ export const charge = Method.from({
       payload: z.discriminatedUnion('type', [
         z.object({ hash: z.hash(), type: z.literal('hash') }),
         z.object({ signature: z.signature(), type: z.literal('transaction') }),
+        z.object({ signature: z.signature(), type: z.literal('proof') }),
       ]),
     },
     request: z.pipe(

package/src/tempo/client/Charge.ts

@@ -1,6 +1,11 @@
 import type * as Hex from 'ox/Hex'
 import type { Address } from 'viem'
-import { prepareTransactionRequest, sendCallsSync, signTransaction } from 'viem/actions'
+import {
+  prepareTransactionRequest,
+  sendCallsSync,
+  signTypedData,
+  signTransaction,
+} from 'viem/actions'
 import { tempo as tempo_chain } from 'viem/chains'
 import { Actions } from 'viem/tempo'
 
@@ -13,6 +18,7 @@ import * as Attribution from '../Attribution.js'
 import * as AutoSwap from '../internal/auto-swap.js'
 import * as Charge_internal from '../internal/charge.js'
 import * as defaults from '../internal/defaults.js'
+import * as Proof from '../internal/proof.js'
 import * as Methods from '../Methods.js'
 
 /**
@@ -49,11 +55,28 @@ export function charge(parameters: charge.Parameters = {}) {
       const client = await getClient({ chainId })
       const account = getAccount(client, context)
 
+      const { request } = challenge
+      const { amount, methodDetails } = request
+
+      // Zero-amount: sign EIP-712 typed data instead of creating a transaction.
+      if (BigInt(amount) === 0n) {
+        const signature = await signTypedData(client, {
+          account,
+          domain: Proof.domain(chainId!),
+          types: Proof.types,
+          primaryType: 'Proof',
+          message: Proof.message(challenge.id),
+        })
+        return Credential.serialize({
+          challenge,
+          payload: { signature, type: 'proof' },
+          source: Proof.proofSource({ address: account.address, chainId: chainId! }),
+        })
+      }
+
       const mode =
         context?.mode ?? parameters.mode ?? (account.type === 'json-rpc' ? 'push' : 'pull')
 
-      const { request } = challenge
-      const { amount, methodDetails } = request
       const currency = request.currency as Address
 
       if (parameters.expectedRecipients) {

package/src/tempo/internal/charge.test.ts

@@ -0,0 +1,66 @@
+import type { Address } from 'viem'
+import { describe, expect, test } from 'vp/test'
+
+import { getTransfers } from './charge.js'
+
+const recipient = '0x1234567890abcdef1234567890abcdef12345678' as Address
+
+describe('getTransfers', () => {
+  test('returns single transfer when no splits', () => {
+    const transfers = getTransfers({ amount: '100', recipient })
+    expect(transfers).toEqual([{ amount: '100', memo: undefined, recipient }])
+  })
+
+  test('splits amount between primary and split recipients', () => {
+    const splitRecipient = '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd' as Address
+    const transfers = getTransfers({
+      amount: '100',
+      methodDetails: { splits: [{ amount: '30', recipient: splitRecipient }] },
+      recipient,
+    })
+    expect(transfers).toHaveLength(2)
+    expect(transfers[0]!.amount).toBe('70')
+    expect(transfers[0]!.recipient).toBe(recipient)
+    expect(transfers[1]!.amount).toBe('30')
+    expect(transfers[1]!.recipient).toBe(splitRecipient)
+  })
+
+  test('throws when amount is zero with no splits', () => {
+    expect(() => getTransfers({ amount: '0', recipient })).toThrow(
+      'split total must be less than total amount',
+    )
+  })
+
+  test('throws when amount is zero with splits', () => {
+    const splitRecipient = '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd' as Address
+    expect(() =>
+      getTransfers({
+        amount: '0',
+        methodDetails: { splits: [{ amount: '0', recipient: splitRecipient }] },
+        recipient,
+      }),
+    ).toThrow()
+  })
+
+  test('throws when split total equals amount', () => {
+    const splitRecipient = '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd' as Address
+    expect(() =>
+      getTransfers({
+        amount: '100',
+        methodDetails: { splits: [{ amount: '100', recipient: splitRecipient }] },
+        recipient,
+      }),
+    ).toThrow('split total must be less than total amount')
+  })
+
+  test('throws when split total exceeds amount', () => {
+    const splitRecipient = '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd' as Address
+    expect(() =>
+      getTransfers({
+        amount: '100',
+        methodDetails: { splits: [{ amount: '200', recipient: splitRecipient }] },
+        recipient,
+      }),
+    ).toThrow('split total must be less than total amount')
+  })
+})

package/src/tempo/internal/proof.test.ts

@@ -0,0 +1,36 @@
+import { describe, expect, test } from 'vp/test'
+
+import * as Proof from './proof.js'
+
+describe('Proof', () => {
+  test('types has Proof with challengeId field', () => {
+    expect(Proof.types).toEqual({
+      Proof: [{ name: 'challengeId', type: 'string' }],
+    })
+  })
+
+  test('domain returns EIP-712 domain with name, version, chainId', () => {
+    const d = Proof.domain(42431)
+    expect(d).toEqual({ name: 'MPP', version: '1', chainId: 42431 })
+  })
+
+  test('domain uses provided chainId', () => {
+    expect(Proof.domain(1).chainId).toBe(1)
+    expect(Proof.domain(99999).chainId).toBe(99999)
+  })
+
+  test('message wraps challengeId', () => {
+    expect(Proof.message('abc123')).toEqual({ challengeId: 'abc123' })
+  })
+
+  test('proofSource constructs did:pkh DID', () => {
+    expect(Proof.proofSource({ address: '0x1234567890abcdef', chainId: 42431 })).toBe(
+      'did:pkh:eip155:42431:0x1234567890abcdef',
+    )
+  })
+
+  test('proofSource preserves address casing', () => {
+    const address = '0xAbCdEf1234567890AbCdEf1234567890AbCdEf12'
+    expect(Proof.proofSource({ address, chainId: 1 })).toBe(`did:pkh:eip155:1:${address}`)
+  })
+})

package/src/tempo/internal/proof.ts

@@ -0,0 +1,19 @@
+/** EIP-712 typed data types for proof credentials. */
+export const types = {
+  Proof: [{ name: 'challengeId', type: 'string' }],
+} as const
+
+/** Constructs the EIP-712 domain for a proof credential. */
+export function domain(chainId: number) {
+  return { name: 'MPP', version: '1', chainId } as const
+}
+
+/** Constructs the EIP-712 message for a proof credential. */
+export function message(challengeId: string) {
+  return { challengeId } as const
+}
+
+/** Constructs the expected `did:pkh` source DID for a proof credential. */
+export function proofSource(parameters: { address: string; chainId: number }): string {
+  return `did:pkh:eip155:${parameters.chainId}:${parameters.address}`
+}