Add DelegationManager validation for EIP-7710 actions (#150) (#156)

Co-authored-by: Patchy Bot <patchy@localhost>

Author: patchy-the-bot

packages/smart-accounts-kit/src/actions/erc7710RedeemDelegationAction.ts

@@ -59,6 +59,20 @@ export async function sendTransactionWithDelegationAction<
     );
   }
 
+  // Validate DelegationManager address
+  const chainId = client.chain?.id;
+  if (!chainId) {
+    throw new Error('Chain ID is not set');
+  }
+
+  const { DelegationManager: expectedDelegationManager } =
+    getSmartAccountsEnvironment(chainId);
+  if (!isAddressEqual(args.delegationManager, expectedDelegationManager)) {
+    throw new Error(
+      `Invalid DelegationManager: expected ${expectedDelegationManager} for chain ${chainId}, but got ${args.delegationManager}`,
+    );
+  }
+
   const executions = [
     createExecution({
       target: args.to,

packages/smart-accounts-kit/test/actions/erc7710RedeemDelegationAction.test.ts

@@ -277,14 +277,19 @@ describe('erc7710RedeemDelegationAction', () => {
 
       const sendTransaction = stub(walletClient, 'sendTransaction');
 
+      const expectedDelegationManager = randomAddress();
+      overrideDeployedEnvironment(chain.id, '1.3.0', {
+        DelegationManager: expectedDelegationManager,
+      } as any as SmartAccountsEnvironment);
+
       const args: SendTransactionWithDelegationParameters = {
         account,
         chain,
         to: randomAddress(),
         value: 0n,
         data: randomBytes(128),
         permissionsContext: randomBytes(128),
-        delegationManager: randomAddress(),
+        delegationManager: expectedDelegationManager,
       };
 
       await extendedWalletClient.sendTransactionWithDelegation(args);
@@ -349,14 +354,19 @@ describe('erc7710RedeemDelegationAction', () => {
 
       const sendTransaction = stub(walletClient, 'sendTransaction');
 
+      const expectedDelegationManager = randomAddress();
+      overrideDeployedEnvironment(chain.id, '1.3.0', {
+        DelegationManager: expectedDelegationManager,
+      } as any as SmartAccountsEnvironment);
+
       const args: SendTransactionWithDelegationParameters = {
         account,
         chain,
         to: randomAddress(),
         value: 100n,
         data: randomBytes(128),
         permissionsContext: randomBytes(128),
-        delegationManager: randomAddress(),
+        delegationManager: expectedDelegationManager,
       };
 
       await extendedWalletClient.sendTransactionWithDelegation(args);
@@ -371,5 +381,53 @@ describe('erc7710RedeemDelegationAction', () => {
         undefined,
       );
     });
+
+    it('should throw an error when DelegationManager does not match expected address for the chain', async () => {
+      const extendedWalletClient = walletClient.extend(erc7710WalletActions());
+
+      const expectedDelegationManager = randomAddress();
+      const invalidDelegationManager = randomAddress();
+
+      overrideDeployedEnvironment(chain.id, '1.3.0', {
+        DelegationManager: expectedDelegationManager,
+      } as any as SmartAccountsEnvironment);
+
+      await expect(
+        extendedWalletClient.sendTransactionWithDelegation({
+          account,
+          chain,
+          to: randomAddress(),
+          value: 0n,
+          data: randomBytes(128),
+          permissionsContext: randomBytes(128),
+          delegationManager: invalidDelegationManager,
+        }),
+      ).rejects.toThrow(
+        `Invalid DelegationManager: expected ${expectedDelegationManager} for chain ${chain.id}, but got ${invalidDelegationManager}`,
+      );
+    });
+
+    it('should throw an error when chain ID is not set', async () => {
+      const walletClientWithoutChain = createWalletClient({
+        account,
+        transport: custom({ request: async () => '0x' }),
+      });
+
+      const extendedWalletClient = walletClientWithoutChain.extend(
+        erc7710WalletActions(),
+      );
+
+      await expect(
+        extendedWalletClient.sendTransactionWithDelegation({
+          account,
+          chain: undefined,
+          to: randomAddress(),
+          value: 0n,
+          data: randomBytes(128),
+          permissionsContext: randomBytes(128),
+          delegationManager: randomAddress(),
+        }),
+      ).rejects.toThrow('Chain ID is not set');
+    });
   });
 });