@alchemy/smart-accounts 0.0.0-alpha.2 → 0.0.0-alpha.21

package/src/utils.ts

@@ -1,12 +1,38 @@
-import { type Client, concat, type Hex, toHex } from "viem";
+import {
+  type Address,
+  type Client,
+  concatHex,
+  type Hex,
+  RawContractError,
+  BaseError as ViemBaseError,
+  toHex,
+} from "viem";
+import {
+  decodeErrorResult,
+  encodeFunctionData,
+  getAction,
+  getAddress,
+  isHex,
+} from "viem/utils";
+import {
+  entryPoint07Abi,
+  type EntryPointVersion,
+  type UserOperation,
+} from "viem/account-abstraction";
+import { assertNever, BaseError } from "@alchemy/common";
 import { call } from "viem/actions";
-import { getAction } from "viem/utils";
-import type { UserOperation } from "viem/account-abstraction";
-import { BaseError } from "@alchemy/common";
 
 const RIP_7212_CHECK_BYTECODE =
   "0x60806040526040517f532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25815260056020820152600160408201527f4a03ef9f92eb268cafa601072489a56380fa0dc43171d7712813b3a19a1eb5e560608201527f3e213e28a608ce9a2f4a17fd830c6654018a79b3e0263d91a8ba90622df6f2f0608082015260208160a0836101005afa503d5f823e3d81f3fe";
 
