feat: support @solana/web3js

package.json

@@ -36,7 +36,8 @@
     "test:watch": "bun test --watch",
     "changeset": "changeset",
     "changeset:release": "bash remove-type.sh && bun run build && changeset publish && bash restore-type.sh && bun run format",
-    "changeset:version": "changeset version && bun install --lockfile-only"
+    "changeset:version": "changeset version && bun install --lockfile-only",
+    "typecheck": "tsc --noEmit"
   },
   "exports": {
     ".": {

src/actions/getCAB.ts

@@ -1,14 +1,11 @@
-import type { Address as SolanaAddress, TransactionSigner } from "@solana/kit";
+import type { Address as SolanaAddress } from "@solana/kit";
 import { AccountNotFoundError } from "@zerodev/sdk";
-import type {
-  Address as EvmAddress,
-  Chain,
-  Client,
-  Hex,
-  Transport,
-} from "viem";
+import type { Address as EvmAddress, Chain, Hex, Transport } from "viem";
 import type { SmartAccount } from "viem/account-abstraction";
-import type { CombinedIntentRpcSchema } from "../client/intentClient.js";
+import type {
+  BaseIntentClient,
+  CombinedIntentRpcSchema,
+} from "../client/intentClient.js";
 
 export type NetworkType = "mainnet" | "testnet";
 
@@ -97,13 +94,12 @@ export async function getCAB<
   chain extends Chain | undefined = Chain | undefined,
   account extends SmartAccount | undefined = SmartAccount | undefined,
 >(
-  client: Client<transport, chain, account, CombinedIntentRpcSchema>,
+  client: BaseIntentClient<transport, chain, account, CombinedIntentRpcSchema>,
   parameters: GetCABParameters,
-  solanaSigner: TransactionSigner | undefined,
 ): Promise<GetCABResult> {
   const { account: account_ = client.account } = parameters;
   const evmAddress = parameters.evmAddress ?? account_?.address;
-  const solanaAddress = parameters.solanaAddress ?? solanaSigner?.address;
+  const solanaAddress = parameters.solanaAddress ?? client?.solana?.address;
   if (!evmAddress && !solanaAddress) throw new AccountNotFoundError();
 
   const result = await client.request({

src/actions/getIntent.ts

@@ -1,12 +1,10 @@
-import type {
-  Address as SolanaAddress,
-  Rpc,
-  SolanaRpcApi,
-  TransactionSigner,
-} from "@solana/kit";
-import type { Chain, Client, Hex, RpcErrorType, Transport } from "viem";
+import type { Address as SolanaAddress } from "@solana/kit";
+import type { Chain, Hex, RpcErrorType, Transport } from "viem";
 import type { SmartAccount } from "viem/account-abstraction";
-import type { CombinedIntentRpcSchema } from "../client/intentClient.js";
+import type {
+  BaseIntentClient,
+  CombinedIntentRpcSchema,
+} from "../client/intentClient.js";
 import type { INTENT_VERSION_TYPE } from "../types/intent.js";
 import { deepHexlify } from "../utils/deepHexlify.js";
 
@@ -87,11 +85,9 @@ export async function getIntent<
   chain extends Chain | undefined = Chain | undefined,
   account extends SmartAccount | undefined = SmartAccount | undefined,
 >(
-  client: Client<transport, chain, account, CombinedIntentRpcSchema>,
+  client: BaseIntentClient<transport, chain, account, CombinedIntentRpcSchema>,
   parameters: GetIntentParameters,
   version: INTENT_VERSION_TYPE,
-  _solanaSigner: TransactionSigner | undefined,
-  _solanaRpc: Rpc<SolanaRpcApi> | undefined,
 ): Promise<GetIntentReturnType> {
   const { gasToken, ...rest } = parameters;
   const parametersWithVersion = {

src/actions/prepareUserIntent.ts

@@ -1,27 +1,11 @@
-import type {
-  Address as SolanaAddress,
-  IInstruction,
-  Rpc,
-  SolanaRpcApi,
-  TransactionSigner,
-} from "@solana/kit";
-import {
-  appendTransactionMessageInstructions,
-  compileTransactionMessage,
-  createTransactionMessage,
-  getCompiledTransactionMessageEncoder,
-  pipe,
-  setTransactionMessageFeePayer,
-  setTransactionMessageLifetimeUsingBlockhash,
-} from "@solana/kit";
+import type { Address as SolanaAddress, ReadonlyUint8Array } from "@solana/kit";
 import {
   AccountNotFoundError,
   type KernelSmartAccountImplementation,
 } from "@zerodev/sdk";
 import type {
   Address,
   Chain,
-  Client,
   ContractFunctionParameters,
   Hex,
   Transport,
@@ -33,7 +17,10 @@ import type {
   UserOperationCall,
 } from "viem/account-abstraction";
 import { parseAccount } from "viem/utils";
-import type { CombinedIntentRpcSchema } from "../client/intentClient.js";
+import type {
+  BaseIntentClient,
+  CombinedIntentRpcSchema,
+} from "../client/intentClient.js";
 import type { INTENT_VERSION_TYPE } from "../types/intent.js";
 import { SOLANA_CHAIN_ID } from "../utils/constants.js";
 import type { GetIntentReturnType } from "./getIntent.js";
@@ -55,12 +42,6 @@ export type PrepareUserIntentParameters<
   account extends SmartAccount | undefined = SmartAccount | undefined,
   accountOverride extends SmartAccount | undefined = SmartAccount | undefined,
   calls extends readonly unknown[] = readonly unknown[],
-  solanaRpc extends Rpc<SolanaRpcApi> | undefined =
-    | Rpc<SolanaRpcApi>
-    | undefined,
-  solanaSigner extends TransactionSigner | undefined =
-    | TransactionSigner
-    | undefined,
 > = PrepareUserOperationParametersWithOptionalCalls<
   account,
   accountOverride,
@@ -76,11 +57,13 @@ export type PrepareUserIntentParameters<
     amount: bigint;
     chainId: number;
   }>;
-  instructions?: IInstruction[];
+  /**
+   * Prepared and encoded transactions for solana
+   * Built using : `getCompiledTransactionMessageEncoder().encode(compiledTransactionMessage)`
+   */
+  solTransaction?: ReadonlyUint8Array;
   gasToken?: "SPONSORED" | "NATIVE";
   chainId?: number;
-  solanaRpc?: solanaRpc;
-  solanaSigner?: solanaSigner;
 };
 
 export type PrepareUserIntentResult = GetIntentReturnType;
@@ -134,30 +117,34 @@ export type PrepareUserIntentResult = GetIntentReturnType;
  *     chainId: 10n
  *   }]
  * })
+ * 
+ * // Using solana transaction
+ * const result = await intentClient.sendUserIntent({
+ *   inputTokens: [
+ *     {
+ *       chainId: 1n,
+ *       address: '0x...',
+ *     }
+ *   ],
+ *   outputTokens: [
+ *     {
+ *       chainId: 10n,
+ *       address: '0x...',
+ *       amount: 900000n,
+ *     }
+ *   ],
+ *   solTransaction: encodedTransactionMessage,
+ * })
  */
 export async function prepareUserIntent<
   account extends SmartAccount | undefined = SmartAccount | undefined,
   chain extends Chain | undefined = Chain | undefined,
   accountOverride extends SmartAccount | undefined = undefined,
   calls extends readonly unknown[] = readonly unknown[],
-  SolanaRpc extends Rpc<SolanaRpcApi> | undefined =
-    | Rpc<SolanaRpcApi>
-    | undefined,
-  SolanaSigner extends TransactionSigner | undefined =
-    | TransactionSigner
-    | undefined,
 >(
-  client: Client<Transport, chain, account, CombinedIntentRpcSchema>,
-  parameters: PrepareUserIntentParameters<
-    account,
-    accountOverride,
-    calls,
-    SolanaRpc,
-    SolanaSigner
-  >,
+  client: BaseIntentClient<Transport, chain, account, CombinedIntentRpcSchema>,
+  parameters: PrepareUserIntentParameters<account, accountOverride, calls>,
   version: INTENT_VERSION_TYPE,
-  solanaSigner: TransactionSigner | undefined,
-  solanaRpc: Rpc<SolanaRpcApi> | undefined,
 ): Promise<PrepareUserIntentResult> {
   const { account: account_ = client.account } = parameters;
   if (!account_) throw new AccountNotFoundError();
@@ -192,29 +179,9 @@ export async function prepareUserIntent<
 
   // get instructionData
   const instructionData = await (async () => {
-    const instructions = parameters.instructions;
-    if (instructions) {
-      if (!solanaSigner || !solanaRpc)
-        throw new Error("please provide solanaSigner and solanaRpc");
-      const { value: latestBlockhash } = await solanaRpc
-        .getLatestBlockhash()
-        .send();
-      const transactionMessage = pipe(
-        createTransactionMessage({ version: 0 }),
-        (message) =>
-          setTransactionMessageFeePayer(solanaSigner.address, message),
-        (message) =>
-          setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, message),
-        (message) =>
-          appendTransactionMessageInstructions(instructions, message),
-      );
-      const compiledTransactionMessage =
-        compileTransactionMessage(transactionMessage);
-      const encodedTransactionMessage =
-        getCompiledTransactionMessageEncoder().encode(
-          compiledTransactionMessage,
-        );
-      return toHex(new Uint8Array(encodedTransactionMessage));
+    // If we got a provided solana transaction, return it
+    if (parameters.solTransaction) {
+      return toHex(new Uint8Array(parameters.solTransaction));
     }
     return "0x";
   })();
@@ -231,7 +198,7 @@ export async function prepareUserIntent<
   }
   const recipient =
     BigInt(desinationChainId) === SOLANA_CHAIN_ID
-      ? solanaSigner?.address
+      ? client.solana?.address
       : account.address;
   if (!recipient) throw new Error("please provide solanaSigner");
 
@@ -250,7 +217,5 @@ export async function prepareUserIntent<
       initData,
     },
     version,
-    solanaSigner,
-    solanaRpc,
   );
 }