Merge branch 'main' into ds/docs-ci-improvements

Author: dslovinsky

aa-sdk/core/src/errors/client.ts

@@ -118,20 +118,6 @@ export class InvalidModularAccountV2Mode extends BaseError {
   }
 }
 
-/**
- * Error class denoting that the deferred action mode used is invalid.
- */
-export class InvalidDeferredActionMode extends BaseError {
-  override name = "InvalidDeferredActionMode";
-
-  /**
-   * Initializes a new instance of the error message with a default message indicating that the provided deferred action mode is invalid.
-   */
-  constructor() {
-    super(`The provided deferred action mode is invalid`);
-  }
-}
-
 /**
  * Error class denoting that the deferred action nonce used is invalid.
  */

aa-sdk/core/src/index.ts

@@ -77,7 +77,6 @@ export {
   InvalidNonceKeyError,
   EntityIdOverrideError,
   InvalidModularAccountV2Mode,
-  InvalidDeferredActionMode,
   InvalidDeferredActionNonce,
 } from "./errors/client.js";
 export {

account-kit/infra/src/chains.ts

@@ -21,8 +21,6 @@ import {
   arbitrumNova as vabn,
   zora as vzora,
   zoraSepolia as vzoras,
-  sonic as vsonic,
-  sonicTestnet as vsonict,
 } from "viem/chains";
 
 export type AlchemyChainConfig = {
@@ -240,20 +238,6 @@ export const zoraSepolia: Chain = {
   },
 };
 
-export const sonic: Chain = {
-  ...vsonic,
-  rpcUrls: {
-    ...vsonic.rpcUrls,
-  },
-};
-
-export const sonicTestnet: Chain = {
-  ...vsonict,
-  rpcUrls: {
-    ...vsonict.rpcUrls,
-  },
-};
-
 export const worldChainSepolia: Chain = defineChain({
   id: 4801,
   name: "World Chain Sepolia",

account-kit/infra/src/index.ts

@@ -44,8 +44,6 @@ export {
   openlootSepolia,
   gensynTestnet,
   riseTestnet,
-  sonic,
-  sonicTestnet,
 } from "./chains.js";
 export type * from "./client/decorators/alchemyEnhancedApis.js";
 export { alchemyEnhancedApiActions } from "./client/decorators/alchemyEnhancedApis.js";

account-kit/smart-contracts/src/ma-v2/account/common/modularAccountV2Base.ts

@@ -4,14 +4,13 @@ import {
   InvalidEntityIdError,
   InvalidNonceKeyError,
   InvalidDeferredActionNonce,
-  InvalidDeferredActionMode,
   toSmartContractAccount,
   type AccountOp,
   type SmartAccountSigner,
   type SmartContractAccountWithSigner,
   type ToSmartContractAccountParams,
 } from "@aa-sdk/core";
-import { DEFAULT_OWNER_ENTITY_ID } from "../../utils.js";
+import { DEFAULT_OWNER_ENTITY_ID, parseDeferredAction } from "../../utils.js";
 import {
   type Hex,
   type Address,
@@ -136,9 +135,9 @@ export async function createMAv2Base<
   let hasAssociatedExecHooks: boolean = false;
 
   if (deferredAction) {
-    if (deferredAction.slice(2, 4) !== "00") {
-      throw new InvalidDeferredActionMode();
-    }
+    ({ nonce, deferredActionData, hasAssociatedExecHooks } =
+      parseDeferredAction(deferredAction));
+
     // Set these values if the deferred action has not been consumed. We check this with the EP
     const nextNonceForDeferredAction: bigint =
       (await entryPointContract.read.getNonce([
@@ -148,10 +147,7 @@ export async function createMAv2Base<
 
     // we only add the deferred action in if the nonce has not been consumed
     if (nonce === nextNonceForDeferredAction) {
-      nonce = BigInt(`0x${deferredAction.slice(6, 70)}`);
       useDeferredAction = true;
-      deferredActionData = `0x${deferredAction.slice(70)}`;
-      hasAssociatedExecHooks = deferredAction[5] === "1";
     } else if (nonce > nextNonceForDeferredAction) {
       throw new InvalidDeferredActionNonce();
     }

account-kit/smart-contracts/src/ma-v2/actions/deferralActions.test.ts

@@ -3,13 +3,7 @@ import {
   LocalAccountSigner,
   type SmartAccountSigner,
 } from "@aa-sdk/core";
-import {
-  custom,
-  parseEther,
-  publicActions,
-  testActions,
-  type TestActions,
-} from "viem";
+import { custom, parseEther } from "viem";
 import {
   createModularAccountV2Client,
   type SignerEntity,
@@ -28,17 +22,6 @@ import { alchemyGasAndPaymasterAndDataMiddleware } from "@account-kit/infra";
 describe("MA v2 deferral actions tests", async () => {
   const instance = local070Instance;
 
-  let client: ReturnType<typeof instance.getClient> &
-    ReturnType<typeof publicActions> &
-    TestActions;
-
-  beforeAll(async () => {
-    client = instance
-      .getClient()
-      .extend(publicActions)
-      .extend(testActions({ mode: "anvil" }));
-  });
-
   const signer: SmartAccountSigner = new LocalAccountSigner(
     accounts.fundedAccountOwner
   );
@@ -73,25 +56,22 @@ describe("MA v2 deferral actions tests", async () => {
     });
 
     const { typedData, fullPreSignatureDeferredActionDigest } =
-      await new PermissionBuilder(serverClient)
-        .configure({
-          key: {
-            publicKey: await sessionKey.getAddress(),
-            type: "secp256k1",
-          },
-          entityId,
-          nonce: nonce,
-        })
+      await new PermissionBuilder({
+        client: serverClient,
+        key: {
+          publicKey: await sessionKey.getAddress(),
+          type: "secp256k1",
+        },
+        entityId,
+        nonce: nonce,
+        deadline: 0,
+      })
         .addPermission({
           permission: {
             type: PermissionType.ROOT,
           },
         })
-        .compileDeferred({
-          deadline: 0,
-          uoValidationEntityId: entityId,
-          uoIsGlobalValidation: true,
-        });
+        .compileDeferred();
 
     const sig = await provider.account.signTypedData(typedData);
 

account-kit/smart-contracts/src/ma-v2/client/client.test.ts

@@ -356,15 +356,16 @@ describe("MA v2 Tests", async () => {
     // Must be built with the client that's going to sign the deferred action
     // OR a client with the same set signer entity as the signing client (entityId + isGlobal)
     const { typedData, fullPreSignatureDeferredActionDigest } =
-      await new PermissionBuilder(provider)
-        .configure({
-          key: {
-            publicKey: await sessionKey.getAddress(),
-            type: "secp256k1",
-          },
-          entityId: entityId,
-          nonce: nonce,
-        })
+      await new PermissionBuilder({
+        client: provider,
+        key: {
+          publicKey: await sessionKey.getAddress(),
+          type: "secp256k1",
+        },
+        entityId: entityId,
+        nonce: nonce,
+        deadline: 0,
+      })
         .addPermission({
           permission: {
             type: PermissionType.GAS_LIMIT,
@@ -381,11 +382,7 @@ describe("MA v2 Tests", async () => {
             },
           },
         })
-        .compileDeferred({
-          deadline: 0,
-          uoValidationEntityId: entityId,
-          uoIsGlobalValidation: false,
-        });
+        .compileDeferred();
 
     // Sign the typed data using the owner (fallback) validation, this must be done via the account to skip 6492
     const deferredValidationSig = await provider.account.signTypedData(
@@ -473,21 +470,22 @@ describe("MA v2 Tests", async () => {
     // const sessionKeyEntityId = 1;
     // these can be default values or from call arguments
     const { entityId, nonce } = await provider.getEntityIdAndNonce({
-      isGlobalValidation: false,
+      isGlobalValidation: false, // assumes the session key is used to sign the UO
     });
 
     // Must be built with the client that's going to sign the deferred action
     // OR a client with the same set signer entity as the signing client (entityId + isGlobal)
     const { typedData, fullPreSignatureDeferredActionDigest } =
-      await new PermissionBuilder(provider)
-        .configure({
-          key: {
-            publicKey: await sessionKey.getAddress(),
-            type: "secp256k1",
-          },
-          entityId: entityId,
-          nonce: nonce,
-        })
+      await new PermissionBuilder({
+        client: provider,
+        key: {
+          publicKey: await sessionKey.getAddress(),
+          type: "secp256k1",
+        },
+        entityId: entityId,
+        nonce: nonce,
+        deadline: 0,
+      })
         .addPermission({
           permission: {
             type: PermissionType.ERC20_TOKEN_TRANSFER,
@@ -497,11 +495,7 @@ describe("MA v2 Tests", async () => {
             },
           },
         })
-        .compileDeferred({
-          deadline: 0,
-          uoValidationEntityId: entityId,
-          uoIsGlobalValidation: false,
-        });
+        .compileDeferred();
 
     // Sign the typed data using the owner (fallback) validation, this must be done via the account to skip 6492
     const deferredValidationSig = await provider.account.signTypedData(
@@ -619,7 +613,7 @@ describe("MA v2 Tests", async () => {
 
     // version 00, preExecHooks 00, nonce, deferredActionDigest
     const fullDeferredAction = concatHex([
-      "0x0000",
+      "0x00",
       toHex(nonce, { size: 32 }),
       deferredActionDigest,
     ]);
@@ -710,35 +704,29 @@ describe("MA v2 Tests", async () => {
       randomWallet
     );
 
-    // Test variables
-    const isGlobalValidation = true;
-
     const { entityId, nonce } = await provider.getEntityIdAndNonce({
       isGlobalValidation: true,
     });
 
     // Must be built with the client that's going to sign the deferred action
     // OR a client with the same set signer entity as the signing client (entityId + isGlobal)
     const { typedData, fullPreSignatureDeferredActionDigest } =
-      await new PermissionBuilder(sessionKeyClient)
-        .configure({
-          key: {
-            publicKey: await newSessionKey.getAddress(),
-            type: "secp256k1",
-          },
-          entityId: entityId,
-          nonce: nonce,
-        })
+      await new PermissionBuilder({
+        client: sessionKeyClient,
+        key: {
+          publicKey: await newSessionKey.getAddress(),
+          type: "secp256k1",
+        },
+        entityId: entityId,
+        nonce: nonce,
+        deadline: 0,
+      })
         .addPermission({
           permission: {
             type: PermissionType.ROOT,
           },
         })
-        .compileDeferred({
-          deadline: 0,
-          uoValidationEntityId: entityId,
-          uoIsGlobalValidation: isGlobalValidation,
-        });
+        .compileDeferred();
 
     // Sign the typed data using the first session key
     const deferredValidationSig = await sessionKeyClient.account.signTypedData(