Merge branch 'main' into feat/scopes

Author: jeffsmale90

package.json

@@ -52,7 +52,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

@@ -139,10 +139,10 @@
     "tsconfig-paths": "^4.2.0",
     "tsup": "^8.5.0",
     "typescript": "5.0.4",
-    "viem": "2.21.55",
+    "viem": "2.31.4",
     "vitest": "^3.2.4"
   },
   "peerDependencies": {
-    "viem": ">=2.18.2 <3.0.0"
+    "viem": "^2.31.4"
   }
 }

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

@@ -79,8 +79,15 @@ export async function sendTransactionWithDelegationAction<
     ],
   });
 
+  const {
+    value: _value,
+    permissionsContext: _permissionsContext,
+    delegationManager: _delegationManager,
+    ...rest
+  } = args;
+
   const hash = await client.sendTransaction({
-    ...args,
+    ...rest,
     to: args.delegationManager,
     data: calldata,
   } as unknown as SendTransactionParameters);

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

@@ -8,7 +8,6 @@ import type {
   WalletClient,
 } from 'viem';
 import {
-  createClient,
   createPublicClient,
   createWalletClient,
   custom,
@@ -65,10 +64,7 @@ describe('erc7710RedeemDelegationAction', () => {
       });
 
       metaMaskSmartAccount = await toMetaMaskSmartAccount({
-        client: createClient({
-          transport: custom({ request: async () => '0x' }),
-          chain,
-        }),
+        client: publicClient,
         implementation: Implementation.MultiSig,
         signatory: [{ account: owner }],
         deployParams: [[owner.address], 1n],
@@ -318,15 +314,20 @@ describe('erc7710RedeemDelegationAction', () => {
         ],
       });
 
+      const { delegationManager } = args;
+
       const expectedArgs = {
-        ...args,
-        to: args.delegationManager,
+        account,
+        chain,
+        to: delegationManager,
+        // value is not passed to sendTransaction
         data: redeemDelegationCallData,
+        // permissionsContext and delegationManager are not passed to sendTransaction
       };
 
-      expect(sendTransaction.calledOnceWithExactly(expectedArgs)).to.equal(
-        true,
-      );
+      expect(sendTransaction.calledOnce).to.equal(true);
+
+      expect(sendTransaction.firstCall.args[0]).to.deep.equal(expectedArgs);
     });
 
     it('should throw an error when `to` is not provided', async () => {
@@ -345,5 +346,33 @@ describe('erc7710RedeemDelegationAction', () => {
         '`to` is required. `sendTransactionWithDelegation` cannot be used to deploy contracts.',
       );
     });
+
+    it('should not encode the specified `value`, `permissionsContext` and `delegationManager` into the resulting transaction', async () => {
+      const extendedWalletClient = walletClient.extend(erc7710WalletActions());
+
+      const sendTransaction = stub(walletClient, 'sendTransaction');
+
+      const args: SendTransactionWithDelegationParameters = {
+        account,
+        chain,
+        to: randomAddress(),
+        value: 100n,
+        data: randomBytes(128),
+        permissionsContext: randomBytes(128),
+        delegationManager: randomAddress(),
+      };
+
+      await extendedWalletClient.sendTransactionWithDelegation(args);
+
+      expect(sendTransaction.calledOnce).to.equal(true);
+      const sendTransactionArgs = sendTransaction.firstCall.args[0];
+      expect(sendTransactionArgs.value).to.equal(undefined);
+      expect((sendTransactionArgs as any).permissionsContext).to.equal(
+        undefined,
+      );
+      expect((sendTransactionArgs as any).delegationManager).to.equal(
+        undefined,
+      );
+    });
   });
 });

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

