@wagmi/core 3.2.1 → 3.2.3

package/src/query/waitForTransactionReceipt.ts

@@ -1,5 +1,3 @@
-import type { QueryOptions } from '@tanstack/query-core'
-
 import {
   type WaitForTransactionReceiptErrorType,
   type WaitForTransactionReceiptParameters,
@@ -8,43 +6,49 @@ import {
 } from '../actions/waitForTransactionReceipt.js'
 import type { Config } from '../createConfig.js'
 import type { ScopeKeyParameter } from '../types/properties.js'
+import type { QueryOptions, QueryParameter } from '../types/query.js'
 import type { Compute, ExactPartial } from '../types/utils.js'
 import { filterQueryOptions } from './utils.js'
 
 export type WaitForTransactionReceiptOptions<
   config extends Config,
   chainId extends config['chains'][number]['id'],
+  selectData = WaitForTransactionReceiptData<config, chainId>,
 > = Compute<
   ExactPartial<WaitForTransactionReceiptParameters<config, chainId>> &
     ScopeKeyParameter
->
+> &
+  QueryParameter<
+    WaitForTransactionReceiptQueryFnData<config, chainId>,
+    WaitForTransactionReceiptErrorType,
+    selectData,
+    WaitForTransactionReceiptQueryKey<config, chainId>
+  >
 
 export function waitForTransactionReceiptQueryOptions<
   config extends Config,
   chainId extends config['chains'][number]['id'],
+  selectData = WaitForTransactionReceiptData<config, chainId>,
 >(
   config: config,
-  options: WaitForTransactionReceiptOptions<config, chainId> = {},
-) {
+  options: WaitForTransactionReceiptOptions<config, chainId, selectData> = {},
+): WaitForTransactionReceiptQueryOptions<config, chainId, selectData> {
   return {
-    async queryFn({ queryKey }) {
-      const { hash, ...parameters } = queryKey[1]
-      if (!hash) throw new Error('hash is required')
+    ...options.query,
+    enabled: Boolean(options.hash && (options.query?.enabled ?? true)),
+    queryFn: async (context) => {
+      const [, { scopeKey: _, ...parameters }] = context.queryKey
+      if (!parameters.hash) throw new Error('hash is required')
       return waitForTransactionReceipt(config, {
         ...parameters,
         onReplaced: options.onReplaced,
-        hash,
+        hash: parameters.hash,
       }) as unknown as Promise<
         WaitForTransactionReceiptReturnType<config, chainId>
       >
     },
     queryKey: waitForTransactionReceiptQueryKey(options),
-  } as const satisfies QueryOptions<
-    WaitForTransactionReceiptQueryFnData<config, chainId>,
-    WaitForTransactionReceiptErrorType,
-    WaitForTransactionReceiptData<config, chainId>,
-    WaitForTransactionReceiptQueryKey<config, chainId>
-  >
+  }
 }
 
 export type WaitForTransactionReceiptQueryFnData<
@@ -60,7 +64,12 @@ export type WaitForTransactionReceiptData<
 export function waitForTransactionReceiptQueryKey<
   config extends Config,
   chainId extends config['chains'][number]['id'],
->(options: WaitForTransactionReceiptOptions<config, chainId> = {}) {
+>(
+  options: Compute<
+    ExactPartial<WaitForTransactionReceiptParameters<config, chainId>> &
+      ScopeKeyParameter
+  > = {},
+) {
   const { onReplaced: _, ...rest } = options
   return ['waitForTransactionReceipt', filterQueryOptions(rest)] as const
 }
@@ -69,3 +78,14 @@ export type WaitForTransactionReceiptQueryKey<
   config extends Config,
   chainId extends config['chains'][number]['id'],
 > = ReturnType<typeof waitForTransactionReceiptQueryKey<config, chainId>>
+
+export type WaitForTransactionReceiptQueryOptions<
+  config extends Config,
+  chainId extends config['chains'][number]['id'],
+  selectData = WaitForTransactionReceiptData<config, chainId>,
+> = QueryOptions<
+  WaitForTransactionReceiptQueryFnData<config, chainId>,
+  WaitForTransactionReceiptErrorType,
+  selectData,
+  WaitForTransactionReceiptQueryKey<config, chainId>
+>

package/src/tempo/Connectors.ts

@@ -360,17 +360,16 @@ export function webAuthn(options: webAuthn.Parameters) {
 
       const targetAccount = await (async () => {
         if (!accessKey) return account
+        if (!account) throw new Error('account not found.')
 
-        const item = await idb.get(
-          `accessKey:${accessKey.address.toLowerCase()}`,
-        )
+        const item = await idb.get(`accessKey:${account.address.toLowerCase()}`)
         if (
           item?.keyAuthorization.expiry &&
           item.keyAuthorization.expiry < Date.now() / 1000
         ) {
           // remove any pending key authorizations from storage.
           await config?.storage?.removeItem(
-            `pendingKeyAuthorization:${accessKey.address.toLowerCase()}`,
+            `pendingKeyAuthorization:${account.address.toLowerCase()}`,
           )
 
           const message = `Access key expired (on ${new Date(item.keyAuthorization.expiry * 1000).toLocaleString()}).`

package/src/tempo/KeyManager.ts

@@ -1,4 +1,5 @@
 import type { WebAuthnP256 } from 'ox'
+import * as Base64 from 'ox/Base64'
 import type * as Hex from 'ox/Hex'
 import * as Json from 'ox/Json'
 import {
@@ -158,7 +159,10 @@ export function http(
           headers: {
             'Content-Type': 'application/json',
           },
-          body: Json.stringify(parameters),
+          body: Json.stringify({
+            ...parameters,
+            credential: serializeCredential(parameters.credential),
+          }),
         },
       )
 
@@ -174,3 +178,62 @@ export namespace http {
     fetch?: typeof fetch | undefined
   }
 }
+
+/**
+ * Serializes a WebAuthn credential for JSON transmission.
+ * @internal
+ */
+function serializeCredential(
+  credential: WebAuthnP256.P256Credential['raw'],
+): Record<string, unknown> {
+  const response = credential.response
+  return {
+    ...credential,
+    rawId: Base64.fromBytes(new Uint8Array(credential.rawId)),
+    response: {
+      clientDataJSON: Base64.fromBytes(new Uint8Array(response.clientDataJSON)),
+      ...('attestationObject' in response && {
+        attestationObject: Base64.fromBytes(
+          new Uint8Array(response.attestationObject as ArrayBuffer),
+        ),
+      }),
+      ...('getAuthenticatorData' in response &&
+        typeof response.getAuthenticatorData === 'function' && {
+          authenticatorData: Base64.fromBytes(
+            new Uint8Array(response.getAuthenticatorData() as ArrayBuffer),
+          ),
+        }),
+      ...('getPublicKey' in response &&
+        typeof response.getPublicKey === 'function' && {
+          publicKey: Base64.fromBytes(
+            new Uint8Array(response.getPublicKey() as ArrayBuffer),
+          ),
+        }),
+      ...('getPublicKeyAlgorithm' in response &&
+        typeof response.getPublicKeyAlgorithm === 'function' && {
+          publicKeyAlgorithm: response.getPublicKeyAlgorithm(),
+        }),
+      ...('getTransports' in response &&
+        typeof response.getTransports === 'function' && {
+          transports: response.getTransports(),
+        }),
+      ...('authenticatorData' in response && {
+        authenticatorData: Base64.fromBytes(
+          new Uint8Array(response.authenticatorData as ArrayBuffer),
+        ),
+      }),
+      ...('signature' in response && {
+        signature: Base64.fromBytes(
+          new Uint8Array(response.signature as ArrayBuffer),
+        ),
+      }),
+      ...('userHandle' in response && response.userHandle
+        ? {
+            userHandle: Base64.fromBytes(
+              new Uint8Array(response.userHandle as ArrayBuffer),
+            ),
+          }
+        : {}),
+    },
+  }
+}

package/src/tempo/actions/amm.ts

@@ -2,13 +2,13 @@ import type { Account, BaseErrorType } from 'viem'
 import { Actions } from 'viem/tempo'
 import { getConnectorClient } from '../../actions/getConnectorClient.js'
 import type { Config } from '../../createConfig.js'
-import { filterQueryOptions } from '../../query/utils.js'
 import type {
   ChainIdParameter,
   ConnectorParameter,
 } from '../../types/properties.js'
 import type { UnionLooseOmit } from '../../types/utils.js'
 import type { QueryOptions, QueryParameter } from './utils.js'
+import { filterQueryOptions } from './utils.js'
 
 /**
  * Gets the reserves for a liquidity pool.
@@ -180,7 +180,7 @@ export namespace getLiquidityBalance {
       queryKey: queryKey(rest),
       async queryFn({ queryKey }) {
         const [, parameters] = queryKey
-        return await getLiquidityBalance(config, parameters)
+        return await getLiquidityBalance(config, parameters as any)
       },
     }
   }

package/src/tempo/actions/fee.ts

@@ -2,13 +2,13 @@ import type { Account, BaseErrorType } from 'viem'
 import { Actions } from 'viem/tempo'
 import { getConnectorClient } from '../../actions/getConnectorClient.js'
 import type { Config } from '../../createConfig.js'
-import { filterQueryOptions } from '../../query/utils.js'
 import type {
   ChainIdParameter,
   ConnectorParameter,
 } from '../../types/properties.js'
 import type { PartialBy, UnionLooseOmit } from '../../types/utils.js'
 import type { QueryOptions, QueryParameter } from './utils.js'
+import { filterQueryOptions } from './utils.js'
 
 /**
  * Gets the user's default fee token.

package/src/tempo/actions/nonce.ts

@@ -1,10 +1,10 @@
 import type { BaseErrorType } from 'viem'
 import { Actions } from 'viem/tempo'
 import type { Config } from '../../createConfig.js'
-import { filterQueryOptions } from '../../query/utils.js'
 import type { ChainIdParameter } from '../../types/properties.js'
 import type { PartialBy } from '../../types/utils.js'
 import type { QueryOptions, QueryParameter } from './utils.js'
+import { filterQueryOptions } from './utils.js'
 
 /**
  * Gets the nonce for an account and nonce key.

package/src/tempo/actions/utils.ts

@@ -24,3 +24,29 @@ export type QueryOptions<
   Query.QueryOptions<queryFnData, error, data, queryKey>,
   'queryKey' | 'queryFn'
 > & { enabled: boolean }
+
+export function filterQueryOptions<type extends Record<string, unknown>>(
+  options: type,
+): type {
+  // biome-ignore format: no formatting
+  const {
+    // import('@tanstack/query-core').QueryOptions
+    // biome-ignore lint/correctness/noUnusedVariables: tossing
+    _defaulted, behavior, gcTime, initialData, initialDataUpdatedAt, maxPages, meta, networkMode, queryFn, queryHash, queryKey, queryKeyHashFn, retry, retryDelay, structuralSharing,
+
+    // import('@tanstack/query-core').InfiniteQueryObserverOptions
+    // biome-ignore lint/correctness/noUnusedVariables: tossing
+    getPreviousPageParam, getNextPageParam, initialPageParam,
+
+    // import('@tanstack/react-query').UseQueryOptions
+    // biome-ignore lint/correctness/noUnusedVariables: tossing
+    _optimisticResults, enabled, notifyOnChangeProps, placeholderData, refetchInterval, refetchIntervalInBackground, refetchOnMount, refetchOnReconnect, refetchOnWindowFocus, retryOnMount, select, staleTime, suspense, throwOnError,
+
+    // wagmi
+    // biome-ignore lint/correctness/noUnusedVariables: tossing
+    config, connector, query,
+    ...rest
+  } = options
+
+  return rest as type
+}

package/src/types/query.ts

@@ -0,0 +1,40 @@
+import type * as Query from '@tanstack/query-core'
+import type { RequiredBy, UnionLooseOmit } from './utils.js'
+
+export type QueryParameter<
+  queryFnData = unknown,
+  error = Query.DefaultError,
+  data = queryFnData,
+  queryKey extends Query.QueryKey = Query.QueryKey,
+> = {
+  query?:
+    | UnionLooseOmit<
+        QueryOptions<queryFnData, error, data, queryKey>,
+        'queryKey' | 'queryFn'
+      >
+    | undefined
+}
+
+export type QueryOptions<
+  queryFnData = unknown,
+  error = Query.DefaultError,
+  data = queryFnData,
+  queryKey extends Query.QueryKey = Query.QueryKey,
+> = Omit<
+  RequiredBy<
+    Query.QueryObserverOptions<queryFnData, error, data, queryFnData, queryKey>,
+    'queryKey'
+  >,
+  'queryFn' | 'queryHash' | 'queryKeyHashFn' | 'throwOnError'
+> & {
+  queryFn: Exclude<
+    Query.QueryObserverOptions<
+      queryFnData,
+      error,
+      data,
+      queryFnData,
+      queryKey
+    >['queryFn'],
+    typeof Query.skipToken | undefined
+  >
+}

package/src/version.ts

@@ -1 +1 @@
-export const version = '3.2.1'
+export const version = '3.2.3'