viem 2.43.2 → 2.43.4

package/account-abstraction/utils/userOperation/getUserOperationHash.ts

@@ -54,11 +54,14 @@ export function getUserOperationHash<
     if (entryPointVersion === '0.6') {
       const factory = userOperation.initCode?.slice(0, 42) as Hex
       const factoryData = userOperation.initCode?.slice(42) as Hex | undefined
-      const initCode = getInitCode({
-        authorization,
-        factory,
-        factoryData,
-      })
+      const initCode = getInitCode(
+        {
+          authorization,
+          factory,
+          factoryData,
+        },
+        { forHash: true },
+      )
       return encodeAbiParameters(
         [
           { type: 'address' },
@@ -88,7 +91,9 @@ export function getUserOperationHash<
     }
 
     if (entryPointVersion === '0.7') {
-      const packedUserOp = toPackedUserOperation(userOperation)
+      const packedUserOp = toPackedUserOperation(userOperation, {
+        forHash: true,
+      })
       return encodeAbiParameters(
         [
           { type: 'address' },

package/account-abstraction/utils/userOperation/getUserOperationTypedData.ts

@@ -33,7 +33,7 @@ export function getUserOperationTypedData(
 ): GetUserOperationTypedDataReturnType {
   const { chainId, entryPointAddress, userOperation } = parameters
 
-  const packedUserOp = toPackedUserOperation(userOperation)
+  const packedUserOp = toPackedUserOperation(userOperation, { forHash: true })
 
   return {
     types,

package/account-abstraction/utils/userOperation/toPackedUserOperation.ts

@@ -7,8 +7,14 @@ import type {
 } from '../../types/userOperation.js'
 import { getInitCode } from './getInitCode.js'
 
+export type ToPackedUserOperationOptions = {
+  /** Prepare the packed user operation for hashing. */
+  forHash?: boolean | undefined
+}
+
 export function toPackedUserOperation(
   userOperation: UserOperation,
+  options: ToPackedUserOperationOptions = {},
 ): PackedUserOperation {
   const {
     callGasLimit,
@@ -29,7 +35,8 @@ export function toPackedUserOperation(
     pad(numberToHex(verificationGasLimit || 0n), { size: 16 }),
     pad(numberToHex(callGasLimit || 0n), { size: 16 }),
   ])
-  const initCode = getInitCode(userOperation)
+  const initCode = getInitCode(userOperation, options)
+
   const gasFees = concat([
     pad(numberToHex(maxPriorityFeePerGas || 0n), { size: 16 }),
     pad(numberToHex(maxFeePerGas || 0n), { size: 16 }),

package/actions/wallet/prepareTransactionRequest.ts

@@ -270,10 +270,14 @@ export async function prepareTransactionRequest<
   let request = args as PrepareTransactionRequestParameters
 
   request.account ??= client.account
-  request.chain ??= client.chain
   request.parameters ??= defaultParameters
 
-  const { account: account_, chain, nonceManager, parameters } = request
+  const {
+    account: account_,
+    chain = client.chain,
+    nonceManager,
+    parameters,
+  } = request
 
   const prepareTransactionRequest = (() => {
     if (typeof chain?.prepareTransactionRequest === 'function')
@@ -320,9 +324,12 @@ export async function prepareTransactionRequest<
     prepareTransactionRequest?.fn &&
     prepareTransactionRequest.runAt?.includes('beforeFillTransaction')
   ) {
-    request = await prepareTransactionRequest.fn(request, {
-      phase: 'beforeFillTransaction',
-    })
+    request = await prepareTransactionRequest.fn(
+      { ...request, chain },
+      {
+        phase: 'beforeFillTransaction',
+      },
+    )
     nonce ??= request.nonce
   }
 
@@ -433,9 +440,12 @@ export async function prepareTransactionRequest<
     prepareTransactionRequest?.fn &&
     prepareTransactionRequest.runAt?.includes('beforeFillParameters')
   ) {
-    request = await prepareTransactionRequest.fn(request, {
-      phase: 'beforeFillParameters',
-    })
+    request = await prepareTransactionRequest.fn(
+      { ...request, chain },
+      {
+        phase: 'beforeFillParameters',
+      },
+    )
   }
 
   let block: Block | undefined
@@ -580,9 +590,12 @@ export async function prepareTransactionRequest<
     prepareTransactionRequest?.fn &&
     prepareTransactionRequest.runAt?.includes('afterFillParameters')
   )
-    request = await prepareTransactionRequest.fn(request, {
-      phase: 'afterFillParameters',
-    })
+    request = await prepareTransactionRequest.fn(
+      { ...request, chain },
+      {
+        phase: 'afterFillParameters',
+      },
+    )
 
   assertRequest(request as AssertRequestParameters)
 

package/chains/definitions/cpchain.ts

@@ -0,0 +1,21 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const cpchain = /*#__PURE__*/ defineChain({
+  id: 86608,
+  name: 'CpChain',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'CpChain',
+    symbol: 'CP',
+  },
+  rpcUrls: {
+    default: { http: ['https://rpc.cpchain.com'] },
+  },
+  blockExplorers: {
+    default: {
+      name: 'CpChain Explorer',
+      url: 'https://explorer.cpchain.com',
+    },
+  },
+  testnet: false,
+})

package/chains/definitions/tempoDevnet.ts

@@ -3,7 +3,7 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 
 export const tempoDevnet = /*#__PURE__*/ defineChain({
   ...chainConfig,
-  id: 1337,
+  id: 42429,
   name: 'Tempo Devnet',
   nativeCurrency: {
     name: 'USD',
@@ -12,8 +12,8 @@ export const tempoDevnet = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: {
-      http: ['https://rpc.devnet.tempo.xyz'],
-      webSocket: ['wss://rpc.devnet.tempo.xyz'],
+      http: ['https://rpc.devnet.tempoxyz.dev'],
+      webSocket: ['wss://rpc.devnet.tempoxyz.dev'],
     },
   },
 })

package/chains/index.ts

@@ -121,6 +121,7 @@ export { coreTestnet1 } from './definitions/coreTestnet1.js'
 export { coreTestnet2 } from './definitions/coreTestnet2.js'
 export { corn } from './definitions/corn.js'
 export { cornTestnet } from './definitions/cornTestnet.js'
+export { cpchain } from './definitions/cpchain.js'
 export { crab } from './definitions/crab.js'
 export { creatorTestnet } from './definitions/creatorTestnet.js'
 export { creditCoin3Devnet } from './definitions/creditCoin3Devnet.js'

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.43.2'
+export const version = '2.43.4'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.43.2",
+  "version": "2.43.4",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",
@@ -217,7 +217,7 @@
     "@scure/bip39": "1.6.0",
     "abitype": "1.2.3",
     "isows": "1.0.7",
-    "ox": "0.10.6",
+    "ox": "0.11.1",
     "ws": "8.18.3"
   },
   "license": "MIT",

package/tempo/Capabilities.ts

@@ -0,0 +1,9 @@
+import type { DefaultCapabilitiesSchema } from '../types/capabilities.js'
+import type { ExactPartial } from '../types/utils.js'
+import type { TransactionRequestTempo } from './Transaction.js'
+
+export type Schema = Omit<DefaultCapabilitiesSchema, 'sendCalls'> & {
+  sendCalls: {
+    Request: ExactPartial<TransactionRequestTempo>
+  }
+}

package/tempo/Formatters.ts

@@ -121,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/Transport.ts

@@ -132,7 +132,7 @@ export function walletNamespaceCompat(
         if (request.method === 'wallet_sendCalls') {
           const params = request.params[0] ?? {}
           const { capabilities, chainId, from } = params
-          const { sync } = capabilities ?? {}
+          const { sync, ...properties } = capabilities ?? {}
 
           if (!chainId) throw new Provider.UnsupportedChainIdError()
           if (Number(chainId) !== client.chain.id)
@@ -150,11 +150,13 @@ export function walletNamespaceCompat(
             if (!sync)
               return sendTransaction(client, {
                 account,
+                ...(properties ? properties : {}),
                 calls,
               })
 
             const { transactionHash } = await sendTransactionSync(client, {
               account,
+              ...(properties ? properties : {}),
               calls,
             })
             return transactionHash

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

@@ -15,6 +15,7 @@ export * as Abis from './Abis.js'
 export * as Account from './Account.js'
 export * as Addresses from './Addresses.js'
 export * as Actions from './actions/index.js'
+export * as Capabilities from './Capabilities.js'
 export {
   type Decorator as TempoActions,
   decorator as tempoActions,
@@ -54,6 +55,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'

package/utils/abi/getAbiItem.ts

@@ -171,9 +171,14 @@ export function isArgOfType(arg: unknown, abiParameter: AbiParameter): boolean {
       if (abiParameterType === 'tuple' && 'components' in abiParameter)
         return Object.values(abiParameter.components).every(
           (component, index) => {
-            return isArgOfType(
-              Object.values(arg as unknown[] | Record<string, unknown>)[index],
-              component as AbiParameter,
+            return (
+              argType === 'object' &&
+              isArgOfType(
+                Object.values(arg as unknown[] | Record<string, unknown>)[
+                  index
+                ],
+                component as AbiParameter,
+              )
             )
           },
         )