tempo.ts 0.1.4 → 0.2.0

package/src/viem/e2e.test.ts

@@ -1,238 +1,867 @@
 import * as Http from 'node:http'
 import { createRequestListener } from '@remix-run/node-fetch-server'
-import { RpcRequest, RpcResponse } from 'ox'
-import { Transaction } from 'tempo.ts/viem'
-import { createClient, http, publicActions, walletActions } from 'viem'
-import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts'
-import { afterAll, beforeAll, describe, expect, test } from 'vitest'
-import { tempoTest } from '../../test/viem/config.js'
+import { RpcRequest, RpcResponse, WebCryptoP256 } from 'ox'
+import { Account, Transaction } from 'tempo.ts/viem'
+import {
+  createClient,
+  http,
+  parseUnits,
+  publicActions,
+  walletActions,
+} from 'viem'
+import { privateKeyToAccount } from 'viem/accounts'
+import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest'
+import {
+  accounts,
+  addresses,
+  rpcUrl,
+  tempoTest,
+} from '../../test/viem/config.js'
 import * as actions from './Actions/index.js'
 import { tempoActions } from './index.js'
 import { withFeePayer } from './Transport.js'
 
+const client = createClient({
+  chain: tempoTest({ feeToken: 1n }),
+  transport: http(),
+})
+  .extend(publicActions)
+  .extend(walletActions)
+  .extend(tempoActions())
+
 describe('sendTransaction', () => {
-  test('default', async () => {
-    const client = createClient({
-      account: mnemonicToAccount(
-        'test test test test test test test test test test test junk',
-      ),
-      chain: tempoTest,
-      transport: http(),
+  describe('secp256k1', () => {
+    test('default', async () => {
+      const account = accounts[0]
+
+      const hash = await client.sendTransaction({
+        account,
+        data: '0xdeadbeef',
+        feeToken: '0x20c0000000000000000000000000000000000001',
+        to: '0x0000000000000000000000000000000000000000',
+      })
+      await client.waitForTransactionReceipt({ hash })
+
+      const {
+        blockHash: _,
+        blockNumber: __,
+        ...transaction
+      } = await client.getTransaction({ hash })
+
+      expect(transaction).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "calls": [
+            {
+              "data": "0xdeadbeef",
+              "to": "0x0000000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayerSignature": undefined,
+          "feeToken": "0x20c0000000000000000000000000000000000001",
+          "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+          "gas": 24002n,
+          "gasPrice": 10000000000n,
+          "hash": "0x19ffdd8817d0180edc18be1ab5001445eaf267713e8d5f9e87e9b481413aca46",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 0,
+          "nonceKey": 0n,
+          "signature": {
+            "signature": {
+              "r": 18480044007397695090640579354047056183881606998783899463314972543335313635471n,
+              "s": 7944214793912353709460484452936700808754473617494909879093391150696529863949n,
+              "yParity": 1,
+            },
+            "type": "secp256k1",
+          },
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
     })
-      .extend(publicActions)
-      .extend(walletActions)
 
-    const hash = await client.sendTransaction({
-      data: '0xdeadbeef',
-      feeToken: '0x20c0000000000000000000000000000000000001',
-      to: '0x0000000000000000000000000000000000000000',
+    test('with calls', async () => {
+      const hash = await client.sendTransaction({
+        account: accounts[0],
+        calls: [
+          actions.token.create.call({
+            admin: accounts[0].address,
+            currency: 'USD',
+            name: 'Test Token 3',
+            symbol: 'TEST3',
+          }),
+        ],
+      })
+      await client.waitForTransactionReceipt({ hash })
+
+      const transaction = await client.getTransaction({ hash })
+      expect({
+        ...transaction,
+        blockHash: undefined,
+        blockNumber: undefined,
+      }).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "blockHash": undefined,
+          "blockNumber": undefined,
+          "calls": [
+            {
+              "data": "0xb395b9ac00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000020c0000000000000000000000000000000000000000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266000000000000000000000000000000000000000000000000000000000000000c5465737420546f6b656e203300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005544553543300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000035553440000000000000000000000000000000000000000000000000000000000",
+              "to": "0x20fc000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayerSignature": undefined,
+          "feeToken": null,
+          "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+          "gas": 239290n,
+          "gasPrice": 10000000000n,
+          "hash": "0x1b62b8248f353290df1c914ee4aaf37c5ece8d020e1ac171cf78906612d7bc5a",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 1,
+          "nonceKey": 0n,
+          "signature": {
+            "signature": {
+              "r": 78503646767442786974432974752095559477349685648765578842048507711761355176107n,
+              "s": 57178559224012078251730091306310112266493733814812722813686070134939395899608n,
+              "yParity": 0,
+            },
+            "type": "secp256k1",
+          },
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
     })
-    await client.waitForTransactionReceipt({ hash })
 
-    const {
-      blockHash: _,
-      blockNumber: __,
-      ...transaction
-    } = await client.getTransaction({ hash })
+    test('with feePayer', async () => {
+      const account = privateKeyToAccount(
+        // unfunded PK
+        '0xecc3fe55647412647e5c6b657c496803b08ef956f927b7a821da298cfbdd9666',
+      )
+      const feePayer = accounts[0]
 
-    expect(transaction).toMatchInlineSnapshot(`
-      {
-        "accessList": [],
-        "authorizationList": undefined,
-        "calls": [
-          {
-            "data": "0xdeadbeef",
-            "to": "0x0000000000000000000000000000000000000000",
-            "value": 0n,
+      const hash = await client.sendTransaction({
+        account,
+        feePayer,
+        to: '0x0000000000000000000000000000000000000000',
+      })
+      await client.waitForTransactionReceipt({ hash })
+
+      const {
+        blockHash: _,
+        blockNumber: __,
+        ...transaction
+      } = await client.getTransaction({ hash })
+
+      expect(transaction).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "calls": [
+            {
+              "data": "0x",
+              "to": "0x0000000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayer": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+          "feePayerSignature": {
+            "r": "0x8f719d9463938d85897ee74b518c4121995791c59873199e2bbc1d9d69a458b6",
+            "s": "0x45c622bec0e381c5a06cfe7c5397cace1f7972137cefd1eba87174d7936a689c",
+            "v": 27n,
+            "yParity": 0,
           },
-        ],
-        "chainId": 1337,
-        "data": undefined,
-        "feePayerSignature": undefined,
-        "feeToken": "0x20c0000000000000000000000000000000000001",
-        "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-        "gas": 53793n,
-        "gasPrice": 44n,
-        "hash": "0xab174e234e36ccb8bfa8c4917541b283c6bb71c0018b22aab44e2ac3d6472487",
-        "maxFeePerBlobGas": undefined,
-        "maxFeePerGas": 52n,
-        "maxPriorityFeePerGas": 0n,
-        "nonce": 0,
-        "nonceKey": 0n,
-        "signature": {
+          "feeToken": null,
+          "from": "0x740474977e01d056f04a314b5537e4dd88f35952",
+          "gas": 23938n,
+          "gasPrice": 10000000000n,
+          "hash": "0x5aae48907ceccf3331f634bf9a76fe51f52576000e4becac929ed04d953fb0bb",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 0,
+          "nonceKey": 0n,
           "signature": {
-            "r": 33687256364985057221987783909312106640857703993135866595362338429449340139426n,
-            "s": 20898247015832861772943764590866653791079823975780950675135942025860554494301n,
-            "yParity": 1,
+            "signature": {
+              "r": 65079212976636076484448674374308068589367423744201870901549594095730781246312n,
+              "s": 36138663572355181246084885182221172668063229180861599797673217267233822764445n,
+              "yParity": 1,
+            },
+            "type": "secp256k1",
           },
-          "type": "secp256k1",
-        },
-        "to": null,
-        "transactionIndex": 0,
-        "type": "aa",
-        "typeHex": "0x76",
-        "v": undefined,
-        "validAfter": null,
-        "validBefore": null,
-        "value": 0n,
-        "yParity": undefined,
-      }
-    `)
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
   })
 
-  test('with calls', async () => {
-    const client = createClient({
-      account: mnemonicToAccount(
-        'test test test test test test test test test test test junk',
-      ),
-      chain: tempoTest,
-      transport: http(),
-    })
-      .extend(publicActions)
-      .extend(walletActions)
-
-    const hash = await client.sendTransaction({
-      calls: [
-        actions.token.create.call({
-          admin: client.account.address,
-          currency: 'USD',
-          name: 'Test Token 3',
-          symbol: 'TEST3',
-        }),
-      ],
-    })
-    await client.waitForTransactionReceipt({ hash })
+  describe('p256', () => {
+    test('default', async () => {
+      const account = Account.fromP256(
+        '0x6a3086fb3f2f95a3f36ef5387d18151ff51dc98a1e0eb987b159ba196beb0c99',
+      )
 
-    const transaction = await client.getTransaction({ hash })
-    expect({
-      ...transaction,
-      blockHash: undefined,
-      blockNumber: undefined,
-    }).toMatchInlineSnapshot(`
-      {
-        "accessList": [],
-        "authorizationList": undefined,
-        "blockHash": undefined,
-        "blockNumber": undefined,
-        "calls": [
-          {
-            "data": "0xb395b9ac00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000020c0000000000000000000000000000000000000000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266000000000000000000000000000000000000000000000000000000000000000c5465737420546f6b656e203300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005544553543300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000035553440000000000000000000000000000000000000000000000000000000000",
-            "to": "0x20fc000000000000000000000000000000000000",
-            "value": 0n,
+      // fund account
+      await client.token.transferSync({
+        account: accounts[0],
+        token: addresses.alphaUsd,
+        to: account.address,
+        amount: parseUnits('10000', 6),
+      })
+
+      const receipt = await client.sendTransactionSync({
+        account,
+        data: '0xdeadbeef',
+        to: '0x0000000000000000000000000000000000000000',
+      })
+
+      const transaction = await client.getTransaction({
+        hash: receipt.transactionHash,
+      })
+      expect({
+        ...transaction,
+        blockHash: undefined,
+        blockNumber: undefined,
+      }).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "blockHash": undefined,
+          "blockNumber": undefined,
+          "calls": [
+            {
+              "data": "0xdeadbeef",
+              "to": "0x0000000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayerSignature": undefined,
+          "feeToken": null,
+          "from": "0xfc39755d501fa7b79164f74efb906e87ecde342c",
+          "gas": 29012n,
+          "gasPrice": 10000000000n,
+          "hash": "0x13ed96d72f7b21a19f30b734575004fb34cd0694b54d6833cc88e3de37d61d58",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 0,
+          "nonceKey": 0n,
+          "signature": {
+            "prehash": undefined,
+            "publicKey": {
+              "prefix": 4,
+              "x": 76851314197341596384765982852901663495246887984601955818013524729577854391357n,
+              "y": 28479403900638612718017087999484027026245572142646745985103165612268853186552n,
+            },
+            "signature": {
+              "r": 82730263136973498533190232493673429238005086892575761509437404111798066703019n,
+              "s": 44946766134305303588824367771503538281500341815262656891619888686974098389980n,
+            },
+            "type": "p256",
           },
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
+
+    test('with calls', async () => {
+      const account = Account.fromP256(
+        '0x6a3086fb3f2f95a3f36ef5387d18151ff51dc98a1e0eb987b159ba196beb0c99',
+      )
+
+      // fund account
+      await client.token.transferSync({
+        account: accounts[0],
+        token: addresses.alphaUsd,
+        to: account.address,
+        amount: parseUnits('10000', 6),
+      })
+
+      const receipt = await client.sendTransactionSync({
+        account,
+        calls: [
+          actions.token.create.call({
+            admin: account.address,
+            currency: 'USD',
+            name: 'Test Token 4',
+            symbol: 'TEST4',
+          }),
         ],
-        "chainId": 1337,
-        "data": undefined,
-        "feePayerSignature": undefined,
-        "feeToken": null,
-        "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-        "gas": 53793n,
-        "gasPrice": 44n,
-        "hash": "0xaac409f81cf7a716479d4a1b516a3514edbe9d6def569725de8a36715e30f4c5",
-        "maxFeePerBlobGas": undefined,
-        "maxFeePerGas": 52n,
-        "maxPriorityFeePerGas": 0n,
-        "nonce": 0,
-        "nonceKey": 0n,
-        "signature": {
+        // TODO: remove once `eth_estimateGas` supports passing key type.
+        gas: 100_000n,
+      })
+
+      const transaction = await client.getTransaction({
+        hash: receipt.transactionHash,
+      })
+      expect({
+        ...transaction,
+        blockHash: undefined,
+        blockNumber: undefined,
+      }).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "blockHash": undefined,
+          "blockNumber": undefined,
+          "calls": [
+            {
+              "data": "0xb395b9ac00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000020c0000000000000000000000000000000000000000000000000000000000000fc39755d501fa7b79164f74efb906e87ecde342c000000000000000000000000000000000000000000000000000000000000000c5465737420546f6b656e203400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005544553543400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000035553440000000000000000000000000000000000000000000000000000000000",
+              "to": "0x20fc000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayerSignature": undefined,
+          "feeToken": null,
+          "from": "0xfc39755d501fa7b79164f74efb906e87ecde342c",
+          "gas": 100000n,
+          "gasPrice": 10000000000n,
+          "hash": "0x47d30679625b66e09219f73c11e657a8950259e814ec9bef0a8054bc418ce138",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 1,
+          "nonceKey": 0n,
           "signature": {
-            "r": 75472279831718666729809418999288579618977673042864019617021223809045246862945n,
-            "s": 33092981795205421900290930709795805463804729368014914886506847441614835773161n,
+            "prehash": undefined,
+            "publicKey": {
+              "prefix": 4,
+              "x": 76851314197341596384765982852901663495246887984601955818013524729577854391357n,
+              "y": 28479403900638612718017087999484027026245572142646745985103165612268853186552n,
+            },
+            "signature": {
+              "r": 113341784972223677657638155264375724813412569467929323654477865838324981972769n,
+              "s": 42271961989228659763384216377289107353157423528268870961696295632380366334643n,
+            },
+            "type": "p256",
+          },
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
+
+    test('with feePayer', async () => {
+      const account = Account.fromP256(
+        // unfunded account with different key
+        '0x1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b',
+      )
+      const feePayer = accounts[0]
+
+      const hash = await client.sendTransaction({
+        account,
+        feePayer,
+        to: '0x0000000000000000000000000000000000000000',
+      })
+      await client.waitForTransactionReceipt({ hash })
+
+      const {
+        blockHash: _,
+        blockNumber: __,
+        ...transaction
+      } = await client.getTransaction({ hash })
+
+      expect(transaction).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "calls": [
+            {
+              "data": "0x",
+              "to": "0x0000000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayer": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+          "feePayerSignature": {
+            "r": "0x9d9e74278c306658fff5cca2a736f07c475d3dbe4b931ba73be8543d522b5430",
+            "s": "0x2224242aaf6fa17b8f2266bea1ad501837c2c2ad13e0d96b9ed29ecb60ba1ac4",
+            "v": 27n,
             "yParity": 0,
           },
-          "type": "secp256k1",
-        },
-        "to": null,
-        "transactionIndex": 0,
-        "type": "aa",
-        "typeHex": "0x76",
-        "v": undefined,
-        "validAfter": null,
-        "validBefore": null,
-        "value": 0n,
-        "yParity": undefined,
-      }
-    `)
+          "feeToken": null,
+          "from": "0x5f704c6c7075acd14ee36527f03b5b5dcb4a966f",
+          "gas": 28947n,
+          "gasPrice": 10000000000n,
+          "hash": "0x77ce7f3b60540465d681b360293aaafca496c0a2ff2a4f5f146f144206a487dd",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 0,
+          "nonceKey": 0n,
+          "signature": {
+            "prehash": undefined,
+            "publicKey": {
+              "prefix": 4,
+              "x": 89768657165983002447270155621964907577955735922001002175265262336201091268103n,
+              "y": 21692506528696391747937034302216251793515398807520467579078748804389014172835n,
+            },
+            "signature": {
+              "r": 6861653902973636215987311933940928353425544366774814432483697786223275705586n,
+              "s": 7277254520198161524871116736077233939785567558470334763663181456500888822079n,
+            },
+            "type": "p256",
+          },
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
   })
 
-  test('with feePayer', async () => {
-    const account = privateKeyToAccount(
-      // unfunded PK
-      '0xecc3fe55647412647e5c6b657c496803b08ef956f927b7a821da298cfbdd9666',
-    )
-    const feePayer = mnemonicToAccount(
-      'test test test test test test test test test test test junk',
-    )
+  describe('webcrypto', () => {
+    test('default', async () => {
+      const keyPair = await WebCryptoP256.createKeyPair()
+      const account = Account.fromWebCryptoP256(keyPair)
 
-    const client = createClient({
-      account,
-      chain: tempoTest,
-      transport: http(),
+      // fund account
+      await client.token.transferSync({
+        account: accounts[0],
+        token: addresses.alphaUsd,
+        to: account.address,
+        amount: parseUnits('10000', 6),
+      })
+
+      const receipt = await client.sendTransactionSync({
+        account,
+        data: '0xdeadbeef',
+        to: '0x0000000000000000000000000000000000000000',
+      })
+
+      const transaction = await client.getTransaction({
+        hash: receipt.transactionHash,
+      })
+      expect({
+        ...transaction,
+        blockHash: undefined,
+        blockNumber: undefined,
+        from: undefined,
+        hash: undefined,
+        signature: undefined,
+      }).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "blockHash": undefined,
+          "blockNumber": undefined,
+          "calls": [
+            {
+              "data": "0xdeadbeef",
+              "to": "0x0000000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayerSignature": undefined,
+          "feeToken": null,
+          "from": undefined,
+          "gas": 29012n,
+          "gasPrice": 10000000000n,
+          "hash": undefined,
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 0,
+          "nonceKey": 0n,
+          "signature": undefined,
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
     })
-      .extend(publicActions)
-      .extend(walletActions)
 
-    const hash = await client.sendTransaction({
-      feePayer,
-      to: '0x0000000000000000000000000000000000000000',
+    test('with calls', async () => {
+      const keyPair = await WebCryptoP256.createKeyPair()
+      const account = Account.fromWebCryptoP256(keyPair)
+
+      // fund account
+      await client.token.transferSync({
+        account: accounts[0],
+        token: addresses.alphaUsd,
+        to: account.address,
+        amount: parseUnits('10000', 6),
+      })
+
+      const receipt = await client.sendTransactionSync({
+        account,
+        calls: [
+          actions.token.create.call({
+            admin: account.address,
+            currency: 'USD',
+            name: 'Test Token 5',
+            symbol: 'TEST5',
+          }),
+        ],
+        // TODO: remove once `eth_estimateGas` supports passing key type.
+        gas: 100_000n,
+      })
+
+      const transaction = await client.getTransaction({
+        hash: receipt.transactionHash,
+      })
+      expect(transaction).toBeDefined()
     })
-    await client.waitForTransactionReceipt({ hash })
 
-    const {
-      blockHash: _,
-      blockNumber: __,
-      ...transaction
-    } = await client.getTransaction({ hash })
+    test('with feePayer', async () => {
+      const keyPair = await WebCryptoP256.createKeyPair()
+      const account = Account.fromWebCryptoP256(keyPair)
+      const feePayer = accounts[0]
 
-    expect(transaction).toMatchInlineSnapshot(`
-      {
-        "accessList": [],
-        "authorizationList": undefined,
-        "calls": [
-          {
-            "data": "0x",
-            "to": "0x0000000000000000000000000000000000000000",
-            "value": 0n,
+      const hash = await client.sendTransaction({
+        account,
+        feePayer,
+        to: '0x0000000000000000000000000000000000000000',
+      })
+      await client.waitForTransactionReceipt({ hash })
+
+      const transaction = await client.getTransaction({ hash })
+      expect(transaction).toBeDefined()
+    })
+  })
+
+  describe('webAuthn', () => {
+    test('default', async () => {
+      const account = Account.fromHeadlessWebAuthn(
+        '0x6a3086fb3f2f95a3f36ef5387d18151ff51dc98a1e0eb987b159ba196beb0c99',
+        {
+          rpId: 'localhost',
+          origin: 'http://localhost',
+        },
+      )
+
+      // fund account
+      await client.token.transferSync({
+        account: accounts[0],
+        token: addresses.alphaUsd,
+        to: account.address,
+        amount: parseUnits('10000', 6),
+      })
+
+      const receipt = await client.sendTransactionSync({
+        account,
+        data: '0xdeadbeef',
+        to: '0x0000000000000000000000000000000000000000',
+      })
+
+      const transaction = await client.getTransaction({
+        hash: receipt.transactionHash,
+      })
+      expect({
+        ...transaction,
+        blockHash: undefined,
+        blockNumber: undefined,
+      }).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "blockHash": undefined,
+          "blockNumber": undefined,
+          "calls": [
+            {
+              "data": "0xdeadbeef",
+              "to": "0x0000000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayerSignature": undefined,
+          "feeToken": null,
+          "from": "0xfc39755d501fa7b79164f74efb906e87ecde342c",
+          "gas": 41404n,
+          "gasPrice": 10000000000n,
+          "hash": "0x1b56e02e48a5c39478bcc7f912108892a8fa0302747c6928260fc89cd8729499",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 2,
+          "nonceKey": 0n,
+          "signature": {
+            "metadata": {
+              "authenticatorData": "0x49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000",
+              "clientDataJSON": "{"type":"webauthn.get","challenge":"YHxXuO3IIuui0Kz1A5bvEMnEwcV1jXHGgH4s_DEFq0Q","origin":"http://localhost","crossOrigin":false}",
+            },
+            "publicKey": {
+              "prefix": 4,
+              "x": 76851314197341596384765982852901663495246887984601955818013524729577854391357n,
+              "y": 28479403900638612718017087999484027026245572142646745985103165612268853186552n,
+            },
+            "signature": {
+              "r": 20513840452271821919896541370744222233657684228117041709895363014729132314467n,
+              "s": 27363596257739130609932989541270702074673583176160656328016769892248487926140n,
+            },
+            "type": "webAuthn",
           },
-        ],
-        "chainId": 1337,
-        "data": undefined,
-        "feePayer": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-        "feePayerSignature": {
-          "r": "0xc2406b257f0a6af102739a49ec871137037eb9ce0a26be112cda91b0b55f0866",
-          "s": "0x713f4df2408d1e38d8d54447213e41acd68829e19712243e6dfd188e2fe07ca0",
-          "v": 28n,
-          "yParity": 1,
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
+
+    test('with calls', async () => {
+      const account = Account.fromHeadlessWebAuthn(
+        '0x6a3086fb3f2f95a3f36ef5387d18151ff51dc98a1e0eb987b159ba196beb0c99',
+        {
+          rpId: 'localhost',
+          origin: 'http://localhost',
         },
-        "feeToken": null,
-        "from": "0x740474977e01d056f04a314b5537e4dd88f35952",
-        "gas": 53793n,
-        "gasPrice": 44n,
-        "hash": "0x5b7ae2e6eb4d460522a62cf031ec37f9ce649f0fa1108071a7ba15c6d20f8f3b",
-        "maxFeePerBlobGas": undefined,
-        "maxFeePerGas": 52n,
-        "maxPriorityFeePerGas": 0n,
-        "nonce": 0,
-        "nonceKey": 0n,
-        "signature": {
+      )
+
+      // fund account
+      await client.token.transferSync({
+        account: accounts[0],
+        token: addresses.alphaUsd,
+        to: account.address,
+        amount: parseUnits('10000', 6),
+      })
+
+      const receipt = await client.sendTransactionSync({
+        account,
+        calls: [
+          actions.token.create.call({
+            admin: account.address,
+            currency: 'USD',
+            name: 'Test Token 6',
+            symbol: 'TEST6',
+          }),
+        ],
+        // TODO: remove once `eth_estimateGas` supports passing key type.
+        gas: 100_000n,
+      })
+
+      const transaction = await client.getTransaction({
+        hash: receipt.transactionHash,
+      })
+      expect({
+        ...transaction,
+        blockHash: undefined,
+        blockNumber: undefined,
+      }).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "blockHash": undefined,
+          "blockNumber": undefined,
+          "calls": [
+            {
+              "data": "0xb395b9ac00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000020c0000000000000000000000000000000000000000000000000000000000000fc39755d501fa7b79164f74efb906e87ecde342c000000000000000000000000000000000000000000000000000000000000000c5465737420546f6b656e203600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005544553543600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000035553440000000000000000000000000000000000000000000000000000000000",
+              "to": "0x20fc000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayerSignature": undefined,
+          "feeToken": null,
+          "from": "0xfc39755d501fa7b79164f74efb906e87ecde342c",
+          "gas": 100000n,
+          "gasPrice": 10000000000n,
+          "hash": "0x6520a97076d29b5e1bc76cb4dcd813e5b2a1bdbf1bba622e542bab3de9ea4a9f",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 3,
+          "nonceKey": 0n,
           "signature": {
-            "r": 78092362620450313170407859447796714674816655259251697170830907867162787398844n,
-            "s": 8477378266727504882091645495297339736341469566116127798403581541349939397793n,
-            "yParity": 0,
+            "metadata": {
+              "authenticatorData": "0x49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000",
+              "clientDataJSON": "{"type":"webauthn.get","challenge":"PqvaeGCzQHEM5f8UU4LbjCY97K8kfxlwFl4VpOfQy9U","origin":"http://localhost","crossOrigin":false}",
+            },
+            "publicKey": {
+              "prefix": 4,
+              "x": 76851314197341596384765982852901663495246887984601955818013524729577854391357n,
+              "y": 28479403900638612718017087999484027026245572142646745985103165612268853186552n,
+            },
+            "signature": {
+              "r": 90764526189385409482244930589827202930214636605680311984211069314044601874317n,
+              "s": 54909273314024796243497246034814125113763800884613983294394271661966971076442n,
+            },
+            "type": "webAuthn",
           },
-          "type": "secp256k1",
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
+
+    test('with feePayer', async () => {
+      const account = Account.fromHeadlessWebAuthn(
+        // unfunded account with different key
+        '0x1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b',
+        {
+          rpId: 'localhost',
+          origin: 'http://localhost',
         },
-        "to": null,
-        "transactionIndex": 0,
-        "type": "aa",
-        "typeHex": "0x76",
-        "v": undefined,
-        "validAfter": null,
-        "validBefore": null,
-        "value": 0n,
-        "yParity": undefined,
-      }
-    `)
+      )
+      const feePayer = accounts[0]
+
+      const hash = await client.sendTransaction({
+        account,
+        feePayer,
+        to: '0x0000000000000000000000000000000000000000',
+      })
+      await client.waitForTransactionReceipt({ hash })
+
+      const {
+        blockHash: _,
+        blockNumber: __,
+        ...transaction
+      } = await client.getTransaction({ hash })
+
+      expect(transaction).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "calls": [
+            {
+              "data": "0x",
+              "to": "0x0000000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayer": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+          "feePayerSignature": {
+            "r": "0x90b71f46a775d5ca06725fcef4fe4763b4dce34bb72cde30a527ec26407baa84",
+            "s": "0x398d0192f02d503b5463b1f886790eee882f2329e7af44b8106f27930735041d",
+            "v": 28n,
+            "yParity": 1,
+          },
+          "feeToken": null,
+          "from": "0x5f704c6c7075acd14ee36527f03b5b5dcb4a966f",
+          "gas": 41340n,
+          "gasPrice": 10000000000n,
+          "hash": "0x6f6801526c00fba8e107e5064758bd20a978f3952b144f6c52bab1abfc913143",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 1,
+          "nonceKey": 0n,
+          "signature": {
+            "metadata": {
+              "authenticatorData": "0x49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000",
+              "clientDataJSON": "{"type":"webauthn.get","challenge":"dVrVJFewcT_ifvpphKoheG6VSAQJ_74h6g3O32Rri2Q","origin":"http://localhost","crossOrigin":false}",
+            },
+            "publicKey": {
+              "prefix": 4,
+              "x": 89768657165983002447270155621964907577955735922001002175265262336201091268103n,
+              "y": 21692506528696391747937034302216251793515398807520467579078748804389014172835n,
+            },
+            "signature": {
+              "r": 72341690970159629319932745028286754044171557161564831284038819357806396549916n,
+              "s": 47900412910547062549030763809045404303050255516583713899170528571925897239021n,
+            },
+            "type": "webAuthn",
+          },
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
   })
 })
 
@@ -242,19 +871,10 @@ describe('signTransaction', () => {
       // unfunded PK
       '0xecc3fe55647412647e5c6b657c496803b08ef956f927b7a821da298cfbdd9666',
     )
-    const feePayer = mnemonicToAccount(
-      'test test test test test test test test test test test junk',
-    )
-
-    const client = createClient({
-      account,
-      chain: tempoTest,
-      transport: http(),
-    })
-      .extend(walletActions)
-      .extend(publicActions)
+    const feePayer = accounts[0]
 
     const request = await client.prepareTransactionRequest({
+      account,
       data: '0xdeadbeef',
       feePayer: true,
       to: '0xcafebabecafebabecafebabecafebabecafebabe',
@@ -263,6 +883,7 @@ describe('signTransaction', () => {
 
     transaction = await client.signTransaction({
       ...Transaction.deserialize(transaction),
+      account,
       feePayer,
     })
     const hash = await client.sendRawTransaction({
@@ -279,6 +900,7 @@ describe('signTransaction', () => {
 
     expect(transaction2).toMatchInlineSnapshot(`
       {
+        "aaAuthorizationList": [],
         "accessList": [],
         "authorizationList": undefined,
         "calls": [
@@ -292,31 +914,31 @@ describe('signTransaction', () => {
         "data": undefined,
         "feePayer": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
         "feePayerSignature": {
-          "r": "0xd2174d7e41dec16cea89d13e8411e6e69cc9d7a1711861eba587bd02d1ba49f6",
-          "s": "0x30410097984493bdb80c6cb0cbc48055c9f570d161bdb8e9c23b8da71aa4769c",
-          "v": 27n,
-          "yParity": 0,
+          "r": "0x669793cc2483931ffe3141aab062c7f69d3d16d15003c1192ca944b019ef445a",
+          "s": "0x037cce00c3e94063ef98c4a55e9b11cdfc826ddae125d42cf679a6fcd1c8fef9",
+          "v": 28n,
+          "yParity": 1,
         },
         "feeToken": null,
         "from": "0x740474977e01d056f04a314b5537e4dd88f35952",
-        "gas": 53793n,
-        "gasPrice": 44n,
-        "hash": "0xc54c8ffa49ca69692cadbba5ac6e0f888c7fad53b59f6258f3fde027775832c9",
+        "gas": 24002n,
+        "gasPrice": 10000000000n,
+        "hash": "0xb0abd89951c7d053af43c7684859a604b381680dc8521e41e57a2412cef13211",
         "maxFeePerBlobGas": undefined,
-        "maxFeePerGas": 52n,
+        "maxFeePerGas": 12000000000n,
         "maxPriorityFeePerGas": 0n,
-        "nonce": 0,
+        "nonce": 1,
         "nonceKey": 0n,
         "signature": {
           "signature": {
-            "r": 44677545391995483967867222268488221760813651834887327154544748280403243454311n,
-            "s": 26359569188080842387556837532021842726007422277265560117459876153645612552527n,
-            "yParity": 1,
+            "r": 67093125285953111322286487053649634901104592648978739500209237696329559594663n,
+            "s": 23307791115004510736003345595881666676393686556128238040992902553893261582309n,
+            "yParity": 0,
           },
           "type": "secp256k1",
         },
         "to": null,
-        "transactionIndex": 0,
+        "transactionIndex": 1,
         "type": "aa",
         "typeHex": "0x76",
         "v": undefined,
@@ -330,16 +952,25 @@ describe('signTransaction', () => {
 })
 
 describe('relay', () => {
+  const client = createClient({
+    chain: tempoTest({ feeToken: 1n }),
+    transport: withFeePayer(http(), http('http://localhost:3000')),
+  })
+    .extend(tempoActions())
+    .extend(walletActions)
+    .extend(publicActions)
   let server: Http.Server
 
+  afterEach(async () => {
+    await fetch(`${rpcUrl}/restart`)
+  })
+
   beforeAll(async () => {
     server = Http.createServer(
       createRequestListener(async (r) => {
         const client = createClient({
-          account: mnemonicToAccount(
-            'test test test test test test test test test test test junk',
-          ),
-          chain: tempoTest,
+          account: accounts[0],
+          chain: tempoTest({ feeToken: 1n }),
           transport: http(),
         }).extend(walletActions)
 
@@ -401,86 +1032,284 @@ describe('relay', () => {
     })
   })
 
-  test('default', async () => {
-    const client = createClient({
-      account: privateKeyToAccount(
+  describe('secp256k1', () => {
+    test('default', async () => {
+      const account = privateKeyToAccount(
         // unfunded PK
         '0xecc3fe55647412647e5c6b657c496803b08ef956f927b7a821da298cfbdd9666',
-      ),
-      chain: tempoTest,
-      transport: withFeePayer(http(), http('http://localhost:3000')),
-    })
-      .extend(tempoActions())
-      .extend(walletActions)
-      .extend(publicActions)
+      )
 
-    const { receipt } = await client.fee.setUserTokenSync({
-      feePayer: true,
-      token: 1n,
-    })
+      const { receipt } = await client.fee.setUserTokenSync({
+        account,
+        feePayer: true,
+        token: 1n,
+      })
 
-    const userToken = await client.fee.getUserToken()
-    expect(userToken).toMatchInlineSnapshot(`
-      {
-        "address": "0x20C0000000000000000000000000000000000001",
-        "id": 1n,
-      }
-    `)
+      const userToken = await client.fee.getUserToken({ account })
+      expect(userToken).toMatchInlineSnapshot(`
+        {
+          "address": "0x20C0000000000000000000000000000000000001",
+          "id": 1n,
+        }
+      `)
 
-    const {
-      blockHash: _,
-      blockNumber: __,
-      ...transaction
-    } = await client.getTransaction({ hash: receipt.transactionHash })
+      const {
+        blockHash: _,
+        blockNumber: __,
+        ...transaction
+      } = await client.getTransaction({ hash: receipt.transactionHash })
 
-    expect(transaction).toMatchInlineSnapshot(`
-      {
-        "accessList": [],
-        "authorizationList": undefined,
-        "calls": [
-          {
-            "data": "0xe789744400000000000000000000000020c0000000000000000000000000000000000001",
-            "to": "0xfeec000000000000000000000000000000000000",
-            "value": 0n,
+      expect(transaction).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "calls": [
+            {
+              "data": "0xe789744400000000000000000000000020c0000000000000000000000000000000000001",
+              "to": "0xfeec000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayer": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+          "feePayerSignature": {
+            "r": "0x57f6f6777f1689f87c333d1fa37207cf668b2c2d7321dcd5c63a2e6a7108077e",
+            "s": "0x3c4270f67d8add0b5e7a9de6fee2b915cd754e1c0495ee88a1b78fd7568e6619",
+            "v": 28n,
+            "yParity": 1,
           },
-        ],
-        "chainId": 1337,
-        "data": undefined,
-        "feePayer": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-        "feePayerSignature": {
-          "r": "0x6485c1333cb3bef00a8742d92fe5e8921f10d68506de7ab6bd54049d8ac9d345",
-          "s": "0x552550b209d538830a2863731a2c3382a671bc40cfa69a01d1d616d3df63f43c",
-          "v": 28n,
-          "yParity": 1,
-        },
-        "feeToken": null,
-        "from": "0x740474977e01d056f04a314b5537e4dd88f35952",
-        "gas": 53793n,
-        "gasPrice": 44n,
-        "hash": "0xcb8f0e58ddb27f9fb3cbf200ec3023dffd43ced39c2e187c7907373082707420",
-        "maxFeePerBlobGas": undefined,
-        "maxFeePerGas": 52n,
-        "maxPriorityFeePerGas": 0n,
-        "nonce": 0,
-        "nonceKey": 0n,
-        "signature": {
+          "feeToken": null,
+          "from": "0x740474977e01d056f04a314b5537e4dd88f35952",
+          "gas": 47825n,
+          "gasPrice": 10000000000n,
+          "hash": "0xd8429515914095d1093e6cd0cace8a06890ed5a2e4e3c775f3196ec78b4fa75d",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 2,
+          "nonceKey": 0n,
           "signature": {
-            "r": 58099370446734310330089633205075850139248168609383772256670067872736796317902n,
-            "s": 40363612152801210185555264529559625661542041105068748708016255256620242651218n,
+            "signature": {
+              "r": 3978685029830144709654747044848526179202245954092725489802520292215589805538n,
+              "s": 13481864494883849326291583961518021266257348574613329487348338733748737047938n,
+              "yParity": 1,
+            },
+            "type": "secp256k1",
+          },
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
+  })
+
+  describe('p256', () => {
+    test('default', async () => {
+      const account = Account.fromP256(
+        '0x1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b',
+      )
+
+      const { receipt } = await client.fee.setUserTokenSync({
+        account,
+        feePayer: true,
+        token: 1n,
+      })
+
+      const userToken = await client.fee.getUserToken({ account })
+      expect(userToken).toMatchInlineSnapshot(`
+        {
+          "address": "0x20C0000000000000000000000000000000000001",
+          "id": 1n,
+        }
+      `)
+
+      const {
+        blockHash: _,
+        blockNumber: __,
+        ...transaction
+      } = await client.getTransaction({ hash: receipt.transactionHash })
+
+      expect(transaction).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "calls": [
+            {
+              "data": "0xe789744400000000000000000000000020c0000000000000000000000000000000000001",
+              "to": "0xfeec000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayer": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+          "feePayerSignature": {
+            "r": "0x44507c3e9e4df1dff5f54ca012c69b2556e5395d9166b3b4594181e4e656a1cc",
+            "s": "0x5ba80c21e194089173ffaed7c12a627f611d5fba846c84e2f6f83d55353f01d2",
+            "v": 28n,
             "yParity": 1,
           },
-          "type": "secp256k1",
+          "feeToken": null,
+          "from": "0x5f704c6c7075acd14ee36527f03b5b5dcb4a966f",
+          "gas": 53231n,
+          "gasPrice": 10000000000n,
+          "hash": "0xb6848050598c30b26855673a029127a5532885dd44719894f0ac1c6ce380cffe",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 0,
+          "nonceKey": 0n,
+          "signature": {
+            "prehash": undefined,
+            "publicKey": {
+              "prefix": 4,
+              "x": 89768657165983002447270155621964907577955735922001002175265262336201091268103n,
+              "y": 21692506528696391747937034302216251793515398807520467579078748804389014172835n,
+            },
+            "signature": {
+              "r": 50668837405839025212455471714452555085562104168132337639876146018573466159747n,
+              "s": 27497318506208669156329628613746311078142570431871623594260715714766657455474n,
+            },
+            "type": "p256",
+          },
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
+  })
+
+  describe('webcrypto', () => {
+    test('default', async () => {
+      const keyPair = await WebCryptoP256.createKeyPair()
+      const account = Account.fromWebCryptoP256(keyPair)
+
+      const { receipt } = await client.fee.setUserTokenSync({
+        account,
+        feePayer: true,
+        token: 1n,
+      })
+
+      const userToken = await client.fee.getUserToken({ account })
+      expect(userToken).toMatchInlineSnapshot(`
+        {
+          "address": "0x20C0000000000000000000000000000000000001",
+          "id": 1n,
+        }
+      `)
+
+      const transaction = await client.getTransaction({
+        hash: receipt.transactionHash,
+      })
+      expect(transaction).toBeDefined()
+    })
+  })
+
+  describe('webAuthn', () => {
+    test('default', async () => {
+      const account = Account.fromHeadlessWebAuthn(
+        '0x1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b',
+        {
+          rpId: 'localhost',
+          origin: 'http://localhost',
         },
-        "to": null,
-        "transactionIndex": 0,
-        "type": "aa",
-        "typeHex": "0x76",
-        "v": undefined,
-        "validAfter": null,
-        "validBefore": null,
-        "value": 0n,
-        "yParity": undefined,
-      }
-    `)
+      )
+
+      const { receipt } = await client.fee.setUserTokenSync({
+        account,
+        feePayer: true,
+        token: 1n,
+      })
+
+      const userToken = await client.fee.getUserToken({ account })
+      expect(userToken).toMatchInlineSnapshot(`
+        {
+          "address": "0x20C0000000000000000000000000000000000001",
+          "id": 1n,
+        }
+      `)
+
+      const {
+        blockHash: _,
+        blockNumber: __,
+        ...transaction
+      } = await client.getTransaction({ hash: receipt.transactionHash })
+
+      expect(transaction).toMatchInlineSnapshot(`
+        {
+          "aaAuthorizationList": [],
+          "accessList": [],
+          "authorizationList": undefined,
+          "calls": [
+            {
+              "data": "0xe789744400000000000000000000000020c0000000000000000000000000000000000001",
+              "to": "0xfeec000000000000000000000000000000000000",
+              "value": 0n,
+            },
+          ],
+          "chainId": 1337,
+          "data": undefined,
+          "feePayer": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+          "feePayerSignature": {
+            "r": "0xc4446d8fe8fa3341d1f004cf5d54fd30ce3079909d26d8a2878ba95b7b9eec2d",
+            "s": "0x3dbe6bcd56aafcff58b0faad331ac8339389cad60b42e82cdccd23f67e1f82c8",
+            "v": 27n,
+            "yParity": 0,
+          },
+          "feeToken": null,
+          "from": "0x5f704c6c7075acd14ee36527f03b5b5dcb4a966f",
+          "gas": 65648n,
+          "gasPrice": 10000000000n,
+          "hash": "0x279ae834209d6df5bded3c96bf5c74671cb34ef7b041b262cab97085d471f6f4",
+          "maxFeePerBlobGas": undefined,
+          "maxFeePerGas": 12000000000n,
+          "maxPriorityFeePerGas": 0n,
+          "nonce": 0,
+          "nonceKey": 0n,
+          "signature": {
+            "metadata": {
+              "authenticatorData": "0x49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000",
+              "clientDataJSON": "{"type":"webauthn.get","challenge":"v8tl8bzz9Csc1GJFeUfNTnjOLM03xPTSseTVmPjPgGU","origin":"http://localhost","crossOrigin":false}",
+            },
+            "publicKey": {
+              "prefix": 4,
+              "x": 89768657165983002447270155621964907577955735922001002175265262336201091268103n,
+              "y": 21692506528696391747937034302216251793515398807520467579078748804389014172835n,
+            },
+            "signature": {
+              "r": 58941397289082666235265603710597281523077712128054003324346038713355012809744n,
+              "s": 40774536608463041714947524596466110685374802167796811824221384869265764799570n,
+            },
+            "type": "webAuthn",
+          },
+          "to": null,
+          "transactionIndex": 1,
+          "type": "aa",
+          "typeHex": "0x76",
+          "v": undefined,
+          "validAfter": null,
+          "validBefore": null,
+          "value": 0n,
+          "yParity": undefined,
+        }
+      `)
+    })
   })
 })