viem 2.19.7 → 2.19.9

package/op-stack/actions/getWithdrawalStatus.ts

@@ -238,6 +238,7 @@ export async function getWithdrawalStatus<
     if (error.cause instanceof ContractFunctionRevertedError) {
       const errorMessage = error.cause.data?.args?.[0]
       if (
+        errorMessage === 'OptimismPortal: invalid game type' ||
         errorMessage === 'OptimismPortal: withdrawal has not been proven yet' ||
         errorMessage ===
           'OptimismPortal: withdrawal has not been proven by proof submitter address yet'
@@ -251,6 +252,9 @@ export async function getWithdrawalStatus<
         errorMessage === 'OptimismPortal: output proposal in air-gap'
       )
         return 'waiting-to-finalize'
+
+      if (error.cause.data?.errorName === 'InvalidGameType')
+        return 'ready-to-prove'
     }
     throw checkWithdrawalResult.reason
   }

package/package.json

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

package/types/eip1193.ts

@@ -1335,7 +1335,7 @@ export type TestRpcSchema<mode extends string> = [
    * @link https://ganache.dev/#evm_setAccountBalance
    */
   {
-    Method: `evm_setAccountBalance`
+    Method: 'evm_setAccountBalance'
     Parameters: [
       /** The address of the target account. */
       address: Address,
@@ -1344,12 +1344,26 @@ export type TestRpcSchema<mode extends string> = [
     ]
     ReturnType: void
   },
+  /**
+   * @description Modifies the bytecode stored at an account's address.
+   * @link https://ganache.dev/#evm_setAccountCode
+   */
+  {
+    Method: 'evm_setAccountCode'
+    Parameters: [
+      /** The address of the contract. */
+      address: Address,
+      /** Data bytecode. */
+      data: string,
+    ]
+    ReturnType: void
+  },
   /**
    * @description Enables or disables, based on the single boolean argument, the automatic mining of new blocks with each new transaction submitted to the network.
    * @link https://hardhat.org/hardhat-network/docs/reference#evm_setautomine
    */
   {
-    Method: `evm_setAutomine`
+    Method: 'evm_setAutomine'
     Parameters: [boolean]
     ReturnType: void
   },
@@ -1367,7 +1381,7 @@ export type TestRpcSchema<mode extends string> = [
    * @link https://github.com/trufflesuite/ganache/blob/ef1858d5d6f27e4baeb75cccd57fb3dc77a45ae8/src/chains/ethereum/ethereum/RPC-METHODS.md#evm_increasetime
    */
   {
-    Method: `evm_increaseTime`
+    Method: 'evm_increaseTime'
     Parameters: [seconds: Quantity]
     ReturnType: Quantity
   },

package/zksync/accounts/toMultisigSmartAccount.ts

@@ -0,0 +1,37 @@
+import type { Address } from 'abitype'
+
+import { sign } from '../../accounts/utils/sign.js'
+import type { Hex } from '../../types/misc.js'
+import { concatHex } from '../../utils/index.js'
+import type { ZksyncSmartAccount } from '../types/account.js'
+import { toSmartAccount } from './toSmartAccount.js'
+
+export type ToMultisigSmartAccountParameters = {
+  /** Address of the deployed Account's Contract implementation. */
+  address: Address
+  /** Array of Private Keys belonging to the owners. */
+  privateKeys: readonly Hex[]
+}
+
+/**
+ * Creates a [ZKsync Smart Account](https://docs.zksync.io/build/developer-reference/account-abstraction/building-smart-accounts)
+ * from a Contract Address and an array of Private Keys belonging to the owners.
+ */
+export function toMultisigSmartAccount(
+  parameters: ToMultisigSmartAccountParameters,
+): ZksyncSmartAccount {
+  const { address, privateKeys } = parameters
+
+  return toSmartAccount({
+    address,
+    async sign({ hash }) {
+      return concatHex(
+        await Promise.all(
+          privateKeys.map((privateKey) =>
+            sign({ hash, privateKey, to: 'hex' }),
+          ),
+        ),
+      )
+    },
+  })
+}

package/zksync/accounts/toSinglesigSmartAccount.ts

@@ -0,0 +1,30 @@
+import type { Address } from 'abitype'
+
+import { sign } from '../../accounts/utils/sign.js'
+import type { Hex } from '../../types/misc.js'
+import type { ZksyncSmartAccount } from '../types/account.js'
+import { toSmartAccount } from './toSmartAccount.js'
+
+export type ToSinglesigSmartAccountParameters = {
+  /** Address of the deployed Account's Contract implementation. */
+  address: Address
+  /** Private Key of the owner. */
+  privateKey: Hex
+}
+
+/**
+ * Creates a [ZKsync Smart Account](https://docs.zksync.io/build/developer-reference/account-abstraction/building-smart-accounts)
+ * from a Contract Address and a Private Key belonging to the owner.
+ */
+export function toSinglesigSmartAccount(
+  parameters: ToSinglesigSmartAccountParameters,
+): ZksyncSmartAccount {
+  const { address, privateKey } = parameters
+
+  return toSmartAccount({
+    address,
+    async sign({ hash }) {
+      return sign({ hash, privateKey, to: 'hex' })
+    },
+  })
+}

package/zksync/accounts/toSmartAccount.ts

@@ -0,0 +1,63 @@
+import type { Address } from 'abitype'
+
+import { toAccount } from '../../accounts/toAccount.js'
+import type { ErrorType } from '../../errors/utils.js'
+import type { Hash, Hex } from '../../types/misc.js'
+import { keccak256 } from '../../utils/index.js'
+import { hashMessage } from '../../utils/signature/hashMessage.js'
+import { hashTypedData } from '../../utils/signature/hashTypedData.js'
+import { serializeTransaction } from '../serializers.js'
+import type { ZksyncSmartAccount } from '../types/account.js'
+import type { ZksyncTransactionSerializableEIP712 } from '../types/transaction.js'
+
+export type ToSmartAccountParameters = {
+  /** Address of the deployed Account's Contract implementation. */
+  address: Address
+  /** Function to sign a hash. */
+  sign: (parameters: { hash: Hash }) => Promise<Hex>
+}
+
+export type ToSmartAccountErrorType = ErrorType
+
+/**
+ * Creates a [ZKsync Smart Account](https://docs.zksync.io/build/developer-reference/account-abstraction/building-smart-accounts)
+ * from a Contract Address and a custom sign function.
+ */
+export function toSmartAccount(
+  parameters: ToSmartAccountParameters,
+): ZksyncSmartAccount {
+  const { address, sign } = parameters
+
+  const account = toAccount({
+    address,
+    sign,
+    async signMessage({ message }) {
+      return sign({
+        hash: hashMessage(message),
+      })
+    },
+    async signTransaction(transaction) {
+      const signableTransaction = {
+        ...transaction,
+        from: this.address!,
+      } as ZksyncTransactionSerializableEIP712
+
+      return serializeTransaction({
+        ...signableTransaction,
+        customSignature: await sign({
+          hash: keccak256(serializeTransaction(signableTransaction)),
+        }),
+      })
+    },
+    async signTypedData(typedData) {
+      return sign({
+        hash: hashTypedData(typedData),
+      })
+    },
+  })
+
+  return {
+    ...account,
+    source: 'smartAccountZksync',
+  } as ZksyncSmartAccount
+}

package/zksync/index.ts

@@ -1,4 +1,18 @@
 // biome-ignore lint/performance/noBarrelFile: entrypoint module
+export {
+  type ToSmartAccountErrorType,
+  type ToSmartAccountParameters,
+  toSmartAccount,
+} from './accounts/toSmartAccount.js'
+export {
+  type ToMultisigSmartAccountParameters,
+  toMultisigSmartAccount,
+} from './accounts/toMultisigSmartAccount.js'
+export {
+  type ToSinglesigSmartAccountParameters,
+  toSinglesigSmartAccount,
+} from './accounts/toSinglesigSmartAccount.js'
+
 export {
   type DeployContractErrorType,
   type DeployContractParameters,
@@ -131,6 +145,7 @@ export {
 
 export { serializeTransaction } from './serializers.js'
 
+export type { ZksyncSmartAccount } from './types/account.js'
 export type {
   /** @deprecated Use `ZksyncBlock` instead */
   ZksyncBlock as ZkSyncBlock,

package/zksync/types/account.ts

@@ -0,0 +1,5 @@
+import type { CustomSource, LocalAccount } from '../../accounts/types.js'
+
+export type ZksyncSmartAccount = LocalAccount<'smartAccountZksync'> & {
+  sign: NonNullable<CustomSource['sign']>
+}