refactor: split aa-alchemy into account-kit packages (#704)

* refactor: split aa-alchemy into account-kit packages BREAKING CHANGE: this removes the @alchemy/aa-alchemy package in favor of @account-kit/* * refactor: delete aa-accounts and move to @account-kit/accounts (#706) BREAKING CHANGE: @alchemy/aa-accounts was deleted in favor of @account-kit/accounts * refactor: further rename packages
alchemyplatform · Jun 14, 2024 · 6c41e22 · 6c41e22
1 parent 6c9c720
commit 6c41e22
Show file tree

Hide file tree

Showing 716 changed files with 1,995 additions and 13,198 deletions.
diff --git a/packages/core/CHANGELOG.md → aa-sdk/core/CHANGELOG.md b/packages/core/CHANGELOG.md → aa-sdk/core/CHANGELOG.md
diff --git a/packages/core/README.md → aa-sdk/core/README.md b/packages/core/README.md → aa-sdk/core/README.md
diff --git a/packages/core/e2e-tests/constants.ts → aa-sdk/core/e2e-tests/constants.ts b/packages/core/e2e-tests/constants.ts → aa-sdk/core/e2e-tests/constants.ts
diff --git a/...-tests/simple-account-staging.e2e.test.ts → ...-tests/simple-account-staging.e2e.test.ts b/...-tests/simple-account-staging.e2e.test.ts → ...-tests/simple-account-staging.e2e.test.ts
diff --git a/...core/e2e-tests/simple-account.e2e.test.ts → ...core/e2e-tests/simple-account.e2e.test.ts b/...core/e2e-tests/simple-account.e2e.test.ts → ...core/e2e-tests/simple-account.e2e.test.ts
diff --git a/packages/alchemy/inject-version.ts → aa-sdk/core/inject-version.ts b/packages/alchemy/inject-version.ts → aa-sdk/core/inject-version.ts
diff --git a/packages/core/package.json → aa-sdk/core/package.json b/packages/core/package.json → aa-sdk/core/package.json
diff --git a/packages/core/src/__tests__/utils.test.ts → aa-sdk/core/src/__tests__/utils.test.ts b/packages/core/src/__tests__/utils.test.ts → aa-sdk/core/src/__tests__/utils.test.ts
diff --git a/packages/core/src/abis/EntryPointAbi_v6.ts → aa-sdk/core/src/abis/EntryPointAbi_v6.ts b/packages/core/src/abis/EntryPointAbi_v6.ts → aa-sdk/core/src/abis/EntryPointAbi_v6.ts
diff --git a/packages/core/src/abis/EntryPointAbi_v7.ts → aa-sdk/core/src/abis/EntryPointAbi_v7.ts b/packages/core/src/abis/EntryPointAbi_v7.ts → aa-sdk/core/src/abis/EntryPointAbi_v7.ts
diff --git a/...ages/core/src/abis/SimpleAccountAbi_v6.ts → aa-sdk/core/src/abis/SimpleAccountAbi_v6.ts b/...ages/core/src/abis/SimpleAccountAbi_v6.ts → aa-sdk/core/src/abis/SimpleAccountAbi_v6.ts
diff --git a/...ages/core/src/abis/SimpleAccountAbi_v7.ts → aa-sdk/core/src/abis/SimpleAccountAbi_v7.ts b/...ages/core/src/abis/SimpleAccountAbi_v7.ts → aa-sdk/core/src/abis/SimpleAccountAbi_v7.ts
diff --git a/.../core/src/abis/SimpleAccountFactoryAbi.ts → .../core/src/abis/SimpleAccountFactoryAbi.ts b/.../core/src/abis/SimpleAccountFactoryAbi.ts → .../core/src/abis/SimpleAccountFactoryAbi.ts
diff --git a/...core/src/account/__tests__/simple.test.ts → ...core/src/account/__tests__/simple.test.ts b/...core/src/account/__tests__/simple.test.ts → ...core/src/account/__tests__/simple.test.ts
diff --git a/packages/core/src/account/base.ts → aa-sdk/core/src/account/base.ts b/packages/core/src/account/base.ts → aa-sdk/core/src/account/base.ts
diff --git a/packages/core/src/account/schema.ts → aa-sdk/core/src/account/schema.ts b/packages/core/src/account/schema.ts → aa-sdk/core/src/account/schema.ts
diff --git a/packages/core/src/account/simple.ts → aa-sdk/core/src/account/simple.ts b/packages/core/src/account/simple.ts → aa-sdk/core/src/account/simple.ts
diff --git a/.../core/src/account/smartContractAccount.ts → .../core/src/account/smartContractAccount.ts b/.../core/src/account/smartContractAccount.ts → .../core/src/account/smartContractAccount.ts
diff --git a/packages/core/src/account/types.ts → aa-sdk/core/src/account/types.ts b/packages/core/src/account/types.ts → aa-sdk/core/src/account/types.ts
diff --git a/...tions/bundler/estimateUserOperationGas.ts → ...tions/bundler/estimateUserOperationGas.ts b/...tions/bundler/estimateUserOperationGas.ts → ...tions/bundler/estimateUserOperationGas.ts
diff --git a/...ctions/bundler/getSupportedEntryPoints.ts → ...ctions/bundler/getSupportedEntryPoints.ts b/...ctions/bundler/getSupportedEntryPoints.ts → ...ctions/bundler/getSupportedEntryPoints.ts
diff --git a/...actions/bundler/getUserOperationByHash.ts → ...actions/bundler/getUserOperationByHash.ts b/...actions/bundler/getUserOperationByHash.ts → ...actions/bundler/getUserOperationByHash.ts
diff --git a/...ctions/bundler/getUserOperationReceipt.ts → ...ctions/bundler/getUserOperationReceipt.ts b/...ctions/bundler/getUserOperationReceipt.ts → ...ctions/bundler/getUserOperationReceipt.ts
diff --git a/...c/actions/bundler/sendRawUserOperation.ts → ...c/actions/bundler/sendRawUserOperation.ts b/...c/actions/bundler/sendRawUserOperation.ts → ...c/actions/bundler/sendRawUserOperation.ts
diff --git a/...ctions/smartAccount/buildUserOperation.ts → ...ctions/smartAccount/buildUserOperation.ts b/...ctions/smartAccount/buildUserOperation.ts → ...ctions/smartAccount/buildUserOperation.ts
diff --git a/.../smartAccount/buildUserOperationFromTx.ts → .../smartAccount/buildUserOperationFromTx.ts b/.../smartAccount/buildUserOperationFromTx.ts → .../smartAccount/buildUserOperationFromTx.ts
diff --git a/...smartAccount/buildUserOperationFromTxs.ts → ...smartAccount/buildUserOperationFromTxs.ts b/...smartAccount/buildUserOperationFromTxs.ts → ...smartAccount/buildUserOperationFromTxs.ts
diff --git a/...Account/checkGasSponsorshipEligibility.ts → ...Account/checkGasSponsorshipEligibility.ts b/...Account/checkGasSponsorshipEligibility.ts → ...Account/checkGasSponsorshipEligibility.ts
diff --git a/...artAccount/dropAndReplaceUserOperation.ts → ...artAccount/dropAndReplaceUserOperation.ts b/...artAccount/dropAndReplaceUserOperation.ts → ...artAccount/dropAndReplaceUserOperation.ts
diff --git a/.../smartAccount/estimateUserOperationGas.ts → .../smartAccount/estimateUserOperationGas.ts b/.../smartAccount/estimateUserOperationGas.ts → .../smartAccount/estimateUserOperationGas.ts
diff --git a/...re/src/actions/smartAccount/getAddress.ts → ...re/src/actions/smartAccount/getAddress.ts b/...re/src/actions/smartAccount/getAddress.ts → ...re/src/actions/smartAccount/getAddress.ts
diff --git a/...martAccount/internal/initUserOperation.ts → ...martAccount/internal/initUserOperation.ts b/...martAccount/internal/initUserOperation.ts → ...martAccount/internal/initUserOperation.ts
diff --git a/...artAccount/internal/runMiddlewareStack.ts → ...artAccount/internal/runMiddlewareStack.ts b/...artAccount/internal/runMiddlewareStack.ts → ...artAccount/internal/runMiddlewareStack.ts
diff --git a/...martAccount/internal/sendUserOperation.ts → ...martAccount/internal/sendUserOperation.ts b/...martAccount/internal/sendUserOperation.ts → ...martAccount/internal/sendUserOperation.ts
diff --git a/...c/actions/smartAccount/sendTransaction.ts → ...c/actions/smartAccount/sendTransaction.ts b/...c/actions/smartAccount/sendTransaction.ts → ...c/actions/smartAccount/sendTransaction.ts
diff --git a/.../actions/smartAccount/sendTransactions.ts → .../actions/smartAccount/sendTransactions.ts b/.../actions/smartAccount/sendTransactions.ts → .../actions/smartAccount/sendTransactions.ts
diff --git a/...actions/smartAccount/sendUserOperation.ts → ...actions/smartAccount/sendUserOperation.ts b/...actions/smartAccount/sendUserOperation.ts → ...actions/smartAccount/sendUserOperation.ts
diff --git a/...e/src/actions/smartAccount/signMessage.ts → ...e/src/actions/smartAccount/signMessage.ts b/...e/src/actions/smartAccount/signMessage.ts → ...e/src/actions/smartAccount/signMessage.ts
diff --git a/...tions/smartAccount/signMessageWith6492.ts → ...tions/smartAccount/signMessageWith6492.ts b/...tions/smartAccount/signMessageWith6492.ts → ...tions/smartAccount/signMessageWith6492.ts
diff --git a/...src/actions/smartAccount/signTypedData.ts → ...src/actions/smartAccount/signTypedData.ts b/...src/actions/smartAccount/signTypedData.ts → ...src/actions/smartAccount/signTypedData.ts
diff --git a/...ons/smartAccount/signTypedDataWith6492.ts → ...ons/smartAccount/signTypedDataWith6492.ts b/...ons/smartAccount/signTypedDataWith6492.ts → ...ons/smartAccount/signTypedDataWith6492.ts
diff --git a/...actions/smartAccount/signUserOperation.ts → ...actions/smartAccount/signUserOperation.ts b/...actions/smartAccount/signUserOperation.ts → ...actions/smartAccount/signUserOperation.ts
diff --git a/...es/core/src/actions/smartAccount/types.ts → ...dk/core/src/actions/smartAccount/types.ts b/...es/core/src/actions/smartAccount/types.ts → ...dk/core/src/actions/smartAccount/types.ts
diff --git a/...rc/actions/smartAccount/upgradeAccount.ts → ...rc/actions/smartAccount/upgradeAccount.ts b/...rc/actions/smartAccount/upgradeAccount.ts → ...rc/actions/smartAccount/upgradeAccount.ts
diff --git a/...count/waitForUserOperationTransacation.ts → ...count/waitForUserOperationTransacation.ts b/...count/waitForUserOperationTransacation.ts → ...count/waitForUserOperationTransacation.ts
diff --git a/packages/core/src/chains/index.ts → aa-sdk/core/src/chains/index.ts b/packages/core/src/chains/index.ts → aa-sdk/core/src/chains/index.ts
diff --git a/packages/core/src/client/bundlerClient.ts → aa-sdk/core/src/client/bundlerClient.ts b/packages/core/src/client/bundlerClient.ts → aa-sdk/core/src/client/bundlerClient.ts
diff --git a/...re/src/client/decorators/bundlerClient.ts → ...re/src/client/decorators/bundlerClient.ts b/...re/src/client/decorators/bundlerClient.ts → ...re/src/client/decorators/bundlerClient.ts
diff --git a/...c/client/decorators/smartAccountClient.ts → ...c/client/decorators/smartAccountClient.ts b/...c/client/decorators/smartAccountClient.ts → ...c/client/decorators/smartAccountClient.ts
diff --git a/...s/core/src/client/isSmartAccountClient.ts → ...k/core/src/client/isSmartAccountClient.ts b/...s/core/src/client/isSmartAccountClient.ts → ...k/core/src/client/isSmartAccountClient.ts
diff --git a/packages/core/src/client/schema.ts → aa-sdk/core/src/client/schema.ts b/packages/core/src/client/schema.ts → aa-sdk/core/src/client/schema.ts
diff --git a/...ore/src/client/smartAccountClient.test.ts → ...ore/src/client/smartAccountClient.test.ts b/...ore/src/client/smartAccountClient.test.ts → ...ore/src/client/smartAccountClient.test.ts
diff --git a/...ges/core/src/client/smartAccountClient.ts → aa-sdk/core/src/client/smartAccountClient.ts b/...ges/core/src/client/smartAccountClient.ts → aa-sdk/core/src/client/smartAccountClient.ts
diff --git a/packages/core/src/client/types.ts → aa-sdk/core/src/client/types.ts b/packages/core/src/client/types.ts → aa-sdk/core/src/client/types.ts
diff --git a/packages/core/src/ens/utils.ts → aa-sdk/core/src/ens/utils.ts b/packages/core/src/ens/utils.ts → aa-sdk/core/src/ens/utils.ts
diff --git a/packages/core/src/entrypoint/0.6.ts → aa-sdk/core/src/entrypoint/0.6.ts b/packages/core/src/entrypoint/0.6.ts → aa-sdk/core/src/entrypoint/0.6.ts
diff --git a/packages/core/src/entrypoint/0.7.ts → aa-sdk/core/src/entrypoint/0.7.ts b/packages/core/src/entrypoint/0.7.ts → aa-sdk/core/src/entrypoint/0.7.ts
diff --git a/packages/core/src/entrypoint/index.ts → aa-sdk/core/src/entrypoint/index.ts b/packages/core/src/entrypoint/index.ts → aa-sdk/core/src/entrypoint/index.ts
diff --git a/packages/core/src/entrypoint/types.ts → aa-sdk/core/src/entrypoint/types.ts b/packages/core/src/entrypoint/types.ts → aa-sdk/core/src/entrypoint/types.ts
diff --git a/packages/core/src/errors/account.ts → aa-sdk/core/src/errors/account.ts b/packages/core/src/errors/account.ts → aa-sdk/core/src/errors/account.ts
diff --git a/packages/core/src/errors/base.ts → aa-sdk/core/src/errors/base.ts b/packages/core/src/errors/base.ts → aa-sdk/core/src/errors/base.ts
diff --git a/packages/core/src/errors/client.ts → aa-sdk/core/src/errors/client.ts b/packages/core/src/errors/client.ts → aa-sdk/core/src/errors/client.ts
diff --git a/packages/core/src/errors/entrypoint.ts → aa-sdk/core/src/errors/entrypoint.ts b/packages/core/src/errors/entrypoint.ts → aa-sdk/core/src/errors/entrypoint.ts
diff --git a/packages/core/src/errors/signer.ts → aa-sdk/core/src/errors/signer.ts b/packages/core/src/errors/signer.ts → aa-sdk/core/src/errors/signer.ts
diff --git a/packages/core/src/errors/transaction.ts → aa-sdk/core/src/errors/transaction.ts b/packages/core/src/errors/transaction.ts → aa-sdk/core/src/errors/transaction.ts
diff --git a/packages/core/src/errors/useroperation.ts → aa-sdk/core/src/errors/useroperation.ts b/packages/core/src/errors/useroperation.ts → aa-sdk/core/src/errors/useroperation.ts
diff --git a/packages/core/src/index.ts → aa-sdk/core/src/index.ts b/packages/core/src/index.ts → aa-sdk/core/src/index.ts
diff --git a/packages/core/src/logger.ts → aa-sdk/core/src/logger.ts b/packages/core/src/logger.ts → aa-sdk/core/src/logger.ts
diff --git a/packages/core/src/middleware/actions.ts → aa-sdk/core/src/middleware/actions.ts b/packages/core/src/middleware/actions.ts → aa-sdk/core/src/middleware/actions.ts
diff --git a/...e/src/middleware/defaults/feeEstimator.ts → ...e/src/middleware/defaults/feeEstimator.ts b/...e/src/middleware/defaults/feeEstimator.ts → ...e/src/middleware/defaults/feeEstimator.ts
diff --git a/...e/src/middleware/defaults/gasEstimator.ts → ...e/src/middleware/defaults/gasEstimator.ts b/...e/src/middleware/defaults/gasEstimator.ts → ...e/src/middleware/defaults/gasEstimator.ts
diff --git a/...c/middleware/defaults/paymasterAndData.ts → ...c/middleware/defaults/paymasterAndData.ts b/...c/middleware/defaults/paymasterAndData.ts → ...c/middleware/defaults/paymasterAndData.ts
diff --git a/...e/src/middleware/defaults/userOpSigner.ts → ...e/src/middleware/defaults/userOpSigner.ts b/...e/src/middleware/defaults/userOpSigner.ts → ...e/src/middleware/defaults/userOpSigner.ts
diff --git a/...ges/core/src/middleware/noopMiddleware.ts → aa-sdk/core/src/middleware/noopMiddleware.ts b/...ges/core/src/middleware/noopMiddleware.ts → aa-sdk/core/src/middleware/noopMiddleware.ts
diff --git a/packages/core/src/middleware/types.ts → aa-sdk/core/src/middleware/types.ts b/packages/core/src/middleware/types.ts → aa-sdk/core/src/middleware/types.ts
diff --git a/...rc/signer/__tests__/local-account.test.ts → ...rc/signer/__tests__/local-account.test.ts b/...rc/signer/__tests__/local-account.test.ts → ...rc/signer/__tests__/local-account.test.ts
diff --git a/...rc/signer/__tests__/wallet-client.test.ts → ...rc/signer/__tests__/wallet-client.test.ts b/...rc/signer/__tests__/wallet-client.test.ts → ...rc/signer/__tests__/wallet-client.test.ts
diff --git a/packages/core/src/signer/local-account.ts → aa-sdk/core/src/signer/local-account.ts b/packages/core/src/signer/local-account.ts → aa-sdk/core/src/signer/local-account.ts
diff --git a/packages/core/src/signer/schema.ts → aa-sdk/core/src/signer/schema.ts b/packages/core/src/signer/schema.ts → aa-sdk/core/src/signer/schema.ts
diff --git a/packages/core/src/signer/types.ts → aa-sdk/core/src/signer/types.ts b/packages/core/src/signer/types.ts → aa-sdk/core/src/signer/types.ts
diff --git a/packages/core/src/signer/utils.ts → aa-sdk/core/src/signer/utils.ts b/packages/core/src/signer/utils.ts → aa-sdk/core/src/signer/utils.ts
diff --git a/packages/core/src/signer/wallet-client.ts → aa-sdk/core/src/signer/wallet-client.ts b/packages/core/src/signer/wallet-client.ts → aa-sdk/core/src/signer/wallet-client.ts
diff --git a/packages/core/src/transport/split.ts → aa-sdk/core/src/transport/split.ts b/packages/core/src/transport/split.ts → aa-sdk/core/src/transport/split.ts
diff --git a/packages/core/src/types.ts → aa-sdk/core/src/types.ts b/packages/core/src/types.ts → aa-sdk/core/src/types.ts
diff --git a/...s/core/src/utils/__tests__/bigint.test.ts → ...k/core/src/utils/__tests__/bigint.test.ts b/...s/core/src/utils/__tests__/bigint.test.ts → ...k/core/src/utils/__tests__/bigint.test.ts
diff --git a/packages/core/src/utils/bigint.ts → aa-sdk/core/src/utils/bigint.ts b/packages/core/src/utils/bigint.ts → aa-sdk/core/src/utils/bigint.ts
diff --git a/packages/core/src/utils/bytes.ts → aa-sdk/core/src/utils/bytes.ts b/packages/core/src/utils/bytes.ts → aa-sdk/core/src/utils/bytes.ts
diff --git a/packages/core/src/utils/defaults.ts → aa-sdk/core/src/utils/defaults.ts b/packages/core/src/utils/defaults.ts → aa-sdk/core/src/utils/defaults.ts
diff --git a/packages/core/src/utils/index.ts → aa-sdk/core/src/utils/index.ts b/packages/core/src/utils/index.ts → aa-sdk/core/src/utils/index.ts
diff --git a/packages/core/src/utils/schema.ts → aa-sdk/core/src/utils/schema.ts b/packages/core/src/utils/schema.ts → aa-sdk/core/src/utils/schema.ts
diff --git a/packages/core/src/utils/stateOverride.ts → aa-sdk/core/src/utils/stateOverride.ts b/packages/core/src/utils/stateOverride.ts → aa-sdk/core/src/utils/stateOverride.ts
diff --git a/packages/core/src/utils/testUtils.ts → aa-sdk/core/src/utils/testUtils.ts b/packages/core/src/utils/testUtils.ts → aa-sdk/core/src/utils/testUtils.ts
diff --git a/packages/core/src/utils/types.ts → aa-sdk/core/src/utils/types.ts b/packages/core/src/utils/types.ts → aa-sdk/core/src/utils/types.ts
diff --git a/packages/core/src/utils/userop.ts → aa-sdk/core/src/utils/userop.ts b/packages/core/src/utils/userop.ts → aa-sdk/core/src/utils/userop.ts
diff --git a/packages/alchemy/src/version.ts → aa-sdk/core/src/version.ts b/packages/alchemy/src/version.ts → aa-sdk/core/src/version.ts
diff --git a/packages/core/tsconfig.build.json → aa-sdk/core/tsconfig.build.json b/packages/core/tsconfig.build.json → aa-sdk/core/tsconfig.build.json
diff --git a/packages/accounts/tsconfig.json → aa-sdk/core/tsconfig.json b/packages/accounts/tsconfig.json → aa-sdk/core/tsconfig.json
diff --git a/packages/core/vitest.config.e2e.ts → aa-sdk/core/vitest.config.e2e.ts b/packages/core/vitest.config.e2e.ts → aa-sdk/core/vitest.config.e2e.ts
diff --git a/packages/core/vitest.config.ts → aa-sdk/core/vitest.config.ts b/packages/core/vitest.config.ts → aa-sdk/core/vitest.config.ts
diff --git a/packages/ethers/CHANGELOG.md → aa-sdk/ethers/CHANGELOG.md b/packages/ethers/CHANGELOG.md → aa-sdk/ethers/CHANGELOG.md
diff --git a/packages/ethers/README.md → aa-sdk/ethers/README.md b/packages/ethers/README.md → aa-sdk/ethers/README.md
diff --git a/packages/ethers/e2e-tests/constants.ts → aa-sdk/ethers/e2e-tests/constants.ts b/packages/ethers/e2e-tests/constants.ts → aa-sdk/ethers/e2e-tests/constants.ts
diff --git a/...hers/e2e-tests/simple-account.e2e.test.ts → ...hers/e2e-tests/simple-account.e2e.test.ts b/...hers/e2e-tests/simple-account.e2e.test.ts → ...hers/e2e-tests/simple-account.e2e.test.ts
diff --git a/packages/ethers/package.json → aa-sdk/ethers/package.json b/packages/ethers/package.json → aa-sdk/ethers/package.json
diff --git a/...rs/src/__tests__/provider-adapter.test.ts → ...rs/src/__tests__/provider-adapter.test.ts b/...rs/src/__tests__/provider-adapter.test.ts → ...rs/src/__tests__/provider-adapter.test.ts
diff --git a/packages/ethers/src/account-signer.ts → aa-sdk/ethers/src/account-signer.ts b/packages/ethers/src/account-signer.ts → aa-sdk/ethers/src/account-signer.ts
diff --git a/packages/ethers/src/index.ts → aa-sdk/ethers/src/index.ts b/packages/ethers/src/index.ts → aa-sdk/ethers/src/index.ts
diff --git a/packages/ethers/src/provider-adapter.ts → aa-sdk/ethers/src/provider-adapter.ts b/packages/ethers/src/provider-adapter.ts → aa-sdk/ethers/src/provider-adapter.ts
diff --git a/packages/ethers/src/types.ts → aa-sdk/ethers/src/types.ts b/packages/ethers/src/types.ts → aa-sdk/ethers/src/types.ts
diff --git a/packages/ethers/src/utils.ts → aa-sdk/ethers/src/utils.ts b/packages/ethers/src/utils.ts → aa-sdk/ethers/src/utils.ts
diff --git a/packages/ethers/tsconfig.build.json → aa-sdk/ethers/tsconfig.build.json b/packages/ethers/tsconfig.build.json → aa-sdk/ethers/tsconfig.build.json
diff --git a/packages/core/tsconfig.json → aa-sdk/ethers/tsconfig.json b/packages/core/tsconfig.json → aa-sdk/ethers/tsconfig.json
diff --git a/packages/ethers/vitest.config.e2e.ts → aa-sdk/ethers/vitest.config.e2e.ts b/packages/ethers/vitest.config.e2e.ts → aa-sdk/ethers/vitest.config.e2e.ts
diff --git a/packages/ethers/vitest.config.ts → aa-sdk/ethers/vitest.config.ts b/packages/ethers/vitest.config.ts → aa-sdk/ethers/vitest.config.ts
diff --git a/packages/plugingen/CHANGELOG.md → aa-sdk/plugingen/CHANGELOG.md b/packages/plugingen/CHANGELOG.md → aa-sdk/plugingen/CHANGELOG.md
diff --git a/packages/core/inject-version.ts → aa-sdk/plugingen/inject-version.ts b/packages/core/inject-version.ts → aa-sdk/plugingen/inject-version.ts
diff --git a/packages/plugingen/package.json → aa-sdk/plugingen/package.json b/packages/plugingen/package.json → aa-sdk/plugingen/package.json
@@ -60,7 +60,6 @@
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
   "dependencies": {
-    "@alchemy/aa-accounts": "^3.18.2",
     "@alchemy/aa-core": "^3.18.2",
     "bundle-require": "^4.0.2",
     "cac": "^6.7.14",

diff --git a/packages/accounts/src/msca/abis/IPlugin.ts → aa-sdk/plugingen/src/IPlugin.ts b/packages/accounts/src/msca/abis/IPlugin.ts → aa-sdk/plugingen/src/IPlugin.ts
diff --git a/packages/plugingen/src/cli.ts → aa-sdk/plugingen/src/cli.ts b/packages/plugingen/src/cli.ts → aa-sdk/plugingen/src/cli.ts
diff --git a/.../plugingen/src/commands/generate/index.ts → .../plugingen/src/commands/generate/index.ts b/.../plugingen/src/commands/generate/index.ts → .../plugingen/src/commands/generate/index.ts
@@ -1,4 +1,3 @@
-import { IPluginAbi } from "@alchemy/aa-accounts";
 import { asyncPipe } from "@alchemy/aa-core";
 import { kebabCase } from "change-case";
 import dedent from "dedent";
@@ -14,6 +13,7 @@ import {
 } from "viem";
 import z from "zod";
 import type { Config, PluginConfig } from "../../config.js";
+import { IPluginAbi } from "../../IPlugin.js";
 import * as logger from "../../logger.js";
 import { findConfig } from "../../utils/findConfig.js";
 import { format } from "../../utils/format.js";

diff --git a/...mands/generate/phases/contract-abi-gen.ts → ...mands/generate/phases/contract-abi-gen.ts b/...mands/generate/phases/contract-abi-gen.ts → ...mands/generate/phases/contract-abi-gen.ts
diff --git a/...generate/phases/contract-addresses-gen.ts → ...generate/phases/contract-addresses-gen.ts b/...generate/phases/contract-addresses-gen.ts → ...generate/phases/contract-addresses-gen.ts
diff --git a/...ands/generate/phases/execution-abi-gen.ts → ...ands/generate/phases/execution-abi-gen.ts b/...ands/generate/phases/execution-abi-gen.ts → ...ands/generate/phases/execution-abi-gen.ts
diff --git a/...s/generate/phases/plugin-actions/index.ts → ...s/generate/phases/plugin-actions/index.ts b/...s/generate/phases/plugin-actions/index.ts → ...s/generate/phases/plugin-actions/index.ts
@@ -32,7 +32,11 @@ export const PluginActionsGenPhase: Phase = async (input) => {
     isType: true,
   });
   addImport("@alchemy/aa-core", {
-    name: "EntryPointVersion",
+    name: "GetEntryPointFromAccount",
+    isType: true,
+  });
+  addImport("@alchemy/aa-core", {
+    name: "UserOperationOverridesParameter",
     isType: true,
   });
   addImport("@alchemy/aa-core", {

diff --git a/...ases/plugin-actions/management-actions.ts → ...ases/plugin-actions/management-actions.ts b/...ases/plugin-actions/management-actions.ts → ...ases/plugin-actions/management-actions.ts
@@ -118,20 +118,24 @@ const addImports = (
 
   addImport("@alchemy/aa-core", { name: "ChainNotFoundError" });
   addImport("viem", { name: "encodeAbiParameters" });
-  addImport("@alchemy/aa-accounts", {
+  addImport("@account-kit/smart-contracts", {
     name: "installPlugin as installPlugin_",
   });
   addImport("@alchemy/aa-core", {
     name: "GetAccountParameter",
     isType: true,
   });
-  addImport("@alchemy/aa-accounts", {
-    name: "FunctionReference",
+  addImport("@alchemy/aa-core", {
+    name: "GetEntryPointFromAccount",
     isType: true,
   });
-  addImport("@alchemy/aa-accounts", {
+  addImport("@alchemy/aa-core", {
     name: "UserOperationContext",
     isType: true,
   });
+  addImport("@account-kit/smart-contracts", {
+    name: "FunctionReference",
+    isType: true,
+  });
   addImport("@alchemy/aa-core", { name: "GetContextParameter", isType: true });
 };
diff --git a/...ate/phases/plugin-actions/read-actions.ts → ...ate/phases/plugin-actions/read-actions.ts b/...ate/phases/plugin-actions/read-actions.ts → ...ate/phases/plugin-actions/read-actions.ts
@@ -50,9 +50,9 @@ export const AccountReadActionsGenPhase: Phase = async (input) => {
         n.inputs.length > 0
           ? dedent`${readMethodName}: (
             args: Pick<EncodeFunctionDataParameters<typeof ${executionAbiConst}, "${n.name}">, "args"> &
-              GetAccountParameter<TEntryPointVersion, TAccount>
+              GetAccountParameter<TAccount>
           ) => Promise<ReadContractReturnType<typeof ${executionAbiConst}, "${n.name}">>`
-          : dedent`${readMethodName}: (args: GetAccountParameter<TEntryPointVersion, TAccount>) =>
+          : dedent`${readMethodName}: (args: GetAccountParameter<TAccount>) =>
               Promise<ReadContractReturnType<typeof ${executionAbiConst}, "${n.name}">>`
       );
 
@@ -82,7 +82,6 @@ export const AccountReadActionsGenPhase: Phase = async (input) => {
   const typeName = input.hasReadMethods
     ? `ReadAndEncodeActions<
         TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined,
-        TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>,
       >`
     : "ReadAndEncodeActions";
 

diff --git a/...ases/plugin-generator/get-contract-gen.ts → ...ases/plugin-generator/get-contract-gen.ts b/...ases/plugin-generator/get-contract-gen.ts → ...ases/plugin-generator/get-contract-gen.ts
diff --git a/...generate/phases/plugin-generator/index.ts → ...generate/phases/plugin-generator/index.ts b/...generate/phases/plugin-generator/index.ts → ...generate/phases/plugin-generator/index.ts
@@ -13,7 +13,7 @@ export const PluginGeneratorPhase: Phase = async (input) => {
     content: [],
   });
 
-  addImport("@alchemy/aa-accounts", { name: "Plugin", isType: true });
+  addImport("@account-kit/smart-contracts", { name: "Plugin", isType: true });
 
   input.content.push(dedent`
     export const ${pluginConfig.name}: Plugin<typeof ${

diff --git a/...erate/phases/plugin-generator/meta-gen.ts → ...erate/phases/plugin-generator/meta-gen.ts b/...erate/phases/plugin-generator/meta-gen.ts → ...erate/phases/plugin-generator/meta-gen.ts
diff --git a/.../plugingen/src/commands/generate/types.ts → .../plugingen/src/commands/generate/types.ts b/.../plugingen/src/commands/generate/types.ts → .../plugingen/src/commands/generate/types.ts
@@ -1,6 +1,6 @@
-import type { IPluginAbi } from "@alchemy/aa-accounts";
 import type { GetContractReturnType, PublicClient } from "viem";
 import type { Config, PluginConfig } from "../../config.js";
+import type { IPluginAbi } from "../../IPlugin.js";
 
 export type PhaseInput = {
   content: string[];

diff --git a/packages/accounts/plugingen/utils.ts → .../plugingen/src/commands/generate/utils.ts b/packages/accounts/plugingen/utils.ts → .../plugingen/src/commands/generate/utils.ts
diff --git a/packages/plugingen/src/commands/init.ts → aa-sdk/plugingen/src/commands/init.ts b/packages/plugingen/src/commands/init.ts → aa-sdk/plugingen/src/commands/init.ts
diff --git a/packages/plugingen/src/config.ts → aa-sdk/plugingen/src/config.ts b/packages/plugingen/src/config.ts → aa-sdk/plugingen/src/config.ts
diff --git a/packages/plugingen/src/errors.ts → aa-sdk/plugingen/src/errors.ts b/packages/plugingen/src/errors.ts → aa-sdk/plugingen/src/errors.ts
diff --git a/packages/plugingen/src/exports/config.ts → aa-sdk/plugingen/src/exports/config.ts b/packages/plugingen/src/exports/config.ts → aa-sdk/plugingen/src/exports/config.ts
diff --git a/packages/plugingen/src/exports/index.ts → aa-sdk/plugingen/src/exports/index.ts b/packages/plugingen/src/exports/index.ts → aa-sdk/plugingen/src/exports/index.ts
diff --git a/aa-sdk/plugingen/src/exports/types.ts b/aa-sdk/plugingen/src/exports/types.ts
@@ -0,0 +1 @@
+export { IPluginAbi } from "../IPlugin.js";
diff --git a/packages/plugingen/src/logger.ts → aa-sdk/plugingen/src/logger.ts b/packages/plugingen/src/logger.ts → aa-sdk/plugingen/src/logger.ts
diff --git a/packages/plugingen/src/types.ts → aa-sdk/plugingen/src/types.ts b/packages/plugingen/src/types.ts → aa-sdk/plugingen/src/types.ts
diff --git a/packages/plugingen/src/utils/findConfig.ts → aa-sdk/plugingen/src/utils/findConfig.ts b/packages/plugingen/src/utils/findConfig.ts → aa-sdk/plugingen/src/utils/findConfig.ts
diff --git a/packages/plugingen/src/utils/format.ts → aa-sdk/plugingen/src/utils/format.ts b/packages/plugingen/src/utils/format.ts → aa-sdk/plugingen/src/utils/format.ts
diff --git a/.../plugingen/src/utils/isUsingTypescript.ts → .../plugingen/src/utils/isUsingTypescript.ts b/.../plugingen/src/utils/isUsingTypescript.ts → .../plugingen/src/utils/isUsingTypescript.ts
diff --git a/packages/plugingen/src/utils/loadEnv.ts → aa-sdk/plugingen/src/utils/loadEnv.ts b/packages/plugingen/src/utils/loadEnv.ts → aa-sdk/plugingen/src/utils/loadEnv.ts
diff --git a/...ages/plugingen/src/utils/resolveConfig.ts → aa-sdk/plugingen/src/utils/resolveConfig.ts b/...ages/plugingen/src/utils/resolveConfig.ts → aa-sdk/plugingen/src/utils/resolveConfig.ts
diff --git a/packages/core/src/version.ts → aa-sdk/plugingen/src/version.ts b/packages/core/src/version.ts → aa-sdk/plugingen/src/version.ts
diff --git a/packages/plugingen/tsconfig.build.json → aa-sdk/plugingen/tsconfig.build.json b/packages/plugingen/tsconfig.build.json → aa-sdk/plugingen/tsconfig.build.json
diff --git a/packages/ethers/tsconfig.json → aa-sdk/plugingen/tsconfig.json b/packages/ethers/tsconfig.json → aa-sdk/plugingen/tsconfig.json
diff --git a/packages/plugingen/vitest.config.e2e.ts → aa-sdk/plugingen/vitest.config.e2e.ts b/packages/plugingen/vitest.config.e2e.ts → aa-sdk/plugingen/vitest.config.e2e.ts
diff --git a/packages/plugingen/vitest.config.ts → aa-sdk/plugingen/vitest.config.ts b/packages/plugingen/vitest.config.ts → aa-sdk/plugingen/vitest.config.ts
diff --git a/packages/plugingen/inject-version.ts → account-kit/core/inject-version.ts b/packages/plugingen/inject-version.ts → account-kit/core/inject-version.ts
diff --git a/account-kit/core/package.json b/account-kit/core/package.json
@@ -0,0 +1,77 @@
+{
+  "name": "@account-kit/core",
+  "version": "3.18.2",
+  "description": "Core library for account kit that provides state management and framework indepednent abstractions across infra, Alchemy Signer, and Smart Contracts",
+  "author": "Alchemy",
+  "license": "MIT",
+  "private": false,
+  "type": "module",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/types/index.d.ts",
+  "typings": "./dist/types/index.d.ts",
+  "sideEffects": false,
+  "files": [
+    "dist",
+    "src/**/*.ts",
+    "!dist/**/*.tsbuildinfo",
+    "!vitest.config.ts",
+    "!.env",
+    "!src/**/*.test.ts",
+    "!src/__tests__/**/*"
+  ],
+  "exports": {
+    ".": {
+      "types": "./dist/types/index.d.ts",
+      "import": "./dist/esm/index.js",
+      "default": "./dist/cjs/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "prebuild": "node --loader ts-node/esm ./inject-version.ts",
+    "build": "yarn clean && yarn build:cjs && yarn build:esm && yarn build:types",
+    "build:cjs": "tsc --project tsconfig.build.json --module commonjs --outDir ./dist/cjs --removeComments --verbatimModuleSyntax false && echo > ./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
+    "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir ./dist/esm --removeComments && echo > ./dist/esm/package.json '{\"type\":\"module\"}'",
+    "build:types": "tsc --project tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
+    "clean": "rm -rf ./dist",
+    "test": "vitest --passWithNoTests",
+    "test:run": "vitest run --passWithNoTests",
+    "test:run-e2e": "vitest run --config vitest.config.e2e.ts --passWithNoTests"
+  },
+  "devDependencies": {
+    "typescript": "^5.0.4",
+    "typescript-template": "*",
+    "vitest": "^0.31.0"
+  },
+  "dependencies": {
+    "@account-kit/infra": "^3.18.2",
+    "@wagmi/core": "^2.9.8",
+    "js-cookie": "^3.0.5",
+    "viem": "2.8.6",
+    "zod": "^3.22.4",
+    "zustand": "^4.5.2"
+  },
+  "peerDependencies": {
+    "viem": "2.8.6"
+  },
+  "resolutions": {
+    "viem": "2.8.6"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/alchemyplatform/aa-sdk.git"
+  },
+  "bugs": {
+    "url": "https://github.com/alchemyplatform/aa-sdk/issues"
+  },
+  "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
+  "gitHead": "ee46e8bb857de3b631044fa70714ea706d9e317d",
+  "optionalDependencies": {
+    "alchemy-sdk": "^3.0.0"
+  }
+}
diff --git a/...chemy/src/config/actions/createAccount.ts → ...unt-kit/core/src/actions/createAccount.ts b/...chemy/src/config/actions/createAccount.ts → ...unt-kit/core/src/actions/createAccount.ts
@@ -1,18 +1,18 @@
 import {
   createLightAccount,
-  createMultiOwnerModularAccount,
+  createModularAccount,
   type CreateLightAccountParams,
   type CreateMultiOwnerModularAccountParams,
   type GetLightAccountVersion,
-} from "@alchemy/aa-accounts";
+} from "@account-kit/infra";
 import { type SmartAccountSigner } from "@alchemy/aa-core";
 import { custom, type Transport } from "viem";
 import { ClientOnlyPropertyError } from "../errors.js";
 import type {
   AlchemyAccountsConfig,
   SupportedAccountTypes,
   SupportedAccounts,
-} from "../types";
+} from "../types.js";
 import { getBundlerClient } from "./getBundlerClient.js";
 import { getSigner } from "./getSigner.js";
 import { getSignerStatus } from "./getSignerStatus.js";
