@aomi-labs/client 0.1.7 → 0.1.8

package/dist/cli.js

@@ -2602,7 +2602,9 @@ function resolveAlchemyConfig(options) {
     },
     modeOverride,
     publicOnly = false,
-    throwOnMissingConfig = false
+    throwOnMissingConfig = false,
+    apiKey: preResolvedApiKey,
+    gasPolicyId: preResolvedGasPolicyId
   } = options;
   if (!calls || localPrivateKey) {
     return null;
@@ -2620,7 +2622,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.");
@@ -2631,7 +2633,7 @@ function resolveAlchemyConfig(options) {
   if (!chain) {
     return null;
   }
-  const gasPolicyId = readGasPolicyEnv(
+  const gasPolicyId = preResolvedGasPolicyId != null ? preResolvedGasPolicyId : readGasPolicyEnv(
     chainConfig.chainId,
     chainSlugById,
     ALCHEMY_GAS_POLICY_ENVS,
@@ -2674,7 +2676,8 @@ function resolvePimlicoConfig(options) {
     rpcUrl,
     modeOverride,
     publicOnly = false,
-    throwOnMissingConfig = false
+    throwOnMissingConfig = false,
+    apiKey: preResolvedApiKey
   } = options;
   if (!calls || localPrivateKey) {
     return null;
@@ -2692,7 +2695,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.");
@@ -2752,15 +2755,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)
+    };
+  }
+  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 createPimlicoAAState(options);
+  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 _a3, _b;
   const {
     chain,
-    privateKey,
+    owner,
     rpcUrl,
     callList,
     mode,
@@ -2771,7 +2823,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.");
@@ -2782,17 +2836,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,
@@ -2820,7 +2875,7 @@ async function createPimlicoAAState(options) {
   var _a3;
   const {
     chain,
-    privateKey,
+    owner,
     rpcUrl,
     callList,
     mode
@@ -2830,7 +2885,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.");
@@ -2839,16 +2895,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,
@@ -2915,7 +2972,7 @@ async function createCliProviderState(params) {
   return createAAProviderState({
     provider: decision.provider,
     chain,
-    privateKey,
+    owner: { privateKey },
     rpcUrl,
     callList,
     mode: decision.aaMode,

package/dist/index.cjs

@@ -1462,7 +1462,9 @@ function resolveAlchemyConfig(options) {
     },
     modeOverride,
     publicOnly = false,
-    throwOnMissingConfig = false
+    throwOnMissingConfig = false,
+    apiKey: preResolvedApiKey,
+    gasPolicyId: preResolvedGasPolicyId
   } = options;
   if (!calls || localPrivateKey) {
     return null;
@@ -1480,7 +1482,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.");
@@ -1491,7 +1493,7 @@ function resolveAlchemyConfig(options) {
   if (!chain) {
     return null;
   }
-  const gasPolicyId = readGasPolicyEnv(
+  const gasPolicyId = preResolvedGasPolicyId != null ? preResolvedGasPolicyId : readGasPolicyEnv(
     chainConfig.chainId,
     chainSlugById,
     ALCHEMY_GAS_POLICY_ENVS,
@@ -1534,7 +1536,8 @@ function resolvePimlicoConfig(options) {
     rpcUrl,
     modeOverride,
     publicOnly = false,
-    throwOnMissingConfig = false
+    throwOnMissingConfig = false,
+    apiKey: preResolvedApiKey
   } = options;
   if (!calls || localPrivateKey) {
     return null;
@@ -1552,7 +1555,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.");
@@ -1685,15 +1688,64 @@ var import_aa_pimlico = require("@getpara/aa-pimlico");
 var import_accounts = require("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: (0, import_accounts.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,
@@ -1704,7 +1756,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.");
@@ -1715,17 +1769,18 @@ async function createAlchemyAAState(options) {
     sponsorship: gasPolicyId ? resolved.plan.sponsorship : "disabled",
     fallbackToEoa: false
   });
-  const signer = (0, import_accounts.privateKeyToAccount)(privateKey);
+  const ownerParams = getOwnerParams(owner);
+  if (!ownerParams) {
+    return getMissingOwnerState(plan, "alchemy");
+  }
   try {
-    const smartAccount = await (0, import_aa_alchemy.createAlchemySmartAccount)({
-      para: void 0,
-      signer,
+    const smartAccount = await (0, import_aa_alchemy.createAlchemySmartAccount)(__spreadProps(__spreadValues({}, ownerParams), {
       apiKey,
       gasPolicyId,
       chain,
       rpcUrl,
       mode: plan.mode
-    });
+    }));
     if (!smartAccount) {
       return {
         plan,
@@ -1753,7 +1808,7 @@ async function createPimlicoAAState(options) {
   var _a;
   const {
     chain,
-    privateKey,
+    owner,
     rpcUrl,
     callList,
     mode
@@ -1763,7 +1818,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.");
@@ -1772,16 +1828,17 @@ async function createPimlicoAAState(options) {
   const plan = __spreadProps(__spreadValues({}, resolved.plan), {
     fallbackToEoa: false
   });
-  const signer = (0, import_accounts.privateKeyToAccount)(privateKey);
+  const ownerParams = getOwnerParams(owner);
+  if (!ownerParams) {
+    return getMissingOwnerState(plan, "pimlico");
+  }
   try {
-    const smartAccount = await (0, import_aa_pimlico.createPimlicoSmartAccount)({
-      para: void 0,
-      signer,
+    const smartAccount = await (0, import_aa_pimlico.createPimlicoSmartAccount)(__spreadProps(__spreadValues({}, ownerParams), {
       apiKey,
       chain,
       rpcUrl,
       mode: plan.mode
-    });
+    }));
     if (!smartAccount) {
       return {
         plan,