@aomi-labs/client 0.1.21 → 0.1.22

package/dist/index.js

@@ -1272,6 +1272,9 @@ function parseAAConfig(value) {
   if (typeof value.provider !== "string" || !value.provider) {
     throw new Error("Invalid AA config: provider must be a non-empty string");
   }
+  if (value.provider !== "alchemy" && value.provider !== "pimlico") {
+    throw new Error('Invalid AA config: provider must be either "alchemy" or "pimlico"');
+  }
   if (typeof value.fallbackToEoa !== "boolean") {
     throw new Error("Invalid AA config: fallbackToEoa must be a boolean");
   }
@@ -1322,7 +1325,7 @@ function buildAAExecutionPlan(config, chainConfig) {
   };
 }
 function getWalletExecutorReady(providerState) {
-  return !providerState.plan || !providerState.isPending && (Boolean(providerState.AA) || Boolean(providerState.error) || providerState.plan.fallbackToEoa);
+  return !providerState.resolved || !providerState.pending && (Boolean(providerState.account) || Boolean(providerState.error) || providerState.resolved.fallbackToEoa);
 }
 function mapCall(call) {
   return {
@@ -1391,10 +1394,10 @@ async function executeWalletCalls(params) {
     chainsById,
     getPreferredRpcUrl
   } = params;
-  if (providerState.plan && providerState.AA) {
+  if (providerState.resolved && providerState.account) {
     return executeViaAA(callList, providerState);
   }
-  if (providerState.plan && providerState.error && !providerState.plan.fallbackToEoa) {
+  if (providerState.resolved && providerState.error && !providerState.resolved.fallbackToEoa) {
     throw providerState.error;
   }
   return executeViaEoa({
@@ -1411,26 +1414,26 @@ async function executeWalletCalls(params) {
 }
 async function executeViaAA(callList, providerState) {
   var _a;
-  const AA = providerState.AA;
-  const plan = providerState.plan;
-  if (!AA || !plan) {
+  const account = providerState.account;
+  const resolved = providerState.resolved;
+  if (!account || !resolved) {
     throw (_a = providerState.error) != null ? _a : new Error("smart_account_unavailable");
   }
   const callsPayload = callList.map(mapCall);
-  const receipt = callList.length > 1 ? await AA.sendBatchTransaction(callsPayload) : await AA.sendTransaction(callsPayload[0]);
+  const receipt = callList.length > 1 ? await account.sendBatchTransaction(callsPayload) : await account.sendTransaction(callsPayload[0]);
   const txHash = receipt.transactionHash;
-  const providerPrefix = AA.provider.toLowerCase();
-  let delegationAddress = AA.mode === "7702" ? AA.delegationAddress : void 0;
-  if (AA.mode === "7702" && !delegationAddress) {
+  const providerPrefix = account.provider.toLowerCase();
+  let delegationAddress = account.mode === "7702" ? account.delegationAddress : void 0;
+  if (account.mode === "7702" && !delegationAddress) {
     delegationAddress = await resolve7702Delegation(txHash, callList);
   }
   return {
     txHash,
     txHashes: [txHash],
-    executionKind: `${providerPrefix}_${AA.mode}`,
+    executionKind: `${providerPrefix}_${account.mode}`,
     batched: callList.length > 1,
-    sponsored: plan.sponsorship !== "disabled",
-    AAAddress: AA.AAAddress,
+    sponsored: resolved.sponsorship !== "disabled",
+    AAAddress: account.AAAddress,
     delegationAddress
   };
 }
@@ -1474,7 +1477,7 @@ async function executeViaEoa({
 }) {
   var _a, _b;
   const { createPublicClient, createWalletClient, http } = await import("viem");
-  const { privateKeyToAccount: privateKeyToAccount2 } = await import("viem/accounts");
+  const { privateKeyToAccount: privateKeyToAccount3 } = await import("viem/accounts");
   const hashes = [];
   if (localPrivateKey) {
     for (const call of callList) {
@@ -1486,7 +1489,7 @@ async function executeViaEoa({
       if (!rpcUrl) {
         throw new Error(`No RPC for chain ${call.chainId}`);
       }
-      const account = privateKeyToAccount2(localPrivateKey);
+      const account = privateKeyToAccount3(localPrivateKey);
       const walletClient = createWalletClient({
         account,
         chain,
@@ -1559,7 +1562,7 @@ async function executeViaEoa({
   };
 }
 
-// src/aa/env.ts
+// src/aa/alchemy/env.ts
 var ALCHEMY_API_KEY_ENVS = [
   "ALCHEMY_API_KEY",
   "NEXT_PUBLIC_ALCHEMY_API_KEY"
@@ -1568,10 +1571,14 @@ var ALCHEMY_GAS_POLICY_ENVS = [
   "ALCHEMY_GAS_POLICY_ID",
   "NEXT_PUBLIC_ALCHEMY_GAS_POLICY_ID"
 ];
+
+// src/aa/pimlico/env.ts
 var PIMLICO_API_KEY_ENVS = [
   "PIMLICO_API_KEY",
   "NEXT_PUBLIC_PIMLICO_API_KEY"
 ];
+
+// src/aa/env.ts
 function readEnv(candidates, options = {}) {
   var _a;
   const { publicOnly = false } = options;
@@ -1606,7 +1613,7 @@ function resolveDefaultProvider(options = {}) {
   );
 }
 
-// src/aa/resolve.ts
+// src/aa/alchemy/resolve.ts
 function resolveAlchemyConfig(options) {
   const {
     calls,
@@ -1674,77 +1681,17 @@ function resolveAlchemyConfig(options) {
     return null;
   }
   const resolvedChainConfig = modeOverride ? __spreadProps(__spreadValues({}, chainConfig), { defaultMode: modeOverride }) : chainConfig;
-  const plan = buildAAExecutionPlan(config, resolvedChainConfig);
-  return {
-    chainConfig: resolvedChainConfig,
-    plan,
+  const resolved = buildAAExecutionPlan(config, resolvedChainConfig);
+  return __spreadProps(__spreadValues({}, resolved), {
     apiKey,
     chain,
     rpcUrl: getPreferredRpcUrl(chain),
     gasPolicyId,
     mode: resolvedChainConfig.defaultMode
-  };
-}
-function resolvePimlicoConfig(options) {
-  const {
-    calls,
-    localPrivateKey,
-    accountAbstractionConfig = DEFAULT_AA_CONFIG,
-    chainsById,
-    rpcUrl,
-    modeOverride,
-    publicOnly = false,
-    throwOnMissingConfig = false,
-    apiKey: preResolvedApiKey
-  } = options;
-  if (!calls || localPrivateKey) {
-    return null;
-  }
-  const config = __spreadProps(__spreadValues({}, accountAbstractionConfig), {
-    provider: "pimlico"
   });
-  const chainConfig = getAAChainConfig(config, calls, chainsById);
-  if (!chainConfig) {
-    if (throwOnMissingConfig) {
-      const chainIds = Array.from(new Set(calls.map((c) => c.chainId)));
-      throw new Error(
-        `AA is not configured for chain ${chainIds[0]}, or batching is disabled for that chain.`
-      );
-    }
-    return null;
-  }
-  const apiKey = preResolvedApiKey != null ? preResolvedApiKey : readEnv(PIMLICO_API_KEY_ENVS, { publicOnly });
-  if (!apiKey) {
-    if (throwOnMissingConfig) {
-      throw new Error("Pimlico AA requires PIMLICO_API_KEY.");
-    }
-    return null;
-  }
-  const chain = chainsById[chainConfig.chainId];
-  if (!chain) {
-    return null;
-  }
-  if (modeOverride && !chainConfig.supportedModes.includes(modeOverride)) {
-    if (throwOnMissingConfig) {
-      throw new Error(
-        `AA mode "${modeOverride}" is not supported on chain ${chainConfig.chainId}.`
-      );
-    }
-    return null;
-  }
-  const resolvedChainConfig = modeOverride ? __spreadProps(__spreadValues({}, chainConfig), { defaultMode: modeOverride }) : chainConfig;
-  const plan = buildAAExecutionPlan(config, resolvedChainConfig);
-  return {
-    chainConfig: resolvedChainConfig,
-    plan,
-    apiKey,
-    chain,
-    rpcUrl,
-    mode: resolvedChainConfig.defaultMode
-  };
 }
 
-// src/aa/alchemy.ts
+// src/aa/alchemy/provider.ts
 function createAlchemyAAProvider({
   accountAbstractionConfig = DEFAULT_AA_CONFIG,
   useAlchemyAA,
@@ -1753,7 +1700,7 @@ function createAlchemyAAProvider({
   getPreferredRpcUrl
 }) {
   return function useAlchemyAAProvider(calls, localPrivateKey) {
-    var _a, _b;
+    var _a;
     const resolved = resolveAlchemyConfig({
       calls,
       localPrivateKey,
@@ -1773,49 +1720,16 @@ function createAlchemyAAProvider({
     } : void 0;
     const query = useAlchemyAA(params);
     return {
-      plan: (_a = resolved == null ? void 0 : resolved.plan) != null ? _a : null,
-      query,
-      AA: query.AA,
-      isPending: Boolean(resolved && query.isPending),
-      error: (_b = query.error) != null ? _b : null
+      resolved: resolved != null ? resolved : null,
+      account: query.account,
+      pending: Boolean(resolved && query.pending),
+      error: (_a = query.error) != null ? _a : null
     };
   };
 }
 
-// src/aa/pimlico.ts
-function createPimlicoAAProvider({
-  accountAbstractionConfig = DEFAULT_AA_CONFIG,
-  usePimlicoAA,
-  chainsById,
-  rpcUrl
-}) {
-  return function usePimlicoAAProvider(calls, localPrivateKey) {
-    var _a, _b;
-    const resolved = resolvePimlicoConfig({
-      calls,
-      localPrivateKey,
-      accountAbstractionConfig,
-      chainsById,
-      rpcUrl,
-      publicOnly: true
-    });
-    const params = resolved ? {
-      enabled: true,
-      apiKey: resolved.apiKey,
-      chain: resolved.chain,
-      mode: resolved.mode,
-      rpcUrl: resolved.rpcUrl
-    } : void 0;
-    const query = usePimlicoAA(params);
-    return {
-      plan: (_a = resolved == null ? void 0 : resolved.plan) != null ? _a : null,
-      query,
-      AA: query.AA,
-      isPending: Boolean(resolved && query.isPending),
-      error: (_b = query.error) != null ? _b : null
-    };
-  };
-}
+// src/aa/alchemy/create.ts
+import { privateKeyToAccount as privateKeyToAccount2 } from "viem/accounts";
 
 // src/aa/adapt.ts
 function adaptSmartAccount(account) {
@@ -1841,33 +1755,8 @@ function isAlchemySponsorshipLimitError(error) {
   return normalized.includes("gas sponsorship limit") || normalized.includes("put your team over your gas sponsorship limit") || normalized.includes("buy gas credits in your gas manager dashboard");
 }
 
-// src/aa/create.ts
-import { createAlchemySmartAccount } from "@getpara/aa-alchemy";
-import { createPimlicoSmartAccount } from "@getpara/aa-pimlico";
+// src/aa/owner.ts
 import { privateKeyToAccount } from "viem/accounts";
-var ALCHEMY_7702_DELEGATION_ADDRESS = "0x69007702764179f14F51cdce752f4f775d74E139";
-async function createAAProviderState(options) {
-  if (options.provider === "alchemy") {
-    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 getDirectOwnerParams(owner) {
   return {
     kind: "ready",
@@ -1913,24 +1802,27 @@ function getOwnerParams(owner) {
       return getSessionOwnerParams(owner);
   }
 }
-function getMissingOwnerState(plan, provider) {
+function getMissingOwnerState(resolved, provider) {
   return {
-    plan,
-    AA: null,
-    isPending: false,
+    resolved,
+    account: null,
+    pending: false,
     error: new Error(
       `${provider} AA account creation requires a direct owner or a supported session owner.`
     )
   };
 }
-function getUnsupportedAdapterState(plan, adapter) {
+function getUnsupportedAdapterState(resolved, adapter) {
   return {
-    plan,
-    AA: null,
-    isPending: false,
+    resolved,
+    account: null,
+    pending: false,
     error: new Error(`Session adapter "${adapter}" is not implemented.`)
   };
 }
+
+// src/aa/alchemy/create.ts
+var ALCHEMY_7702_DELEGATION_ADDRESS = "0x69007702764179f14F51cdce752f4f775d74E139";
 async function createAlchemyAAState(options) {
   var _a, _b;
   const {
@@ -1955,70 +1847,71 @@ async function createAlchemyAAState(options) {
   }
   const apiKey = (_a = options.apiKey) != null ? _a : resolved.apiKey;
   const gasPolicyId = sponsored ? (_b = options.gasPolicyId) != null ? _b : readEnv(ALCHEMY_GAS_POLICY_ENVS) : void 0;
-  const plan = __spreadProps(__spreadValues({}, resolved.plan), {
-    sponsorship: gasPolicyId ? resolved.plan.sponsorship : "disabled",
+  const execution = __spreadProps(__spreadValues({}, resolved), {
+    sponsorship: gasPolicyId ? resolved.sponsorship : "disabled",
     fallbackToEoa: false
   });
   const ownerParams = getOwnerParams(owner);
   if (ownerParams.kind === "missing") {
-    return getMissingOwnerState(plan, "alchemy");
+    return getMissingOwnerState(execution, "alchemy");
   }
   if (ownerParams.kind === "unsupported_adapter") {
-    return getUnsupportedAdapterState(plan, ownerParams.adapter);
+    return getUnsupportedAdapterState(execution, ownerParams.adapter);
   }
   if (owner.kind === "direct") {
     try {
       return await createAlchemyWalletApisState({
-        plan,
+        resolved: execution,
         chain,
         privateKey: owner.privateKey,
         apiKey,
         gasPolicyId,
-        mode: plan.mode
+        mode: execution.mode
       });
     } catch (error) {
       return {
-        plan,
-        AA: null,
-        isPending: false,
+        resolved: execution,
+        account: null,
+        pending: false,
         error: error instanceof Error ? error : new Error(String(error))
       };
     }
   }
   try {
+    const { createAlchemySmartAccount } = await import("@getpara/aa-alchemy");
     const smartAccount = await createAlchemySmartAccount(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
       gasPolicyId,
       chain,
       rpcUrl,
-      mode: plan.mode
+      mode: execution.mode
     }));
     if (!smartAccount) {
       return {
-        plan,
-        AA: null,
-        isPending: false,
+        resolved: execution,
+        account: null,
+        pending: false,
         error: new Error("Alchemy AA account could not be initialized.")
       };
     }
     return {
-      plan,
-      AA: adaptSmartAccount(smartAccount),
-      isPending: false,
+      resolved: execution,
+      account: adaptSmartAccount(smartAccount),
+      pending: false,
       error: null
     };
   } catch (error) {
     return {
-      plan,
-      AA: null,
-      isPending: false,
+      resolved: execution,
+      account: null,
+      pending: false,
       error: error instanceof Error ? error : new Error(String(error))
     };
   }
 }
 async function createAlchemyWalletApisState(params) {
   const { createSmartWalletClient, alchemyWalletTransport } = await import("@alchemy/wallet-apis");
-  const signer = privateKeyToAccount(params.privateKey);
+  const signer = privateKeyToAccount2(params.privateKey);
   const walletClient = createSmartWalletClient(__spreadValues({
     transport: alchemyWalletTransport({ apiKey: params.apiKey }),
     chain: params.chain,
@@ -2026,8 +1919,8 @@ async function createAlchemyWalletApisState(params) {
   }, params.gasPolicyId ? { paymaster: { policyId: params.gasPolicyId } } : {}));
   let accountAddress = signer.address;
   if (params.mode === "4337") {
-    const account = await walletClient.requestAccount();
-    accountAddress = account.address;
+    const account2 = await walletClient.requestAccount();
+    accountAddress = account2.address;
   }
   const sendCalls = async (calls) => {
     var _a, _b;
@@ -2041,7 +1934,7 @@ async function createAlchemyWalletApisState(params) {
     }
     return { transactionHash };
   };
-  const AA = {
+  const account = {
     provider: "alchemy",
     mode: params.mode,
     AAAddress: accountAddress,
@@ -2050,12 +1943,106 @@ async function createAlchemyWalletApisState(params) {
     sendBatchTransaction: async (calls) => sendCalls(calls)
   };
   return {
-    plan: params.plan,
-    AA,
-    isPending: false,
+    resolved: params.resolved,
+    account,
+    pending: false,
     error: null
   };
 }
+
+// src/aa/pimlico/resolve.ts
+function resolvePimlicoConfig(options) {
+  const {
+    calls,
+    localPrivateKey,
+    accountAbstractionConfig = DEFAULT_AA_CONFIG,
+    chainsById,
+    rpcUrl,
+    modeOverride,
+    publicOnly = false,
+    throwOnMissingConfig = false,
+    apiKey: preResolvedApiKey
+  } = options;
+  if (!calls || localPrivateKey) {
+    return null;
+  }
+  const config = __spreadProps(__spreadValues({}, accountAbstractionConfig), {
+    provider: "pimlico"
+  });
+  const chainConfig = getAAChainConfig(config, calls, chainsById);
+  if (!chainConfig) {
+    if (throwOnMissingConfig) {
+      const chainIds = Array.from(new Set(calls.map((c) => c.chainId)));
+      throw new Error(
+        `AA is not configured for chain ${chainIds[0]}, or batching is disabled for that chain.`
+      );
+    }
+    return null;
+  }
+  const apiKey = preResolvedApiKey != null ? preResolvedApiKey : readEnv(PIMLICO_API_KEY_ENVS, { publicOnly });
+  if (!apiKey) {
+    if (throwOnMissingConfig) {
+      throw new Error("Pimlico AA requires PIMLICO_API_KEY.");
+    }
+    return null;
+  }
+  const chain = chainsById[chainConfig.chainId];
+  if (!chain) {
+    return null;
+  }
+  if (modeOverride && !chainConfig.supportedModes.includes(modeOverride)) {
+    if (throwOnMissingConfig) {
+      throw new Error(
+        `AA mode "${modeOverride}" is not supported on chain ${chainConfig.chainId}.`
+      );
+    }
+    return null;
+  }
+  const resolvedChainConfig = modeOverride ? __spreadProps(__spreadValues({}, chainConfig), { defaultMode: modeOverride }) : chainConfig;
+  const resolved = buildAAExecutionPlan(config, resolvedChainConfig);
+  return __spreadProps(__spreadValues({}, resolved), {
+    apiKey,
+    chain,
+    rpcUrl,
+    mode: resolvedChainConfig.defaultMode
+  });
+}
+
+// src/aa/pimlico/provider.ts
+function createPimlicoAAProvider({
+  accountAbstractionConfig = DEFAULT_AA_CONFIG,
+  usePimlicoAA,
+  chainsById,
+  rpcUrl
+}) {
+  return function usePimlicoAAProvider(calls, localPrivateKey) {
+    var _a;
+    const resolved = resolvePimlicoConfig({
+      calls,
+      localPrivateKey,
+      accountAbstractionConfig,
+      chainsById,
+      rpcUrl,
+      publicOnly: true
+    });
+    const params = resolved ? {
+      enabled: true,
+      apiKey: resolved.apiKey,
+      chain: resolved.chain,
+      mode: resolved.mode,
+      rpcUrl: resolved.rpcUrl
+    } : void 0;
+    const query = usePimlicoAA(params);
+    return {
+      resolved: resolved != null ? resolved : null,
+      account: query.account,
+      pending: Boolean(resolved && query.pending),
+      error: (_a = query.error) != null ? _a : null
+    };
+  };
+}
+
+// src/aa/pimlico/create.ts
 async function createPimlicoAAState(options) {
   var _a;
   const {
@@ -2077,46 +2064,71 @@ async function createPimlicoAAState(options) {
     throw new Error("Pimlico AA config resolution failed.");
   }
   const apiKey = (_a = options.apiKey) != null ? _a : resolved.apiKey;
-  const plan = __spreadProps(__spreadValues({}, resolved.plan), {
+  const execution = __spreadProps(__spreadValues({}, resolved), {
     fallbackToEoa: false
   });
   const ownerParams = getOwnerParams(owner);
   if (ownerParams.kind === "missing") {
-    return getMissingOwnerState(plan, "pimlico");
+    return getMissingOwnerState(execution, "pimlico");
   }
   if (ownerParams.kind === "unsupported_adapter") {
-    return getUnsupportedAdapterState(plan, ownerParams.adapter);
+    return getUnsupportedAdapterState(execution, ownerParams.adapter);
   }
   try {
+    const { createPimlicoSmartAccount } = await import("@getpara/aa-pimlico");
     const smartAccount = await createPimlicoSmartAccount(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
       chain,
       rpcUrl,
-      mode: plan.mode
+      mode: execution.mode
     }));
     if (!smartAccount) {
       return {
-        plan,
-        AA: null,
-        isPending: false,
+        resolved: execution,
+        account: null,
+        pending: false,
         error: new Error("Pimlico AA account could not be initialized.")
       };
     }
     return {
-      plan,
-      AA: adaptSmartAccount(smartAccount),
-      isPending: false,
+      resolved: execution,
+      account: adaptSmartAccount(smartAccount),
+      pending: false,
       error: null
     };
   } catch (error) {
     return {
-      plan,
-      AA: null,
-      isPending: false,
+      resolved: execution,
+      account: null,
+      pending: false,
       error: error instanceof Error ? error : new Error(String(error))
     };
   }
 }
+
+// src/aa/create.ts
+async function createAAProviderState(options) {
+  if (options.provider === "alchemy") {
+    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
+  });
+}
 export {
   AomiClient,
   CLIENT_TYPE_TS_CLI,