refactor: move SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS out to configs and duplicate for acpContractClient.ts

Author: Ang-dot

src/constants.ts

@@ -19,3 +19,5 @@ export const HTTP_STATUS_CODES = {
   OK: 200,
   PAYMENT_REQUIRED: 402,
 };
+
+export const SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS: Address = "0x00000000000099DE0BF6fA90dEB851E2A2df7d83";

src/contractClients/acpContractClient.ts

@@ -74,6 +74,23 @@ class AcpContractClient extends BaseAcpContractClient {
       this.sessionKeyClient,
       this.publicClient
     );
+
+    const account = this.sessionKeyClient.account;
+    const sessionSignerAddress: Address = await account.getSigner().getAddress();
+
+    if (!await account.isAccountDeployed()) {
+      throw new AcpError(
+        `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
+      );
+    }
+
+    await this.validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId);
+
+    console.log("Connected to ACP:", {
+      agentWalletAddress: this.agentWalletAddress,
+      whitelistedWalletAddress: sessionSignerAddress,
+      entityId: sessionEntityKeyId,
+    });
   }
 
   getRandomNonce(bits = 152) {

src/contractClients/acpContractClientV2.ts

@@ -4,7 +4,7 @@ import {
   createModularAccountV2Client,
   ModularAccountV2Client,
 } from "@account-kit/smart-contracts";
-import { createPublicClient, decodeEventLog, http, zeroAddress } from "viem";
+import { createPublicClient, decodeEventLog, http } from "viem";
 import { AcpContractConfig, baseAcpConfigV2 } from "../configs/acpConfigs";
 import AcpError from "../acpError";
 import BaseAcpContractClient, {
@@ -20,14 +20,11 @@ import {
   X402PaymentResponse,
 } from "../interfaces";
 import { AcpX402 } from "../acpX402";
-import SINGLE_SIGNER_VALIDATION_MODULE_ABI from "../abis/singleSignerValidationModuleAbi";
 
 class AcpContractClientV2 extends BaseAcpContractClient {
   private PRIORITY_FEE_MULTIPLIER = 2;
   private MAX_FEE_PER_GAS = 20000000;
   private MAX_PRIORITY_FEE_PER_GAS = 21000000;
-  private readonly SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS: Address =
-    "0x00000000000099DE0BF6fA90dEB851E2A2df7d83" as Address;
 
   private _sessionKeyClient: ModularAccountV2Client | undefined;
   private _acpX402: AcpX402 | undefined;
@@ -135,47 +132,6 @@ class AcpContractClientV2 extends BaseAcpContractClient {
     });
   }
 
-  private async validateSessionKeyOnChain(
-    sessionSignerAddress: Address,
-    sessionEntityKeyId: number
-  ): Promise<void> {
-    const onChainSignerAddress = (await this.publicClient.readContract({
-      address: this.SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS,
-      abi: SINGLE_SIGNER_VALIDATION_MODULE_ABI,
-      functionName: "signers",
-      args: [sessionEntityKeyId, this.agentWalletAddress],
-    })) as Address;
-
-    if (!onChainSignerAddress || onChainSignerAddress.toLowerCase() === zeroAddress.toLowerCase()) {
-      throw new AcpError(
-        `ACP Contract Client validation failed:\n${JSON.stringify(
-          {
-            reason: "no whitelisted wallet registered on-chain for entity id",
-            entityId: sessionEntityKeyId,
-            agentWalletAddress: this.agentWalletAddress,
-          },
-          null,
-          2
-        )}`
-      );
-    }
-
-    if (onChainSignerAddress.toLowerCase() !== sessionSignerAddress.toLowerCase()) {
-      throw new AcpError(
-        `ACP Contract Client validation failed:\n${JSON.stringify(
-          {
-            agentWalletAddress: this.agentWalletAddress,
-            entityId: sessionEntityKeyId,
-            givenSessionSignerAddress: sessionSignerAddress,
-            expectedSignerAddress: onChainSignerAddress,
-          },
-          null,
-          2
-        )}`
-      );
-    }
-  }
-
   getRandomNonce(bits = 152) {
     const bytes = bits / 8;
     const array = new Uint8Array(bytes);

src/contractClients/baseAcpContractClient.ts

@@ -9,6 +9,7 @@ import {
   keccak256,
   toEventSignature,
   toHex,
+  zeroAddress,
 } from "viem";
 import { AcpContractConfig, baseAcpConfig } from "../configs/acpConfigs";
 import ACP_V2_ABI from "../abis/acpAbiV2";
@@ -25,6 +26,8 @@ import {
   X402PaymentResponse,
 } from "../interfaces";
 import FIAT_TOKEN_V2_ABI from "../abis/fiatTokenV2Abi";
+import SINGLE_SIGNER_VALIDATION_MODULE_ABI from "../abis/singleSignerValidationModuleAbi";
+import { SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS } from "../constants";
 
 export enum MemoType {
   MESSAGE, // 0 - Text message
@@ -89,6 +92,47 @@ abstract class BaseAcpContractClient {
     });
   }
 
+  protected async validateSessionKeyOnChain(
+    sessionSignerAddress: Address,
+    sessionEntityKeyId: number
+  ): Promise<void> {
+    const onChainSignerAddress = ((await this.publicClient.readContract({
+      address: SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS,
+      abi: SINGLE_SIGNER_VALIDATION_MODULE_ABI,
+      functionName: "signers",
+      args: [sessionEntityKeyId, this.agentWalletAddress],
+    })) as Address).toLowerCase();
+
+    if (onChainSignerAddress === zeroAddress.toLowerCase()) {
+      throw new AcpError(
+        `ACP Contract Client validation failed:\n${JSON.stringify(
+          {
+            reason: "no whitelisted wallet registered on-chain for entity id",
+            entityId: sessionEntityKeyId,
+            agentWalletAddress: this.agentWalletAddress,
+          },
+          null,
+          2
+        )}`
+      );
+    }
+
+    if (onChainSignerAddress !== sessionSignerAddress.toLowerCase()) {
+      throw new AcpError(
+        `ACP Contract Client validation failed:\n${JSON.stringify(
+          {
+            agentWalletAddress: this.agentWalletAddress,
+            entityId: sessionEntityKeyId,
+            givenWhitelistedWalletAddress: sessionSignerAddress,
+            expectedWhitelistedWalletAddress: onChainSignerAddress,
+          },
+          null,
+          2
+        )}`
+      );
+    }
+  }
+
   abstract handleOperation(operations: OperationPayload[]): Promise<{ userOpHash: Address , txnHash: Address }>;
 
   abstract getJobId(