viem 2.43.1 → 2.43.3

package/tempo/Formatters.ts

@@ -106,31 +106,9 @@ export function formatTransactionRequest(
     rpc.maxPriorityFeePerGas = undefined
   }
 
-  // JSON-RPC accounts (wallets) don't support Tempo transactions yet,
-  // we will omit the type to attempt to make them compatible
-  // with the base transaction structure.
-  // TODO: `calls` will not be supported by a lot of JSON-RPC accounts (wallet),
-  // use `wallet_sendCalls` or sequential `eth_sendTransaction` to mimic the
-  // behavior of `calls`.
-  if (account?.type === 'json-rpc') {
-    if (rpc.calls?.length && rpc.calls.length > 1)
-      throw new Error(
-        'Batch calls are not supported with JSON-RPC accounts yet.',
-      )
-    rpc.data = rpc.calls?.at(0)?.data
-    rpc.to = rpc.calls?.at(0)?.to
-    rpc.type = undefined
-  }
-
-  // We rely on `calls` for Tempo transactions.
-  // However, `calls` may not be supported by JSON-RPC accounts (wallets) yet,
-  // so we will not remove the `data`, `to`, and `value` fields to make it
-  // compatible with the base transaction structure.
-  if (account?.type !== 'json-rpc') {
-    rpc.to = undefined
-    rpc.data = undefined
-    rpc.value = undefined
-  }
+  rpc.to = undefined
+  rpc.data = undefined
+  rpc.value = undefined
 
   const [keyType, keyData] = (() => {
     const type =
@@ -143,10 +121,16 @@ export function formatTransactionRequest(
     return [undefined, undefined]
   })()
 
+  const keyId =
+    account && 'accessKeyAddress' in account
+      ? account.accessKeyAddress
+      : undefined
+
   return {
     ...rpc,
-    ...(keyType ? { keyType } : {}),
     ...(keyData ? { keyData } : {}),
+    ...(keyId ? { keyId } : {}),
+    ...(keyType ? { keyType } : {}),
     ...(request.feePayer
       ? {
           feePayer:

package/tempo/Transaction.ts

@@ -159,9 +159,11 @@ export type TransactionType = viem_TransactionType | 'tempo'
 export function getType(
   transaction: Record<string, unknown>,
 ): Transaction['type'] {
+  const account = transaction.account as
+    | { keyType?: string | undefined }
+    | undefined
   if (
-    (transaction.account &&
-      (transaction.account as { keyType?: string })?.keyType !== 'secp256k1') ||
+    (account?.keyType && account.keyType !== 'secp256k1') ||
     typeof transaction.calls !== 'undefined' ||
     typeof transaction.feePayer !== 'undefined' ||
     typeof transaction.feeToken !== 'undefined' ||

package/tempo/actions/nonce.ts

@@ -111,27 +111,7 @@ export namespace getNonce {
 }
 
 /**
- * Gets the number of active nonce keys for an account.
- *
- * @example
- * ```ts
- * import { createClient, http } from 'viem'
- * import { tempo } from 'tempo.ts/chains'
- * import { Actions } from 'tempo.ts/viem'
- *
- * const client = createClient({
- *   chain: tempo({ feeToken: '0x20c0000000000000000000000000000000000001' }),
- *   transport: http(),
- * })
- *
- * const count = await Actions.nonce.getNonceKeyCount(client, {
- *   account: '0x...',
- * })
- * ```
- *
- * @param client - Client.
- * @param parameters - Parameters.
- * @returns The number of active nonce keys.
+ * @deprecated This function has been deprecated post-AllegroModerato. It will be removed in a future version.
  */
 export async function getNonceKeyCount<
   chain extends Chain | undefined,
@@ -203,29 +183,7 @@ export namespace getNonceKeyCount {
 }
 
 /**
- * Watches for nonce incremented events.
- *
- * @example
- * ```ts
- * import { createClient, http } from 'viem'
- * import { tempo } from 'tempo.ts/chains'
- * import { Actions } from 'tempo.ts/viem'
- *
- * const client = createClient({
- *   chain: tempo({ feeToken: '0x20c0000000000000000000000000000000000001' }),
- *   transport: http(),
- * })
- *
- * const unwatch = Actions.nonce.watchNonceIncremented(client, {
- *   onNonceIncremented: (args, log) => {
- *     console.log('Nonce incremented:', args)
- *   },
- * })
- * ```
- *
- * @param client - Client.
- * @param parameters - Parameters.
- * @returns A function to unsubscribe from the event.
+ * @deprecated This function has been deprecated post-AllegroModerato. It will be removed in a future version.
  */
 export function watchNonceIncremented<
   chain extends Chain | undefined,

package/tempo/chainConfig.ts

@@ -31,41 +31,54 @@ export const chainConfig = {
       format: Formatters.formatTransactionRequest,
     }),
   },
-  async prepareTransactionRequest(r) {
-    const request = r as Transaction.TransactionRequest & {
-      account?: Account | undefined
-      chain?:
-        | (Chain & { feeToken?: TokenId.TokenIdOrAddress | undefined })
-        | undefined
-    }
+  prepareTransactionRequest: [
+    async (r, { phase }) => {
+      const request = r as Transaction.TransactionRequest & {
+        account?: Account | undefined
+        chain?:
+          | (Chain & { feeToken?: TokenId.TokenIdOrAddress | undefined })
+          | undefined
+      }
+
+      if (phase === 'afterFillParameters') {
+        if (typeof request.nonceKey === 'bigint' && request.nonceKey > 0n)
+          request.gas = (request.gas ?? 0n) + 40_000n
+        return request as unknown as typeof r
+      }
 
-    request.nonceKey = (() => {
-      if (typeof request.nonceKey !== 'undefined') return request.nonceKey
+      request.nonceKey = (() => {
+        if (
+          typeof request.nonceKey !== 'undefined' &&
+          request.nonceKey !== 'random'
+        )
+          return request.nonceKey
 
-      const address = request.account?.address ?? request.from
-      if (!address) return undefined
-      if (!request.chain) return undefined
-      const nonceKey = NonceKeyStore.getNonceKey(NonceKeyStore.store, {
-        address,
-        chainId: request.chain.id,
-      })
+        const address = request.account?.address ?? request.from
+        if (!address) return undefined
+        if (!request.chain) return undefined
+        const nonceKey = NonceKeyStore.getNonceKey(NonceKeyStore.store, {
+          address,
+          chainId: request.chain.id,
+        })
 
-      if (nonceKey === 0n) return undefined
-      return nonceKey
-    })()
+        if (nonceKey === 0n) return undefined
+        return nonceKey
+      })()
 
-    request.nonce = (() => {
-      if (typeof request.nonce === 'number') return request.nonce
-      // TODO: remove this line once `eth_fillTransaction` supports nonce keys.
-      if (request.nonceKey) return 0
-      return undefined
-    })()
+      request.nonce = (() => {
+        if (typeof request.nonce === 'number') return request.nonce
+        // TODO: remove this line once `eth_fillTransaction` supports nonce keys.
+        if (request.nonceKey) return 0
+        return undefined
+      })()
 
-    if (!request.feeToken && request.chain?.feeToken)
-      request.feeToken = request.chain.feeToken
+      if (!request.feeToken && request.chain?.feeToken)
+        request.feeToken = request.chain.feeToken
 
-    return request as unknown as typeof r
-  },
+      return request as unknown as typeof r
+    },
+    { runAt: ['beforeFillTransaction', 'afterFillParameters'] },
+  ],
   serializers: {
     // TODO: casting to satisfy viem – viem v3 to have more flexible serializer type.
     transaction: ((transaction, signature) =>

package/tempo/index.ts

@@ -54,6 +54,6 @@ export type {
 } from './Transaction.js'
 export * as Transaction from './Transaction.js'
 export * as Transport from './Transport.js'
-export { withFeePayer } from './Transport.js'
+export { walletNamespaceCompat, withFeePayer } from './Transport.js'
 export * as WebAuthnP256 from './WebAuthnP256.js'
 export * as WebCryptoP256 from './WebCryptoP256.js'