tempo.ts 0.4.3 → 0.5.0

package/src/wagmi/Actions/amm.test.ts

@@ -1,11 +1,8 @@
 import { connect, getConnectorClient } from '@wagmi/core'
 import { parseUnits } from 'viem'
 import { describe, expect, test } from 'vitest'
-import {
-  accounts,
-  addresses,
-  setupPoolWithLiquidity,
-} from '../../../test/viem/config.js'
+import { addresses } from '../../../test/config.js'
+import { accounts, setupPoolWithLiquidity } from '../../../test/viem/config.js'
 import { config, queryClient } from '../../../test/wagmi/config.js'
 import * as ammActions from './amm.js'
 import * as tokenActions from './token.js'

package/src/wagmi/Actions/dex.test.ts

@@ -3,7 +3,8 @@ import { Tick } from 'tempo.ts/viem'
 import { Actions } from 'tempo.ts/wagmi'
 import { isAddress, parseUnits } from 'viem'
 import { beforeAll, describe, expect, test } from 'vitest'
-import { accounts, addresses } from '../../../test/viem/config.js'
+import { addresses } from '../../../test/config.js'
+import { accounts } from '../../../test/viem/config.js'
 import {
   config,
   queryClient,

package/src/wagmi/Actions/token.test.ts

@@ -1,7 +1,8 @@
 import { connect } from '@wagmi/core'
 import { parseUnits } from 'viem'
 import { describe, expect, test } from 'vitest'
-import { accounts, addresses } from '../../../test/viem/config.js'
+import { addresses } from '../../../test/config.js'
+import { accounts } from '../../../test/viem/config.js'
 import { config, queryClient } from '../../../test/wagmi/config.js'
 import * as token from './token.js'
 

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/amm.test.ts

@@ -2,11 +2,8 @@ import { getConnectorClient } from '@wagmi/core'
 import { type Address, parseUnits } from 'viem'
 import { describe, expect, test, vi } from 'vitest'
 import { useConnect } from 'wagmi'
-import {
-  accounts,
-  addresses,
-  setupPoolWithLiquidity,
-} from '../../../test/viem/config.js'
+import { addresses } from '../../../test/config.js'
+import { accounts, setupPoolWithLiquidity } from '../../../test/viem/config.js'
 import { config, renderHook } from '../../../test/wagmi/config.js'
 import * as hooks from './amm.js'
 import * as tokenHooks from './token.js'

package/src/wagmi/Hooks/dex.test.ts

@@ -3,7 +3,8 @@ import { Actions, Hooks } from 'tempo.ts/wagmi'
 import { type Address, isAddress, parseUnits } from 'viem'
 import { describe, expect, test, vi } from 'vitest'
 import { useConnect } from 'wagmi'
-import { accounts, addresses } from '../../../test/viem/config.js'
+import { addresses } from '../../../test/config.js'
+import { accounts } from '../../../test/viem/config.js'
 import {
   config,
   renderHook,

package/src/wagmi/Hooks/token.test.ts

@@ -1,7 +1,8 @@
 import { type Address, parseUnits } from 'viem'
 import { describe, expect, test, vi } from 'vitest'
 import { useConnect } from 'wagmi'
-import { accounts, addresses } from '../../../test/viem/config.js'
+import { addresses } from '../../../test/config.js'
+import { accounts } from '../../../test/viem/config.js'
 import { config, renderHook } from '../../../test/wagmi/config.js'
 import * as hooks from './token.js'
 

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...',
  *   })
  *