feat: msca plugingen to accept multichain address format

packages/accounts/plugindefs/multi-owner/config.ts

@@ -5,6 +5,8 @@ import { MultiOwnerPluginAbi } from "./abi.js";
 export const MultiOwnerPluginGenConfig: PluginGenConfig = {
   name: "MultiOwnerPlugin",
   abi: MultiOwnerPluginAbi,
-  address: "0x56bC629F342821FBe91C5273880792dFECBE7920",
+  address: {
+    [sepolia.id]: "0x56bC629F342821FBe91C5273880792dFECBE7920",
+  },
   chain: sepolia,
 };

packages/accounts/plugindefs/types.ts

@@ -1,8 +1,9 @@
-import type { Abi, Address, Chain } from "viem";
+import type { ContractConfig } from "@wagmi/cli";
+import type { Abi, Chain } from "viem";
 
 export type PluginGenConfig = {
   abi: Abi;
-  address: Address;
+  address: ContractConfig["address"];
   chain: Chain;
   name: string;
   // TODO: need to make this configurable to run in CI without requiring this

packages/accounts/scripts/plugingen.ts

@@ -1,4 +1,4 @@
-import type { RequiredBy } from "@alchemy/aa-core";
+import type { ConnectionConfig, RequiredBy } from "@alchemy/aa-core";
 import { type Plugin } from "@wagmi/cli";
 import { camelCase, pascalCase } from "change-case";
 import dedent from "dedent";
@@ -14,10 +14,10 @@ import { IPluginAbi } from "../src/msca/abis/IPlugin.js";
 
 export function plugingen({
   chain,
-  rpcUrl,
+  connectionConfig,
 }: {
   chain: Chain;
-  rpcUrl?: string;
+  connectionConfig: ConnectionConfig;
 }): RequiredBy<Plugin, "run"> {
   return {
     name: "ERC6900PluginGen: This file is auto-generated by plugingen",
@@ -28,26 +28,46 @@ export function plugingen({
         );
       }
 
-      // TODO: move this out of here and have the plugin accept the connection params for where
-      // to pull this data from
-      const httpUrl =
-        rpcUrl ?? `${chain.rpcUrls.alchemy.http[0]}/${process.env.API_KEY}`;
+      const rpcUrl =
+        connectionConfig.rpcUrl == null
+          ? `${chain.rpcUrls.alchemy.http[0]}/${
+              connectionConfig.apiKey ?? process.env.API_KEY
+            }`
+          : connectionConfig.rpcUrl;
+
       const client = createPublicClient({
         chain,
-        transport: http(httpUrl),
+        transport: http(rpcUrl, {
+          fetchOptions: {
+            headers: {
+              Authorization: `Bearer ${connectionConfig.jwt}`,
+            },
+          },
+        }),
       });
 
       const content: string[] = [];
       for (const contract of contracts) {
         // This is done to clear out the ABI generated by wagmi
         contract.content = "";
 
-        if (contract.address == null || typeof contract.address !== "string") {
-          throw new Error("contract must have an address and only one address");
+        if (contract.address == null) {
+          throw new Error("contract must have at least one address");
+        }
+
+        const address =
+          typeof contract.address === "string"
+            ? { [chain.id]: contract.address }
+            : contract.address;
+
+        if (!(chain.id in address)) {
+          throw new Error(
+            `contract address missing for the reference chain ${chain.id}`
+          );
         }
 
         const plugin = getContract({
-          address: contract.address,
+          address: address[chain.id],
           abi: IPluginAbi,
           publicClient: client,
         });
@@ -135,6 +155,11 @@ export function plugingen({
                 meta: {
                     name: "${name}",
                     version: "${version}",
+                    address: {${Object.entries(address).reduce(
+                      (prev, [chainId, addr]) =>
+                        (prev += `${chainId}: "${addr}" as Address, `),
+                      ""
+                    )}},
                 },
                 accountMethods: (account: IMSCA<any, any>) => ({ ${accountFunctions.join(
                   ",\n\n"
@@ -163,7 +188,7 @@ export function plugingen({
       }
 
       const imports = dedent`
-        import { type GetFunctionArgs, encodeFunctionData } from "viem";
+        import { type Address, type GetFunctionArgs, encodeFunctionData } from "viem";
         import type { Plugin } from "./types";
         import type { IMSCA } from "../builder";
         import type { ISmartAccountProvider, SupportedTransports } from "@alchemy/aa-core";

packages/accounts/src/msca/plugins/multi-owner.ts

@@ -1,4 +1,4 @@
-import { type GetFunctionArgs, encodeFunctionData } from "viem";
+import { type Address, type GetFunctionArgs, encodeFunctionData } from "viem";
 import type { Plugin } from "./types";
 import type { IMSCA } from "../builder";
 import type {
@@ -14,6 +14,9 @@ const MultiOwnerPlugin_ = {
   meta: {
     name: "Multi Owner Plugin",
     version: "1.0.0",
+    address: {
+      11155111: "0x56bC629F342821FBe91C5273880792dFECBE7920" as Address,
+    },
   },
   accountMethods: (account: IMSCA<any, any>) => ({
     encodeUpdateOwnersData: ({

packages/accounts/src/msca/plugins/types.ts

@@ -1,11 +1,12 @@
 import type {
+  Address,
   ISmartAccountProvider,
   SupportedTransports,
 } from "@alchemy/aa-core";
 import type { IMSCA } from "../builder";
 
 export interface Plugin<AD, PD> {
-  meta: { name: string; version: string };
+  meta: { name: string; version: string; address: Record<number, Address> };
   /**
    * Decorator functions that can be used to read data from an MSCA contract instance
    * These methods can be used on their own or with the `account.extend` method to add them to the account instance

packages/accounts/wagmi.config.ts

@@ -20,6 +20,11 @@ export default defineConfig(
         address: config.address,
       },
     ],
-    plugins: [plugingen({ chain: config.chain, rpcUrl: config.rpcUrl })],
+    plugins: [
+      plugingen({
+        chain: config.chain,
+        connectionConfig: { rpcUrl: config.rpcUrl! },
+      }),
+    ],
   }))
 );

packages/alchemy/src/schema.ts

@@ -1,31 +1,11 @@
 import { LightAccountFactoryConfigSchema } from "@alchemy/aa-accounts";
-import { createSmartAccountProviderConfigSchema } from "@alchemy/aa-core";
+import {
+  ConnectionConfigSchema,
+  createSmartAccountProviderConfigSchema,
+} from "@alchemy/aa-core";
 import { Alchemy } from "alchemy-sdk";
 import z from "zod";
 
-export const ConnectionConfigSchema = z.union([
-  z.object({
-    rpcUrl: z.never().optional(),
-    apiKey: z.string(),
-    jwt: z.never().optional(),
-  }),
-  z.object({
-    rpcUrl: z.never().optional(),
-    apiKey: z.never().optional(),
-    jwt: z.string(),
-  }),
-  z.object({
-    rpcUrl: z.string(),
-    apiKey: z.never().optional(),
-    jwt: z.never().optional(),
-  }),
-  z.object({
-    rpcUrl: z.string(),
-    apiKey: z.never().optional(),
-    jwt: z.string(),
-  }),
-]);
-
 export const AlchemyProviderConfigSchema =
   createSmartAccountProviderConfigSchema()
     .omit({ rpcProvider: true })

packages/alchemy/src/type.ts

@@ -1,12 +1,9 @@
 import { z } from "zod";
 import type {
   AlchemyProviderConfigSchema,
-  ConnectionConfigSchema,
   LightAccountAlchemyProviderConfigSchema,
 } from "./schema.js";
 
-export type ConnectionConfig = z.input<typeof ConnectionConfigSchema>;
-
 export type AlchemyProviderConfig = z.input<typeof AlchemyProviderConfigSchema>;
 
 export type LightAccountAlchemyProviderConfig = z.input<

packages/core/src/index.ts

@@ -43,6 +43,7 @@ export {
 
 export { SmartAccountProvider, noOpMiddleware } from "./provider/base.js";
 export {
+  ConnectionConfigSchema,
   SmartAccountProviderOptsSchema,
   createSmartAccountProviderConfigSchema,
 } from "./provider/schema.js";

packages/core/src/provider/schema.ts

@@ -9,6 +9,29 @@ import {
   PercentageSchema,
 } from "../utils/index.js";
 
+export const ConnectionConfigSchema = z.union([
+  z.object({
+    rpcUrl: z.never().optional(),
+    apiKey: z.string(),
+    jwt: z.never().optional(),
+  }),
+  z.object({
+    rpcUrl: z.never().optional(),
+    apiKey: z.never().optional(),
+    jwt: z.string(),
+  }),
+  z.object({
+    rpcUrl: z.string(),
+    apiKey: z.never().optional(),
+    jwt: z.never().optional(),
+  }),
+  z.object({
+    rpcUrl: z.string(),
+    apiKey: z.never().optional(),
+    jwt: z.string(),
+  }),
+]);
+
 export const UserOperationFeeOptionsFieldSchema =
   BigNumberishRangeSchema.merge(PercentageSchema).partial();
 

packages/core/src/provider/types.ts

@@ -29,6 +29,7 @@ import type {
 import type { Deferrable } from "../utils";
 import type { IsUndefined, NoUndefined } from "../utils/types.js";
 import type {
+  ConnectionConfigSchema,
   SmartAccountProviderOptsSchema,
   createSmartAccountProviderConfigSchema,
 } from "./schema.js";
@@ -40,6 +41,8 @@ export type ConnectorData = {
   chainId?: Hex;
 };
 
+export type ConnectionConfig = z.input<typeof ConnectionConfigSchema>;
+
 export interface ProviderEvents {
   chainChanged(chainId: Hex): void;
   accountsChanged(accounts: Address[]): void;

packages/core/src/types.ts

@@ -1,4 +1,4 @@
-import type { Address, Hash } from "viem";
+import { type Address, type Hash } from "viem";
 import type { z } from "zod";
 import type {
   UserOperationFeeOptionsFieldSchema,