@aomi-labs/client 0.1.7 → 0.1.8

package/dist/index.d.cts

@@ -644,6 +644,12 @@ interface AlchemyResolveOptions {
     modeOverride?: AAExecutionMode;
     publicOnly?: boolean;
     throwOnMissingConfig?: boolean;
+    /**
+     * Pre-resolved API key. Use this in Next.js client-side code where
+     * dynamic `process.env[name]` access doesn't work.
+     */
+    apiKey?: string;
+    gasPolicyId?: string;
 }
 interface AlchemyResolvedConfig {
     chainConfig: AAChainConfig;
@@ -664,6 +670,11 @@ interface PimlicoResolveOptions {
     modeOverride?: AAExecutionMode;
     publicOnly?: boolean;
     throwOnMissingConfig?: boolean;
+    /**
+     * Pre-resolved API key. Use this in Next.js client-side code where
+     * dynamic `process.env[name]` access doesn't work.
+     */
+    apiKey?: string;
 }
 interface PimlicoResolvedConfig {
     chainConfig: AAChainConfig;
@@ -675,10 +686,20 @@ interface PimlicoResolvedConfig {
 }
 declare function resolvePimlicoConfig(options: PimlicoResolveOptions): PimlicoResolvedConfig | null;
 
+type CreateAAOwner = {
+    privateKey: `0x${string}`;
+} | {
+    signer: unknown;
+    para: unknown;
+    address?: Hex;
+} | {
+    para: unknown;
+    address?: Hex;
+};
 interface CreateAAProviderStateOptions {
     provider: AAProvider;
     chain: Chain;
-    privateKey: `0x${string}`;
+    owner: CreateAAOwner;
     rpcUrl: string;
     callList: WalletExecutionCall[];
     mode?: AAExecutionMode;
@@ -694,4 +715,4 @@ interface CreateAAProviderStateOptions {
  */
 declare function createAAProviderState(options: CreateAAProviderStateOptions): Promise<AAProviderState>;
 
-export { type AAChainConfig, type AAConfig, type AAExecutionMode, type AAExecutionPlan, type AALike, type AAProvider, type AAProviderQuery, type AAProviderState, type AASponsorshipMode, type AlchemyHookParams, type AlchemyResolveOptions, type AlchemyResolvedConfig, type AomiChatResponse, AomiClient, type AomiClientOptions, type AomiCreateThreadResponse, type AomiInterruptResponse, type AomiMessage, type AomiSSEEvent, type AomiSSEEventType, type AomiStateResponse, type AomiSystemEvent, type AomiSystemResponse, type AomiThread, type CreateAAProviderStateOptions, type CreateAlchemyAAProviderOptions, type CreatePimlicoAAProviderOptions, DEFAULT_AA_CONFIG, type ExecuteWalletCallsParams, type Logger, type ParaSmartAccountLike, type PimlicoHookParams, type PimlicoResolveOptions, type PimlicoResolvedConfig, type SendCallsSyncArgs, type SendResult, ClientSession as Session, type SessionEventMap, type SessionOptions, type TransactionExecutionResult, TypedEventEmitter, type UnwrappedEvent, type UseAlchemyAAHook, type UsePimlicoAAHook, type UserState, type WalletAtomicCapability, type WalletEip712Payload, type WalletExecutionCall, type WalletPrimitiveCall, type WalletRequest, type WalletRequestKind, type WalletRequestResult, type WalletTxPayload, adaptSmartAccount, buildAAExecutionPlan, createAAProviderState, createAlchemyAAProvider, createPimlicoAAProvider, executeWalletCalls, getAAChainConfig, getWalletExecutorReady, isAlchemySponsorshipLimitError, isAsyncCallback, isInlineCall, isProviderConfigured, isSystemError, isSystemNotice, normalizeEip712Payload, normalizeTxPayload, parseAAConfig, readEnv, resolveAlchemyConfig, resolveDefaultProvider, resolvePimlicoConfig, unwrapSystemEvent };
+export { type AAChainConfig, type AAConfig, type AAExecutionMode, type AAExecutionPlan, type AALike, type AAProvider, type AAProviderQuery, type AAProviderState, type AASponsorshipMode, type AlchemyHookParams, type AlchemyResolveOptions, type AlchemyResolvedConfig, type AomiChatResponse, AomiClient, type AomiClientOptions, type AomiCreateThreadResponse, type AomiInterruptResponse, type AomiMessage, type AomiSSEEvent, type AomiSSEEventType, type AomiStateResponse, type AomiSystemEvent, type AomiSystemResponse, type AomiThread, type CreateAAOwner, type CreateAAProviderStateOptions, type CreateAlchemyAAProviderOptions, type CreatePimlicoAAProviderOptions, DEFAULT_AA_CONFIG, type ExecuteWalletCallsParams, type Logger, type ParaSmartAccountLike, type PimlicoHookParams, type PimlicoResolveOptions, type PimlicoResolvedConfig, type SendCallsSyncArgs, type SendResult, ClientSession as Session, type SessionEventMap, type SessionOptions, type TransactionExecutionResult, TypedEventEmitter, type UnwrappedEvent, type UseAlchemyAAHook, type UsePimlicoAAHook, type UserState, type WalletAtomicCapability, type WalletEip712Payload, type WalletExecutionCall, type WalletPrimitiveCall, type WalletRequest, type WalletRequestKind, type WalletRequestResult, type WalletTxPayload, adaptSmartAccount, buildAAExecutionPlan, createAAProviderState, createAlchemyAAProvider, createPimlicoAAProvider, executeWalletCalls, getAAChainConfig, getWalletExecutorReady, isAlchemySponsorshipLimitError, isAsyncCallback, isInlineCall, isProviderConfigured, isSystemError, isSystemNotice, normalizeEip712Payload, normalizeTxPayload, parseAAConfig, readEnv, resolveAlchemyConfig, resolveDefaultProvider, resolvePimlicoConfig, unwrapSystemEvent };

package/dist/index.d.ts

@@ -644,6 +644,12 @@ interface AlchemyResolveOptions {
     modeOverride?: AAExecutionMode;
     publicOnly?: boolean;
     throwOnMissingConfig?: boolean;
+    /**
+     * Pre-resolved API key. Use this in Next.js client-side code where
+     * dynamic `process.env[name]` access doesn't work.
+     */
+    apiKey?: string;
+    gasPolicyId?: string;
 }
 interface AlchemyResolvedConfig {
     chainConfig: AAChainConfig;
@@ -664,6 +670,11 @@ interface PimlicoResolveOptions {
     modeOverride?: AAExecutionMode;
     publicOnly?: boolean;
     throwOnMissingConfig?: boolean;
+    /**
+     * Pre-resolved API key. Use this in Next.js client-side code where
+     * dynamic `process.env[name]` access doesn't work.
+     */
+    apiKey?: string;
 }
 interface PimlicoResolvedConfig {
     chainConfig: AAChainConfig;
@@ -675,10 +686,20 @@ interface PimlicoResolvedConfig {
 }
 declare function resolvePimlicoConfig(options: PimlicoResolveOptions): PimlicoResolvedConfig | null;
 
+type CreateAAOwner = {
+    privateKey: `0x${string}`;
+} | {
+    signer: unknown;
+    para: unknown;
+    address?: Hex;
+} | {
+    para: unknown;
+    address?: Hex;
+};
 interface CreateAAProviderStateOptions {
     provider: AAProvider;
     chain: Chain;
-    privateKey: `0x${string}`;
+    owner: CreateAAOwner;
     rpcUrl: string;
     callList: WalletExecutionCall[];
     mode?: AAExecutionMode;
@@ -694,4 +715,4 @@ interface CreateAAProviderStateOptions {
  */
 declare function createAAProviderState(options: CreateAAProviderStateOptions): Promise<AAProviderState>;
 
-export { type AAChainConfig, type AAConfig, type AAExecutionMode, type AAExecutionPlan, type AALike, type AAProvider, type AAProviderQuery, type AAProviderState, type AASponsorshipMode, type AlchemyHookParams, type AlchemyResolveOptions, type AlchemyResolvedConfig, type AomiChatResponse, AomiClient, type AomiClientOptions, type AomiCreateThreadResponse, type AomiInterruptResponse, type AomiMessage, type AomiSSEEvent, type AomiSSEEventType, type AomiStateResponse, type AomiSystemEvent, type AomiSystemResponse, type AomiThread, type CreateAAProviderStateOptions, type CreateAlchemyAAProviderOptions, type CreatePimlicoAAProviderOptions, DEFAULT_AA_CONFIG, type ExecuteWalletCallsParams, type Logger, type ParaSmartAccountLike, type PimlicoHookParams, type PimlicoResolveOptions, type PimlicoResolvedConfig, type SendCallsSyncArgs, type SendResult, ClientSession as Session, type SessionEventMap, type SessionOptions, type TransactionExecutionResult, TypedEventEmitter, type UnwrappedEvent, type UseAlchemyAAHook, type UsePimlicoAAHook, type UserState, type WalletAtomicCapability, type WalletEip712Payload, type WalletExecutionCall, type WalletPrimitiveCall, type WalletRequest, type WalletRequestKind, type WalletRequestResult, type WalletTxPayload, adaptSmartAccount, buildAAExecutionPlan, createAAProviderState, createAlchemyAAProvider, createPimlicoAAProvider, executeWalletCalls, getAAChainConfig, getWalletExecutorReady, isAlchemySponsorshipLimitError, isAsyncCallback, isInlineCall, isProviderConfigured, isSystemError, isSystemNotice, normalizeEip712Payload, normalizeTxPayload, parseAAConfig, readEnv, resolveAlchemyConfig, resolveDefaultProvider, resolvePimlicoConfig, unwrapSystemEvent };
+export { type AAChainConfig, type AAConfig, type AAExecutionMode, type AAExecutionPlan, type AALike, type AAProvider, type AAProviderQuery, type AAProviderState, type AASponsorshipMode, type AlchemyHookParams, type AlchemyResolveOptions, type AlchemyResolvedConfig, type AomiChatResponse, AomiClient, type AomiClientOptions, type AomiCreateThreadResponse, type AomiInterruptResponse, type AomiMessage, type AomiSSEEvent, type AomiSSEEventType, type AomiStateResponse, type AomiSystemEvent, type AomiSystemResponse, type AomiThread, type CreateAAOwner, type CreateAAProviderStateOptions, type CreateAlchemyAAProviderOptions, type CreatePimlicoAAProviderOptions, DEFAULT_AA_CONFIG, type ExecuteWalletCallsParams, type Logger, type ParaSmartAccountLike, type PimlicoHookParams, type PimlicoResolveOptions, type PimlicoResolvedConfig, type SendCallsSyncArgs, type SendResult, ClientSession as Session, type SessionEventMap, type SessionOptions, type TransactionExecutionResult, TypedEventEmitter, type UnwrappedEvent, type UseAlchemyAAHook, type UsePimlicoAAHook, type UserState, type WalletAtomicCapability, type WalletEip712Payload, type WalletExecutionCall, type WalletPrimitiveCall, type WalletRequest, type WalletRequestKind, type WalletRequestResult, type WalletTxPayload, adaptSmartAccount, buildAAExecutionPlan, createAAProviderState, createAlchemyAAProvider, createPimlicoAAProvider, executeWalletCalls, getAAChainConfig, getWalletExecutorReady, isAlchemySponsorshipLimitError, isAsyncCallback, isInlineCall, isProviderConfigured, isSystemError, isSystemNotice, normalizeEip712Payload, normalizeTxPayload, parseAAConfig, readEnv, resolveAlchemyConfig, resolveDefaultProvider, resolvePimlicoConfig, unwrapSystemEvent };

package/dist/index.js

@@ -1404,7 +1404,9 @@ function resolveAlchemyConfig(options) {
     },
     modeOverride,
     publicOnly = false,
-    throwOnMissingConfig = false
+    throwOnMissingConfig = false,
+    apiKey: preResolvedApiKey,
+    gasPolicyId: preResolvedGasPolicyId
   } = options;
   if (!calls || localPrivateKey) {
     return null;
@@ -1422,7 +1424,7 @@ function resolveAlchemyConfig(options) {
     }
     return null;
   }
-  const apiKey = readEnv(ALCHEMY_API_KEY_ENVS, { publicOnly });
+  const apiKey = preResolvedApiKey != null ? preResolvedApiKey : readEnv(ALCHEMY_API_KEY_ENVS, { publicOnly });
   if (!apiKey) {
     if (throwOnMissingConfig) {
       throw new Error("Alchemy AA requires ALCHEMY_API_KEY.");
@@ -1433,7 +1435,7 @@ function resolveAlchemyConfig(options) {
   if (!chain) {
     return null;
   }
-  const gasPolicyId = readGasPolicyEnv(
+  const gasPolicyId = preResolvedGasPolicyId != null ? preResolvedGasPolicyId : readGasPolicyEnv(
     chainConfig.chainId,
     chainSlugById,
     ALCHEMY_GAS_POLICY_ENVS,
@@ -1476,7 +1478,8 @@ function resolvePimlicoConfig(options) {
     rpcUrl,
     modeOverride,
     publicOnly = false,
-    throwOnMissingConfig = false
+    throwOnMissingConfig = false,
+    apiKey: preResolvedApiKey
   } = options;
   if (!calls || localPrivateKey) {
     return null;
@@ -1494,7 +1497,7 @@ function resolvePimlicoConfig(options) {
     }
     return null;
   }
-  const apiKey = readEnv(PIMLICO_API_KEY_ENVS, { publicOnly });
+  const apiKey = preResolvedApiKey != null ? preResolvedApiKey : readEnv(PIMLICO_API_KEY_ENVS, { publicOnly });
   if (!apiKey) {
     if (throwOnMissingConfig) {
       throw new Error("Pimlico AA requires PIMLICO_API_KEY.");
@@ -1627,15 +1630,64 @@ import { createPimlicoSmartAccount } from "@getpara/aa-pimlico";
 import { privateKeyToAccount } from "viem/accounts";
 async function createAAProviderState(options) {
   if (options.provider === "alchemy") {
-    return createAlchemyAAState(options);
+    return createAlchemyAAState({
+      chain: options.chain,
+      owner: options.owner,
+      rpcUrl: options.rpcUrl,
+      callList: options.callList,
+      mode: options.mode,
+      apiKey: options.apiKey,
+      gasPolicyId: options.gasPolicyId,
+      sponsored: options.sponsored
+    });
+  }
+  return createPimlicoAAState({
+    chain: options.chain,
+    owner: options.owner,
+    rpcUrl: options.rpcUrl,
+    callList: options.callList,
+    mode: options.mode,
+    apiKey: options.apiKey
+  });
+}
+function getOwnerParams(owner) {
+  if (!owner) {
+    return null;
+  }
+  if ("privateKey" in owner) {
+    return {
+      para: void 0,
+      signer: privateKeyToAccount(owner.privateKey)
+    };
   }
-  return createPimlicoAAState(options);
+  if ("signer" in owner) {
+    return __spreadValues({
+      para: owner.para,
+      signer: owner.signer
+    }, owner.address ? { address: owner.address } : {});
+  }
+  if ("para" in owner) {
+    return __spreadValues({
+      para: owner.para
+    }, owner.address ? { address: owner.address } : {});
+  }
+  return null;
+}
+function getMissingOwnerState(plan, provider) {
+  return {
+    plan,
+    AA: null,
+    isPending: false,
+    error: new Error(
+      `${provider} AA account creation requires a signer or Para session.`
+    )
+  };
 }
 async function createAlchemyAAState(options) {
   var _a, _b;
   const {
     chain,
-    privateKey,
+    owner,
     rpcUrl,
     callList,
     mode,
@@ -1646,7 +1698,9 @@ async function createAlchemyAAState(options) {
     chainsById: { [chain.id]: chain },
     modeOverride: mode,
     throwOnMissingConfig: true,
-    getPreferredRpcUrl: () => rpcUrl
+    getPreferredRpcUrl: () => rpcUrl,
+    apiKey: options.apiKey,
+    gasPolicyId: options.gasPolicyId
   });
   if (!resolved) {
     throw new Error("Alchemy AA config resolution failed.");
@@ -1657,17 +1711,18 @@ async function createAlchemyAAState(options) {
     sponsorship: gasPolicyId ? resolved.plan.sponsorship : "disabled",
     fallbackToEoa: false
   });
-  const signer = privateKeyToAccount(privateKey);
+  const ownerParams = getOwnerParams(owner);
+  if (!ownerParams) {
+    return getMissingOwnerState(plan, "alchemy");
+  }
   try {
-    const smartAccount = await createAlchemySmartAccount({
-      para: void 0,
-      signer,
+    const smartAccount = await createAlchemySmartAccount(__spreadProps(__spreadValues({}, ownerParams), {
       apiKey,
       gasPolicyId,
       chain,
       rpcUrl,
       mode: plan.mode
-    });
+    }));
     if (!smartAccount) {
       return {
         plan,
@@ -1695,7 +1750,7 @@ async function createPimlicoAAState(options) {
   var _a;
   const {
     chain,
-    privateKey,
+    owner,
     rpcUrl,
     callList,
     mode
@@ -1705,7 +1760,8 @@ async function createPimlicoAAState(options) {
     chainsById: { [chain.id]: chain },
     rpcUrl,
     modeOverride: mode,
-    throwOnMissingConfig: true
+    throwOnMissingConfig: true,
+    apiKey: options.apiKey
   });
   if (!resolved) {
     throw new Error("Pimlico AA config resolution failed.");
@@ -1714,16 +1770,17 @@ async function createPimlicoAAState(options) {
   const plan = __spreadProps(__spreadValues({}, resolved.plan), {
     fallbackToEoa: false
   });
-  const signer = privateKeyToAccount(privateKey);
+  const ownerParams = getOwnerParams(owner);
+  if (!ownerParams) {
+    return getMissingOwnerState(plan, "pimlico");
+  }
   try {
-    const smartAccount = await createPimlicoSmartAccount({
-      para: void 0,
-      signer,
+    const smartAccount = await createPimlicoSmartAccount(__spreadProps(__spreadValues({}, ownerParams), {
       apiKey,
       chain,
       rpcUrl,
       mode: plan.mode
-    });
+    }));
     if (!smartAccount) {
       return {
         plan,