@alchemy/smart-accounts 5.0.0-beta.2 → 5.0.0-beta.3

package/src/ma-v2/accounts/base.ts

@@ -8,7 +8,6 @@ import {
   type Transport,
   concat,
   concatHex,
-  encodeFunctionData,
   hashMessage,
   hashTypedData,
   type TypedDataDefinition,
@@ -42,12 +41,7 @@ import type {
   SignatureRequest,
   SmartAccountWithDecodeCalls,
 } from "../../types.js";
-import {
-  decodeFunctionData,
-  getAction,
-  isAddressEqual,
-  sliceHex,
-} from "viem/utils";
+import { getAction, isAddressEqual } from "viem/utils";
 import {
   DEFAULT_OWNER_ENTITY_ID,
   DefaultModuleAddress,
@@ -64,6 +58,7 @@ import { InvalidDeferredActionNonceError } from "../../errors/InvalidDeferredAct
 import { InvalidNonceKeyError } from "../../errors/InvalidNonceKeyError.js";
 import { InvalidEntityIdError } from "../../errors/InvalidEntityIdError.js";
 import { is7702Delegated } from "../../utils.js";
+import { encodeCallsMAv2, decodeCallsMAv2 } from "./calldataCodec.js";
 
 export type ValidationDataParams =
   | {
@@ -336,76 +331,19 @@ export async function toModularAccountV2Base<
         if (isAddressEqual(call.to, accountAddress)) {
           // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.
 
-          if (call.data === undefined) {
+          if (call.data == null) {
             throw new BaseError("Data is required for an account self-call.");
           }
 
           return encodeCallData(call.data);
         }
-
-        return encodeCallData(
-          encodeFunctionData({
-            abi: modularAccountAbi,
-            functionName: "execute",
-            args: [call.to, call.value ?? 0n, call.data ?? "0x"],
-          }),
-        );
       }
 
-      return encodeCallData(
-        encodeFunctionData({
-          abi: modularAccountAbi,
-          functionName: "executeBatch",
-          args: [
-            calls.map((call) => ({
-              target: call.to,
-              data: call.data ?? "0x",
-              value: call.value ?? 0n,
-            })),
-          ],
-        }),
-      );
+      return encodeCallData(encodeCallsMAv2(calls));
     },
 
     async decodeCalls(data) {
-      // Inverse of `encodeCalls`.
-      // Trim the EXECUTE_USER_OP_SELECTOR if it is present.
-      const trimmedData = data
-        .toLowerCase()
-        .startsWith(EXECUTE_USER_OP_SELECTOR.toLowerCase())
-        ? sliceHex(data, 4)
-        : data;
-
-      const decoded = decodeFunctionData({
-        abi: modularAccountAbi,
-        data: trimmedData,
-      });
-
-      if (decoded.functionName === "execute") {
-        return [
-          {
-            to: decoded.args[0],
-            value: decoded.args[1],
-            data: decoded.args[2],
-          },
-        ];
-      }
-
-      if (decoded.functionName === "executeBatch") {
-        return decoded.args[0].map((call) => ({
-          to: call.target,
-          value: call.value,
-          data: call.data,
-        }));
-      }
-
-      // If the data is not for an `execute` or `executeBatch` call, we treat it as a single call to the account itself.
-      return [
-        {
-          to: accountAddress,
-          data,
-        },
-      ];
+      return decodeCallsMAv2(data, accountAddress);
     },
 
     async getStubSignature() {

package/src/ma-v2/accounts/calldataCodec.ts

@@ -0,0 +1,94 @@
+import {
+  decodeFunctionData,
+  encodeFunctionData,
+  type Address,
+  type Call,
+  type Hex,
+} from "viem";
+import { sliceHex } from "viem/utils";
+import { modularAccountAbi } from "../abis/modularAccountAbi.js";
+import { EXECUTE_USER_OP_SELECTOR } from "../utils/account.js";
+import { BaseError } from "@alchemy/common";
+
+/**
+ * Encodes an array of calls into ModularAccountV2 calldata for `execute` or `executeBatch`.
+ * Used internally by the ModularAccountV2 SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Call[]} calls The calls to encode.
+ * @returns {Hex} The encoded calldata.
+ */
+export function encodeCallsMAv2(calls: readonly Call[]): Hex {
+  if (!calls.length) {
+    throw new BaseError("No calls to encode.");
+  }
+
+  if (calls.length === 1) {
+    return encodeFunctionData({
+      abi: modularAccountAbi,
+      functionName: "execute",
+      args: [calls[0].to, calls[0].value ?? 0n, calls[0].data ?? "0x"],
+    });
+  }
+
+  return encodeFunctionData({
+    abi: modularAccountAbi,
+    functionName: "executeBatch",
+    args: [
+      calls.map((call) => ({
+        target: call.to,
+        data: call.data ?? "0x",
+        value: call.value ?? 0n,
+      })),
+    ],
+  });
+}
+
+/**
+ * Decodes ModularAccountV2 calldata back into an array of calls. Strips the `EXECUTE_USER_OP_SELECTOR` prefix if present.
+ * Used internally by the ModularAccountV2 SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Hex} data The calldata to decode.
+ * @param {Address} accountAddress The account address, used as the `to` for unrecognized selectors.
+ * @returns {Call[]} The decoded calls.
+ */
+export function decodeCallsMAv2(data: Hex, accountAddress: Address): Call[] {
+  // Strip the EXECUTE_USER_OP_SELECTOR prefix if present.
+  const trimmedData = data
+    .toLowerCase()
+    .startsWith(EXECUTE_USER_OP_SELECTOR.toLowerCase())
+    ? sliceHex(data, 4)
+    : data;
+
+  const decoded = decodeFunctionData({
+    abi: modularAccountAbi,
+    data: trimmedData,
+  });
+
+  if (decoded.functionName === "execute") {
+    return [
+      {
+        to: decoded.args[0],
+        value: decoded.args[1],
+        data: decoded.args[2],
+      },
+    ];
+  }
+
+  if (decoded.functionName === "executeBatch") {
+    return decoded.args[0].map((call) => ({
+      to: call.target,
+      value: call.value,
+      data: call.data,
+    }));
+  }
+
+  // If the data is not for an `execute` or `executeBatch` call, treat it as a single call to the account itself.
+  return [
+    {
+      to: accountAddress,
+      data,
+    },
+  ];
+}

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "5.0.0-beta.2";
+export const VERSION = "5.0.0-beta.3";