mppx 0.3.13 → 0.3.15

package/src/tempo/Methods.ts

@@ -1,6 +1,5 @@
 import type { Account } from 'viem'
 import { parseUnits } from 'viem'
-import * as Expires from '../Expires.js'
 import * as Method from '../Method.js'
 import * as z from '../zod.js'
 
@@ -26,7 +25,6 @@ export const charge = Method.from({
         currency: z.string(),
         decimals: z.number(),
         description: z.optional(z.string()),
-        expires: z._default(z.datetime(), () => Expires.minutes(5)),
         externalId: z.optional(z.string()),
         feePayer: z.optional(
           z.pipe(
@@ -137,7 +135,9 @@ export const session = Method.from({
           methodDetails: {
             escrowContract,
             ...(channelId !== undefined && { channelId }),
-            ...(minVoucherDelta !== undefined && { minVoucherDelta }),
+            ...(minVoucherDelta !== undefined && {
+              minVoucherDelta: parseUnits(minVoucherDelta, decimals).toString(),
+            }),
             ...(chainId !== undefined && { chainId }),
             ...(feePayer !== undefined && { feePayer }),
           },

package/src/tempo/client/Charge.ts

@@ -1,6 +1,6 @@
 import type * as Hex from 'ox/Hex'
 import type { Address } from 'viem'
-import { prepareTransactionRequest, signTransaction } from 'viem/actions'
+import { prepareTransactionRequest, sendCallsSync, signTransaction } from 'viem/actions'
 import { tempo as tempo_chain } from 'viem/chains'
 import { Actions } from 'viem/tempo'
 import * as Credential from '../../Credential.js'
@@ -39,6 +39,7 @@ export function charge(parameters: charge.Parameters = {}) {
     context: z.object({
       account: z.optional(z.custom<Account.getResolver.Parameters['account']>()),
       autoSwap: z.optional(z.custom<charge.AutoSwap>()),
+      mode: z.optional(z.enum(['push', 'pull'])),
     }),
 
     async createCredential({ challenge, context }) {
@@ -46,6 +47,9 @@ export function charge(parameters: charge.Parameters = {}) {
       const client = await getClient({ chainId })
       const account = getAccount(client, context)
 
+      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
@@ -79,6 +83,21 @@ export function charge(parameters: charge.Parameters = {}) {
 
       const calls = [...(swapCalls ?? []), transferCall]
 
+      if (mode === 'push') {
+        const { receipts } = await sendCallsSync(client, {
+          account,
+          calls: calls as never,
+          experimental_fallback: true,
+        })
+        const hash = receipts?.[0]?.transactionHash
+        if (!hash) throw new Error('No transaction receipt returned.')
+        return Credential.serialize({
+          challenge,
+          payload: { hash, type: 'hash' },
+          source: `did:pkh:eip155:${chainId}:${account.address}`,
+        })
+      }
+
       const prepared = await prepareTransactionRequest(client, {
         account,
         calls,
@@ -111,6 +130,15 @@ export declare namespace charge {
     autoSwap?: AutoSwap | undefined
     /** Client identifier used to derive the client fingerprint in attribution memos. */
     clientId?: string | undefined
+    /**
+     * Controls how the charge transaction is submitted.
+     *
+     * - `'push'`: Client broadcasts the transaction and sends the tx hash to the server.
+     * - `'pull'`: Client signs the transaction and sends the serialized tx to the server for broadcast.
+     *
+     * @default `'push'` for JSON-RPC accounts, `'pull'` for local accounts.
+     */
+    mode?: 'push' | 'pull' | undefined
   } & Account.getResolver.Parameters &
     Client.getResolver.Parameters
 }

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

@@ -30,6 +30,17 @@ const server = Mppx_server.create({
 describe('tempo', () => {
   describe('intent: charge; type: hash', () => {
     test('default', async () => {
+      const mppx = Mppx_client.create({
+        polyfill: false,
+        methods: [
+          tempo_client({
+            account: accounts[1],
+            mode: 'push',
+            getClient: () => client,
+          }),
+        ],
+      })
+
       const httpServer = await Http.createServer(async (req, res) => {
         const result = await Mppx_server.toNodeListener(
           server.charge({ amount: '1', decimals: 6 }),
@@ -38,43 +49,15 @@ describe('tempo', () => {
         res.end('OK')
       })
 
-      const response = await fetch(httpServer.url)
-      expect(response.status).toBe(402)
-
-      const challenge = Challenge.fromResponse(response, {
-        methods: [tempo_client.charge()],
-      })
-      const request = challenge.request
-      expect(request.methodDetails?.chainId).toBe(chain.id)
-
-      const memo = Attribution.encode({ serverId: challenge.realm })
-
-      const { receipt } = await Actions.token.transferSync(client, {
-        account: accounts[1],
-        amount: BigInt(request.amount),
-        memo,
-        to: request.recipient as Hex.Hex,
-        token: request.currency as Hex.Hex,
-      })
-      const hash = receipt.transactionHash
-
-      const credential = Credential.from({
-        challenge,
-        payload: { hash, type: 'hash' as const },
-      })
-
-      {
-        const response = await fetch(httpServer.url, {
-          headers: { Authorization: Credential.serialize(credential) },
-        })
-        expect(response.status).toBe(200)
+      const response = await mppx.fetch(httpServer.url)
+      expect(response.status).toBe(200)
 
-        const receipt = Receipt.fromResponse(response)
-        expect({
-          ...receipt,
-          reference: '[reference]',
-          timestamp: '[timestamp]',
-        }).toMatchInlineSnapshot(`
+      const receipt = Receipt.fromResponse(response)
+      expect({
+        ...receipt,
+        reference: '[reference]',
+        timestamp: '[timestamp]',
+      }).toMatchInlineSnapshot(`
             {
               "method": "tempo",
               "reference": "[reference]",
@@ -82,7 +65,6 @@ describe('tempo', () => {
               "timestamp": "[timestamp]",
             }
           `)
-      }
 
       httpServer.close()
     })
@@ -92,6 +74,17 @@ describe('tempo', () => {
       const overrideCurrency = asset
       const overrideExpires = new Date(Date.now() + 60_000).toISOString()
 
+      const mppx = Mppx_client.create({
+        polyfill: false,
+        methods: [
+          tempo_client({
+            account: accounts[1],
+            mode: 'push',
+            getClient: () => client,
+          }),
+        ],
+      })
+
       const httpServer = await Http.createServer(async (req, res) => {
         const result = await Mppx_server.toNodeListener(
           server.charge({
@@ -105,42 +98,11 @@ describe('tempo', () => {
         res.end('OK')
       })
 
-      const response = await fetch(httpServer.url)
-      expect(response.status).toBe(402)
-
-      const challenge = Challenge.fromResponse(response, {
-        methods: [tempo_client.charge()],
-      })
-      const request = challenge.request
-      expect(request.recipient).toBe(overrideRecipient)
-      expect(request.currency).toBe(overrideCurrency)
-      expect(request.expires).toBe(overrideExpires)
-
-      const memo = Attribution.encode({ serverId: challenge.realm })
-
-      const { receipt } = await Actions.token.transferSync(client, {
-        account: accounts[1],
-        amount: BigInt(request.amount),
-        memo,
-        to: request.recipient as Hex.Hex,
-        token: request.currency as Hex.Hex,
-      })
-      const hash = receipt.transactionHash
-
-      const credential = Credential.from({
-        challenge,
-        payload: { hash, type: 'hash' as const },
-      })
-
-      {
-        const response = await fetch(httpServer.url, {
-          headers: { Authorization: Credential.serialize(credential) },
-        })
-        expect(response.status).toBe(200)
+      const response = await mppx.fetch(httpServer.url)
+      expect(response.status).toBe(200)
 
-        const receipt = Receipt.fromResponse(response)
-        expect(receipt.status).toBe('success')
-      }
+      const receipt = Receipt.fromResponse(response)
+      expect(receipt.status).toBe('success')
 
       httpServer.close()
     })

package/src/tempo/server/Charge.ts

@@ -103,7 +103,8 @@ export function charge<const parameters extends charge.Parameters>(
       const client = await getClient({ chainId })
 
       const { request: challengeRequest } = challenge
-      const { amount, expires, methodDetails } = challengeRequest
+      const { amount, methodDetails } = challengeRequest
+      const expires = challenge.expires
 
       const currency = challengeRequest.currency as `0x${string}`
       const recipient = challengeRequest.recipient as `0x${string}`