@aa-sdk/ethers 4.0.0-alpha.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Alchemy Insights, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,64 @@
+# `@aa-sdk/ethers`
+
+This package contains `EthersProviderAdapter` and `AccountSigner`, respective extensions of the [`JsonRpcProvider`](https://docs.ethers.org/v5/api/providers/jsonrpc-provider/) and [`Signer`](https://docs.ethers.org/v5/api/signer/) classes defined in [`ethers.js`](https://docs.ethers.org/v5/) external library.
+
+If you currently rely `ethers.js` for web3 development, you can use these `ethers.js`-compatible `JsonRpcProvider` and `Signer` to integrate Account Abstraction into your dApp. You may also find the [`util`](https://accountkit.alchemy.com/packages/aa-ethers/utils/introduction.html) methods helpful.
+
+This repo is community maintained and we welcome contributions!
+
+## Getting started
+
+If you are already using the `@aa-sdk/core` package, you can simply install this package and start using the `EthersProviderAdapter` and `AccountSigner`. If you are not using `@aa-sdk/core`, you can install it and follow the instructions in the ["Getting started"](https://accountkit.alchemy.com/packages/aa-ethers/) docs to get started.
+
+```bash [yarn]
+yarn add @aa-sdk/ethers
+```
+
+```bash [npm]
+npm i -s @aa-sdk/ethers
+```
+
+```bash [pnpm]
+pnpm i @aa-sdk/ethers
+```
+
+## Usage
+
+You can create a provider and connect it to a signer account like so:
+
+```typescript ethers-provider.ts
+import {
+  LightSmartContractAccount,
+  getDefaultLightAccountFactoryAddress,
+} from "@alchemy/aa-accounts";
+import { EthersProviderAdapter } from "@aa-sdk/ethers";
+import { LocalAccountSigner, SmartAccountSigner } from "@aa-sdk/core";
+import { Alchemy, Network } from "alchemy-sdk";
+import { polygonMumbai } from "@aa-sdk/core";
+
+const chain = polygonMumbai;
+
+// 1. Create a provider using EthersProviderAdapter
+const alchemy = new Alchemy({
+  apiKey: process.env.API_KEY!,
+  network: Network.MATIC_MUMBAI,
+});
+const ethersProvider = await alchemy.config.getProvider();
+
+const provider = EthersProviderAdapter.fromEthersProvider(ethersProvider);
+
+const signer: SmartAccountSigner = LocalAccountSigner.mnemonicToAccountSigner(
+  process.env.YOUR_OWNER_MNEMONIC!
+);
+
+// 2. Connect the provider to the smart account signer
+export const signer = provider.connectToAccount(
+  (rpcClient) =>
+    new LightSmartContractAccount({
+      chain,
+      factoryAddress: getDefaultLightAccountFactoryAddress(chain),
+      rpcClient,
+      signer,
+    })
+);
+```

package/dist/cjs/account-signer.d.ts

@@ -0,0 +1,19 @@
+import { type BatchUserOperationCallData, type BundlerClient, type GetEntryPointFromAccount, type SmartContractAccount, type UserOperationCallData, type UserOperationOverrides } from "@aa-sdk/core";
+import { Signer } from "@ethersproject/abstract-signer";
+import type { Deferrable } from "@ethersproject/properties";
+import { type TransactionRequest, type TransactionResponse } from "@ethersproject/providers";
+import { type Transport } from "viem";
+import { EthersProviderAdapter } from "./provider-adapter.js";
+export declare class AccountSigner<TAccount extends SmartContractAccount = SmartContractAccount, TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>> extends Signer {
+    provider: EthersProviderAdapter;
+    readonly account: TAccount;
+    sendUserOperation: (args: UserOperationCallData | BatchUserOperationCallData, overrides?: UserOperationOverrides<TEntryPointVersion>) => Promise<import("@aa-sdk/core").SendUserOperationResult<keyof import("@aa-sdk/core").EntryPointRegistryBase<unknown>>>;
+    waitForUserOperationTransaction: (args: import("@aa-sdk/core").WaitForUserOperationTxParameters) => Promise<`0x${string}`>;
+    constructor(provider: EthersProviderAdapter, account: TAccount);
+    getAddress(): Promise<string>;
+    signMessage(message: string | Uint8Array): Promise<string>;
+    sendTransaction(transaction: Deferrable<TransactionRequest>): Promise<TransactionResponse>;
+    signTransaction(_transaction: Deferrable<TransactionRequest>): Promise<string>;
+    getPublicErc4337Client(): BundlerClient<Transport>;
+    connect(provider: EthersProviderAdapter): AccountSigner<TAccount>;
+}

package/dist/cjs/account-signer.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AccountSigner = void 0;
+const core_1 = require("@aa-sdk/core");
+const abstract_signer_1 = require("@ethersproject/abstract-signer");
+const bytes_1 = require("@ethersproject/bytes");
+const viem_1 = require("viem");
+const hexlifyOptional = (value) => {
+    if (value == null) {
+        return undefined;
+    }
+    return (0, bytes_1.hexlify)(value);
+};
+class AccountSigner extends abstract_signer_1.Signer {
+    constructor(provider, account) {
+        super();
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: provider
+        });
+        Object.defineProperty(this, "account", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "sendUserOperation", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "waitForUserOperationTransaction", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.account = account;
+        this.sendUserOperation = (args, overrides) => this.provider.accountProvider.sendUserOperation({
+            uo: args,
+            account,
+            overrides,
+        });
+        this.waitForUserOperationTransaction =
+            this.provider.accountProvider.waitForUserOperationTransaction.bind(this.provider.accountProvider);
+    }
+    async getAddress() {
+        if (!this.account) {
+            throw new core_1.AccountNotFoundError();
+        }
+        return this.account.address;
+    }
+    signMessage(message) {
+        if (!this.account) {
+            throw new core_1.AccountNotFoundError();
+        }
+        return this.account.signMessage({
+            message: typeof message === "string" && !(0, viem_1.isHex)(message)
+                ? message
+                : { raw: (0, viem_1.isHex)(message) ? (0, viem_1.toBytes)(message) : message },
+        });
+    }
+    async sendTransaction(transaction) {
+        if (!this.provider.accountProvider.account || !this.account) {
+            throw new core_1.AccountNotFoundError();
+        }
+        const resolved = await (0, core_1.resolveProperties)(transaction);
+        const txHash = await this.provider.accountProvider.sendTransaction({
+            to: resolved.to,
+            data: hexlifyOptional(resolved.data),
+            chain: this.provider.accountProvider.chain,
+            account: this.account,
+        });
+        return this.provider.getTransaction(txHash);
+    }
+    signTransaction(_transaction) {
+        throw new Error("Transaction signing is not supported, use sendUserOperation instead");
+    }
+    getPublicErc4337Client() {
+        return this.provider.getBundlerClient();
+    }
+    connect(provider) {
+        this.provider = provider;
+        return this;
+    }
+}
+exports.AccountSigner = AccountSigner;
+//# sourceMappingURL=account-signer.js.map

package/dist/cjs/account-signer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-signer.js","sourceRoot":"","sources":["../../src/account-signer.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AccountNotFoundError,\n  resolveProperties,\n  type BatchUserOperationCallData,\n  type BundlerClient,\n  type GetEntryPointFromAccount,\n  type SmartContractAccount,\n  type UserOperationCallData,\n  type UserOperationOverrides,\n} from \"@aa-sdk/core\";\nimport { Signer } from \"@ethersproject/abstract-signer\";\nimport { hexlify } from \"@ethersproject/bytes\";\nimport type { Deferrable } from \"@ethersproject/properties\";\nimport {\n  type TransactionRequest,\n  type TransactionResponse,\n} from \"@ethersproject/providers\";\nimport { isHex, toBytes, type Transport } from \"viem\";\nimport { EthersProviderAdapter } from \"./provider-adapter.js\";\n\nconst hexlifyOptional = (value: any): `0x${string}` | undefined => {\n  if (value == null) {\n    return undefined;\n  }\n\n  return hexlify(value) as `0x${string}`;\n};\n\nexport class AccountSigner<\n  TAccount extends SmartContractAccount = SmartContractAccount,\n  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>\n> extends Signer {\n  readonly account: TAccount;\n\n  sendUserOperation;\n  waitForUserOperationTransaction;\n\n  constructor(public provider: EthersProviderAdapter, account: TAccount) {\n    super();\n    this.account = account;\n\n    this.sendUserOperation = (\n      args: UserOperationCallData | BatchUserOperationCallData,\n      overrides?: UserOperationOverrides<TEntryPointVersion>\n    ) =>\n      this.provider.accountProvider.sendUserOperation({\n        uo: args,\n        account,\n        overrides,\n      });\n\n    this.waitForUserOperationTransaction =\n      this.provider.accountProvider.waitForUserOperationTransaction.bind(\n        this.provider.accountProvider\n      );\n  }\n\n  async getAddress(): Promise<string> {\n    if (!this.account) {\n      throw new AccountNotFoundError();\n    }\n\n    return this.account.address;\n  }\n\n  signMessage(message: string | Uint8Array): Promise<string> {\n    if (!this.account) {\n      throw new AccountNotFoundError();\n    }\n\n    return this.account.signMessage({\n      message:\n        typeof message === \"string\" && !isHex(message)\n          ? message\n          : { raw: isHex(message) ? toBytes(message) : message },\n    });\n  }\n\n  async sendTransaction(\n    transaction: Deferrable<TransactionRequest>\n  ): Promise<TransactionResponse> {\n    if (!this.provider.accountProvider.account || !this.account) {\n      throw new AccountNotFoundError();\n    }\n\n    const resolved = await resolveProperties(transaction);\n    const txHash = await this.provider.accountProvider.sendTransaction({\n      to: resolved.to as `0x${string}` | undefined,\n      data: hexlifyOptional(resolved.data),\n      chain: this.provider.accountProvider.chain,\n      account: this.account,\n    });\n\n    return this.provider.getTransaction(txHash);\n  }\n\n  signTransaction(\n    _transaction: Deferrable<TransactionRequest>\n  ): Promise<string> {\n    throw new Error(\n      \"Transaction signing is not supported, use sendUserOperation instead\"\n    );\n  }\n\n  getPublicErc4337Client(): BundlerClient<Transport> {\n    return this.provider.getBundlerClient();\n  }\n\n  connect(provider: EthersProviderAdapter): AccountSigner<TAccount> {\n    this.provider = provider;\n\n    return this;\n  }\n}\n"]}

