fix: tests

alchemyplatform · Dec 18, 2024 · ceff675 · ceff675
1 parent 0e4ee07
commit ceff675
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/account-kit/smart-contracts/src/ma-v2/account/account.ts b/account-kit/smart-contracts/src/ma-v2/account/account.ts
@@ -190,11 +190,19 @@ export async function createSMAV2Account(
   });
 
   const getExecutionData = async (args: ExecutionDataParams) => {
+    if (!(await baseAccount.isAccountDeployed())) {
+      return {} as ExecutionDataView;
+    }
+
     const { selector } = args;
     return await accountContract.read.getExecutionData([selector]);
   };
 
   const getValidationData = async (args: ValidationDataParams) => {
+    if (!(await baseAccount.isAccountDeployed())) {
+      return {} as ValidationDataView;
+    }
+
     const { validationModuleAddress, entityId } = args;
     return await accountContract.read.getValidationData([
       serializeModuleEntity({
@@ -209,23 +217,28 @@ export async function createSMAV2Account(
       entityId: Number(entityId),
     });
 
-    return validationData.executionHooks.length
-      ? concatHex([executeUserOpSelector, callData])
-      : callData;
+    const numHooks = validationData?.executionHooks?.length ?? 0;
+
+    return numHooks ? concatHex([executeUserOpSelector, callData]) : callData;
   };
 
   const encodeExecute: (tx: AccountOp) => Promise<Hex> = async ({
     target,
     data,
     value,
-  }) =>
-    encodeCallData(
-      encodeFunctionData({
-        abi: modularAccountAbi,
-        functionName: "execute",
-        args: [target, value ?? 0n, data],
-      })
-    );
+  }) => {
+    let callData = encodeFunctionData({
+      abi: modularAccountAbi,
+      functionName: "execute",
+      args: [target, value ?? 0n, data],
+    });
+
+    callData = (await baseAccount.isAccountDeployed())
+      ? await encodeCallData(callData)
+      : callData;
+
+    return callData;
+  };
 
   const encodeBatchExecute: (txs: AccountOp[]) => Promise<Hex> = async (txs) =>
     encodeCallData(

diff --git a/account-kit/smart-contracts/src/ma-v2/client/client.test.ts b/account-kit/smart-contracts/src/ma-v2/client/client.test.ts
@@ -30,7 +30,7 @@ describe("MA v2 Tests", async () => {
   const target = "0x000000000000000000000000000000000000dEaD";
   const sendAmount = parseEther("1");
 
-  const getTargetBalance = async (): Promise<number> => {
+  const getTargetBalance = async (): Promise<bigint> => {
     return client.getBalance({
       address: target,
     });
@@ -99,7 +99,7 @@ describe("MA v2 Tests", async () => {
       signer: sessionKey,
       transport: custom(instance.getClient()),
       accountAddress: provider.getAddress(),
-      entityId: 1n,
+      entityId: 1,
       isGlobalValidation: true,
     });