@@ -1,6 +1,6 @@
-import type { Account, Client } from 'viem';
+import type { Account, PublicClient } from 'viem';
 import {
-  createClient,
+  createPublicClient,
   custom,
   hashTypedData,
   isAddress,
@@ -19,7 +19,7 @@ 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 alice: Account;
   let bob: Account;
   let environment: DeleGatorEnvironment;
@@ -28,7 +28,8 @@ describe('MetaMaskSmartAccount', () => {
     const transport = custom({
       request: async () => '0x',
     });
-    client = createClient({ transport, chain });
+    publicClient = createPublicClient({ transport, chain });
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 
     environment = {
       SimpleFactory: randomAddress(),
@@ -48,7 +49,7 @@ describe('MetaMaskSmartAccount', () => {
     // note derivation of the correctness of counterfactual account data is validated in counterfactualAccountData.test.ts
     it('creates a MetaMaskSmartAccount for Hybrid implementation', async () => {
       const smartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.Hybrid,
         deployParams: [alice.address, [], [], []],
         deploySalt: '0x0',
@@ -65,7 +66,7 @@ describe('MetaMaskSmartAccount', () => {
 
     it('creates a MetaMaskSmartAccount for MultiSig implementation', async () => {
       const smartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.MultiSig,
         deployParams: [[alice.address, bob.address], 2n],
         deploySalt: '0x0',
@@ -82,7 +83,7 @@ describe('MetaMaskSmartAccount', () => {
 
     it('creates 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 },
@@ -102,7 +103,7 @@ describe('MetaMaskSmartAccount', () => {
     it('throws error when creating Stateless7702 without address (counterfactual not supported)', async () => {
       await expect(
         toMetaMaskSmartAccount({
-          client,
+          client: publicClient,
           implementation: Implementation.Stateless7702,
           signatory: { account: alice },
           environment,
@@ -115,7 +116,7 @@ describe('MetaMaskSmartAccount', () => {
     it('throws an error for unsupported implementation', async () => {
       await expect(
         toMetaMaskSmartAccount({
-          client,
+          client: publicClient,
           implementation: 99 as any as Implementation,
           deployParams: [alice.address, [], [], []],
           deploySalt: '0x0',
@@ -128,7 +129,7 @@ describe('MetaMaskSmartAccount', () => {
     it('has 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',
@@ -142,7 +143,7 @@ describe('MetaMaskSmartAccount', () => {
   describe('signUserOperation()', () => {
     it('signs a user operation for MultiSig implementation', async () => {
       const smartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.MultiSig,
         deployParams: [[alice.address, bob.address], 2n],
         deploySalt: '0x0',
@@ -188,7 +189,7 @@ describe('MetaMaskSmartAccount', () => {
 
     it('signs a user operation for Hybrid implementation', async () => {
       const smartAccount = await toMetaMaskSmartAccount({
-        client,
+        client: publicClient,
         implementation: Implementation.Hybrid,
         deployParams: [alice.address, [], [], []],
         deploySalt: '0x0',
@@ -234,7 +235,7 @@ describe('MetaMaskSmartAccount', () => {
 
     it('signs 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

@@ -1,12 +1,5 @@
 import { bytesToHex, getAddress } from 'viem';
-import type {
-  Chain,
-  Hex,
-  WalletClient,
-  PublicClient,
-  Account,
-  Client,
-} from 'viem';
+import type { Chain, Hex, WalletClient, PublicClient, Account } from 'viem';
 import {
   generatePrivateKey,
   privateKeyToAccount,
@@ -48,7 +41,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,
@@ -62,7 +55,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,
@@ -71,7 +64,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

@@ -21,6 +21,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

@@ -14,36 +14,29 @@ import {
   encodePermissionContexts,
 } from '@metamask/delegation-toolkit/utils';
 import {
-  transport,
   gasPrice,
   sponsoredBundlerClient,
   deploySmartAccount,
   deployCounter,
   CounterContract,
   randomBytes,
+  publicClient,
+  stringToUnprefixedHex,
 } from '../utils/helpers';
-import {
-  createClient,
-  encodeFunctionData,
-  Hex,
-  hexToBigInt,
-  slice,
-} from 'viem';
+import { encodeFunctionData, Hex, hexToBigInt, slice } from 'viem';
 import { expectUserOperationToSucceed } from '../utils/assertions';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
-import { chain } from '../../src/config';
 
-let aliceSmartAccount: MetaMaskSmartAccount<Implementation.Hybrid>;
-let bobSmartAccount: MetaMaskSmartAccount<Implementation.Hybrid>;
+let aliceSmartAccount: MetaMaskSmartAccount;
+let bobSmartAccount: MetaMaskSmartAccount;
 let aliceCounter: CounterContract;
 
 beforeEach(async () => {
-  const client = createClient({ transport, chain });
   const alice = privateKeyToAccount(generatePrivateKey());
   const bob = privateKeyToAccount(generatePrivateKey());
 
   aliceSmartAccount = await toMetaMaskSmartAccount({
-    client,
+    client: publicClient,
     implementation: Implementation.Hybrid,
     deployParams: [alice.address, [], [], []],
     deploySalt: '0x1',
@@ -53,7 +46,7 @@ beforeEach(async () => {
   await deploySmartAccount(aliceSmartAccount);
 
   bobSmartAccount = await toMetaMaskSmartAccount({
-    client,
+    client: publicClient,
     implementation: Implementation.Hybrid,
     deployParams: [bob.address, [], [], []],
     deploySalt: '0x1',
@@ -268,7 +261,7 @@ const runTest_expectFailure = async (
       ],
       ...gasPrice,
     }),
-  ).rejects.toThrow(expectedError);
+  ).rejects.toThrow(stringToUnprefixedHex(expectedError));
 
   const counterAfter = await aliceCounter.read.count?.();
   expect(counterAfter, 'Expected count to remain 0n').toEqual(0n);