package/dist/cjs/index.d.ts

@@ -0,0 +1,3 @@
+export { AccountSigner } from "./account-signer.js";
+export { EthersProviderAdapter } from "./provider-adapter.js";
+export { convertEthersSignerToAccountSigner, convertWalletToAccountSigner, } from "./utils.js";

package/dist/cjs/index.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertWalletToAccountSigner = exports.convertEthersSignerToAccountSigner = exports.EthersProviderAdapter = exports.AccountSigner = void 0;
+var account_signer_js_1 = require("./account-signer.js");
+Object.defineProperty(exports, "AccountSigner", { enumerable: true, get: function () { return account_signer_js_1.AccountSigner; } });
+var provider_adapter_js_1 = require("./provider-adapter.js");
+Object.defineProperty(exports, "EthersProviderAdapter", { enumerable: true, get: function () { return provider_adapter_js_1.EthersProviderAdapter; } });
+var utils_js_1 = require("./utils.js");
+Object.defineProperty(exports, "convertEthersSignerToAccountSigner", { enumerable: true, get: function () { return utils_js_1.convertEthersSignerToAccountSigner; } });
+Object.defineProperty(exports, "convertWalletToAccountSigner", { enumerable: true, get: function () { return utils_js_1.convertWalletToAccountSigner; } });
+//# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AAA3C,kHAAA,aAAa,OAAA;AACtB,6DAA8D;AAArD,4HAAA,qBAAqB,OAAA;AAC9B,uCAGoB;AAFlB,8HAAA,kCAAkC,OAAA;AAClC,wHAAA,4BAA4B,OAAA","sourcesContent":["export { AccountSigner } from \"./account-signer.js\";\nexport { EthersProviderAdapter } from \"./provider-adapter.js\";\nexport {\n  convertEthersSignerToAccountSigner,\n  convertWalletToAccountSigner,\n} from \"./utils.js\";\n"]}

package/dist/cjs/package.json

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

package/dist/cjs/provider-adapter.d.ts

@@ -0,0 +1,13 @@
+import { type BundlerClient, type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
+import { JsonRpcProvider } from "@ethersproject/providers";
+import { type Transport } from "viem";
+import { AccountSigner } from "./account-signer.js";
+import type { EthersProviderAdapterOpts } from "./types.js";
+export declare class EthersProviderAdapter extends JsonRpcProvider {
+    readonly accountProvider: SmartAccountClient;
+    constructor(opts: EthersProviderAdapterOpts);
+    send(method: any, params: any[]): Promise<any>;
+    connectToAccount<TAccount extends SmartContractAccount>(account: TAccount): AccountSigner<TAccount>;
+    getBundlerClient(): BundlerClient<Transport>;
+    static fromEthersProvider(provider: JsonRpcProvider): EthersProviderAdapter;
+}

package/dist/cjs/provider-adapter.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EthersProviderAdapter = void 0;
+const core_1 = require("@aa-sdk/core");
+const providers_1 = require("@ethersproject/providers");
+const viem_1 = require("viem");
+const account_signer_js_1 = require("./account-signer.js");
+class EthersProviderAdapter extends providers_1.JsonRpcProvider {
+    constructor(opts) {
+        super();
+        Object.defineProperty(this, "accountProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        if ("accountProvider" in opts) {
+            this.accountProvider = opts.accountProvider;
+        }
+        else {
+            const chain = (0, core_1.getChain)(opts.chainId);
+            if (typeof opts.rpcProvider === "string") {
+                this.accountProvider = (0, core_1.createSmartAccountClient)({
+                    transport: (0, viem_1.http)(opts.rpcProvider),
+                    chain,
+                    account: opts.account,
+                });
+            }
+            else {
+                this.accountProvider = (0, core_1.createSmartAccountClient)({
+                    transport: (0, viem_1.custom)(opts.rpcProvider.transport),
+                    chain,
+                    account: opts.account,
+                });
+            }
+        }
+    }
+    send(method, params) {
+        return this.accountProvider.request({ method, params });
+    }
+    connectToAccount(account) {
+        return new account_signer_js_1.AccountSigner(this, account);
+    }
+    getBundlerClient() {
+        return (0, core_1.createBundlerClientFromExisting)((0, viem_1.createPublicClient)({
+            transport: (0, viem_1.custom)(this.accountProvider.transport),
+            chain: this.accountProvider.chain,
+        }));
+    }
+    static fromEthersProvider(provider) {
+        return new EthersProviderAdapter({
+            rpcProvider: provider.connection.url,
+            chainId: provider.network.chainId,
+        });
+    }
+}
+exports.EthersProviderAdapter = EthersProviderAdapter;
+//# sourceMappingURL=provider-adapter.js.map

package/dist/cjs/provider-adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-adapter.js","sourceRoot":"","sources":["../../src/provider-adapter.ts"],"names":[],"mappings":";;;AAAA,uCAOsB;AACtB,wDAA2D;AAC3D,+BAAwE;AACxE,2DAAoD;AAKpD,MAAa,qBAAsB,SAAQ,2BAAe;IAGxD,YAAY,IAA+B;QACzC,KAAK,EAAE,CAAC;QAHD;;;;;WAAoC;QAI3C,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;gBACzC,IAAI,CAAC,eAAe,GAAG,IAAA,+BAAwB,EAAC;oBAC9C,SAAS,EAAE,IAAA,WAAI,EAAC,IAAI,CAAC,WAAW,CAAC;oBACjC,KAAK;oBACL,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,eAAe,GAAG,IAAA,+BAAwB,EAAC;oBAC9C,SAAS,EAAE,IAAA,aAAM,EAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;oBAC7C,KAAK;oBACL,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAUD,IAAI,CAAC,MAAW,EAAE,MAAa;QAE7B,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1D,CAAC;IAQD,gBAAgB,CACd,OAAiB;QAEjB,OAAO,IAAI,iCAAa,CAAW,IAAI,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,gBAAgB;QACd,OAAO,IAAA,sCAA+B,EACpC,IAAA,yBAAkB,EAAC;YACjB,SAAS,EAAE,IAAA,aAAM,EAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;YACjD,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,KAAM;SACnC,CAAC,CACH,CAAC;IACJ,CAAC;IAQD,MAAM,CAAC,kBAAkB,CAAC,QAAyB;QACjD,OAAO,IAAI,qBAAqB,CAAC;YAC/B,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG;YACpC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO;SAClC,CAAC,CAAC;IACL,CAAC;CACF;AAvED,sDAuEC","sourcesContent":["import {\n  createBundlerClientFromExisting,\n  createSmartAccountClient,\n  getChain,\n  type BundlerClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport { JsonRpcProvider } from \"@ethersproject/providers\";\nimport { createPublicClient, custom, http, type Transport } from \"viem\";\nimport { AccountSigner } from \"./account-signer.js\";\nimport type { EthersProviderAdapterOpts } from \"./types.js\";\n\n/** Lightweight Adapter for SmartAccountProvider to enable Signer Creation */\n// TODO: Add support for strong entry point version type\nexport class EthersProviderAdapter extends JsonRpcProvider {\n  readonly accountProvider: SmartAccountClient;\n\n  constructor(opts: EthersProviderAdapterOpts) {\n    super();\n    if (\"accountProvider\" in opts) {\n      this.accountProvider = opts.accountProvider;\n    } else {\n      const chain = getChain(opts.chainId);\n      if (typeof opts.rpcProvider === \"string\") {\n        this.accountProvider = createSmartAccountClient({\n          transport: http(opts.rpcProvider),\n          chain,\n          account: opts.account,\n        });\n      } else {\n        this.accountProvider = createSmartAccountClient({\n          transport: custom(opts.rpcProvider.transport),\n          chain,\n          account: opts.account,\n        });\n      }\n    }\n  }\n\n  /**\n   * Rewrites the send method to use the account provider's EIP-1193\n   * compliant request method\n   *\n   * @param method - the RPC method to call\n   * @param params - the params required by the RPC method\n   * @returns the result of the RPC call\n   */\n  send(method: any, params: any[]): Promise<any> {\n    // @ts-expect-error - viem is strongly typed on the request methods, but ethers is not\n    return this.accountProvider.request({ method, params });\n  }\n\n  /**\n   * Connects the Provider to an Account and returns a Signer\n   *\n   * @param account - the account to connect to\n   * @returns an {@link AccountSigner} that can be used to sign and send user operations\n   */\n  connectToAccount<TAccount extends SmartContractAccount>(\n    account: TAccount\n  ): AccountSigner<TAccount> {\n    return new AccountSigner<TAccount>(this, account);\n  }\n\n  getBundlerClient(): BundlerClient<Transport> {\n    return createBundlerClientFromExisting(\n      createPublicClient({\n        transport: custom(this.accountProvider.transport),\n        chain: this.accountProvider.chain!,\n      })\n    );\n  }\n\n  /**\n   * Creates an instance of EthersProviderAdapter from an ethers.js JsonRpcProvider.\n   *\n   * @param provider - the ethers JSON RPC provider to convert\n   * @returns an instance of {@link EthersProviderAdapter}\n   */\n  static fromEthersProvider(provider: JsonRpcProvider): EthersProviderAdapter {\n    return new EthersProviderAdapter({\n      rpcProvider: provider.connection.url,\n      chainId: provider.network.chainId,\n    });\n  }\n}\n"]}

