@aomi-labs/client 0.1.8 → 0.1.9

package/dist/cli.js

@@ -2775,28 +2775,50 @@ async function createAAProviderState(options) {
     apiKey: options.apiKey
   });
 }
-function getOwnerParams(owner) {
-  if (!owner) {
-    return null;
-  }
-  if ("privateKey" in owner) {
-    return {
+function getDirectOwnerParams(owner) {
+  return {
+    kind: "ready",
+    ownerParams: {
       para: void 0,
       signer: privateKeyToAccount(owner.privateKey)
+    }
+  };
+}
+function getParaSessionOwnerParams(owner) {
+  if (owner.signer) {
+    return {
+      kind: "ready",
+      ownerParams: __spreadValues({
+        para: owner.session,
+        signer: owner.signer
+      }, owner.address ? { address: owner.address } : {})
     };
   }
-  if ("signer" in owner) {
-    return __spreadValues({
-      para: owner.para,
-      signer: owner.signer
-    }, owner.address ? { address: owner.address } : {});
+  return {
+    kind: "ready",
+    ownerParams: __spreadValues({
+      para: owner.session
+    }, owner.address ? { address: owner.address } : {})
+  };
+}
+function getSessionOwnerParams(owner) {
+  switch (owner.adapter) {
+    case "para":
+      return getParaSessionOwnerParams(owner);
+    default:
+      return { kind: "unsupported_adapter", adapter: owner.adapter };
+  }
+}
+function getOwnerParams(owner) {
+  if (!owner) {
+    return { kind: "missing" };
   }
-  if ("para" in owner) {
-    return __spreadValues({
-      para: owner.para
-    }, owner.address ? { address: owner.address } : {});
+  switch (owner.kind) {
+    case "direct":
+      return getDirectOwnerParams(owner);
+    case "session":
+      return getSessionOwnerParams(owner);
   }
-  return null;
 }
 function getMissingOwnerState(plan, provider) {
   return {
@@ -2804,10 +2826,18 @@ function getMissingOwnerState(plan, provider) {
     AA: null,
     isPending: false,
     error: new Error(
-      `${provider} AA account creation requires a signer or Para session.`
+      `${provider} AA account creation requires a direct owner or a supported session owner.`
     )
   };
 }
+function getUnsupportedAdapterState(plan, adapter) {
+  return {
+    plan,
+    AA: null,
+    isPending: false,
+    error: new Error(`Session adapter "${adapter}" is not implemented.`)
+  };
+}
 async function createAlchemyAAState(options) {
   var _a3, _b;
   const {
@@ -2837,11 +2867,14 @@ async function createAlchemyAAState(options) {
     fallbackToEoa: false
   });
   const ownerParams = getOwnerParams(owner);
-  if (!ownerParams) {
+  if (ownerParams.kind === "missing") {
     return getMissingOwnerState(plan, "alchemy");
   }
+  if (ownerParams.kind === "unsupported_adapter") {
+    return getUnsupportedAdapterState(plan, ownerParams.adapter);
+  }
   try {
-    const smartAccount = await createAlchemySmartAccount(__spreadProps(__spreadValues({}, ownerParams), {
+    const smartAccount = await createAlchemySmartAccount(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
       gasPolicyId,
       chain,
@@ -2896,11 +2929,14 @@ async function createPimlicoAAState(options) {
     fallbackToEoa: false
   });
   const ownerParams = getOwnerParams(owner);
-  if (!ownerParams) {
+  if (ownerParams.kind === "missing") {
     return getMissingOwnerState(plan, "pimlico");
   }
+  if (ownerParams.kind === "unsupported_adapter") {
+    return getUnsupportedAdapterState(plan, ownerParams.adapter);
+  }
   try {
-    const smartAccount = await createPimlicoSmartAccount(__spreadProps(__spreadValues({}, ownerParams), {
+    const smartAccount = await createPimlicoSmartAccount(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
       chain,
       rpcUrl,
@@ -2972,7 +3008,7 @@ async function createCliProviderState(params) {
   return createAAProviderState({
     provider: decision.provider,
     chain,
-    owner: { privateKey },
+    owner: { kind: "direct", privateKey },
     rpcUrl,
     callList,
     mode: decision.aaMode,

package/dist/index.cjs

@@ -1708,28 +1708,50 @@ async function createAAProviderState(options) {
     apiKey: options.apiKey
   });
 }
-function getOwnerParams(owner) {
-  if (!owner) {
-    return null;
-  }
-  if ("privateKey" in owner) {
-    return {
+function getDirectOwnerParams(owner) {
+  return {
+    kind: "ready",
+    ownerParams: {
       para: void 0,
       signer: (0, import_accounts.privateKeyToAccount)(owner.privateKey)
+    }
+  };
+}
+function getParaSessionOwnerParams(owner) {
+  if (owner.signer) {
+    return {
+      kind: "ready",
+      ownerParams: __spreadValues({
+        para: owner.session,
+        signer: owner.signer
+      }, owner.address ? { address: owner.address } : {})
     };
   }
-  if ("signer" in owner) {
-    return __spreadValues({
-      para: owner.para,
-      signer: owner.signer
-    }, owner.address ? { address: owner.address } : {});
+  return {
+    kind: "ready",
+    ownerParams: __spreadValues({
+      para: owner.session
+    }, owner.address ? { address: owner.address } : {})
+  };
+}
+function getSessionOwnerParams(owner) {
+  switch (owner.adapter) {
+    case "para":
+      return getParaSessionOwnerParams(owner);
+    default:
+      return { kind: "unsupported_adapter", adapter: owner.adapter };
+  }
+}
+function getOwnerParams(owner) {
+  if (!owner) {
+    return { kind: "missing" };
   }
-  if ("para" in owner) {
-    return __spreadValues({
-      para: owner.para
-    }, owner.address ? { address: owner.address } : {});
+  switch (owner.kind) {
+    case "direct":
+      return getDirectOwnerParams(owner);
+    case "session":
+      return getSessionOwnerParams(owner);
   }
-  return null;
 }
 function getMissingOwnerState(plan, provider) {
   return {
@@ -1737,10 +1759,18 @@ function getMissingOwnerState(plan, provider) {
     AA: null,
     isPending: false,
     error: new Error(
-      `${provider} AA account creation requires a signer or Para session.`
+      `${provider} AA account creation requires a direct owner or a supported session owner.`
     )
   };
 }
+function getUnsupportedAdapterState(plan, adapter) {
+  return {
+    plan,
+    AA: null,
+    isPending: false,
+    error: new Error(`Session adapter "${adapter}" is not implemented.`)
+  };
+}
 async function createAlchemyAAState(options) {
   var _a, _b;
   const {
@@ -1770,11 +1800,14 @@ async function createAlchemyAAState(options) {
     fallbackToEoa: false
   });
   const ownerParams = getOwnerParams(owner);
-  if (!ownerParams) {
+  if (ownerParams.kind === "missing") {
     return getMissingOwnerState(plan, "alchemy");
   }
+  if (ownerParams.kind === "unsupported_adapter") {
+    return getUnsupportedAdapterState(plan, ownerParams.adapter);
+  }
   try {
-    const smartAccount = await (0, import_aa_alchemy.createAlchemySmartAccount)(__spreadProps(__spreadValues({}, ownerParams), {
+    const smartAccount = await (0, import_aa_alchemy.createAlchemySmartAccount)(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
       gasPolicyId,
       chain,
@@ -1829,11 +1862,14 @@ async function createPimlicoAAState(options) {
     fallbackToEoa: false
   });
   const ownerParams = getOwnerParams(owner);
-  if (!ownerParams) {
+  if (ownerParams.kind === "missing") {
     return getMissingOwnerState(plan, "pimlico");
   }
+  if (ownerParams.kind === "unsupported_adapter") {
+    return getUnsupportedAdapterState(plan, ownerParams.adapter);
+  }
   try {
-    const smartAccount = await (0, import_aa_pimlico.createPimlicoSmartAccount)(__spreadProps(__spreadValues({}, ownerParams), {
+    const smartAccount = await (0, import_aa_pimlico.createPimlicoSmartAccount)(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
       chain,
       rpcUrl,