@account-kit/smart-contracts 4.0.0-alpha.9 → 4.0.0-beta.1

package/plugindefs/multisig/config.ts

@@ -1,10 +1,11 @@
+import type { PluginConfig } from "@account-kit/plugingen";
+import { parseAbiParameters } from "viem";
 import {
   arbitrum,
   arbitrumSepolia,
   base,
   baseSepolia,
   fraxtal,
-  fraxtalSepolia,
   mainnet,
   optimism,
   optimismSepolia,
@@ -13,9 +14,7 @@ import {
   sepolia,
   zora,
   zoraSepolia,
-} from "@account-kit/infra";
-import type { PluginConfig } from "@account-kit/plugingen";
-import { parseAbiParameters } from "viem";
+} from "viem/chains";
 import { MultisigPluginAbi } from "./abi.js";
 
 export const MultisigPluginGenConfig: PluginConfig = {
@@ -33,7 +32,7 @@ export const MultisigPluginGenConfig: PluginConfig = {
     [arbitrumSepolia.id]: "0x000000000000A53f64b7bcf4Cd59624943C43Fc7",
     [base.id]: "0x000000000000A53f64b7bcf4Cd59624943C43Fc7",
     [fraxtal.id]: "0x000000000000A53f64b7bcf4Cd59624943C43Fc7",
-    [fraxtalSepolia.id]: "0x000000000000A53f64b7bcf4Cd59624943C43Fc7",
+    2523: "0x000000000000A53f64b7bcf4Cd59624943C43Fc7",
     [zora.id]: "0x000000000000A53f64b7bcf4Cd59624943C43Fc7",
     [zoraSepolia.id]: "0x000000000000A53f64b7bcf4Cd59624943C43Fc7",
   },

package/plugindefs/session-key/config.ts

@@ -1,10 +1,11 @@
+import type { PluginConfig } from "@account-kit/plugingen";
+import { parseAbiParameters } from "viem";
 import {
   arbitrum,
   arbitrumSepolia,
   base,
   baseSepolia,
   fraxtal,
-  fraxtalSepolia,
   mainnet,
   optimism,
   optimismSepolia,
@@ -14,9 +15,7 @@ import {
   sepolia,
   zora,
   zoraSepolia,
-} from "@account-kit/infra";
-import type { PluginConfig } from "@account-kit/plugingen";
-import { parseAbiParameters } from "viem";
+} from "viem/chains";
 import { MultiOwnerPluginGenConfig } from "../multi-owner/config.js";
 import { SessionKeyPluginAbi } from "./abi.js";
 
@@ -34,9 +33,8 @@ export const SessionKeyPluginGenConfig: PluginConfig = {
     [arbitrum.id]: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",
     [arbitrumSepolia.id]: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",
     [base.id]: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",
-    [baseSepolia.id]: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",
     [fraxtal.id]: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",
-    [fraxtalSepolia.id]: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",
+    2523: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",
     [zora.id]: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",
     [zoraSepolia.id]: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",
     [mainnet.id]: "0x0000003E0000a96de4058e1E02a62FaaeCf23d8d",

package/src/index.ts

@@ -24,6 +24,7 @@ export {
   LightAccountUnsupported1271Impls,
   defaultLightAccountVersion,
   getDefaultLightAccountFactoryAddress,
+  getDefaultMultiOwnerLightAccountFactoryAddress,
   getLightAccountVersionForAccount,
 } from "./light-account/utils.js";
 

package/src/light-account/clients/client.ts

@@ -24,14 +24,11 @@ export type CreateLightAccountClientParams<
 > = {
   transport: CreateLightAccountParams<TTransport, TSigner>["transport"];
   chain: CreateLightAccountParams<TTransport, TSigner>["chain"];
-  account: Omit<
-    CreateLightAccountParams<TTransport, TSigner>,
-    "transport" | "chain"
+} & Omit<CreateLightAccountParams<TTransport, TSigner>, "transport" | "chain"> &
+  Omit<
+    SmartAccountClientConfig<TTransport, TChain>,
+    "transport" | "account" | "chain"
   >;
-} & Omit<
-  SmartAccountClientConfig<TTransport, TChain>,
-  "transport" | "account" | "chain"
->;
 
 export function createLightAccountClient<
   TChain extends Chain | undefined = Chain | undefined,
@@ -61,9 +58,7 @@ export function createLightAccountClient<
  * const account = await createLightAccountClient({
  *  chain: sepolia,
  *  transport: http("RPC_URL"),
- *  account: {
- *    signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
- *  }
+ *  signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
  * });
  * ```
  *
@@ -73,16 +68,16 @@ export function createLightAccountClient<
 export async function createLightAccountClient(
   params: CreateLightAccountClientParams
 ): Promise<SmartAccountClient> {
-  const { account, transport, chain, ...clientConfig } = params;
+  const { transport, chain } = params;
 
   const lightAccount = await createLightAccount({
-    ...account,
+    ...params,
     transport,
     chain,
   });
 
   return createSmartAccountClient({
-    ...clientConfig,
+    ...params,
     transport,
     chain: chain,
     account: lightAccount,

package/src/light-account/clients/multiOwnerLightAccount.ts

@@ -27,14 +27,14 @@ export type CreateMultiOwnerLightAccountClientParams<
     TSigner
   >["transport"];
   chain: CreateMultiOwnerLightAccountParams<TTransport, TSigner>["chain"];
-  account: Omit<
-    CreateMultiOwnerLightAccountParams<TTransport, TSigner>,
-    "transport" | "chain"
-  >;
 } & Omit<
-  SmartAccountClientConfig<TTransport, TChain>,
-  "transport" | "account" | "chain"
->;
+  CreateMultiOwnerLightAccountParams<TTransport, TSigner>,
+  "transport" | "chain"
+> &
+  Omit<
+    SmartAccountClientConfig<TTransport, TChain>,
+    "transport" | "account" | "chain"
+  >;
 
 export function createMultiOwnerLightAccountClient<
   TChain extends Chain | undefined = Chain | undefined,
@@ -67,9 +67,7 @@ export function createMultiOwnerLightAccountClient<
  * const account = await createMultiOwnerLightAccountClient({
  *  chain: sepolia,
  *  transport: http("RPC_URL"),
- *  account: {
- *    signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
- *  }
+ *  signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
  * });
  * ```
  *
@@ -79,16 +77,16 @@ export function createMultiOwnerLightAccountClient<
 export async function createMultiOwnerLightAccountClient(
   params: CreateMultiOwnerLightAccountClientParams
 ): Promise<SmartAccountClient> {
-  const { account, transport, chain, ...clientConfig } = params;
+  const { transport, chain } = params;
 
   const lightAccount = await createMultiOwnerLightAccount({
-    ...account,
+    ...params,
     transport,
     chain,
   });
 
   return createSmartAccountClient({
-    ...clientConfig,
+    ...params,
     transport,
     chain: chain,
     account: lightAccount,

package/src/msca/client/client.ts

@@ -40,29 +40,21 @@ export type CreateMultiOwnerModularAccountClientParams<
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
   TSigner extends SmartAccountSigner = SmartAccountSigner
-> = {
-  account: Omit<
-    CreateMultiOwnerModularAccountParams<TTransport, TSigner>,
-    "transport" | "chain"
-  >;
-} & Omit<
-  CreateLightAccountClientParams<TTransport, TChain, TSigner>,
-  "account"
->;
+> = Omit<
+  CreateMultiOwnerModularAccountParams<TTransport, TSigner>,
+  "transport" | "chain"
+> &
+  Omit<CreateLightAccountClientParams<TTransport, TChain, TSigner>, "account">;
 
 export type CreateMultisigModularAccountClientParams<
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
   TSigner extends SmartAccountSigner = SmartAccountSigner
-> = {
-  account: Omit<
-    CreateMultisigModularAccountParams<TTransport, TSigner>,
-    "transport" | "chain"
-  >;
-} & Omit<
-  CreateLightAccountClientParams<TTransport, TChain, TSigner>,
-  "account"
->;
+> = Omit<
+  CreateMultisigModularAccountParams<TTransport, TSigner>,
+  "transport" | "chain"
+> &
+  Omit<CreateLightAccountClientParams<TTransport, TChain, TSigner>, "account">;
 
 export function createMultiOwnerModularAccountClient<
   TChain extends Chain | undefined = Chain | undefined,
@@ -88,14 +80,13 @@ export function createMultiOwnerModularAccountClient<
  * import { createMultiOwnerModularAccountClient } from "@account-kit/smart-contracts";
  * import { LocalAccountSigner } from "@aa-sdk/core";
  * import { sepolia } from "viem/chains";
- * import { http, generatePrivateKey } from "viem"
+ * import { http } from "viem";
+ * import { generatePrivateKey } from "viem/accounts";
  *
  * const accountClient = await createMultiOwnerModularAccountClient({
  *  chain: sepolia,
  *  transport: http("RPC_URL"),
- *  account: {
- *    signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
- *  }
+ *  signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
  * });
  * ```
  *
@@ -103,19 +94,18 @@ export function createMultiOwnerModularAccountClient<
  * @returns {Promise<SmartAccountClient>} A promise that resolves to a `SmartAccountClient` instance with extended plugin actions
  */
 export async function createMultiOwnerModularAccountClient({
-  account,
   transport,
   chain,
-  ...clientConfig
+  ...params
 }: CreateMultiOwnerModularAccountClientParams): Promise<SmartAccountClient> {
   const modularAccount = await createMultiOwnerModularAccount({
-    ...account,
+    ...params,
     transport,
     chain,
   });
 
   return createSmartAccountClient({
-    ...clientConfig,
+    ...params,
     transport,
     chain,
     account: modularAccount,
@@ -151,16 +141,15 @@ export function createMultisigModularAccountClient<
  * import { createMultisigModularAccountClient } from "@account-kit/smart-contracts";
  * import { LocalAccountSigner } from "@aa-sdk/core";
  * import { sepolia } from "viem/chains";
- * import { http, generatePrivateKey } from "viem"
+ * import { http } from "viem"
+ * import { generatePrivateKey } from "viem/accounts";
  *
  * const accountClient = await createMultisigModularAccountClient({
  *  chain: sepolia,
  *  transport: http("RPC_URL"),
- *  account: {
- *    signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey()),
- *    owners: [...], // other owners on the account
- *    threshold: 2, // 2 of N signatures
- *  }
+ *  signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey()),
+ *  owners: [], // other owners on the account
+ *  threshold: 2, // 2 of N signatures
  * });
  * ```
  *
@@ -168,10 +157,9 @@ export function createMultisigModularAccountClient<
  * @returns {Promise<SmartAccountClient<Transport, Chain, MultisigModularAccount<SmartAccountSigner>, {}, SmartAccountClientRpcSchema, MultisigUserOperationContext>>} a promise that resolves to a `SmartAccountClient` object extended with the multisig modular account and additional actions
  */
 export async function createMultisigModularAccountClient({
-  account,
   transport,
   chain,
-  ...clientConfig
+  ...params
 }: CreateMultisigModularAccountClientParams): Promise<
   SmartAccountClient<
     Transport,
@@ -183,13 +171,13 @@ export async function createMultisigModularAccountClient({
   >
 > {
   const modularAccount = await createMultisigModularAccount({
-    ...account,
+    ...params,
     transport,
     chain,
   });
 
   const client = createSmartAccountClient({
-    ...clientConfig,
+    ...params,
     transport,
     chain,
     account: modularAccount,

package/src/msca/plugins/multi-owner/plugin.ts

@@ -189,7 +189,11 @@ export const MultiOwnerPlugin: Plugin<typeof MultiOwnerPluginAbi> = {
       address: address || addresses[client.chain.id],
       abi: MultiOwnerPluginAbi,
       client: client,
-    });
+    }) as GetContractReturnType<
+      typeof MultiOwnerPluginAbi,
+      PublicClient,
+      Address
+    >;
   },
 };
 

package/src/msca/plugins/multisig/plugin.ts

@@ -184,7 +184,11 @@ export const MultisigPlugin: Plugin<typeof MultisigPluginAbi> = {
       address: address || addresses[client.chain.id],
       abi: MultisigPluginAbi,
       client: client,
-    });
+    }) as GetContractReturnType<
+      typeof MultisigPluginAbi,
+      PublicClient,
+      Address
+    >;
   },
 };
 