package/dist/cjs/types.d.ts

@@ -0,0 +1,10 @@
+import { type BundlerClient, type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
+import type { Chain, Transport } from "viem";
+export type EthersProviderAdapterOpts<TTransport extends Transport = Transport, TChain extends Chain = Chain, TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined> = {
+    account?: TAccount;
+} & ({
+    rpcProvider: string | BundlerClient<TTransport>;
+    chainId: number;
+} | {
+    accountProvider: SmartAccountClient<TTransport, TChain, TAccount>;
+});

package/dist/cjs/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/cjs/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import {\n  type BundlerClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Chain, Transport } from \"viem\";\n\nexport type EthersProviderAdapterOpts<\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined\n> = {\n  account?: TAccount;\n} & (\n  | {\n      rpcProvider: string | BundlerClient<TTransport>;\n      chainId: number;\n    }\n  | {\n      accountProvider: SmartAccountClient<TTransport, TChain, TAccount>;\n    }\n);\n"]}

package/dist/cjs/utils.d.ts

@@ -0,0 +1,5 @@
+import type { SmartAccountSigner } from "@aa-sdk/core";
+import type { Signer } from "@ethersproject/abstract-signer";
+import { Wallet } from "@ethersproject/wallet";
+export declare const convertWalletToAccountSigner: (wallet: Wallet) => SmartAccountSigner<Wallet>;
+export declare const convertEthersSignerToAccountSigner: (signer: Signer) => SmartAccountSigner<Signer>;

package/dist/cjs/utils.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertEthersSignerToAccountSigner = exports.convertWalletToAccountSigner = void 0;
+const convertWalletToAccountSigner = (wallet) => {
+    return {
+        inner: wallet,
+        signerType: "local",
+        getAddress: async () => Promise.resolve(wallet.address),
+        signMessage: async (msg) => (await wallet.signMessage(typeof msg === "string" ? msg : msg.raw)),
+        signTypedData: async (params) => {
+            return (await wallet._signTypedData(params.domain ?? {}, params.types, params.message));
+        },
+    };
+};
+exports.convertWalletToAccountSigner = convertWalletToAccountSigner;
+const convertEthersSignerToAccountSigner = (signer) => {
+    return {
+        inner: signer,
+        signerType: "json-rpc",
+        getAddress: async () => signer.getAddress(),
+        signMessage: async (msg) => (await signer.signMessage(typeof msg === "string" ? msg : msg.raw)),
+        signTypedData: async (_params) => {
+            throw new Error("signTypedData is not supported for ethers signers; use Wallet");
+        },
+    };
+};
+exports.convertEthersSignerToAccountSigner = convertEthersSignerToAccountSigner;
+//# sourceMappingURL=utils.js.map

package/dist/cjs/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AAWO,MAAM,4BAA4B,GAAG,CAC1C,MAAc,EACc,EAAE;IAC9B,OAAO;QACL,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,OAAO;QACnB,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAwB,CAAC;QACxE,WAAW,EAAE,KAAK,EAAE,GAAoB,EAAE,EAAE,CAC1C,CAAC,MAAM,MAAM,CAAC,WAAW,CACvB,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CACxC,CAAkB;QACrB,aAAa,EAAE,KAAK,EAIlB,MAAqD,EACrD,EAAE;YACF,OAAO,CAAC,MAAM,MAAM,CAAC,cAAc,CACjC,MAAM,CAAC,MAAM,IAAI,EAAE,EAEnB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,OAAO,CACf,CAAkB,CAAC;QACtB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,4BAA4B,gCAyBvC;AAQK,MAAM,kCAAkC,GAAG,CAChD,MAAc,EACc,EAAE;IAC9B,OAAO;QACL,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,UAAU;QACtB,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,EAAsB;QAC/D,WAAW,EAAE,KAAK,EAAE,GAAoB,EAAE,EAAE,CAC1C,CAAC,MAAM,MAAM,CAAC,WAAW,CACvB,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CACxC,CAAkB;QACrB,aAAa,EAAE,KAAK,EAIlB,OAAsD,EACtD,EAAE;YACF,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,kCAAkC,sCAsB7C","sourcesContent":["import type { Address, SmartAccountSigner } from \"@aa-sdk/core\";\nimport type { Signer } from \"@ethersproject/abstract-signer\";\nimport { Wallet } from \"@ethersproject/wallet\";\nimport type { SignableMessage, TypedData, TypedDataDefinition } from \"viem\";\n\n/**\n * Converts a ethersjs Wallet to a SmartAccountSigner\n *\n * @param wallet - the Wallet to convert\n * @returns - a signer that can be used to sign and send user operations\n */\nexport const convertWalletToAccountSigner = (\n  wallet: Wallet\n): SmartAccountSigner<Wallet> => {\n  return {\n    inner: wallet,\n    signerType: \"local\",\n    getAddress: async () => Promise.resolve(wallet.address as `0x${string}`),\n    signMessage: async (msg: SignableMessage) =>\n      (await wallet.signMessage(\n        typeof msg === \"string\" ? msg : msg.raw\n      )) as `0x${string}`,\n    signTypedData: async <\n      const TTypedData extends TypedData | { [key: string]: unknown },\n      TPrimaryType extends string = string\n    >(\n      params: TypedDataDefinition<TTypedData, TPrimaryType>\n    ) => {\n      return (await wallet._signTypedData(\n        params.domain ?? {},\n        // @ts-expect-error: these params should line up due to the spec for this function\n        params.types,\n        params.message\n      )) as `0x${string}`;\n    },\n  };\n};\n\n/**\n * Converts a ethers.js Signer to a SmartAccountSigner\n *\n * @param signer - the Signer to convert\n * @returns - a signer that can be used to sign and send user operations\n */\nexport const convertEthersSignerToAccountSigner = (\n  signer: Signer\n): SmartAccountSigner<Signer> => {\n  return {\n    inner: signer,\n    signerType: \"json-rpc\",\n    getAddress: async () => signer.getAddress() as Promise<Address>,\n    signMessage: async (msg: SignableMessage) =>\n      (await signer.signMessage(\n        typeof msg === \"string\" ? msg : msg.raw\n      )) as `0x${string}`,\n    signTypedData: async <\n      const TTypedData extends TypedData | { [key: string]: unknown },\n      TPrimaryType extends string = string\n    >(\n      _params: TypedDataDefinition<TTypedData, TPrimaryType>\n    ) => {\n      throw new Error(\n        \"signTypedData is not supported for ethers signers; use Wallet\"\n      );\n    },\n  };\n};\n"]}

