Upgrade viem peer dependency

Author: jeffsmale90

package.json

@@ -60,7 +60,7 @@
     "prettier": "^3.3.3",
     "turbo": "latest",
     "typescript": "5.0.4",
-    "viem": "2.21.55",
+    "viem": "^2.31.4",
     "webauthn-p256": "^0.0.10"
   },
   "packageManager": "yarn@4.2.2",

packages/delegation-toolkit/package.json

@@ -157,9 +157,9 @@
     "tsconfig-paths": "^4.2.0",
     "tsup": "^7.2.0",
     "typescript": "5.0.4",
-    "viem": "2.21.55"
+    "viem": "2.31.4"
   },
   "peerDependencies": {
-    "viem": ">=2.18.2 <3.0.0"
+    "viem": "^2.31.4"
   }
 }

packages/delegation-toolkit/src/types.ts

@@ -8,9 +8,9 @@ import type {
   Account,
   Address,
   Chain,
-  Client,
   Hex,
   OneOf,
+  PublicClient,
   Transport,
   WalletClient,
 } from 'viem';
@@ -143,7 +143,7 @@ export type DeployParams<TImplementation extends Implementation> = {
 export type ToMetaMaskSmartAccountParameters<
   TImplementation extends Implementation,
 > = {
-  client: Client;
+  client: PublicClient;
   implementation: TImplementation;
   signatory: SignatoryConfigByImplementation<TImplementation>;
   environment?: DeleGatorEnvironment;

packages/delegation-toolkit/test/experimental/erc7710RedeemDelegationAction.test.ts

@@ -10,7 +10,7 @@ import type {
   WalletClient,
 } from 'viem';
 import {
-  createClient,
+  createPublicClient,
   createWalletClient,
   custom,
   encodeFunctionData,
@@ -61,7 +61,7 @@ describe('erc7710RedeemDelegationAction', () => {
       } as any as DeleGatorEnvironment);
 
       metaMaskSmartAccount = await toMetaMaskSmartAccount({
-        client: createClient({
+        client: createPublicClient({
           transport: await createHardhatTransport(),
           chain: publicClient.chain,
         }),

packages/delegation-toolkit/test/toMetaMaskSmartAccount.test.ts

@@ -1,12 +1,7 @@
 import { expect } from 'chai';
 import hre from 'hardhat';
-import type { Account, Client, PublicClient, WalletClient } from 'viem';
-import {
-  createClient,
-  createPublicClient,
-  hashTypedData,
-  recoverAddress,
-} from 'viem';
+import type { Account, PublicClient, WalletClient } from 'viem';
+import { createPublicClient, hashTypedData, recoverAddress } from 'viem';
 import { toPackedUserOperation } from 'viem/account-abstraction';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 import { hardhat as chain } from 'viem/chains';
@@ -22,7 +17,6 @@ import type { DeleGatorEnvironment, MetaMaskSmartAccount } from '../src/types';
 import { SIGNABLE_USER_OP_TYPED_DATA } from '../src/userOp';
 
 describe('MetaMaskSmartAccount', () => {
-  let client: Client;
   let publicClient: PublicClient;
   let walletClient: WalletClient;
   let alice: Account;
@@ -31,7 +25,6 @@ describe('MetaMaskSmartAccount', () => {
 
   beforeEach(async () => {
     const transport = await createHardhatTransport();
-    client = createClient({ transport, chain });
     publicClient = createPublicClient({ transport, chain });
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     walletClient = (await hre.viem.getWalletClients())[0]!;
@@ -49,7 +42,7 @@ describe('MetaMaskSmartAccount', () => {
   describe('toMetaMaskSmartAccount()', () => {
     it('should create a MetaMaskSmartAccount for Hybrid implementation', async () => {
       const smartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.Hybrid,
         deployParams: [alice.address, [], [], []],
         deploySalt: '0x0',
@@ -85,7 +78,7 @@ describe('MetaMaskSmartAccount', () => {
 
     it('should create a MetaMaskSmartAccount for MultiSig implementation', async () => {
       const smartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.MultiSig,
         deployParams: [[alice.address, bob.address], 2n],
         deploySalt: '0x0',
@@ -121,7 +114,7 @@ describe('MetaMaskSmartAccount', () => {
 
     it('should create a MetaMaskSmartAccount for Stateless7702 implementation with existing address', async () => {
       const smartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.Stateless7702,
         address: alice.address,
         signatory: { account: alice },
@@ -141,7 +134,7 @@ describe('MetaMaskSmartAccount', () => {
     it('should throw error when creating Stateless7702 without address (counterfactual not supported)', async () => {
       await expect(
         toMetaMaskSmartAccount({
-          client,
+          client: publicClient,
           implementation: Implementation.Stateless7702,
           signatory: { account: alice },
           environment,
@@ -154,7 +147,7 @@ describe('MetaMaskSmartAccount', () => {
     it('should throw an error for unsupported implementation', async () => {
       await expect(
         toMetaMaskSmartAccount({
-          client,
+          client: publicClient,
           implementation: 99 as any as Implementation,
           deployParams: [alice.address, [], [], []],
           deploySalt: '0x0',
@@ -167,7 +160,7 @@ describe('MetaMaskSmartAccount', () => {
     it('should have a default for MetaMaskSmartAccount generic TImplementation parameter', async () => {
       // MetaMaskSmartAccount requires a generic parameter, and defaults to `Implementation` which covers all implementations
       const smartAccount: MetaMaskSmartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.MultiSig,
         deployParams: [[alice.address, bob.address], 2n],
         deploySalt: '0x0',
@@ -183,7 +176,7 @@ describe('MetaMaskSmartAccount', () => {
     // this is a special case test, because as of Framework 1.2, user operations are signed via typed data
     it('should sign a user operation', async () => {
       const smartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.MultiSig,
         deployParams: [[alice.address, bob.address], 2n],
         deploySalt: '0x0',
@@ -229,7 +222,7 @@ describe('MetaMaskSmartAccount', () => {
 
     it('should sign a user operation for Stateless7702 implementation', async () => {
       const smartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.Stateless7702,
         address: alice.address,
         signatory: { account: alice },

packages/delegation-toolkit/test/utils.ts

@@ -7,7 +7,6 @@ import type {
   WalletClient,
   PublicClient,
   Account,
-  Client,
 } from 'viem';
 import {
   generatePrivateKey,
@@ -47,7 +46,7 @@ export const randomBytes = (byteLength: number): Hex => {
 
 export const counterfactualAccountConfig: ToMetaMaskSmartAccountParameters<Implementation.Hybrid> =
   {
-    client: {} as Client,
+    client: {} as PublicClient,
     implementation: Implementation.Hybrid,
     deployParams: [
       OWNER_ACCOUNT.address,
@@ -61,7 +60,7 @@ export const counterfactualAccountConfig: ToMetaMaskSmartAccountParameters<Imple
 
 export const multiSigAccountConfig: ToMetaMaskSmartAccountParameters<Implementation.MultiSig> =
   {
-    client: {} as Client,
+    client: {} as PublicClient,
     implementation: Implementation.MultiSig,
     deployParams: [[OWNER_ACCOUNT.address], 1n],
     deploySalt: SALT,
@@ -70,7 +69,7 @@ export const multiSigAccountConfig: ToMetaMaskSmartAccountParameters<Implementat
 
 export const deployedAccountConfig: ToMetaMaskSmartAccountParameters<Implementation.Hybrid> =
   {
-    client: {} as Client,
+    client: {} as PublicClient,
     implementation: Implementation.Hybrid,
     address: DEPLOYED_ADDRESS,
     signatory: { account: OWNER_ACCOUNT },

packages/delegator-e2e/package.json

@@ -20,6 +20,6 @@
     "teardown": "docker compose down"
   },
   "peerDependencies": {
-    "viem": ">=2.18.2 <3.0.0"
+    "viem": "^2.31.4"
   }
 }

packages/delegator-e2e/test/caveats/allowedCalldata.test.ts

@@ -249,7 +249,7 @@ const runTest_expectFailure = async (
       ],
       ...gasPrice,
     }),
-  ).rejects.toThrow(expectedError);
+  ).rejects.toThrow(Buffer.from(expectedError).toString('hex'));
 
   const counterAfter = await aliceCounter.read.count?.();
   expect(counterAfter, 'Expected count to remain 0n').toEqual(0n);

packages/delegator-e2e/test/caveats/allowedMethods.test.ts

@@ -249,7 +249,7 @@ const runTest_expectFailure = async (
       ],
       ...gasPrice,
     }),
-  ).rejects.toThrow(expectedError);
+  ).rejects.toThrow(Buffer.from(expectedError).toString('hex'));
 
   const counterAfter = await aliceCounter.read.count();
   expect(counterAfter, 'Expected count to remain 0n').toEqual(0n);

packages/delegator-e2e/test/caveats/allowedTargets.test.ts

@@ -219,7 +219,7 @@ const runTest_expectFailure = async (
       ],
       ...gasPrice,
     }),
-  ).rejects.toThrow(expectedError);
+  ).rejects.toThrow(Buffer.from(expectedError).toString('hex'));
 
   const counterAfter = await aliceCounter.read.count();
   expect(counterAfter, 'Expected count to remain 0n').toEqual(0n);