+/**
+ * Checks if the current chain supports RIP-7212 (precompiled contract for secp256r1 curve operations).
+ * This is used to determine if the chain has native support for P256 signature verification,
+ * which is commonly used in WebAuthn/passkey implementations.
+ *
+ * @param {Client} client - The viem client to use for the check
+ * @returns {Promise<boolean>} True if the chain supports RIP-7212, false otherwise
+ */
 export const chainHas7212 = async (client: Client): Promise<boolean> => {
   const callAction = getAction(client, call, "call");
 
@@ -22,7 +48,7 @@ export function packAccountGasLimits(
     | Pick<UserOperation, "verificationGasLimit" | "callGasLimit">
     | Pick<UserOperation, "maxPriorityFeePerGas" | "maxFeePerGas">,
 ): Hex {
-  return concat(Object.values(data).map((v) => toHex(v, { size: 16 })));
+  return concatHex(Object.values(data).map((v) => toHex(v, { size: 16 })));
 }
 
 export function packPaymasterData({
@@ -45,7 +71,7 @@ export function packPaymasterData({
   ) {
     return "0x";
   }
-  return concat([
+  return concatHex([
     paymaster,
     toHex(paymasterVerificationGasLimit, { size: 16 }),
     toHex(paymasterPostOpGasLimit, { size: 16 }),
@@ -83,3 +109,90 @@ export const bigIntMultiply = (
       return product >= 0n ? product / scale : (product - scale + 1n) / scale;
   }
 };
+
+/**
+ * Derives the counterfactual smart account address from init code by calling
+ * the entry point's `getSenderAddress` function.
+ *
+ * @param {Client} client - The viem client to use for the call.
+ * @param {object} params - The parameters for deriving the sender address.
+ * @param {Hex} params.factory - The factory address for the account.
+ * @param {Hex} params.factoryData - The factory data for the account.
+ * @param {object} params.entryPoint - The entry point contract details.
+ * @param {EntryPointVersion} [params.entryPoint.version] - The entry point version.
+ * @param {Address} params.entryPoint.address - The entry point contract address.
+ * @returns {Promise<Address>} The counterfactual address of the smart account.
+ */
+export const getSenderFromFactoryData = async (
+  client: Client,
+  params: {
+    factory: Hex;
+    factoryData: Hex;
+    entryPoint: {
+      version: EntryPointVersion;
+      address: Address;
+    };
+  },
+): Promise<Address> => {
+  const action = getAction(client, call, "call");
+
+  const data = encodeFunctionData({
+    abi: entryPoint07Abi, // getSenderAddress is the same for EP v0.6, EP v0.7, and v0.8
+    functionName: "getSenderAddress",
+    args: [concatHex([params.factory, params.factoryData])],
+  });
+
+  try {
+    // getSenderAddress is expected to revert with the computed sender
+    await action({ to: params.entryPoint.address, data });
+  } catch (err) {
+    const revertData = getRevertErrorData(err);
+    if (!isHex(revertData)) {
+      throw new BaseError(
+        "Failed to get sender address from init code: no revert data found.",
+      );
+    }
+
+    switch (params.entryPoint.version) {
+      case "0.9":
+      case "0.8":
+      case "0.7": {
+        const decoded = decodeErrorResult({
+          abi: entryPoint07Abi, // same error signature for EP v0.7 and v0.8
+          data: revertData,
+        });
+        if (decoded.errorName !== "SenderAddressResult") {
+          throw new BaseError(
+            `Unexpected error from getSenderAddress: ${decoded.errorName}`,
+          );
+        }
+        return decoded.args[0];
+      }
+      case "0.6":
+        // EP v0.6: last 20 bytes is the address.
+        return getAddress(`0x${revertData.slice(-40)}`);
+      default:
+        return assertNever(
+          params.entryPoint.version,
+          "Unexpected entry point version",
+        );
+    }
+  }
+  throw new BaseError("Expected getSenderAddress to revert.");
+};
+
+// Borrowed from Viem: https://github.com/wevm/viem/blob/3ff6c2f19350dcbe49017e2b3d5a2cf761ab9070/src/actions/public/call.ts#L473
+function getRevertErrorData(err: unknown) {
+  if (!(err instanceof ViemBaseError)) return undefined;
+  const error = err.walk() as RawContractError;
+  return typeof error?.data === "object" ? error.data?.data : error.data;
+}
+
+export function is7702Delegated(
+  delegation: Address,
+  code: Hex | undefined,
+): boolean {
+  return (
+    code?.toLowerCase() === concatHex(["0xef0100", delegation]).toLowerCase()
+  );
+}

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "0.0.0";
+export const VERSION = "0.0.0-alpha.21";

package/dist/esm/ma-v2/abis/webAuthnFactoryAbi.d.ts

@@ -1,330 +0,0 @@
-export declare const webAuthnFactoryAbi: readonly [{
-    readonly inputs: readonly [{
-        readonly internalType: "contract IEntryPoint";
-        readonly name: "_entryPoint";
-        readonly type: "address";
-    }, {
-        readonly internalType: "contract ModularAccount";
-        readonly name: "_accountImpl";
-        readonly type: "address";
-    }, {
-        readonly internalType: "address";
-        readonly name: "_webAuthnValidationModule";
-        readonly type: "address";
-    }, {
-        readonly internalType: "address";
-        readonly name: "owner";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "nonpayable";
-    readonly type: "constructor";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "target";
-        readonly type: "address";
-    }];
-    readonly name: "AddressEmptyCode";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "account";
-        readonly type: "address";
-    }];
-    readonly name: "AddressInsufficientBalance";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "FailedInnerCall";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "InvalidAction";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NoCodeAccountImpl";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "NoCodeWebAuthnModule";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "owner";
-        readonly type: "address";
-    }];
-    readonly name: "OwnableInvalidOwner";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "account";
-        readonly type: "address";
-    }];
-    readonly name: "OwnableUnauthorizedAccount";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "token";
-        readonly type: "address";
-    }];
-    readonly name: "SafeERC20FailedOperation";
-    readonly type: "error";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "TransferFailed";
-    readonly type: "error";
-}, {
-    readonly anonymous: false;
-    readonly inputs: readonly [{
-        readonly indexed: true;
-        readonly internalType: "address";
-        readonly name: "previousOwner";
-        readonly type: "address";
-    }, {
-        readonly indexed: true;
-        readonly internalType: "address";
-        readonly name: "newOwner";
-        readonly type: "address";
-    }];
-    readonly name: "OwnershipTransferStarted";
-    readonly type: "event";
-}, {
-    readonly anonymous: false;
-    readonly inputs: readonly [{
-        readonly indexed: true;
-        readonly internalType: "address";
-        readonly name: "previousOwner";
-        readonly type: "address";
-    }, {
-        readonly indexed: true;
-        readonly internalType: "address";
-        readonly name: "newOwner";
-        readonly type: "address";
-    }];
-    readonly name: "OwnershipTransferred";
-    readonly type: "event";
-}, {
-    readonly anonymous: false;
-    readonly inputs: readonly [{
-        readonly indexed: true;
-        readonly internalType: "address";
-        readonly name: "account";
-        readonly type: "address";
-    }, {
-        readonly indexed: true;
-        readonly internalType: "uint256";
-        readonly name: "ownerX";
-        readonly type: "uint256";
-    }, {
-        readonly indexed: true;
-        readonly internalType: "uint256";
-        readonly name: "ownerY";
-        readonly type: "uint256";
-    }, {
-        readonly indexed: false;
-        readonly internalType: "uint256";
-        readonly name: "salt";
-        readonly type: "uint256";
-    }];
-    readonly name: "WebAuthnModularAccountDeployed";
-    readonly type: "event";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "ACCOUNT_IMPL";
-    readonly outputs: readonly [{
-        readonly internalType: "contract ModularAccount";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "ENTRY_POINT";
-    readonly outputs: readonly [{
-        readonly internalType: "contract IEntryPoint";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "WEBAUTHN_VALIDATION_MODULE";
-    readonly outputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "acceptOwnership";
-    readonly outputs: readonly [];
-    readonly stateMutability: "nonpayable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "uint32";
-        readonly name: "unstakeDelay";
-        readonly type: "uint32";
-    }];
-    readonly name: "addStake";
-    readonly outputs: readonly [];
-    readonly stateMutability: "payable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "uint256";
-        readonly name: "ownerX";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "ownerY";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "salt";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint32";
-        readonly name: "entityId";
-        readonly type: "uint32";
-    }];
-    readonly name: "createWebAuthnAccount";
-    readonly outputs: readonly [{
-        readonly internalType: "contract ModularAccount";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "nonpayable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "uint256";
-        readonly name: "ownerX";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "ownerY";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "salt";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint32";
-        readonly name: "entityId";
-        readonly type: "uint32";
-    }];
-    readonly name: "getAddressWebAuthn";
-    readonly outputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "uint256";
-        readonly name: "ownerX";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "ownerY";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "salt";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint32";
-        readonly name: "entityId";
-        readonly type: "uint32";
-    }];
-    readonly name: "getSaltWebAuthn";
-    readonly outputs: readonly [{
-        readonly internalType: "bytes32";
-        readonly name: "";
-        readonly type: "bytes32";
-    }];
-    readonly stateMutability: "pure";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "owner";
-    readonly outputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "pendingOwner";
-    readonly outputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "renounceOwnership";
-    readonly outputs: readonly [];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "newOwner";
-        readonly type: "address";
-    }];
-    readonly name: "transferOwnership";
-    readonly outputs: readonly [];
-    readonly stateMutability: "nonpayable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [];
-    readonly name: "unlockStake";
-    readonly outputs: readonly [];
-    readonly stateMutability: "nonpayable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address payable";
-        readonly name: "to";
-        readonly type: "address";
-    }, {
-        readonly internalType: "address";
-        readonly name: "token";
-        readonly type: "address";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "amount";
-        readonly type: "uint256";
-    }];
-    readonly name: "withdraw";
-    readonly outputs: readonly [];
-    readonly stateMutability: "nonpayable";
-    readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address payable";
-        readonly name: "withdrawAddress";
-        readonly type: "address";
-    }];
-    readonly name: "withdrawStake";
-    readonly outputs: readonly [];
-    readonly stateMutability: "nonpayable";
-    readonly type: "function";
-}];