package/dist/esm/account-signer.d.ts

@@ -0,0 +1,19 @@
+import { type BatchUserOperationCallData, type BundlerClient, type GetEntryPointFromAccount, type SmartContractAccount, type UserOperationCallData, type UserOperationOverrides } from "@aa-sdk/core";
+import { Signer } from "@ethersproject/abstract-signer";
+import type { Deferrable } from "@ethersproject/properties";
+import { type TransactionRequest, type TransactionResponse } from "@ethersproject/providers";
+import { type Transport } from "viem";
+import { EthersProviderAdapter } from "./provider-adapter.js";
+export declare class AccountSigner<TAccount extends SmartContractAccount = SmartContractAccount, TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>> extends Signer {
+    provider: EthersProviderAdapter;
+    readonly account: TAccount;
+    sendUserOperation: (args: UserOperationCallData | BatchUserOperationCallData, overrides?: UserOperationOverrides<TEntryPointVersion>) => Promise<import("@aa-sdk/core").SendUserOperationResult<keyof import("@aa-sdk/core").EntryPointRegistryBase<unknown>>>;
+    waitForUserOperationTransaction: (args: import("@aa-sdk/core").WaitForUserOperationTxParameters) => Promise<`0x${string}`>;
+    constructor(provider: EthersProviderAdapter, account: TAccount);
+    getAddress(): Promise<string>;
+    signMessage(message: string | Uint8Array): Promise<string>;
+    sendTransaction(transaction: Deferrable<TransactionRequest>): Promise<TransactionResponse>;
+    signTransaction(_transaction: Deferrable<TransactionRequest>): Promise<string>;
+    getPublicErc4337Client(): BundlerClient<Transport>;
+    connect(provider: EthersProviderAdapter): AccountSigner<TAccount>;
+}

package/dist/esm/account-signer.js

@@ -0,0 +1,89 @@
+import { AccountNotFoundError, resolveProperties, } from "@aa-sdk/core";
+import { Signer } from "@ethersproject/abstract-signer";
+import { hexlify } from "@ethersproject/bytes";
+import {} from "@ethersproject/providers";
+import { isHex, toBytes } from "viem";
+import { EthersProviderAdapter } from "./provider-adapter.js";
+const hexlifyOptional = (value) => {
+    if (value == null) {
+        return undefined;
+    }
+    return hexlify(value);
+};
+export class AccountSigner extends Signer {
+    constructor(provider, account) {
+        super();
+        Object.defineProperty(this, "provider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: provider
+        });
+        Object.defineProperty(this, "account", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "sendUserOperation", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "waitForUserOperationTransaction", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.account = account;
+        this.sendUserOperation = (args, overrides) => this.provider.accountProvider.sendUserOperation({
+            uo: args,
+            account,
+            overrides,
+        });
+        this.waitForUserOperationTransaction =
+            this.provider.accountProvider.waitForUserOperationTransaction.bind(this.provider.accountProvider);
+    }
+    async getAddress() {
+        if (!this.account) {
+            throw new AccountNotFoundError();
+        }
+        return this.account.address;
+    }
+    signMessage(message) {
+        if (!this.account) {
+            throw new AccountNotFoundError();
+        }
+        return this.account.signMessage({
+            message: typeof message === "string" && !isHex(message)
+                ? message
+                : { raw: isHex(message) ? toBytes(message) : message },
+        });
+    }
+    async sendTransaction(transaction) {
+        if (!this.provider.accountProvider.account || !this.account) {
+            throw new AccountNotFoundError();
+        }
+        const resolved = await resolveProperties(transaction);
+        const txHash = await this.provider.accountProvider.sendTransaction({
+            to: resolved.to,
+            data: hexlifyOptional(resolved.data),
+            chain: this.provider.accountProvider.chain,
+            account: this.account,
+        });
+        return this.provider.getTransaction(txHash);
+    }
+    signTransaction(_transaction) {
+        throw new Error("Transaction signing is not supported, use sendUserOperation instead");
+    }
+    getPublicErc4337Client() {
+        return this.provider.getBundlerClient();
+    }
+    connect(provider) {
+        this.provider = provider;
+        return this;
+    }
+}
+//# sourceMappingURL=account-signer.js.map

package/dist/esm/account-signer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-signer.js","sourceRoot":"","sources":["../../src/account-signer.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AccountNotFoundError,\n  resolveProperties,\n  type BatchUserOperationCallData,\n  type BundlerClient,\n  type GetEntryPointFromAccount,\n  type SmartContractAccount,\n  type UserOperationCallData,\n  type UserOperationOverrides,\n} from \"@aa-sdk/core\";\nimport { Signer } from \"@ethersproject/abstract-signer\";\nimport { hexlify } from \"@ethersproject/bytes\";\nimport type { Deferrable } from \"@ethersproject/properties\";\nimport {\n  type TransactionRequest,\n  type TransactionResponse,\n} from \"@ethersproject/providers\";\nimport { isHex, toBytes, type Transport } from \"viem\";\nimport { EthersProviderAdapter } from \"./provider-adapter.js\";\n\nconst hexlifyOptional = (value: any): `0x${string}` | undefined => {\n  if (value == null) {\n    return undefined;\n  }\n\n  return hexlify(value) as `0x${string}`;\n};\n\nexport class AccountSigner<\n  TAccount extends SmartContractAccount = SmartContractAccount,\n  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>\n> extends Signer {\n  readonly account: TAccount;\n\n  sendUserOperation;\n  waitForUserOperationTransaction;\n\n  constructor(public provider: EthersProviderAdapter, account: TAccount) {\n    super();\n    this.account = account;\n\n    this.sendUserOperation = (\n      args: UserOperationCallData | BatchUserOperationCallData,\n      overrides?: UserOperationOverrides<TEntryPointVersion>\n    ) =>\n      this.provider.accountProvider.sendUserOperation({\n        uo: args,\n        account,\n        overrides,\n      });\n\n    this.waitForUserOperationTransaction =\n      this.provider.accountProvider.waitForUserOperationTransaction.bind(\n        this.provider.accountProvider\n      );\n  }\n\n  async getAddress(): Promise<string> {\n    if (!this.account) {\n      throw new AccountNotFoundError();\n    }\n\n    return this.account.address;\n  }\n\n  signMessage(message: string | Uint8Array): Promise<string> {\n    if (!this.account) {\n      throw new AccountNotFoundError();\n    }\n\n    return this.account.signMessage({\n      message:\n        typeof message === \"string\" && !isHex(message)\n          ? message\n          : { raw: isHex(message) ? toBytes(message) : message },\n    });\n  }\n\n  async sendTransaction(\n    transaction: Deferrable<TransactionRequest>\n  ): Promise<TransactionResponse> {\n    if (!this.provider.accountProvider.account || !this.account) {\n      throw new AccountNotFoundError();\n    }\n\n    const resolved = await resolveProperties(transaction);\n    const txHash = await this.provider.accountProvider.sendTransaction({\n      to: resolved.to as `0x${string}` | undefined,\n      data: hexlifyOptional(resolved.data),\n      chain: this.provider.accountProvider.chain,\n      account: this.account,\n    });\n\n    return this.provider.getTransaction(txHash);\n  }\n\n  signTransaction(\n    _transaction: Deferrable<TransactionRequest>\n  ): Promise<string> {\n    throw new Error(\n      \"Transaction signing is not supported, use sendUserOperation instead\"\n    );\n  }\n\n  getPublicErc4337Client(): BundlerClient<Transport> {\n    return this.provider.getBundlerClient();\n  }\n\n  connect(provider: EthersProviderAdapter): AccountSigner<TAccount> {\n    this.provider = provider;\n\n    return this;\n  }\n}\n"]}

