viem 2.48.1 → 2.48.2

package/op-stack/actions/getGames.ts

@@ -1,3 +1,8 @@
+import type { Address } from 'abitype'
+import {
+  type MulticallErrorType,
+  multicall,
+} from '../../actions/public/multicall.js'
 import {
   type ReadContractErrorType,
   readContract,
@@ -11,8 +16,7 @@ import type {
   DeriveChain,
   GetChainParameter,
 } from '../../types/chain.js'
-import { decodeAbiParameters } from '../../utils/abi/decodeAbiParameters.js'
-import { disputeGameFactoryAbi, portal2Abi } from '../abis.js'
+import { disputeGameAbi, disputeGameFactoryAbi, portal2Abi } from '../abis.js'
 import type { GetContractAddressParameter } from '../types/contract.js'
 import type { Game } from '../types/withdrawal.js'
 
@@ -38,7 +42,10 @@ export type GetGamesParameters<
 export type GetGamesReturnType = (Game & {
   l2BlockNumber: bigint
 })[]
-export type GetGamesErrorType = ReadContractErrorType | ErrorType
+export type GetGamesErrorType =
+  | ReadContractErrorType
+  | MulticallErrorType
+  | ErrorType
 
 /**
  * Retrieves dispute games for an L2.
@@ -106,23 +113,29 @@ export async function getGames<
     }),
   ])
 
-  const games = (
-    (await readContract(client, {
-      abi: disputeGameFactoryAbi,
-      functionName: 'findLatestGames',
-      address: disputeGameFactoryAddress,
-      args: [
-        gameType,
-        BigInt(Math.max(0, Number(gameCount - 1n))),
-        BigInt(Math.min(limit, Number(gameCount))),
-      ],
-    })) as Game[]
-  )
-    .map((game) => {
-      const [blockNumber] = decodeAbiParameters(
-        [{ type: 'uint256' }],
-        game.extraData,
-      )
+  const rawGames = (await readContract(client, {
+    abi: disputeGameFactoryAbi,
+    functionName: 'findLatestGames',
+    address: disputeGameFactoryAddress,
+    args: [
+      gameType,
+      BigInt(Math.max(0, Number(gameCount - 1n))),
+      BigInt(Math.min(limit, Number(gameCount))),
+    ],
+  })) as Game[]
+
+  const l2SequenceNumbers = await multicall(client, {
+    allowFailure: false,
+    contracts: rawGames.map((game) => ({
+      abi: disputeGameAbi,
+      address: `0x${game.metadata.slice(26)}` as Address,
+      functionName: 'l2SequenceNumber' as const,
+    })),
+  })
+
+  const games = rawGames
+    .map((game, i) => {
+      const blockNumber = l2SequenceNumbers[i] as bigint
       return !l2BlockNumber || blockNumber > l2BlockNumber
         ? { ...game, l2BlockNumber: blockNumber }
         : null

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.48.1",
+  "version": "2.48.2",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",

package/tempo/Account.ts

@@ -45,7 +45,7 @@ export type Account_base<source extends string = string> = RequiredBy<
 export type RootAccount = Account_base<'root'> & {
   /** Sign key authorization. */
   signKeyAuthorization: (
-    key: Pick<AccessKeyAccount, 'accessKeyAddress' | 'keyType'>,
+    key: resolveAccessKey.Parameters,
     parameters: Pick<
       KeyAuthorization.KeyAuthorization,
       'chainId' | 'expiry' | 'limits' | 'scopes'
@@ -382,7 +382,7 @@ export async function signKeyAuthorization(
   parameters: signKeyAuthorization.Parameters,
 ): Promise<signKeyAuthorization.ReturnValue> {
   const { chainId, key, expiry, limits, scopes } = parameters
-  const { accessKeyAddress, keyType: type } = key
+  const { accessKeyAddress, keyType: type } = resolveAccessKey(key)
 
   const signature = await account.sign!({
     hash: KeyAuthorization.getSignPayload({
@@ -410,7 +410,7 @@ export declare namespace signKeyAuthorization {
     KeyAuthorization.KeyAuthorization,
     'chainId' | 'expiry' | 'limits' | 'scopes'
   > & {
-    key: Pick<AccessKeyAccount, 'accessKeyAddress' | 'keyType'>
+    key: resolveAccessKey.Parameters
   }
 
   type ReturnValue = KeyAuthorization.Signed
@@ -530,7 +530,7 @@ function fromRoot(parameters: fromRoot.Parameters): RootAccount {
     source: 'root',
     async signKeyAuthorization(key, parameters) {
       const { chainId, expiry, limits, scopes } = parameters
-      const { accessKeyAddress, keyType: type } = key
+      const { accessKeyAddress, keyType: type } = resolveAccessKey(key)
 
       const signature = await account.sign({
         hash: KeyAuthorization.getSignPayload({
@@ -587,6 +587,52 @@ declare namespace fromAccessKey {
   export type ReturnValue = AccessKeyAccount
 }
 
+/** @internal */
+export function resolveAccessKey(
+  accessKey: resolveAccessKey.Parameters,
+): resolveAccessKey.ReturnType {
+  if ('accessKeyAddress' in accessKey)
+    return {
+      accessKeyAddress: accessKey.accessKeyAddress,
+      keyType: accessKey.keyType,
+    }
+  if ('publicKey' in accessKey && accessKey.publicKey)
+    return {
+      accessKeyAddress: Address.fromPublicKey(
+        PublicKey.fromHex(accessKey.publicKey),
+      ),
+      keyType: accessKey.type,
+    }
+  return {
+    accessKeyAddress: accessKey.address,
+    keyType: accessKey.type,
+  }
+}
+
+export declare namespace resolveAccessKey {
+  type Parameters =
+    | Pick<AccessKeyAccount, 'accessKeyAddress' | 'keyType'>
+    | OneOf<
+        | {
+            /** Access key address. */
+            address: Address.Address
+            /** Key type. */
+            type: SignatureEnvelope.Type
+          }
+        | {
+            /** Access key public key. */
+            publicKey: Hex.Hex
+            /** Key type. */
+            type: SignatureEnvelope.Type
+          }
+      >
+
+  type ReturnType = {
+    accessKeyAddress: Address.Address
+    keyType: SignatureEnvelope.Type
+  }
+}
+
 // Export types required for inference.
 // biome-ignore lint/performance/noBarrelFile: _
 export {

package/tempo/actions/accessKey.ts

@@ -17,7 +17,7 @@ import type { Log } from '../../types/log.js'
 import type { Compute } from '../../types/utils.js'
 import { parseEventLogs } from '../../utils/abi/parseEventLogs.js'
 import * as Abis from '../Abis.js'
-import type { AccessKeyAccount } from '../Account.js'
+import type { AccessKeyAccount, resolveAccessKey } from '../Account.js'
 import { signKeyAuthorization } from '../Account.js'
 import * as Addresses from '../Addresses.js'
 import * as Hardfork from '../Hardfork.js'
@@ -91,7 +91,7 @@ export namespace authorize {
 
   export type Args = {
     /** The access key to authorize. */
-    accessKey: Pick<AccessKeyAccount, 'accessKeyAddress' | 'keyType'>
+    accessKey: resolveAccessKey.Parameters
     /** The chain ID. */
     chainId?: number | undefined
     /** Unix timestamp when the key expires. */
@@ -332,7 +332,7 @@ export namespace revoke {
       address: Addresses.accountKeychain,
       abi: Abis.accountKeychain,
       functionName: 'revokeKey',
-      args: [resolveAccessKey(accessKey)],
+      args: [resolveAccessKeyAddress(accessKey)],
     })
   }
 
@@ -528,7 +528,7 @@ export namespace updateLimit {
       address: Addresses.accountKeychain,
       abi: Abis.accountKeychain,
       functionName: 'updateSpendingLimit',
-      args: [resolveAccessKey(accessKey), token, limit],
+      args: [resolveAccessKeyAddress(accessKey), token, limit],
     })
   }
 
@@ -704,7 +704,7 @@ export namespace getMetadata {
       address: Addresses.accountKeychain,
       abi: Abis.accountKeychain,
       functionName: 'getKey',
-      args: [account, resolveAccessKey(accessKey)],
+      args: [account, resolveAccessKeyAddress(accessKey)],
     })
   }
 }
@@ -804,7 +804,7 @@ export namespace getRemainingLimit {
       address: Addresses.accountKeychain,
       abi: Abis.accountKeychain,
       functionName: 'getRemainingLimit',
-      args: [account, resolveAccessKey(accessKey), token],
+      args: [account, resolveAccessKeyAddress(accessKey), token],
     })
   }
 
@@ -820,7 +820,7 @@ export namespace getRemainingLimit {
       address: Addresses.accountKeychain,
       abi: Abis.accountKeychain,
       functionName: 'getRemainingLimitWithPeriod',
-      args: [account, resolveAccessKey(accessKey), token],
+      args: [account, resolveAccessKeyAddress(accessKey), token],
     })
   }
 }
@@ -876,7 +876,7 @@ export namespace signAuthorization {
     account extends Account | undefined = Account | undefined,
   > = GetAccountParameter<account> & {
     /** The access key to authorize. */
-    accessKey: Pick<AccessKeyAccount, 'accessKeyAddress' | 'keyType'>
+    accessKey: resolveAccessKey.Parameters
     /** The chain ID. */
     chainId?: number | undefined
     /** Unix timestamp when the key expires. */
@@ -893,7 +893,9 @@ export namespace signAuthorization {
 }
 
 /** @internal */
-function resolveAccessKey(accessKey: Address | AccessKeyAccount): Address {
+function resolveAccessKeyAddress(
+  accessKey: Address | AccessKeyAccount,
+): Address {
   if (typeof accessKey === 'string') return accessKey
   return accessKey.accessKeyAddress
 }

package/types/contract.ts

@@ -466,8 +466,8 @@ export type LogTopicType<
   topic extends LogTopic = LogTopic,
 > = topic extends Hex
   ? primitiveType
-  : topic extends Hex[]
-    ? primitiveType[]
+  : topic extends readonly Hex[]
+    ? readonly primitiveType[]
     : topic extends null
       ? null
       : never

package/types/misc.ts

@@ -3,7 +3,7 @@ import type { OneOf } from './utils.js'
 export type ByteArray = Uint8Array
 export type Hex = `0x${string}`
 export type Hash = `0x${string}`
-export type LogTopic = Hex | Hex[] | null
+export type LogTopic = Hex | readonly Hex[] | null
 export type SignableMessage =
   | string
   | {

package/utils/buildRequest.ts

@@ -71,7 +71,6 @@ import type {
   EIP1193RequestFn,
   EIP1193RequestOptions,
 } from '../types/eip1193.js'
-import { stringToHex } from './encoding/toHex.js'
 import type { CreateBatchSchedulerErrorType } from './promise/createBatchScheduler.js'
 import { withDedupe } from './promise/withDedupe.js'
 import { type WithRetryErrorType, withRetry } from './promise/withRetry.js'
@@ -143,7 +142,7 @@ export function buildRequest<request extends (args: any) => Promise<any>>(
       })
 
     const requestId = dedupe
-      ? stringToHex(`${uid}.${stringify(args)}`)
+      ? hashString(`${uid}.${stringify(args)}`)
       : undefined
     return withDedupe(
       () =>
@@ -306,3 +305,19 @@ export function shouldRetry(error: Error) {
   }
   return true
 }
+
+/** @internal cyrb53 – fast, non-cryptographic 53-bit string hash */
+function hashString(str: string, seed = 0): string {
+  let h1 = 0xdeadbeef ^ seed
+  let h2 = 0x41c6ce57 ^ seed
+  for (let i = 0; i < str.length; i++) {
+    const ch = str.charCodeAt(i)
+    h1 = Math.imul(h1 ^ ch, 2654435761)
+    h2 = Math.imul(h2 ^ ch, 1597334677)
+  }
+  h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507)
+  h1 ^= Math.imul(h2 ^ (h2 >>> 16), 3266489909)
+  h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507)
+  h2 ^= Math.imul(h1 ^ (h1 >>> 16), 3266489909)
+  return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString(36)
+}