@@ -75,7 +75,7 @@ export async function createAccount<TAccount extends SupportedAccountTypes>(
           chain,
         });
       case "MultiOwnerModularAccount":
-        return createMultiOwnerModularAccount({
+        return createModularAccount({
           ...params,
           ...cachedConfig,
           signer,

diff --git a/.../alchemy/src/config/actions/getAccount.ts → account-kit/core/src/actions/getAccount.ts b/.../alchemy/src/config/actions/getAccount.ts → account-kit/core/src/actions/getAccount.ts
@@ -1,5 +1,5 @@
 import type { AccountState } from "../store/types.js";
-import type { AlchemyAccountsConfig, SupportedAccountTypes } from "../types";
+import type { AlchemyAccountsConfig, SupportedAccountTypes } from "../types.js";
 import { type CreateAccountParams } from "./createAccount.js";
 import { getChain } from "./getChain.js";
 

diff --git a/...my/src/config/actions/getBundlerClient.ts → ...-kit/core/src/actions/getBundlerClient.ts b/...my/src/config/actions/getBundlerClient.ts → ...-kit/core/src/actions/getBundlerClient.ts
@@ -1,4 +1,4 @@
-import type { ClientWithAlchemyMethods } from "../../client/types";
+import type { ClientWithAlchemyMethods } from "@account-kit/infra";
 import type { AlchemyAccountsConfig } from "../types";
 
 export const getBundlerClient = (

diff --git a/...es/alchemy/src/config/actions/getChain.ts → account-kit/core/src/actions/getChain.ts b/...es/alchemy/src/config/actions/getChain.ts → account-kit/core/src/actions/getChain.ts
diff --git a/...chemy/src/config/actions/getConnection.ts → ...unt-kit/core/src/actions/getConnection.ts b/...chemy/src/config/actions/getConnection.ts → ...unt-kit/core/src/actions/getConnection.ts
@@ -1,5 +1,5 @@
 import { ChainNotFoundError } from "../errors.js";
-import type { AlchemyAccountsConfig, Connection } from "../types";
+import type { AlchemyAccountsConfig, Connection } from "../types.js";
 import { getChain } from "./getChain.js";
 
 /**

diff --git a/...s/alchemy/src/config/actions/getSigner.ts → account-kit/core/src/actions/getSigner.ts b/...s/alchemy/src/config/actions/getSigner.ts → account-kit/core/src/actions/getSigner.ts
@@ -1,6 +1,6 @@
-import type { AlchemySigner } from "../../signer/signer.js";
-import type { AlchemyAccountsConfig } from "../types";
+import type { AlchemyAccountsConfig } from "../types.js";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+import type { AlchemyWebSigner } from "@account-kit/infra";
 import type { hydrate } from "../hydrate.js";
 
 /**
@@ -13,6 +13,6 @@ import type { hydrate } from "../hydrate.js";
  */
 export const getSigner = (
   config: AlchemyAccountsConfig
-): AlchemySigner | null => {
+): AlchemyWebSigner | null => {
   return config.clientStore.getState().signer ?? null;
 };
diff --git a/...emy/src/config/actions/getSignerStatus.ts → ...t-kit/core/src/actions/getSignerStatus.ts b/...emy/src/config/actions/getSignerStatus.ts → ...t-kit/core/src/actions/getSignerStatus.ts
diff --git a/...ges/alchemy/src/config/actions/getUser.ts → account-kit/core/src/actions/getUser.ts b/...ges/alchemy/src/config/actions/getUser.ts → account-kit/core/src/actions/getUser.ts
@@ -1,4 +1,4 @@
-import type { User } from "../../signer";
+import type { User } from "@account-kit/infra";
 import type { AlchemyAccountsConfig } from "../types";
 
 /**

diff --git a/...s/alchemy/src/config/actions/reconnect.ts → account-kit/core/src/actions/reconnect.ts b/...s/alchemy/src/config/actions/reconnect.ts → account-kit/core/src/actions/reconnect.ts
@@ -1,5 +1,5 @@
 import { createSigner } from "../store/client.js";
-import type { AlchemyAccountsConfig } from "../types";
+import type { AlchemyAccountsConfig } from "../types.js";
 import { createAccount } from "./createAccount.js";
 import { getChain } from "./getChain.js";
 

diff --git a/...es/alchemy/src/config/actions/setChain.ts → account-kit/core/src/actions/setChain.ts b/...es/alchemy/src/config/actions/setChain.ts → account-kit/core/src/actions/setChain.ts
@@ -1,8 +1,8 @@
+import { createAlchemyPublicRpcClient } from "@account-kit/infra";
 import { switchChain } from "@wagmi/core";
 import type { Chain } from "viem";
-import { createAlchemyPublicRpcClient } from "../../client/rpcClient.js";
 import { ChainNotFoundError } from "../errors.js";
-import type { AlchemyAccountsConfig } from "../types";
+import type { AlchemyAccountsConfig } from "../types.js";
 
 /**
  * Allows you to change the current chain in the core store

diff --git a/...lchemy/src/config/actions/watchAccount.ts → account-kit/core/src/actions/watchAccount.ts b/...lchemy/src/config/actions/watchAccount.ts → account-kit/core/src/actions/watchAccount.ts
@@ -1,5 +1,5 @@
 import { ClientOnlyPropertyError } from "../errors.js";
-import type { AlchemyAccountsConfig, SupportedAccountTypes } from "../types";
+import type { AlchemyAccountsConfig, SupportedAccountTypes } from "../types.js";
 import { type GetAccountResult } from "./getAccount.js";
 import { getChain } from "./getChain.js";
 

diff --git a/.../src/config/actions/watchBundlerClient.ts → ...it/core/src/actions/watchBundlerClient.ts b/.../src/config/actions/watchBundlerClient.ts → ...it/core/src/actions/watchBundlerClient.ts
@@ -1,4 +1,4 @@
-import type { ClientWithAlchemyMethods } from "../../client/types";
+import type { ClientWithAlchemyMethods } from "@account-kit/infra";
 import type { AlchemyAccountsConfig } from "../types";
 
 export const watchBundlerClient =

diff --git a/.../alchemy/src/config/actions/watchChain.ts → account-kit/core/src/actions/watchChain.ts b/.../alchemy/src/config/actions/watchChain.ts → account-kit/core/src/actions/watchChain.ts
diff --git a/...emy/src/config/actions/watchConnection.ts → ...t-kit/core/src/actions/watchConnection.ts b/...emy/src/config/actions/watchConnection.ts → ...t-kit/core/src/actions/watchConnection.ts
diff --git a/...alchemy/src/config/actions/watchSigner.ts → account-kit/core/src/actions/watchSigner.ts b/...alchemy/src/config/actions/watchSigner.ts → account-kit/core/src/actions/watchSigner.ts
@@ -1,4 +1,4 @@
-import type { AlchemySigner } from "../../signer";
+import type { AlchemyWebSigner } from "@account-kit/infra";
 import type { AlchemyAccountsConfig } from "../types";
 
 /**
@@ -9,6 +9,6 @@ import type { AlchemyAccountsConfig } from "../types";
  */
 export const watchSigner =
   (config: AlchemyAccountsConfig) =>
-  (onChange: (signer?: AlchemySigner) => void) => {
+  (onChange: (signer?: AlchemyWebSigner) => void) => {
     return config.clientStore.subscribe(({ signer }) => signer, onChange);
   };
diff --git a/...y/src/config/actions/watchSignerStatus.ts → ...kit/core/src/actions/watchSignerStatus.ts b/...y/src/config/actions/watchSignerStatus.ts → ...kit/core/src/actions/watchSignerStatus.ts
@@ -1,5 +1,5 @@
 import type { SignerStatus } from "../store/types.js";
-import type { AlchemyAccountsConfig } from "../types";
+import type { AlchemyAccountsConfig } from "../types.js";
 
 export const watchSignerStatus =
   (config: AlchemyAccountsConfig) =>

diff --git a/...s/alchemy/src/config/actions/watchUser.ts → account-kit/core/src/actions/watchUser.ts b/...s/alchemy/src/config/actions/watchUser.ts → account-kit/core/src/actions/watchUser.ts
@@ -1,4 +1,4 @@
-import type { User } from "../../signer";
+import type { User } from "@account-kit/infra";
 import type { AlchemyAccountsConfig } from "../types";
 
 export const watchUser =

diff --git a/packages/alchemy/src/config/createConfig.ts → account-kit/core/src/createConfig.ts b/packages/alchemy/src/config/createConfig.ts → account-kit/core/src/createConfig.ts
@@ -1,14 +1,14 @@
+import { DEFAULT_SESSION_MS } from "@account-kit/infra";
 import { ConnectionConfigSchema } from "@alchemy/aa-core";
 import { createStorage, createConfig as createWagmiConfig } from "@wagmi/core";
-import { DEFAULT_SESSION_MS } from "../signer/session/manager.js";
 import { createClientStore } from "./store/client.js";
 import { createCoreStore } from "./store/core.js";
 import { DEFAULT_STORAGE_KEY } from "./store/types.js";
 import type {
   AlchemyAccountsConfig,
   Connection,
   CreateConfigProps,
-} from "./types";
+} from "./types.js";
 
 export const DEFAULT_IFRAME_CONTAINER_ID = "alchemy-signer-iframe-container";
 

diff --git a/packages/alchemy/src/config/errors.ts → account-kit/core/src/errors.ts b/packages/alchemy/src/config/errors.ts → account-kit/core/src/errors.ts
@@ -1,5 +1,11 @@
+import { BaseError as CoreBaseError } from "@alchemy/aa-core";
 import type { Chain } from "viem";
-import { BaseError } from "../errors/base.js";
+import { VERSION } from "./version.js";
+
+export abstract class BaseError extends CoreBaseError {
+  // This version could be different from the aa-core version so we overwrite this here.
+  override version = VERSION;
+}
 
 export class ClientOnlyPropertyError extends BaseError {
   name: string = "ClientOnlyPropertyError";

diff --git a/packages/alchemy/src/config/hydrate.ts → account-kit/core/src/hydrate.ts b/packages/alchemy/src/config/hydrate.ts → account-kit/core/src/hydrate.ts
@@ -1,14 +1,14 @@
+import { AlchemySignerStatus } from "@account-kit/infra";
 import type { Address } from "@alchemy/aa-core";
 import { hydrate as wagmi_hydrate } from "@wagmi/core";
-import { AlchemySignerStatus } from "../signer/index.js";
 import { reconnect } from "./actions/reconnect.js";
 import {
   convertSignerStatusToState,
   createDefaultAccountState,
   defaultAccountState,
 } from "./store/client.js";
-import type { AccountState, ClientState, StoredState } from "./store/types";
-import type { AlchemyAccountsConfig, SupportedAccountTypes } from "./types";
+import type { AccountState, ClientState, StoredState } from "./store/types.js";
+import type { AlchemyAccountsConfig, SupportedAccountTypes } from "./types.js";
 
 /**
  * Will hydrate the client store with the provided initial state if one is provided.

diff --git a/account-kit/core/src/index.ts b/account-kit/core/src/index.ts
@@ -0,0 +1,39 @@
+export type * from "./actions/createAccount.js";
+export { createAccount } from "./actions/createAccount.js";
+export type * from "./actions/getAccount.js";
+export { getAccount } from "./actions/getAccount.js";
+export type * from "./actions/getBundlerClient.js";
+export { getBundlerClient } from "./actions/getBundlerClient.js";
+export { getChain } from "./actions/getChain.js";
+export type * from "./actions/getConnection.js";
+export { getConnection } from "./actions/getConnection.js";
+export type * from "./actions/getSigner.js";
+export { getSigner } from "./actions/getSigner.js";
+export type * from "./actions/getSignerStatus.js";
+export { getSignerStatus } from "./actions/getSignerStatus.js";
+export type * from "./actions/getUser.js";
+export { getUser } from "./actions/getUser.js";
+export type * from "./actions/reconnect.js";
+export { reconnect } from "./actions/reconnect.js";
+export { setChain } from "./actions/setChain.js";
+export type * from "./actions/watchAccount.js";
+export { watchAccount } from "./actions/watchAccount.js";
+export type * from "./actions/watchBundlerClient.js";
+export { watchBundlerClient } from "./actions/watchBundlerClient.js";
+export { watchChain } from "./actions/watchChain.js";
+export type * from "./actions/watchConnection.js";
+export { watchConnection } from "./actions/watchConnection.js";
+export type * from "./actions/watchSigner.js";
+export { watchSigner } from "./actions/watchSigner.js";
+export type * from "./actions/watchSignerStatus.js";
+export { watchSignerStatus } from "./actions/watchSignerStatus.js";
+export type * from "./actions/watchUser.js";
+export { watchUser } from "./actions/watchUser.js";
+export { DEFAULT_IFRAME_CONTAINER_ID, createConfig } from "./createConfig.js";
+export type * from "./createConfig.js";
+export { ClientOnlyPropertyError } from "./errors.js";
+export { hydrate } from "./hydrate.js";
+export { defaultAccountState } from "./store/client.js";
+export type { SignerStatus } from "./store/types.js";
+export type * from "./types.js";
+export { cookieStorage, cookieToInitialState } from "./utils/cookies.js";