tempo.ts 0.4.2 → 0.4.4

package/src/viem/e2e.test.ts

@@ -278,11 +278,11 @@ describe('sendTransaction', () => {
           "chainId": 1337,
           "data": undefined,
           "feePayerSignature": undefined,
-          "feeToken": null,
+          "feeToken": "0x20c0000000000000000000000000000000000001",
           "from": "0xfc39755d501fa7b79164f74efb906e87ecde342c",
           "gas": 29012n,
           "gasPrice": 10000000000n,
-          "hash": "0x13ed96d72f7b21a19f30b734575004fb34cd0694b54d6833cc88e3de37d61d58",
+          "hash": "0x92497c48650181f386b4daeb3f784620b29af6dea6c8caeb995156f3f75af161",
           "maxFeePerBlobGas": undefined,
           "maxFeePerGas": 12000000000n,
           "maxPriorityFeePerGas": 0n,
@@ -296,8 +296,8 @@ describe('sendTransaction', () => {
               "y": 28479403900638612718017087999484027026245572142646745985103165612268853186552n,
             },
             "signature": {
-              "r": 82730263136973498533190232493673429238005086892575761509437404111798066703019n,
-              "s": 44946766134305303588824367771503538281500341815262656891619888686974098389980n,
+              "r": 73166565759729379192178736994258501393133045207516873483983141310238393892339n,
+              "s": 9678569667446118283593635726095491566145915132050642248430996816820250471583n,
             },
             "type": "p256",
           },
@@ -365,11 +365,11 @@ describe('sendTransaction', () => {
           "chainId": 1337,
           "data": undefined,
           "feePayerSignature": undefined,
-          "feeToken": null,
+          "feeToken": "0x20c0000000000000000000000000000000000001",
           "from": "0xfc39755d501fa7b79164f74efb906e87ecde342c",
           "gas": 100000n,
           "gasPrice": 10000000000n,
-          "hash": "0x47d30679625b66e09219f73c11e657a8950259e814ec9bef0a8054bc418ce138",
+          "hash": "0x42d24b367d36fe86a48a5d3e569a4a7f528eba99c44e17304c6e88ba29e50666",
           "maxFeePerBlobGas": undefined,
           "maxFeePerGas": 12000000000n,
           "maxPriorityFeePerGas": 0n,
@@ -383,8 +383,8 @@ describe('sendTransaction', () => {
               "y": 28479403900638612718017087999484027026245572142646745985103165612268853186552n,
             },
             "signature": {
-              "r": 113341784972223677657638155264375724813412569467929323654477865838324981972769n,
-              "s": 42271961989228659763384216377289107353157423528268870961696295632380366334643n,
+              "r": 106143051119266858928184523090857221408816991676370960197147810502258413383473n,
+              "s": 49844357009853267306291709813432165511067109946085107128095783518674413076631n,
             },
             "type": "p256",
           },
@@ -525,7 +525,7 @@ describe('sendTransaction', () => {
           "chainId": 1337,
           "data": undefined,
           "feePayerSignature": undefined,
-          "feeToken": null,
+          "feeToken": "0x20c0000000000000000000000000000000000001",
           "from": undefined,
           "gas": 29012n,
           "gasPrice": 10000000000n,
@@ -646,11 +646,11 @@ describe('sendTransaction', () => {
           "chainId": 1337,
           "data": undefined,
           "feePayerSignature": undefined,
-          "feeToken": null,
+          "feeToken": "0x20c0000000000000000000000000000000000001",
           "from": "0xfc39755d501fa7b79164f74efb906e87ecde342c",
           "gas": 41404n,
           "gasPrice": 10000000000n,
-          "hash": "0x1b56e02e48a5c39478bcc7f912108892a8fa0302747c6928260fc89cd8729499",
+          "hash": "0x0f9754978f1533d5e8a94c8f6e564150b8ca560a145d7adbafa95537cdd661e0",
           "maxFeePerBlobGas": undefined,
           "maxFeePerGas": 12000000000n,
           "maxPriorityFeePerGas": 0n,
@@ -659,7 +659,7 @@ describe('sendTransaction', () => {
           "signature": {
             "metadata": {
               "authenticatorData": "0x49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000",
-              "clientDataJSON": "{"type":"webauthn.get","challenge":"YHxXuO3IIuui0Kz1A5bvEMnEwcV1jXHGgH4s_DEFq0Q","origin":"http://localhost","crossOrigin":false}",
+              "clientDataJSON": "{"type":"webauthn.get","challenge":"pGxfglkRHnxAvl1iNopy9f3dCpA0yOtMWD52o4QjFIM","origin":"http://localhost","crossOrigin":false}",
             },
             "publicKey": {
               "prefix": 4,
@@ -667,8 +667,8 @@ describe('sendTransaction', () => {
               "y": 28479403900638612718017087999484027026245572142646745985103165612268853186552n,
             },
             "signature": {
-              "r": 20513840452271821919896541370744222233657684228117041709895363014729132314467n,
-              "s": 27363596257739130609932989541270702074673583176160656328016769892248487926140n,
+              "r": 46181083089071531854644596388726939003590007726502882093676118825353436035851n,
+              "s": 40251117141811933316754610200955094367484007878478703779665518197624832232922n,
             },
             "type": "webAuthn",
           },
@@ -740,11 +740,11 @@ describe('sendTransaction', () => {
           "chainId": 1337,
           "data": undefined,
           "feePayerSignature": undefined,
-          "feeToken": null,
+          "feeToken": "0x20c0000000000000000000000000000000000001",
           "from": "0xfc39755d501fa7b79164f74efb906e87ecde342c",
           "gas": 100000n,
           "gasPrice": 10000000000n,
-          "hash": "0x6520a97076d29b5e1bc76cb4dcd813e5b2a1bdbf1bba622e542bab3de9ea4a9f",
+          "hash": "0x9e431e3d0b4a04c5779d0918b1d3140429530c19cada91e5da2eb66edcd77efa",
           "maxFeePerBlobGas": undefined,
           "maxFeePerGas": 12000000000n,
           "maxPriorityFeePerGas": 0n,
@@ -753,7 +753,7 @@ describe('sendTransaction', () => {
           "signature": {
             "metadata": {
               "authenticatorData": "0x49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97630500000000",
-              "clientDataJSON": "{"type":"webauthn.get","challenge":"PqvaeGCzQHEM5f8UU4LbjCY97K8kfxlwFl4VpOfQy9U","origin":"http://localhost","crossOrigin":false}",
+              "clientDataJSON": "{"type":"webauthn.get","challenge":"DAabvi2LJ45ESyCwmmyBACb6VS9MdItb_FksnNfg2ZI","origin":"http://localhost","crossOrigin":false}",
             },
             "publicKey": {
               "prefix": 4,
@@ -761,8 +761,8 @@ describe('sendTransaction', () => {
               "y": 28479403900638612718017087999484027026245572142646745985103165612268853186552n,
             },
             "signature": {
-              "r": 90764526189385409482244930589827202930214636605680311984211069314044601874317n,
-              "s": 54909273314024796243497246034814125113763800884613983294394271661966971076442n,
+              "r": 89695469468583132282454887497226949335068684032456007061013932756262487728086n,
+              "s": 30364371922186410926529917972734911437767801874356315397917029751067680712123n,
             },
             "type": "webAuthn",
           },

package/src/viem/internal/account.ts

@@ -11,14 +11,7 @@ import type { RequiredBy } from '../../internal/types.js'
 import * as SignatureEnvelope from '../../ox/SignatureEnvelope.js'
 import * as Transaction from '../Transaction.js'
 
-export type Account = RequiredBy<
-  Omit<LocalAccount, 'signTransaction'>,
-  'sign' | 'signAuthorization'
-> & {
-  signTransaction: (
-    transaction: Transaction.TransactionSerializable,
-  ) => Promise<Hex.Hex>
-}
+export type Account = RequiredBy<LocalAccount, 'sign' | 'signAuthorization'>
 
 // TODO: this function will be redundant when Viem migrates to Ox.
 /** @internal */
@@ -67,12 +60,13 @@ export function toPrivateKeyAccount(
         )
       return SignatureEnvelope.serialize(envelope)
     },
-    async signTransaction(transaction) {
+    async signTransaction(transaction, options) {
+      const { serializer = Transaction.serialize } = options ?? {}
       const signature = await sign({
-        hash: keccak256(await Transaction.serialize(transaction)),
+        hash: keccak256(await serializer(transaction)),
       })
       const envelope = SignatureEnvelope.from(signature)
-      return await Transaction.serialize(transaction, envelope)
+      return await serializer(transaction, envelope as never)
     },
     async signTypedData(typedData) {
       const signature = await sign({ hash: hashTypedData(typedData) })

package/src/wagmi/Actions/token.ts

@@ -988,7 +988,7 @@ export namespace getMetadata {
  * })
  *
  * const adminRole = await Actions.token.getRoleAdmin(config, {
- *   role: 'minter',
+ *   role: 'issuer',
  *   token: '0x...',
  * })
  * ```

package/src/wagmi/Connector.ts

@@ -1,16 +1,32 @@
 import * as Address from 'ox/Address'
 import * as Bytes from 'ox/Bytes'
-import { Account, WebAuthnP256 } from 'tempo.ts/viem'
+import * as Hash from 'ox/Hash'
+import * as Hex from 'ox/Hex'
+import * as Provider from 'ox/Provider'
+import * as RpcRequest from 'ox/RpcRequest'
 import {
   createClient,
   type EIP1193Provider,
   getAddress,
-  type Hex,
   type LocalAccount,
   SwitchChainError,
+  type Transport,
+  type Account as viem_Account,
 } from 'viem'
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts'
+import {
+  getTransactionReceipt,
+  sendTransaction,
+  sendTransactionSync,
+} from 'viem/actions'
 import { ChainNotConfiguredError, createConnector } from 'wagmi'
+import * as Account from '../viem/Account.js'
+import type * as tempo_Chain from '../viem/Chain.js'
+import * as WebAuthnP256 from '../viem/WebAuthnP256.js'
+
+type Chain = ReturnType<ReturnType<typeof tempo_Chain.define>>
+
+const sendCallsMagic = Hash.keccak256(Hex.fromString('TEMPO_5792'))
 
 /**
  * Connector for a Secp256k1 EOA.
@@ -45,7 +61,7 @@ export function dangerous_secp256k1(
   type StorageItem = {
     'secp256k1.activeAddress': Address.Address
     'secp256k1.lastActiveAddress': Address.Address
-    [key: `secp256k1.${string}.privateKey`]: Hex
+    [key: `secp256k1.${string}.privateKey`]: Hex.Hex
   }
 
   return createConnector<Provider, Properties, StorageItem>((config) => ({
@@ -168,8 +184,10 @@ export function dangerous_secp256k1(
 
       return createClient({
         account,
-        chain,
-        transport,
+        chain: chain as Chain,
+        transport: withErc5792Compat(transport, {
+          account,
+        }),
       })
     },
     async getProvider({ chainId } = {}) {
@@ -214,7 +232,7 @@ export function webAuthn(options: webAuthn.Parameters = {}) {
   type StorageItem = {
     'webAuthn.activeCredential': WebAuthnP256.P256Credential
     'webAuthn.lastActiveCredential': WebAuthnP256.P256Credential
-    [key: `webAuthn.${string}.publicKey`]: Hex
+    [key: `webAuthn.${string}.publicKey`]: Hex.Hex
   }
 
   return createConnector<Provider, Properties, StorageItem>((config) => ({
@@ -270,6 +288,8 @@ export function webAuthn(options: webAuthn.Parameters = {}) {
           credential ??= await WebAuthnP256.getCredential({
             ...(options.getOptions ?? {}),
             credentialId: lastActiveCredential?.id,
+            // biome-ignore lint/suspicious/noTsIgnore: _
+            // @ts-ignore
             async getPublicKey(credential) {
               {
                 const publicKey =
@@ -282,7 +302,7 @@ export function webAuthn(options: webAuthn.Parameters = {}) {
                   `webAuthn.${credential.id}.publicKey`,
                 )
                 if (!publicKey) throw new Error('publicKey not found')
-                return publicKey as Hex
+                return publicKey as Hex.Hex
               }
             },
             rpId: options.getOptions?.rpId ?? options.rpId,
@@ -356,8 +376,10 @@ export function webAuthn(options: webAuthn.Parameters = {}) {
 
       return createClient({
         account,
-        chain,
-        transport,
+        chain: chain as Chain,
+        transport: withErc5792Compat(transport, {
+          account,
+        }),
       })
     },
     async getProvider({ chainId } = {}) {
@@ -376,7 +398,7 @@ export declare namespace webAuthn {
           'createFn' | 'label' | 'rpId' | 'userId' | 'timeout'
         > & {
           /** Function to fetch a challenge to sign over at registration. */
-          getChallenge?: (() => Promise<Hex>) | undefined
+          getChallenge?: (() => Promise<Hex.Hex>) | undefined
         })
       | undefined
     /** Options for WebAuthn authentication. */
@@ -392,3 +414,96 @@ export declare namespace webAuthn {
     rpId?: string | undefined
   }
 }
+
+// TODO: This is a temporary workaround to support EIP-5792. To be removed
+// once we support a EIP-1193 Provider abstraction for Tempo accounts.
+// biome-ignore lint/correctness/noUnusedVariables: _
+function withErc5792Compat(
+  transport: Transport,
+  { account }: withErc5792Compat.Options,
+): Transport {
+  return (options) => {
+    const t = transport(options)
+
+    return {
+      ...t,
+      async request(args: never) {
+        const request = RpcRequest.from(args)
+
+        const client = createClient({
+          account,
+          chain: options.chain as Chain,
+          transport,
+        })
+
+        if (request.method === 'wallet_sendCalls') {
+          const params = request.params[0] ?? {}
+          const { capabilities, chainId, from } = params
+          const { sync } = capabilities ?? {}
+
+          if (!account) throw new Provider.DisconnectedError()
+          if (!chainId) throw new Provider.UnsupportedChainIdError()
+          if (Number(chainId) !== client.chain.id)
+            throw new Provider.UnsupportedChainIdError()
+          if (from && !Address.isEqual(from, account.address))
+            throw new Provider.DisconnectedError()
+
+          const calls = (params.calls ?? []).map((call) => ({
+            to: call.to,
+            value: call.value ? BigInt(call.value) : undefined,
+            data: call.data,
+          }))
+
+          const hash = await (async () => {
+            if (!sync)
+              return sendTransaction(client, {
+                account,
+                calls,
+              })
+
+            const { transactionHash } = await sendTransactionSync(client, {
+              account,
+              calls,
+            })
+            return transactionHash
+          })()
+
+          const id = Hex.concat(hash, Hex.padLeft(chainId, 32), sendCallsMagic)
+
+          return {
+            capabilities: { sync },
+            id,
+          }
+        }
+
+        if (request.method === 'wallet_getCallsStatus') {
+          const [id] = request.params ?? []
+          if (!id) throw new Error('`id` not found')
+          if (!id.endsWith(sendCallsMagic.slice(2)))
+            throw new Error('`id` not supported')
+          Hex.assert(id)
+
+          const hash = Hex.slice(id, 0, 32)
+          const chainId = Hex.slice(id, 32, 64)
+
+          const receipt = await getTransactionReceipt(client, { hash })
+          return {
+            atomic: true,
+            chainId: Number(chainId),
+            receipts: [receipt],
+            status: receipt.status === 'success' ? 200 : 500,
+            version: '2.0.0',
+          }
+        }
+
+        return t.request(args)
+      },
+    } as never
+  }
+}
+
+declare namespace withErc5792Compat {
+  type Options = {
+    account: viem_Account | undefined
+  }
+}

package/src/wagmi/Hooks/token.ts

@@ -1030,7 +1030,7 @@ export declare namespace useGetMetadata {
  *
  * function App() {
  *   const { data, isLoading } = Hooks.token.useGetRoleAdmin({
- *     role: 'minter',
+ *     role: 'issuer',
  *     token: '0x...',
  *   })
  *