package/dist/esm/index.d.ts

@@ -0,0 +1,3 @@
+export { AccountSigner } from "./account-signer.js";
+export { EthersProviderAdapter } from "./provider-adapter.js";
+export { convertEthersSignerToAccountSigner, convertWalletToAccountSigner, } from "./utils.js";

package/dist/esm/index.js

@@ -0,0 +1,4 @@
+export { AccountSigner } from "./account-signer.js";
+export { EthersProviderAdapter } from "./provider-adapter.js";
+export { convertEthersSignerToAccountSigner, convertWalletToAccountSigner, } from "./utils.js";
+//# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EACL,kCAAkC,EAClC,4BAA4B,GAC7B,MAAM,YAAY,CAAC","sourcesContent":["export { AccountSigner } from \"./account-signer.js\";\nexport { EthersProviderAdapter } from \"./provider-adapter.js\";\nexport {\n  convertEthersSignerToAccountSigner,\n  convertWalletToAccountSigner,\n} from \"./utils.js\";\n"]}

package/dist/esm/package.json

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

package/dist/esm/provider-adapter.d.ts

@@ -0,0 +1,13 @@
+import { type BundlerClient, type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
+import { JsonRpcProvider } from "@ethersproject/providers";
+import { type Transport } from "viem";
+import { AccountSigner } from "./account-signer.js";
+import type { EthersProviderAdapterOpts } from "./types.js";
+export declare class EthersProviderAdapter extends JsonRpcProvider {
+    readonly accountProvider: SmartAccountClient;
+    constructor(opts: EthersProviderAdapterOpts);
+    send(method: any, params: any[]): Promise<any>;
+    connectToAccount<TAccount extends SmartContractAccount>(account: TAccount): AccountSigner<TAccount>;
+    getBundlerClient(): BundlerClient<Transport>;
+    static fromEthersProvider(provider: JsonRpcProvider): EthersProviderAdapter;
+}

package/dist/esm/provider-adapter.js

@@ -0,0 +1,54 @@
+import { createBundlerClientFromExisting, createSmartAccountClient, getChain, } from "@aa-sdk/core";
+import { JsonRpcProvider } from "@ethersproject/providers";
+import { createPublicClient, custom, http } from "viem";
+import { AccountSigner } from "./account-signer.js";
+export class EthersProviderAdapter extends JsonRpcProvider {
+    constructor(opts) {
+        super();
+        Object.defineProperty(this, "accountProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        if ("accountProvider" in opts) {
+            this.accountProvider = opts.accountProvider;
+        }
+        else {
+            const chain = getChain(opts.chainId);
+            if (typeof opts.rpcProvider === "string") {
+                this.accountProvider = createSmartAccountClient({
+                    transport: http(opts.rpcProvider),
+                    chain,
+                    account: opts.account,
+                });
+            }
+            else {
+                this.accountProvider = createSmartAccountClient({
+                    transport: custom(opts.rpcProvider.transport),
+                    chain,
+                    account: opts.account,
+                });
+            }
+        }
+    }
+    send(method, params) {
+        return this.accountProvider.request({ method, params });
+    }
+    connectToAccount(account) {
+        return new AccountSigner(this, account);
+    }
+    getBundlerClient() {
+        return createBundlerClientFromExisting(createPublicClient({
+            transport: custom(this.accountProvider.transport),
+            chain: this.accountProvider.chain,
+        }));
+    }
+    static fromEthersProvider(provider) {
+        return new EthersProviderAdapter({
+            rpcProvider: provider.connection.url,
+            chainId: provider.network.chainId,
+        });
+    }
+}
+//# sourceMappingURL=provider-adapter.js.map

package/dist/esm/provider-adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-adapter.js","sourceRoot":"","sources":["../../src/provider-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,wBAAwB,EACxB,QAAQ,GAIT,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,IAAI,EAAkB,MAAM,MAAM,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAKpD,MAAM,OAAO,qBAAsB,SAAQ,eAAe;IAGxD,YAAY,IAA+B;QACzC,KAAK,EAAE,CAAC;QAHD;;;;;WAAoC;QAI3C,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;gBACzC,IAAI,CAAC,eAAe,GAAG,wBAAwB,CAAC;oBAC9C,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;oBACjC,KAAK;oBACL,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,eAAe,GAAG,wBAAwB,CAAC;oBAC9C,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;oBAC7C,KAAK;oBACL,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAUD,IAAI,CAAC,MAAW,EAAE,MAAa;QAE7B,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1D,CAAC;IAQD,gBAAgB,CACd,OAAiB;QAEjB,OAAO,IAAI,aAAa,CAAW,IAAI,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,gBAAgB;QACd,OAAO,+BAA+B,CACpC,kBAAkB,CAAC;YACjB,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;YACjD,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,KAAM;SACnC,CAAC,CACH,CAAC;IACJ,CAAC;IAQD,MAAM,CAAC,kBAAkB,CAAC,QAAyB;QACjD,OAAO,IAAI,qBAAqB,CAAC;YAC/B,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG;YACpC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO;SAClC,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import {\n  createBundlerClientFromExisting,\n  createSmartAccountClient,\n  getChain,\n  type BundlerClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport { JsonRpcProvider } from \"@ethersproject/providers\";\nimport { createPublicClient, custom, http, type Transport } from \"viem\";\nimport { AccountSigner } from \"./account-signer.js\";\nimport type { EthersProviderAdapterOpts } from \"./types.js\";\n\n/** Lightweight Adapter for SmartAccountProvider to enable Signer Creation */\n// TODO: Add support for strong entry point version type\nexport class EthersProviderAdapter extends JsonRpcProvider {\n  readonly accountProvider: SmartAccountClient;\n\n  constructor(opts: EthersProviderAdapterOpts) {\n    super();\n    if (\"accountProvider\" in opts) {\n      this.accountProvider = opts.accountProvider;\n    } else {\n      const chain = getChain(opts.chainId);\n      if (typeof opts.rpcProvider === \"string\") {\n        this.accountProvider = createSmartAccountClient({\n          transport: http(opts.rpcProvider),\n          chain,\n          account: opts.account,\n        });\n      } else {\n        this.accountProvider = createSmartAccountClient({\n          transport: custom(opts.rpcProvider.transport),\n          chain,\n          account: opts.account,\n        });\n      }\n    }\n  }\n\n  /**\n   * Rewrites the send method to use the account provider's EIP-1193\n   * compliant request method\n   *\n   * @param method - the RPC method to call\n   * @param params - the params required by the RPC method\n   * @returns the result of the RPC call\n   */\n  send(method: any, params: any[]): Promise<any> {\n    // @ts-expect-error - viem is strongly typed on the request methods, but ethers is not\n    return this.accountProvider.request({ method, params });\n  }\n\n  /**\n   * Connects the Provider to an Account and returns a Signer\n   *\n   * @param account - the account to connect to\n   * @returns an {@link AccountSigner} that can be used to sign and send user operations\n   */\n  connectToAccount<TAccount extends SmartContractAccount>(\n    account: TAccount\n  ): AccountSigner<TAccount> {\n    return new AccountSigner<TAccount>(this, account);\n  }\n\n  getBundlerClient(): BundlerClient<Transport> {\n    return createBundlerClientFromExisting(\n      createPublicClient({\n        transport: custom(this.accountProvider.transport),\n        chain: this.accountProvider.chain!,\n      })\n    );\n  }\n\n  /**\n   * Creates an instance of EthersProviderAdapter from an ethers.js JsonRpcProvider.\n   *\n   * @param provider - the ethers JSON RPC provider to convert\n   * @returns an instance of {@link EthersProviderAdapter}\n   */\n  static fromEthersProvider(provider: JsonRpcProvider): EthersProviderAdapter {\n    return new EthersProviderAdapter({\n      rpcProvider: provider.connection.url,\n      chainId: provider.network.chainId,\n    });\n  }\n}\n"]}

package/dist/esm/types.d.ts

@@ -0,0 +1,10 @@
+import { type BundlerClient, type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
+import type { Chain, Transport } from "viem";
+export type EthersProviderAdapterOpts<TTransport extends Transport = Transport, TChain extends Chain = Chain, TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined> = {
+    account?: TAccount;
+} & ({
+    rpcProvider: string | BundlerClient<TTransport>;
+    chainId: number;
+} | {
+    accountProvider: SmartAccountClient<TTransport, TChain, TAccount>;
+});

package/dist/esm/types.js

@@ -0,0 +1,2 @@
+import {} from "@aa-sdk/core";
+//# sourceMappingURL=types.js.map

package/dist/esm/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,MAAM,cAAc,CAAC","sourcesContent":["import {\n  type BundlerClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Chain, Transport } from \"viem\";\n\nexport type EthersProviderAdapterOpts<\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined\n> = {\n  account?: TAccount;\n} & (\n  | {\n      rpcProvider: string | BundlerClient<TTransport>;\n      chainId: number;\n    }\n  | {\n      accountProvider: SmartAccountClient<TTransport, TChain, TAccount>;\n    }\n);\n"]}

