improve compile time by at leat 81%

Author: NickSolante

package.json

@@ -32,6 +32,7 @@
     "typescript-eslint": "^7.3.1"
   },
   "dependencies": {
+    "@arktype/attest": "^0.7.0",
     "abitype": "^1.0.0",
     "ethers": "^6.11.1",
     "viem": "^2.9.12"

src/v06/account/common/factoryAddress.ts

@@ -0,0 +1 @@
+export const FACTORY_ADDRESS = "0x9406Cc6185a346906296840746125a0E44976454";

src/v06/account/common/index.ts

@@ -1 +1,4 @@
-export * as SimpleAccount from "./simpleAccount";
+export * as SimpleAccountWithEthers from "./simpleAccountWithEthers";
+export * as SimpleAccountWithoutHoistedViemAccount from "./simpleAccountWithoutViemAccount";
+export * as SimpleAccountWithHoistedViemAccount from "./simpleAccountWithViemAccount";
+export * as SimpleAccountWithSigner from "./simpleAccountWithSigner";

src/v06/account/common/simpleAccount.ts

@@ -0,0 +1,35 @@
+import { Address } from "abitype";
+import { JsonRpcProvider, Signer } from "ethers";
+import { PublicClient, WalletClient, Transport, Chain, Account } from "viem";
+import { RequestSignature } from "../hooks";
+import { RequiredAccountOpts } from "../types";
+import { AccountAbi, FactoryAbi } from "./abi/simpleAccount";
+import { FACTORY_ADDRESS } from "./factoryAddress";
+
+export function baseWithEthers(
+  ethClient: PublicClient | JsonRpcProvider,
+  eoa: WalletClient<Transport, Chain | undefined, Account> | Signer,
+): RequiredAccountOpts<typeof AccountAbi, typeof FactoryAbi> {
+  return {
+    accountAbi: AccountAbi,
+    factoryAbi: FactoryAbi,
+    factoryAddress: FACTORY_ADDRESS,
+    ethClient,
+    async setFactoryData(salt, encoder) {
+      if ("getAddresses" in eoa) {
+        return encoder("createAccount", [(await eoa.getAddresses())[0], salt]);
+      } else {
+        return encoder("createAccount", [
+          (await eoa.getAddress()) as Address,
+          salt,
+        ]);
+      }
+    },
+    requestSignature:
+      "getAddresses" in eoa
+        ? RequestSignature.withViemWalletClient(
+            eoa as WalletClient<Transport, Chain | undefined, Account>,
+          )
+        : RequestSignature.withEthersSigner(eoa),
+  };
+}

src/v06/account/common/simpleAccountWithEthers.ts

@@ -0,0 +1,31 @@
+import { Address } from "abitype";
+import { JsonRpcProvider, Signer } from "ethers";
+import { PublicClient, Account } from "viem";
+import { RequestSignature } from "../hooks";
+import { RequiredAccountOpts } from "../types";
+import { AccountAbi, FactoryAbi } from "./abi/simpleAccount";
+import { FACTORY_ADDRESS } from "./factoryAddress";
+
+export function base(
+  ethClient: PublicClient | JsonRpcProvider,
+  eoa: Signer,
+  account?: Account,
+): RequiredAccountOpts<typeof AccountAbi, typeof FactoryAbi> {
+  return {
+    accountAbi: AccountAbi,
+    factoryAbi: FactoryAbi,
+    factoryAddress: FACTORY_ADDRESS,
+    ethClient,
+    async setFactoryData(salt, encoder) {
+      if (account !== undefined) {
+        return encoder("createAccount", [account.address, salt]);
+      } else {
+        return encoder("createAccount", [
+          (await eoa.getAddress()) as Address,
+          salt,
+        ]);
+      }
+    },
+    requestSignature: RequestSignature.withEthersSigner(eoa),
+  };
+}

src/v06/account/common/simpleAccountWithSigner.ts

@@ -0,0 +1,32 @@
+import { JsonRpcProvider } from "ethers";
+import { PublicClient, WalletClient, Transport, Chain, Account } from "viem";
+import { RequestSignature } from "../hooks";
+import { RequiredAccountOpts } from "../types";
+import { AccountAbi, FactoryAbi } from "./abi/simpleAccount";
+import { FACTORY_ADDRESS } from "./factoryAddress";
+
+export function baseWithViemHoistedAccount(
+  ethClient: PublicClient | JsonRpcProvider,
+  eoa: WalletClient<Transport, Chain | undefined, Account>,
+  account: Account,
+): RequiredAccountOpts<typeof AccountAbi, typeof FactoryAbi> {
+  return {
+    accountAbi: AccountAbi,
+    factoryAbi: FactoryAbi,
+    factoryAddress: FACTORY_ADDRESS,
+    ethClient,
+    async setFactoryData(salt, encoder) {
+      if (account !== undefined) {
+        return encoder("createAccount", [account.address, salt]);
+      } else {
+        return encoder("createAccount", [(await eoa.getAddresses())[0], salt]);
+      }
+    },
+    requestSignature:
+      "getAddresses" in eoa
+        ? RequestSignature.withViemWalletClient(
+            eoa as WalletClient<Transport, Chain | undefined, Account>,
+          )
+        : RequestSignature.withEthersSigner(eoa),
+  };
+}

src/v06/account/common/simpleAccountWithViemAccount.ts

@@ -0,0 +1,33 @@
+import { JsonRpcProvider } from "ethers";
+import { PublicClient, WalletClient, Transport, Chain, Account } from "viem";
+import { RequestSignature } from "../hooks";
+import { RequiredAccountOpts } from "../types";
+import { AccountAbi, FactoryAbi } from "./abi/simpleAccount";
+import { FACTORY_ADDRESS } from "./factoryAddress";
+
+export function baseWithoutHoistedViemAccount(
+  ethClient: PublicClient | JsonRpcProvider,
+  eoa: WalletClient<Transport, Chain | undefined, undefined>,
+  account: Account,
+): RequiredAccountOpts<typeof AccountAbi, typeof FactoryAbi> {
+  return {
+    accountAbi: AccountAbi,
+    factoryAbi: FactoryAbi,
+    factoryAddress: FACTORY_ADDRESS,
+    ethClient,
+    async setFactoryData(salt, encoder) {
+      if (account !== undefined) {
+        return encoder("createAccount", [account.address, salt]);
+      } else {
+        return encoder("createAccount", [(await eoa.getAddresses())[0], salt]);
+      }
+    },
+    requestSignature:
+      "getAddresses" in eoa
+        ? RequestSignature.withoutViemWalletClient(
+            eoa as WalletClient<Transport, Chain | undefined, undefined>,
+            account,
+          )
+        : RequestSignature.withEthersSigner(eoa),
+  };
+}

src/v06/account/common/simpleAccountWithoutViemAccount.ts

@@ -1 +1,2 @@
-export * from "./common";
+export * from "./jsonProvider";
+export * from "./publicClient";