feat: support multiple smart account owners

0xRAG · 0xRAG · commit 50ca422e1e82 · 2025-08-22T00:33:09.000-04:00
diff --git a/typescript/src/accounts/evm/toEvmSmartAccount.ts b/typescript/src/accounts/evm/toEvmSmartAccount.ts
@@ -43,6 +43,7 @@ import {
   SignTypedDataOptions,
   UserOperation,
 } from "../../client/evm/evm.types.js";
+import { UserInputValidationError } from "../../errors.js";
 import {
   type CdpOpenApiClientType,
   type EvmSmartAccount as EvmSmartAccountModel,
@@ -58,34 +59,44 @@ import type {
 import type { Address, Hex } from "../../types/misc.js";
 
 /**
- * Options for converting a pre-existing EvmSmartAccount and owner to a EvmSmartAccount
+ * Options for converting a pre-existing EvmSmartAccount and owner(s) to a EvmSmartAccount
  */
 export type ToEvmSmartAccountOptions = {
   /** The pre-existing EvmSmartAccount. */
   smartAccount: EvmSmartAccountModel;
-  /** The owner of the smart account. */
-  owner: EvmAccount;
+  /** The owner of the smart account (for backwards compatibility). */
+  owner?: EvmAccount;
+  /** The owners of the smart account. If provided, takes precedence over `owner`. */
+  owners?: EvmAccount[];
 };
 
 /**
- * Creates a EvmSmartAccount instance from an existing EvmSmartAccount and owner.
+ * Creates a EvmSmartAccount instance from an existing EvmSmartAccount and owner(s).
  * Use this to interact with previously deployed EvmSmartAccounts, rather than creating new ones.
  *
- * The owner must be the original owner of the evm smart account.
+ * The owner(s) must be among the original owners of the evm smart account.
  *
  * @param {CdpOpenApiClientType} apiClient - The API client.
  * @param {ToEvmSmartAccountOptions} options - Configuration options.
  * @param {EvmSmartAccount} options.smartAccount - The deployed evm smart account.
- * @param {EvmAccount} options.owner - The owner which signs for the smart account.
+ * @param {EvmAccount} [options.owner] - The owner which signs for the smart account (for backwards compatibility).
+ * @param {EvmAccount[]} [options.owners] - The owners which can sign for the smart account. Takes precedence over `owner`.
  * @returns {EvmSmartAccount} A configured EvmSmartAccount instance ready for user operation submission.
  */
 export function toEvmSmartAccount(
   apiClient: CdpOpenApiClientType,
   options: ToEvmSmartAccountOptions,
 ): EvmSmartAccount {
+  // Handle backwards compatibility: if owners is provided, use it; otherwise fall back to owner
+  const accountOwners = options.owners || (options.owner ? [options.owner] : []);
+
+  if (accountOwners.length === 0) {
+    throw new UserInputValidationError("At least one owner must be provided");
+  }
+
   const account: EvmSmartAccount = {
     address: options.smartAccount.address as Address,
-    owners: [options.owner],
+    owners: accountOwners,
     policies: options.smartAccount.policies,
     async transfer(transferArgs): Promise<SendUserOperationReturnType> {
       Analytics.trackAction({
@@ -287,7 +298,7 @@ export function toEvmSmartAccount(
 
       return toNetworkScopedEvmSmartAccount(apiClient, {
         smartAccount: account,
-        owner: options.owner,
+        owners: accountOwners,
         network,
       });
     },
diff --git a/typescript/src/accounts/evm/toNetworkScopedEvmSmartAccount.ts b/typescript/src/accounts/evm/toNetworkScopedEvmSmartAccount.ts
@@ -44,34 +44,43 @@ import type {
 } from "../../openapi-client/index.js";
 
 /**
- * Options for converting a pre-existing EvmSmartAccount and owner to a NetworkScopedEvmSmartAccount
+ * Options for converting a pre-existing EvmSmartAccount and owner(s) to a NetworkScopedEvmSmartAccount
  */
 export type ToNetworkScopedEvmSmartAccountOptions = {
   /** The pre-existing EvmSmartAccount. */
   smartAccount: EvmSmartAccount;
   /** The network to scope the smart account object to. */
   network: KnownEvmNetworks;
-  /** The owner of the smart account. */
-  owner: EvmAccount;
+  /** The owner of the smart account (for backwards compatibility). */
+  owner?: EvmAccount;
+  /** The owners of the smart account. If provided, takes precedence over `owner`. */
+  owners?: EvmAccount[];
 };
 
 /**
- * Creates a NetworkScopedEvmSmartAccount instance from an existing EvmSmartAccount and owner.
+ * Creates a NetworkScopedEvmSmartAccount instance from an existing EvmSmartAccount and owner(s).
  * Use this to interact with previously deployed EvmSmartAccounts, rather than creating new ones.
  *
- * The owner must be the original owner of the evm smart account.
+ * The owner(s) must be among the original owners of the evm smart account.
  *
  * @param {CdpOpenApiClientType} apiClient - The API client.
  * @param {ToNetworkScopedEvmSmartAccountOptions} options - Configuration options.
  * @param {EvmSmartAccount} options.smartAccount - The deployed evm smart account.
- * @param {EvmAccount} options.owner - The owner which signs for the smart account.
+ * @param {EvmAccount} [options.owner] - The owner which signs for the smart account (for backwards compatibility).
+ * @param {EvmAccount[]} [options.owners] - The owners which can sign for the smart account. Takes precedence over `owner`.
  * @param {KnownEvmNetworks} options.network - The network to scope the smart account to.
  * @returns {NetworkScopedEvmSmartAccount} A configured NetworkScopedEvmSmartAccount instance ready for user operation submission.
  */
 export async function toNetworkScopedEvmSmartAccount<Network extends KnownEvmNetworks>(
   apiClient: CdpOpenApiClientType,
   options: ToNetworkScopedEvmSmartAccountOptions & { network: Network },
 ): Promise<NetworkScopedEvmSmartAccount<Network>> {
+  // Handle backwards compatibility: if owners is provided, use it; otherwise fall back to owner
+  const accountOwners = options.owners || (options.owner ? [options.owner] : []);
+
+  if (accountOwners.length === 0) {
+    throw new Error("At least one owner must be provided");
+  }
   const paymasterUrl = await (async () => {
     if (options.network === "base") {
       return getBaseNodeRpcUrl(options.network);
@@ -82,7 +91,7 @@ export async function toNetworkScopedEvmSmartAccount<Network extends KnownEvmNet
   const account = {
     address: options.smartAccount.address,
     network: options.network,
-    owners: [options.owner],
+    owners: accountOwners,
     name: options.smartAccount.name,
     type: "evm-smart",
     sendUserOperation: async (
@@ -266,7 +275,7 @@ export async function toNetworkScopedEvmSmartAccount<Network extends KnownEvmNet
         return createSwapQuote(apiClient, {
           ...quoteSwapOptions,
           taker: options.smartAccount.address,
-          signerAddress: options.owner.address,
+          signerAddress: accountOwners[0].address,
           smartAccount: options.smartAccount,
           network: options.network as SmartAccountSwapNetwork,
         });
@@ -299,7 +308,7 @@ export async function toNetworkScopedEvmSmartAccount<Network extends KnownEvmNet
           ...swapOptionsWithNetwork,
           smartAccount: options.smartAccount,
           taker: options.smartAccount.address,
-          signerAddress: options.owner.address,
+          signerAddress: accountOwners[0].address,
           paymasterUrl: swapOptions.paymasterUrl ?? paymasterUrl,
         });
       },
diff --git a/typescript/src/actions/evm/sendUserOperation.ts b/typescript/src/actions/evm/sendUserOperation.ts
@@ -49,6 +49,8 @@ export type SendUserOperationOptions<T extends readonly unknown[]> = {
   paymasterUrl?: string;
   /** The idempotency key. */
   idempotencyKey?: string;
+  /** Optional signer to use. If not provided, defaults to the first owner of the smart account. */
+  signer?: EvmSmartAccount["owners"][0];
 };
 
 /**
@@ -148,9 +150,9 @@ export async function sendUserOperation<T extends readonly unknown[]>(
     paymasterUrl,
   });
 
-  const owner = options.smartAccount.owners[0];
+  const signer = options.signer || options.smartAccount.owners[0];
 
-  const signature = await owner.sign({
+  const signature = await signer.sign({
     hash: createOpResponse.userOpHash as Hex,
   });
 
diff --git a/typescript/src/actions/evm/spend-permissions/smartAccount.use.ts b/typescript/src/actions/evm/spend-permissions/smartAccount.use.ts
@@ -27,7 +27,7 @@ export function useSpendPermission(
   account: EvmSmartAccount,
   options: UseSpendPermissionOptions,
 ): Promise<SendUserOperationReturnType> {
-  const { spendPermission, value, network } = options;
+  const { spendPermission, value, network, signer } = options;
 
   const data = encodeFunctionData({
     abi: SPEND_PERMISSION_MANAGER_ABI,
@@ -38,6 +38,7 @@ export function useSpendPermission(
   return sendUserOperation(apiClient, {
     smartAccount: account,
     network: network as EvmUserOperationNetwork,
+    signer,
     calls: [
       {
         to: SPEND_PERMISSION_MANAGER_ADDRESS,
diff --git a/typescript/src/actions/evm/spend-permissions/types.ts b/typescript/src/actions/evm/spend-permissions/types.ts
@@ -1,3 +1,4 @@
+import type { EvmSmartAccount } from "../../../accounts/evm/types.js";
 import type { SpendPermissionNetwork } from "../../../openapi-client/index.js";
 import type { SpendPermission } from "../../../spend-permissions/types.js";
 
@@ -11,4 +12,6 @@ export type UseSpendPermissionOptions = {
   value: bigint;
   /** The network to execute the transaction on */
   network: SpendPermissionNetwork;
+  /** The owner to use for signing the transaction */
+  signer?: EvmSmartAccount["owners"][0];
 };
diff --git a/typescript/src/actions/evm/transfer/smartAccountTransferStrategy.ts b/typescript/src/actions/evm/transfer/smartAccountTransferStrategy.ts
@@ -8,13 +8,14 @@ import type { EvmSmartAccount } from "../../../accounts/evm/types.js";
 import type { EvmUserOperationNetwork } from "../../../openapi-client/index.js";
 
 export const smartAccountTransferStrategy: TransferExecutionStrategy<EvmSmartAccount> = {
-  executeTransfer: async ({ apiClient, from, to, value, token, network, paymasterUrl }) => {
+  executeTransfer: async ({ apiClient, from, to, value, token, network, paymasterUrl, signer }) => {
     const smartAccountNetwork = network as EvmUserOperationNetwork;
 
     if (token === "eth") {
       const result = await sendUserOperation(apiClient, {
         smartAccount: from,
         paymasterUrl,
+        signer,
         network: smartAccountNetwork,
         calls: [
           {
@@ -31,6 +32,7 @@ export const smartAccountTransferStrategy: TransferExecutionStrategy<EvmSmartAcc
       const result = await sendUserOperation(apiClient, {
         smartAccount: from,
         paymasterUrl,
+        signer,
         network: smartAccountNetwork,
         calls: [
           {
diff --git a/typescript/src/actions/evm/transfer/types.ts b/typescript/src/actions/evm/transfer/types.ts
@@ -63,7 +63,9 @@ export interface TransferExecutionStrategy<T extends EvmAccount | EvmSmartAccoun
       value: bigint;
       token: TransferOptions["token"];
       network: TransferOptions["network"];
-    } & (T extends EvmSmartAccount ? { paymasterUrl?: string } : object),
+    } & (T extends EvmSmartAccount
+      ? { paymasterUrl?: string; signer?: EvmSmartAccount["owners"][0] }
+      : object),
   ): Promise<T extends EvmSmartAccount ? SendUserOperationReturnType : TransactionResult>;
 }
 
diff --git a/typescript/src/client/evm/evm.test.ts b/typescript/src/client/evm/evm.test.ts
diff --git a/typescript/src/client/evm/evm.ts b/typescript/src/client/evm/evm.ts
diff --git a/typescript/src/client/evm/evm.types.ts b/typescript/src/client/evm/evm.types.ts