package/dist/esm/utils.d.ts

@@ -0,0 +1,5 @@
+import type { SmartAccountSigner } from "@aa-sdk/core";
+import type { Signer } from "@ethersproject/abstract-signer";
+import { Wallet } from "@ethersproject/wallet";
+export declare const convertWalletToAccountSigner: (wallet: Wallet) => SmartAccountSigner<Wallet>;
+export declare const convertEthersSignerToAccountSigner: (signer: Signer) => SmartAccountSigner<Signer>;

package/dist/esm/utils.js

@@ -0,0 +1,24 @@
+import { Wallet } from "@ethersproject/wallet";
+export const convertWalletToAccountSigner = (wallet) => {
+    return {
+        inner: wallet,
+        signerType: "local",
+        getAddress: async () => Promise.resolve(wallet.address),
+        signMessage: async (msg) => (await wallet.signMessage(typeof msg === "string" ? msg : msg.raw)),
+        signTypedData: async (params) => {
+            return (await wallet._signTypedData(params.domain ?? {}, params.types, params.message));
+        },
+    };
+};
+export const convertEthersSignerToAccountSigner = (signer) => {
+    return {
+        inner: signer,
+        signerType: "json-rpc",
+        getAddress: async () => signer.getAddress(),
+        signMessage: async (msg) => (await signer.signMessage(typeof msg === "string" ? msg : msg.raw)),
+        signTypedData: async (_params) => {
+            throw new Error("signTypedData is not supported for ethers signers; use Wallet");
+        },
+    };
+};
+//# sourceMappingURL=utils.js.map

package/dist/esm/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS/C,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,MAAc,EACc,EAAE;IAC9B,OAAO;QACL,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,OAAO;QACnB,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAwB,CAAC;QACxE,WAAW,EAAE,KAAK,EAAE,GAAoB,EAAE,EAAE,CAC1C,CAAC,MAAM,MAAM,CAAC,WAAW,CACvB,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CACxC,CAAkB;QACrB,aAAa,EAAE,KAAK,EAIlB,MAAqD,EACrD,EAAE;YACF,OAAO,CAAC,MAAM,MAAM,CAAC,cAAc,CACjC,MAAM,CAAC,MAAM,IAAI,EAAE,EAEnB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,OAAO,CACf,CAAkB,CAAC;QACtB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAQF,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,MAAc,EACc,EAAE;IAC9B,OAAO;QACL,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,UAAU;QACtB,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,EAAsB;QAC/D,WAAW,EAAE,KAAK,EAAE,GAAoB,EAAE,EAAE,CAC1C,CAAC,MAAM,MAAM,CAAC,WAAW,CACvB,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CACxC,CAAkB;QACrB,aAAa,EAAE,KAAK,EAIlB,OAAsD,EACtD,EAAE;YACF,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type { Address, SmartAccountSigner } from \"@aa-sdk/core\";\nimport type { Signer } from \"@ethersproject/abstract-signer\";\nimport { Wallet } from \"@ethersproject/wallet\";\nimport type { SignableMessage, TypedData, TypedDataDefinition } from \"viem\";\n\n/**\n * Converts a ethersjs Wallet to a SmartAccountSigner\n *\n * @param wallet - the Wallet to convert\n * @returns - a signer that can be used to sign and send user operations\n */\nexport const convertWalletToAccountSigner = (\n  wallet: Wallet\n): SmartAccountSigner<Wallet> => {\n  return {\n    inner: wallet,\n    signerType: \"local\",\n    getAddress: async () => Promise.resolve(wallet.address as `0x${string}`),\n    signMessage: async (msg: SignableMessage) =>\n      (await wallet.signMessage(\n        typeof msg === \"string\" ? msg : msg.raw\n      )) as `0x${string}`,\n    signTypedData: async <\n      const TTypedData extends TypedData | { [key: string]: unknown },\n      TPrimaryType extends string = string\n    >(\n      params: TypedDataDefinition<TTypedData, TPrimaryType>\n    ) => {\n      return (await wallet._signTypedData(\n        params.domain ?? {},\n        // @ts-expect-error: these params should line up due to the spec for this function\n        params.types,\n        params.message\n      )) as `0x${string}`;\n    },\n  };\n};\n\n/**\n * Converts a ethers.js Signer to a SmartAccountSigner\n *\n * @param signer - the Signer to convert\n * @returns - a signer that can be used to sign and send user operations\n */\nexport const convertEthersSignerToAccountSigner = (\n  signer: Signer\n): SmartAccountSigner<Signer> => {\n  return {\n    inner: signer,\n    signerType: \"json-rpc\",\n    getAddress: async () => signer.getAddress() as Promise<Address>,\n    signMessage: async (msg: SignableMessage) =>\n      (await signer.signMessage(\n        typeof msg === \"string\" ? msg : msg.raw\n      )) as `0x${string}`,\n    signTypedData: async <\n      const TTypedData extends TypedData | { [key: string]: unknown },\n      TPrimaryType extends string = string\n    >(\n      _params: TypedDataDefinition<TTypedData, TPrimaryType>\n    ) => {\n      throw new Error(\n        \"signTypedData is not supported for ethers signers; use Wallet\"\n      );\n    },\n  };\n};\n"]}

package/dist/types/account-signer.d.ts

@@ -0,0 +1,20 @@
+import { type BatchUserOperationCallData, type BundlerClient, type GetEntryPointFromAccount, type SmartContractAccount, type UserOperationCallData, type UserOperationOverrides } from "@aa-sdk/core";
+import { Signer } from "@ethersproject/abstract-signer";
+import type { Deferrable } from "@ethersproject/properties";
+import { type TransactionRequest, type TransactionResponse } from "@ethersproject/providers";
+import { type Transport } from "viem";
+import { EthersProviderAdapter } from "./provider-adapter.js";
+export declare class AccountSigner<TAccount extends SmartContractAccount = SmartContractAccount, TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>> extends Signer {
+    provider: EthersProviderAdapter;
+    readonly account: TAccount;
+    sendUserOperation: (args: UserOperationCallData | BatchUserOperationCallData, overrides?: UserOperationOverrides<TEntryPointVersion>) => Promise<import("@aa-sdk/core").SendUserOperationResult<keyof import("@aa-sdk/core").EntryPointRegistryBase<unknown>>>;
+    waitForUserOperationTransaction: (args: import("@aa-sdk/core").WaitForUserOperationTxParameters) => Promise<`0x${string}`>;
+    constructor(provider: EthersProviderAdapter, account: TAccount);
+    getAddress(): Promise<string>;
+    signMessage(message: string | Uint8Array): Promise<string>;
+    sendTransaction(transaction: Deferrable<TransactionRequest>): Promise<TransactionResponse>;
+    signTransaction(_transaction: Deferrable<TransactionRequest>): Promise<string>;
+    getPublicErc4337Client(): BundlerClient<Transport>;
+    connect(provider: EthersProviderAdapter): AccountSigner<TAccount>;
+}
+//# sourceMappingURL=account-signer.d.ts.map

package/dist/types/account-signer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-signer.d.ts","sourceRoot":"","sources":["../../src/account-signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,0BAA0B,EAC/B,KAAK,aAAa,EAClB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC5B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,MAAM,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAU9D,qBAAa,aAAa,CACxB,QAAQ,SAAS,oBAAoB,GAAG,oBAAoB,EAC5D,kBAAkB,SAAS,wBAAwB,CAAC,QAAQ,CAAC,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAClG,SAAQ,MAAM;IAMK,QAAQ,EAAE,qBAAqB;IALlD,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B,iBAAiB,SAQP,qBAAqB,GAAG,0BAA0B,cAC5C,uBAAuB,kBAAkB,CAAC,2HATxC;IAClB,+BAA+B,4FAAC;gBAEb,QAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,QAAQ;IAoB/D,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAQnC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAapD,eAAe,CACnB,WAAW,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAC1C,OAAO,CAAC,mBAAmB,CAAC;IAgB/B,eAAe,CACb,YAAY,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAC3C,OAAO,CAAC,MAAM,CAAC;IAMlB,sBAAsB,IAAI,aAAa,CAAC,SAAS,CAAC;IAIlD,OAAO,CAAC,QAAQ,EAAE,qBAAqB,GAAG,aAAa,CAAC,QAAQ,CAAC;CAKlE"}

