feat: allow passing raw call data to sendUserOperation (#272)

alchemyplatform · Dec 1, 2023 · 26b90b6 · 26b90b6
1 parent 3f24fe0
commit 26b90b6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/packages/accounts/src/kernel-zerodev/types.ts b/packages/accounts/src/kernel-zerodev/types.ts
@@ -1,7 +1,11 @@
 import type { UserOperationCallData } from "@alchemy/aa-core";
+import type { Hex } from "viem";
 
-export interface KernelUserOperationCallData extends UserOperationCallData {
+export type KernelUserOperationCallData = Exclude<
+  UserOperationCallData,
+  Hex
+> & {
   delegateCall?: boolean;
-}
+};
 
 export type KernelBatchUserOperationCallData = KernelUserOperationCallData[];
diff --git a/packages/core/src/provider/base.ts b/packages/core/src/provider/base.ts
@@ -354,6 +354,8 @@ export class SmartAccountProvider<
         nonce: this.account.getNonce(),
         callData: Array.isArray(data)
           ? this.account.encodeBatchExecute(data)
+          : typeof data === "string"
+          ? data
           : this.account.encodeExecute(
               data.target,
               data.value ?? 0n,

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -8,16 +8,18 @@ export type PromiseOrValue<T> = T | Promise<T>;
 export type BigNumberish = string | bigint | number;
 export type BytesLike = Uint8Array | string;
 
-export interface UserOperationCallData {
-  /* the target of the call */
-  target: Address;
-  /* the data passed to the target */
-  data: Hex;
-  /* the amount of native token to send to the target (default: 0) */
-  value?: bigint;
-}
+export type UserOperationCallData =
+  | {
+      /* the target of the call */
+      target: Address;
+      /* the data passed to the target */
+      data: Hex;
+      /* the amount of native token to send to the target (default: 0) */
+      value?: bigint;
+    }
+  | Hex;
 
-export type BatchUserOperationCallData = UserOperationCallData[];
+export type BatchUserOperationCallData = Exclude<UserOperationCallData, Hex>[];
 
 export type UserOperationOverrides = Partial<
   Pick<

diff --git a/site/guides/send-user-operation.md b/site/guides/send-user-operation.md
@@ -53,7 +53,7 @@ Some other helpful viem methods include: [encodeFunctionData](https://viem.sh/do
 
 ## 4. Send The User Operation
 
-Now we'll use the connected provider to send a user operation. We'll use the [sendUserOperation](/packages/aa-core/provider/waitForUserOperationTransaction.md) method on the provider.
+Now we'll use the connected provider to send a user operation. We'll use the [sendUserOperation](/packages/aa-core/provider/sendUserOperation.md) method on the provider.
 
 You can either send ETH to the smart account to pay for User Operation's gas, or you can connect your provider to an Alchemy Gas Manager using the [withAlchemyGasManager](/packages/aa-alchemy/provider/withAlchemyGasManager.md) method to sponsor the UO's gas. We'll use the latter approach below. You can go to the [Alchemy Dashboard](https://dashboard.alchemy.com/gas-manager) to get a Gas Manager policy ID.
 

diff --git a/site/packages/aa-core/provider/sendUserOperation.md b/site/packages/aa-core/provider/sendUserOperation.md
@@ -65,7 +65,9 @@ A Promise containing the hash of the user operation and the request that was sen
 
 ## Parameters
 
-### `UserOperationCallData | UserOperationCallData[]`
+### `UserOperationCallData | UserOperationCallData[] | Hex`
+
+`UserOperationCallData` is an object with the following properties:
 
 - `target: Address` - the target of the call (equivalent to `to` in a transaction)
 - `data: Hex` - can be either `0x` or a call data string