package/src/msca/plugins/session-key/plugin.ts

@@ -237,7 +237,11 @@ export const SessionKeyPlugin: Plugin<typeof SessionKeyPluginAbi> = {
       address: address || addresses[client.chain.id],
       abi: SessionKeyPluginAbi,
       client: client,
-    });
+    }) as GetContractReturnType<
+      typeof SessionKeyPluginAbi,
+      PublicClient,
+      Address
+    >;
   },
 };
 

package/src/msca/plugins/session-key/signer.ts

@@ -134,7 +134,7 @@ export class SessionKeySigner
    */
   signTypedData = async <
     const TTypedData extends TypedData | { [key: string]: unknown },
-    TPrimaryType extends string = string
+    TPrimaryType extends keyof TTypedData | "EIP712Domain" = keyof TTypedData
   >(
     params: TypedDataDefinition<TTypedData, TPrimaryType>
   ) => {

package/dist/cjs/package.json

@@ -1 +0,0 @@
-{"type":"commonjs"}

package/dist/cjs/plugindefs/index.d.ts

@@ -1,3 +0,0 @@
-export { MultiOwnerPluginGenConfig } from "./multi-owner/config.js";
-export { SessionKeyPluginGenConfig } from "./session-key/config.js";
-export { MultisigPluginGenConfig } from "./multisig/config.js";

package/dist/cjs/plugindefs/index.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultisigPluginGenConfig = exports.SessionKeyPluginGenConfig = exports.MultiOwnerPluginGenConfig = void 0;
-var config_js_1 = require("./multi-owner/config.js");
-Object.defineProperty(exports, "MultiOwnerPluginGenConfig", { enumerable: true, get: function () { return config_js_1.MultiOwnerPluginGenConfig; } });
-var config_js_2 = require("./session-key/config.js");
-Object.defineProperty(exports, "SessionKeyPluginGenConfig", { enumerable: true, get: function () { return config_js_2.SessionKeyPluginGenConfig; } });
-var config_js_3 = require("./multisig/config.js");
-Object.defineProperty(exports, "MultisigPluginGenConfig", { enumerable: true, get: function () { return config_js_3.MultisigPluginGenConfig; } });
-//# sourceMappingURL=index.js.map

package/dist/cjs/plugindefs/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../plugindefs/index.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAA3D,sHAAA,yBAAyB,OAAA;AAClC,qDAAoE;AAA3D,sHAAA,yBAAyB,OAAA;AAClC,kDAA+D;AAAtD,oHAAA,uBAAuB,OAAA","sourcesContent":["export { MultiOwnerPluginGenConfig } from \"./multi-owner/config.js\";\nexport { SessionKeyPluginGenConfig } from \"./session-key/config.js\";\nexport { MultisigPluginGenConfig } from \"./multisig/config.js\";\n"]}