package/dist/types/index.d.ts

@@ -0,0 +1,4 @@
+export { AccountSigner } from "./account-signer.js";
+export { EthersProviderAdapter } from "./provider-adapter.js";
+export { convertEthersSignerToAccountSigner, convertWalletToAccountSigner, } from "./utils.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EACL,kCAAkC,EAClC,4BAA4B,GAC7B,MAAM,YAAY,CAAC"}

package/dist/types/provider-adapter.d.ts

@@ -0,0 +1,35 @@
+import { type BundlerClient, type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
+import { JsonRpcProvider } from "@ethersproject/providers";
+import { type Transport } from "viem";
+import { AccountSigner } from "./account-signer.js";
+import type { EthersProviderAdapterOpts } from "./types.js";
+/** Lightweight Adapter for SmartAccountProvider to enable Signer Creation */
+export declare class EthersProviderAdapter extends JsonRpcProvider {
+    readonly accountProvider: SmartAccountClient;
+    constructor(opts: EthersProviderAdapterOpts);
+    /**
+     * Rewrites the send method to use the account provider's EIP-1193
+     * compliant request method
+     *
+     * @param method - the RPC method to call
+     * @param params - the params required by the RPC method
+     * @returns the result of the RPC call
+     */
+    send(method: any, params: any[]): Promise<any>;
+    /**
+     * Connects the Provider to an Account and returns a Signer
+     *
+     * @param account - the account to connect to
+     * @returns an {@link AccountSigner} that can be used to sign and send user operations
+     */
+    connectToAccount<TAccount extends SmartContractAccount>(account: TAccount): AccountSigner<TAccount>;
+    getBundlerClient(): BundlerClient<Transport>;
+    /**
+     * Creates an instance of EthersProviderAdapter from an ethers.js JsonRpcProvider.
+     *
+     * @param provider - the ethers JSON RPC provider to convert
+     * @returns an instance of {@link EthersProviderAdapter}
+     */
+    static fromEthersProvider(provider: JsonRpcProvider): EthersProviderAdapter;
+}
+//# sourceMappingURL=provider-adapter.d.ts.map

package/dist/types/provider-adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-adapter.d.ts","sourceRoot":"","sources":["../../src/provider-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAoC,KAAK,SAAS,EAAE,MAAM,MAAM,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAE5D,6EAA6E;AAE7E,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,QAAQ,CAAC,eAAe,EAAE,kBAAkB,CAAC;gBAEjC,IAAI,EAAE,yBAAyB;IAsB3C;;;;;;;OAOG;IACH,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAK9C;;;;;OAKG;IACH,gBAAgB,CAAC,QAAQ,SAAS,oBAAoB,EACpD,OAAO,EAAE,QAAQ,GAChB,aAAa,CAAC,QAAQ,CAAC;IAI1B,gBAAgB,IAAI,aAAa,CAAC,SAAS,CAAC;IAS5C;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,eAAe,GAAG,qBAAqB;CAM5E"}

package/dist/types/types.d.ts

@@ -0,0 +1,11 @@
+import { type BundlerClient, type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
+import type { Chain, Transport } from "viem";
+export type EthersProviderAdapterOpts<TTransport extends Transport = Transport, TChain extends Chain = Chain, TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined> = {
+    account?: TAccount;
+} & ({
+    rpcProvider: string | BundlerClient<TTransport>;
+    chainId: number;
+} | {
+    accountProvider: SmartAccountClient<TTransport, TChain, TAccount>;
+});
+//# sourceMappingURL=types.d.ts.map

package/dist/types/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAE7C,MAAM,MAAM,yBAAyB,CACnC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,QAAQ,SAAS,oBAAoB,GAAG,SAAS,GAC7C,oBAAoB,GACpB,SAAS,IACX;IACF,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB,GAAG,CACA;IACE,WAAW,EAAE,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;IAChD,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IACE,eAAe,EAAE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;CACnE,CACJ,CAAC"}

package/dist/types/utils.d.ts

@@ -0,0 +1,18 @@
+import type { SmartAccountSigner } from "@aa-sdk/core";
+import type { Signer } from "@ethersproject/abstract-signer";
+import { Wallet } from "@ethersproject/wallet";
+/**
+ * Converts a ethersjs Wallet to a SmartAccountSigner
+ *
+ * @param wallet - the Wallet to convert
+ * @returns - a signer that can be used to sign and send user operations
+ */
+export declare const convertWalletToAccountSigner: (wallet: Wallet) => SmartAccountSigner<Wallet>;
+/**
+ * Converts a ethers.js Signer to a SmartAccountSigner
+ *
+ * @param signer - the Signer to convert
+ * @returns - a signer that can be used to sign and send user operations
+ */
+export declare const convertEthersSignerToAccountSigner: (signer: Signer) => SmartAccountSigner<Signer>;
+//# sourceMappingURL=utils.d.ts.map

package/dist/types/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG/C;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,WAC/B,MAAM,KACb,mBAAmB,MAAM,CAuB3B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kCAAkC,WACrC,MAAM,KACb,mBAAmB,MAAM,CAoB3B,CAAC"}

package/package.json

@@ -0,0 +1,74 @@
+{
+  "name": "@aa-sdk/ethers",
+  "license": "MIT",
+  "version": "4.0.0-alpha.0",
+  "description": "Ethers.js wrapper for @aa-sdk/core",
+  "author": "Alchemy",
+  "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",
+    "!vitest.config.ts",
+    "!.env",
+    "!dist/**/*.tsbuildinfo",
+    "!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"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "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 es2020 --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",
+    "test:run": "vitest run",
+    "test:run-e2e": "vitest run --config vitest.config.e2e.ts"
+  },
+  "devDependencies": {
+    "alchemy-sdk": "^3.0.0",
+    "dotenv": "^16.0.3",
+    "typescript": "^5.0.4",
+    "typescript-template": "*",
+    "vitest": "^0.31.0"
+  },
+  "dependencies": {
+    "@aa-sdk/core": "^4.0.0-alpha.0",
+    "@ethersproject/abi": "^5.7.0",
+    "@ethersproject/abstract-signer": "^5.7.0",
+    "@ethersproject/bytes": "^5.7.0",
+    "@ethersproject/contracts": "^5.7.0",
+    "@ethersproject/hash": "^5.7.0",
+    "@ethersproject/keccak256": "^5.7.0",
+    "@ethersproject/providers": "^5.7.2",
+    "@ethersproject/wallet": "^5.7.0",
+    "viem": "2.8.6"
+  },
+  "peerDependencies": {
+    "viem": "2.8.6"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/alchemyplatform/aa-sdk.git"
+  },
+  "bugs": {
+    "url": "https://github.com/alchemyplatform/aa-sdk/issues"
+  },
+  "gitHead": "bd1788c2bd7f28ba762a06c649f30b544f8bade9"
+}

package/src/account-signer.ts

@@ -0,0 +1,114 @@
+import {
+  AccountNotFoundError,
+  resolveProperties,
+  type BatchUserOperationCallData,
+  type BundlerClient,
+  type GetEntryPointFromAccount,
+  type SmartContractAccount,
+  type UserOperationCallData,
+  type UserOperationOverrides,
+} from "@aa-sdk/core";
+import { Signer } from "@ethersproject/abstract-signer";
+import { hexlify } from "@ethersproject/bytes";
+import type { Deferrable } from "@ethersproject/properties";
+import {
+  type TransactionRequest,
+  type TransactionResponse,
+} from "@ethersproject/providers";
+import { isHex, toBytes, type Transport } from "viem";
+import { EthersProviderAdapter } from "./provider-adapter.js";
+
+const hexlifyOptional = (value: any): `0x${string}` | undefined => {
+  if (value == null) {
+    return undefined;
+  }
+
+  return hexlify(value) as `0x${string}`;
+};
+
+export class AccountSigner<
+  TAccount extends SmartContractAccount = SmartContractAccount,
+  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>
+> extends Signer {
+  readonly account: TAccount;
+
+  sendUserOperation;
+  waitForUserOperationTransaction;
+
+  constructor(public provider: EthersProviderAdapter, account: TAccount) {
+    super();
+    this.account = account;
+
+    this.sendUserOperation = (
+      args: UserOperationCallData | BatchUserOperationCallData,
+      overrides?: UserOperationOverrides<TEntryPointVersion>
+    ) =>
+      this.provider.accountProvider.sendUserOperation({
+        uo: args,
+        account,
+        overrides,
+      });
+
+    this.waitForUserOperationTransaction =
+      this.provider.accountProvider.waitForUserOperationTransaction.bind(
+        this.provider.accountProvider
+      );
+  }
+
+  async getAddress(): Promise<string> {
+    if (!this.account) {
+      throw new AccountNotFoundError();
+    }
+
+    return this.account.address;
+  }
+
+  signMessage(message: string | Uint8Array): Promise<string> {
+    if (!this.account) {
+      throw new AccountNotFoundError();
+    }
+
+    return this.account.signMessage({
+      message:
+        typeof message === "string" && !isHex(message)
+          ? message
+          : { raw: isHex(message) ? toBytes(message) : message },
+    });
+  }
+
+  async sendTransaction(
+    transaction: Deferrable<TransactionRequest>
+  ): Promise<TransactionResponse> {
+    if (!this.provider.accountProvider.account || !this.account) {
+      throw new AccountNotFoundError();
+    }
+
+    const resolved = await resolveProperties(transaction);
+    const txHash = await this.provider.accountProvider.sendTransaction({
+      to: resolved.to as `0x${string}` | undefined,
+      data: hexlifyOptional(resolved.data),
+      chain: this.provider.accountProvider.chain,
+      account: this.account,
+    });
+
+    return this.provider.getTransaction(txHash);
+  }
+
+  signTransaction(
+    _transaction: Deferrable<TransactionRequest>
+  ): Promise<string> {
+    throw new Error(
+      "Transaction signing is not supported, use sendUserOperation instead"
+    );
+  }
+
+  getPublicErc4337Client(): BundlerClient<Transport> {
+    return this.provider.getBundlerClient();
+  }
+
+  connect(provider: EthersProviderAdapter): AccountSigner<TAccount> {
+    this.provider = provider;
+
+    return this;
+  }
+}

package/src/index.ts

@@ -0,0 +1,6 @@
+export { AccountSigner } from "./account-signer.js";
+export { EthersProviderAdapter } from "./provider-adapter.js";
+export {
+  convertEthersSignerToAccountSigner,
+  convertWalletToAccountSigner,
+} from "./utils.js";

package/src/provider-adapter.ts

@@ -0,0 +1,87 @@
+import {
+  createBundlerClientFromExisting,
+  createSmartAccountClient,
+  getChain,
+  type BundlerClient,
+  type SmartAccountClient,
+  type SmartContractAccount,
+} from "@aa-sdk/core";
+import { JsonRpcProvider } from "@ethersproject/providers";
+import { createPublicClient, custom, http, type Transport } from "viem";
+import { AccountSigner } from "./account-signer.js";
+import type { EthersProviderAdapterOpts } from "./types.js";
+
+/** Lightweight Adapter for SmartAccountProvider to enable Signer Creation */
+// TODO: Add support for strong entry point version type
+export class EthersProviderAdapter extends JsonRpcProvider {
+  readonly accountProvider: SmartAccountClient;
+
+  constructor(opts: EthersProviderAdapterOpts) {
+    super();
+    if ("accountProvider" in opts) {
+      this.accountProvider = opts.accountProvider;
+    } else {
+      const chain = getChain(opts.chainId);
+      if (typeof opts.rpcProvider === "string") {
+        this.accountProvider = createSmartAccountClient({
+          transport: http(opts.rpcProvider),
+          chain,
+          account: opts.account,
+        });
+      } else {
+        this.accountProvider = createSmartAccountClient({
+          transport: custom(opts.rpcProvider.transport),
+          chain,
+          account: opts.account,
+        });
+      }
+    }
+  }
+
+  /**
+   * Rewrites the send method to use the account provider's EIP-1193
+   * compliant request method
+   *
+   * @param method - the RPC method to call
+   * @param params - the params required by the RPC method
+   * @returns the result of the RPC call
+   */
+  send(method: any, params: any[]): Promise<any> {
+    // @ts-expect-error - viem is strongly typed on the request methods, but ethers is not
+    return this.accountProvider.request({ method, params });
+  }
+
+  /**
+   * Connects the Provider to an Account and returns a Signer
+   *
+   * @param account - the account to connect to
+   * @returns an {@link AccountSigner} that can be used to sign and send user operations
+   */
+  connectToAccount<TAccount extends SmartContractAccount>(
+    account: TAccount
+  ): AccountSigner<TAccount> {
+    return new AccountSigner<TAccount>(this, account);
+  }
+
+  getBundlerClient(): BundlerClient<Transport> {
+    return createBundlerClientFromExisting(
+      createPublicClient({
+        transport: custom(this.accountProvider.transport),
+        chain: this.accountProvider.chain!,
+      })
+    );
+  }
+
+  /**
+   * Creates an instance of EthersProviderAdapter from an ethers.js JsonRpcProvider.
+   *
+   * @param provider - the ethers JSON RPC provider to convert
+   * @returns an instance of {@link EthersProviderAdapter}
+   */
+  static fromEthersProvider(provider: JsonRpcProvider): EthersProviderAdapter {
+    return new EthersProviderAdapter({
+      rpcProvider: provider.connection.url,
+      chainId: provider.network.chainId,
+    });
+  }
+}

package/src/types.ts

@@ -0,0 +1,24 @@
+import {
+  type BundlerClient,
+  type SmartAccountClient,
+  type SmartContractAccount,
+} from "@aa-sdk/core";
+import type { Chain, Transport } from "viem";
+
+export type EthersProviderAdapterOpts<
+  TTransport extends Transport = Transport,
+  TChain extends Chain = Chain,
+  TAccount extends SmartContractAccount | undefined =
+    | SmartContractAccount
+    | undefined
+> = {
+  account?: TAccount;
+} & (
+  | {
+      rpcProvider: string | BundlerClient<TTransport>;
+      chainId: number;
+    }
+  | {
+      accountProvider: SmartAccountClient<TTransport, TChain, TAccount>;
+    }
+);

package/src/utils.ts

@@ -0,0 +1,67 @@
+import type { Address, SmartAccountSigner } from "@aa-sdk/core";
+import type { Signer } from "@ethersproject/abstract-signer";
+import { Wallet } from "@ethersproject/wallet";
+import type { SignableMessage, TypedData, TypedDataDefinition } from "viem";
+
+/**
+ * Converts a ethersjs Wallet to a SmartAccountSigner
+ *
+ * @param wallet - the Wallet to convert
+ * @returns - a signer that can be used to sign and send user operations
+ */
+export const convertWalletToAccountSigner = (
+  wallet: Wallet
+): SmartAccountSigner<Wallet> => {
+  return {
+    inner: wallet,
+    signerType: "local",
+    getAddress: async () => Promise.resolve(wallet.address as `0x${string}`),
+    signMessage: async (msg: SignableMessage) =>
+      (await wallet.signMessage(
+        typeof msg === "string" ? msg : msg.raw
+      )) as `0x${string}`,
+    signTypedData: async <
+      const TTypedData extends TypedData | { [key: string]: unknown },
+      TPrimaryType extends string = string
+    >(
+      params: TypedDataDefinition<TTypedData, TPrimaryType>
+    ) => {
+      return (await wallet._signTypedData(
+        params.domain ?? {},
+        // @ts-expect-error: these params should line up due to the spec for this function
+        params.types,
+        params.message
+      )) as `0x${string}`;
+    },
+  };
+};
+
+/**
+ * Converts a ethers.js Signer to a SmartAccountSigner
+ *
+ * @param signer - the Signer to convert
+ * @returns - a signer that can be used to sign and send user operations
+ */
+export const convertEthersSignerToAccountSigner = (
+  signer: Signer
+): SmartAccountSigner<Signer> => {
+  return {
+    inner: signer,
+    signerType: "json-rpc",
+    getAddress: async () => signer.getAddress() as Promise<Address>,
+    signMessage: async (msg: SignableMessage) =>
+      (await signer.signMessage(
+        typeof msg === "string" ? msg : msg.raw
+      )) as `0x${string}`,
+    signTypedData: async <
+      const TTypedData extends TypedData | { [key: string]: unknown },
+      TPrimaryType extends string = string
+    >(
+      _params: TypedDataDefinition<TTypedData, TPrimaryType>
+    ) => {
+      throw new Error(
+        "signTypedData is not supported for ethers signers; use Wallet"
+      );
+    },
+  };
+};