@account-kit/smart-contracts 4.7.0 → 4.9.0

package/src/ma-v2/modules/webauthn-validation/abis/webauthnValidationAbi.ts

@@ -0,0 +1,373 @@
+export const webauthnValidationModuleAbi = [
+  {
+    type: "constructor",
+    inputs: [
+      {
+        name: "_entryPoint",
+        type: "address",
+        internalType: "contract IEntryPoint",
+      },
+      {
+        name: "_accountImpl",
+        type: "address",
+        internalType: "contract ModularAccount",
+      },
+      {
+        name: "_webauthnValidationModule",
+        type: "address",
+        internalType: "address",
+      },
+      {
+        name: "owner",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    name: "ACCOUNT_IMPL",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "contract ModularAccount",
+      },
+    ],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    name: "ENTRY_POINT",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "contract IEntryPoint",
+      },
+    ],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    name: "WEBAUTHN_VALIDATION_MODULE",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    name: "addStake",
+    inputs: [
+      {
+        name: "unstakeDelay",
+        type: "uint32",
+        internalType: "uint32",
+      },
+    ],
+    outputs: [],
+    stateMutability: "payable",
+  },
+  {
+    type: "function",
+    name: "createAccount",
+    inputs: [
+      {
+        name: "ownerX",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "ownerY",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "salt",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "entityId",
+        type: "uint32",
+        internalType: "uint32",
+      },
+    ],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "contract ModularAccount",
+      },
+    ],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    name: "getAddress",
+    inputs: [
+      {
+        name: "ownerX",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "ownerY",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "salt",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "entityId",
+        type: "uint32",
+        internalType: "uint32",
+      },
+    ],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    name: "getSalt",
+    inputs: [
+      {
+        name: "ownerX",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "ownerY",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "salt",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "entityId",
+        type: "uint32",
+        internalType: "uint32",
+      },
+    ],
+    outputs: [
+      {
+        name: "",
+        type: "bytes32",
+        internalType: "bytes32",
+      },
+    ],
+    stateMutability: "pure",
+  },
+  {
+    type: "function",
+    name: "owner",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    name: "renounceOwnership",
+    inputs: [],
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    name: "transferOwnership",
+    inputs: [
+      {
+        name: "newOwner",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    name: "unlockStake",
+    inputs: [],
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    name: "withdraw",
+    inputs: [
+      {
+        name: "to",
+        type: "address",
+        internalType: "address payable",
+      },
+      {
+        name: "token",
+        type: "address",
+        internalType: "address",
+      },
+      {
+        name: "amount",
+        type: "uint256",
+        internalType: "uint256",
+      },
+    ],
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    name: "withdrawStake",
+    inputs: [
+      {
+        name: "withdrawAddress",
+        type: "address",
+        internalType: "address payable",
+      },
+    ],
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "event",
+    name: "ModularAccountDeployed",
+    inputs: [
+      {
+        name: "account",
+        type: "address",
+        indexed: true,
+        internalType: "address",
+      },
+      {
+        name: "ownerX",
+        type: "uint256",
+        indexed: true,
+        internalType: "uint256",
+      },
+      {
+        name: "ownerY",
+        type: "uint256",
+        indexed: true,
+        internalType: "uint256",
+      },
+      {
+        name: "salt",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256",
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: "event",
+    name: "OwnershipTransferred",
+    inputs: [
+      {
+        name: "previousOwner",
+        type: "address",
+        indexed: true,
+        internalType: "address",
+      },
+      {
+        name: "newOwner",
+        type: "address",
+        indexed: true,
+        internalType: "address",
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: "error",
+    name: "AddressEmptyCode",
+    inputs: [
+      {
+        name: "target",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+  },
+  {
+    type: "error",
+    name: "AddressInsufficientBalance",
+    inputs: [
+      {
+        name: "account",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+  },
+  {
+    type: "error",
+    name: "FailedInnerCall",
+    inputs: [],
+  },
+  {
+    type: "error",
+    name: "OwnableInvalidOwner",
+    inputs: [
+      {
+        name: "owner",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+  },
+  {
+    type: "error",
+    name: "OwnableUnauthorizedAccount",
+    inputs: [
+      {
+        name: "account",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+  },
+  {
+    type: "error",
+    name: "SafeERC20FailedOperation",
+    inputs: [
+      {
+        name: "token",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+  },
+  {
+    type: "error",
+    name: "TransferFailed",
+    inputs: [],
+  },
+] as const;

package/src/ma-v2/utils.ts

@@ -0,0 +1,138 @@
+import { concat, toHex, type Hex, type Chain, type Address } from "viem";
+import {
+  arbitrum,
+  arbitrumSepolia,
+  base,
+  baseSepolia,
+  mainnet,
+  optimism,
+  optimismSepolia,
+  polygon,
+  polygonAmoy,
+  sepolia,
+} from "@account-kit/infra";
+
+export const DEFAULT_OWNER_ENTITY_ID = 0;
+
+export type PackUOSignatureParams = {
+  // orderedHookData: HookData[];
+  validationSignature: Hex;
+};
+
+// TODO: direct call validation 1271
+export type Pack1271SignatureParams = {
+  validationSignature: Hex;
+  entityId: number;
+};
+
+// Signature packing utility for user operations
+export const packUOSignature = ({
+  // orderedHookData, TODO: integrate in next iteration of MAv2 sdk
+  validationSignature,
+}: PackUOSignatureParams): Hex => {
+  return concat(["0xFF", "0x00", validationSignature]);
+};
+
+// Signature packing utility for 1271 signatures
+export const pack1271Signature = ({
+  validationSignature,
+  entityId,
+}: Pack1271SignatureParams): Hex => {
+  return concat([
+    "0x00",
+    toHex(entityId, { size: 4 }),
+    "0xFF",
+    "0x00", // EOA type signature
+    validationSignature,
+  ]);
+};
+
+export const getDefaultMAV2FactoryAddress = (chain: Chain): Address => {
+  switch (chain.id) {
+    // TODO: case mekong.id:
+    case sepolia.id:
+    case baseSepolia.id:
+    case polygon.id:
+    case mainnet.id:
+    case polygonAmoy.id:
+    case optimism.id:
+    case optimismSepolia.id:
+    case arbitrum.id:
+    case arbitrumSepolia.id:
+    case base.id:
+    default:
+      return "0x00000000000017c61b5bEe81050EC8eFc9c6fecd";
+  }
+};
+
+export const getDefaultSMAV2BytecodeAddress = (chain: Chain): Address => {
+  switch (chain.id) {
+    // TODO: case mekong.id:
+    case sepolia.id:
+    case baseSepolia.id:
+    case polygon.id:
+    case mainnet.id:
+    case polygonAmoy.id:
+    case optimism.id:
+    case optimismSepolia.id:
+    case arbitrum.id:
+    case arbitrumSepolia.id:
+    case base.id:
+    default:
+      return "0x000000000000c5A9089039570Dd36455b5C07383";
+  }
+};
+
+export const getDefaultSMAV2StorageAddress = (chain: Chain): Address => {
+  switch (chain.id) {
+    // TODO: case mekong.id:
+    case sepolia.id:
+    case baseSepolia.id:
+    case polygon.id:
+    case mainnet.id:
+    case polygonAmoy.id:
+    case optimism.id:
+    case optimismSepolia.id:
+    case arbitrum.id:
+    case arbitrumSepolia.id:
+    case base.id:
+    default:
+      return "0x0000000000006E2f9d80CaEc0Da6500f005EB25A";
+  }
+};
+
+export const getDefaultSMAV27702Address = (chain: Chain): Address => {
+  switch (chain.id) {
+    // TODO: case mekong.id:
+    case sepolia.id:
+    case baseSepolia.id:
+    case polygon.id:
+    case mainnet.id:
+    case polygonAmoy.id:
+    case optimism.id:
+    case optimismSepolia.id:
+    case arbitrum.id:
+    case arbitrumSepolia.id:
+    case base.id:
+    default:
+      return "0x69007702764179f14F51cdce752f4f775d74E139";
+  }
+};
+
+export const getDefaultMAV2Address = (chain: Chain): Address => {
+  switch (chain.id) {
+    // TODO: case mekong.id:
+    case sepolia.id:
+    case baseSepolia.id:
+    case polygon.id:
+    case mainnet.id:
+    case polygonAmoy.id:
+    case optimism.id:
+    case optimismSepolia.id:
+    case arbitrum.id:
+    case arbitrumSepolia.id:
+    case base.id:
+    default:
+      return "0x00000000000002377B26b1EdA7b0BC371C60DD4f";
+  }
+};

package/src/msca/client/alchemyClient.ts

@@ -1,14 +1,10 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
 import {
-  createAlchemySmartAccountClient,
   type AlchemySmartAccountClient,
   type AlchemySmartAccountClientConfig,
 } from "@account-kit/infra";
 import {
-  accountLoupeActions,
-  createMultiOwnerModularAccount,
-  multiOwnerPluginActions,
-  pluginManagerActions,
+  createMultiOwnerModularAccountClient,
   type AccountLoupeActions,
   type CreateMultiOwnerModularAccountParams,
   type LightAccount,
@@ -59,27 +55,12 @@ export function createModularAccountAlchemyClient<
  *  signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
  * });
  * ```
- *
+ * @deprecated Use createModularAccountClient instead of this function, we are switching based on the transport
  * @param {AlchemyModularAccountClientConfig} config The configuration for creating the Alchemy client
  * @returns {Promise<AlchemySmartAccountClient>} A promise that resolves to an `AlchemySmartAccountClient` configured with the desired plugins and actions
  */
 export async function createModularAccountAlchemyClient(
   config: AlchemyModularAccountClientConfig
 ): Promise<AlchemySmartAccountClient> {
-  const { transport, chain, opts } = config;
-
-  const account = await createMultiOwnerModularAccount({
-    ...config,
-    transport,
-    chain,
-  });
-
-  return createAlchemySmartAccountClient({
-    ...config,
-    account,
-    opts,
-  })
-    .extend(multiOwnerPluginActions)
-    .extend(pluginManagerActions)
-    .extend(accountLoupeActions);
+  return createMultiOwnerModularAccountClient(config);
 }