@owney/sdk 0.7.7-beta.1 → 0.7.7-beta.3

package/dist/index.cjs

@@ -879,6 +879,12 @@ var ZyfaiAgent = class {
   connectedAddress = null;
   connectedChainId = null;
   smartWalletCache = /* @__PURE__ */ new Map();
+  /**
+   * `${eoa}:${chainId}` keys we have already tried createSessionKey for. Guards
+   * against re-running it on every activation/deposit when Zyfai's
+   * `hasActiveSessionKey` does not flip to true — see ensureSessionKey.
+   */
+  sessionKeyAttempts = /* @__PURE__ */ new Set();
   connectAuthPromise = null;
   rpcUrls;
   publicClients = /* @__PURE__ */ new Map();
@@ -1354,6 +1360,10 @@ var ZyfaiAgent = class {
     try {
       const { portfolio } = await this.sdk.getPositions(ownerAddress);
       const raw = portfolio;
+      debugLog("zyfai:onboard", "wallet state from getPositions", {
+        predeployed: raw?.predeployed,
+        hasActiveSessionKey: raw?.hasActiveSessionKey
+      });
       return {
         predeployed: raw?.predeployed,
         hasActiveSessionKey: raw?.hasActiveSessionKey
@@ -1368,14 +1378,38 @@ var ZyfaiAgent = class {
   }
   async isPredeployedPoolWallet(ownerAddress, smartWallet) {
     const { predeployed } = await this.readWalletState(ownerAddress);
-    if (typeof predeployed === "boolean") return predeployed;
+    if (typeof predeployed === "boolean") {
+      debugLog(
+        "zyfai:onboard",
+        `wallet class: ${predeployed ? "PREDEPLOYED (new flow)" : "OLD (legacy flow)"}`,
+        { source: "getPositions.predeployed", predeployed }
+      );
+      return predeployed;
+    }
     const internals = this.sdk;
     if (typeof internals.isPredeployed === "boolean") {
+      debugLog(
+        "zyfai:onboard",
+        `wallet class: ${internals.isPredeployed ? "PREDEPLOYED (new flow)" : "OLD (legacy flow)"}`,
+        {
+          source: "login response (cached)",
+          predeployed: internals.isPredeployed
+        }
+      );
       return internals.isPredeployed;
     }
     try {
       const byEoa = await this.sdk.getSmartWalletByEOA(ownerAddress);
-      return typeof byEoa?.smartWallet === "string" && byEoa.smartWallet.toLowerCase() === smartWallet.toLowerCase();
+      const isPool = typeof byEoa?.smartWallet === "string" && byEoa.smartWallet.toLowerCase() === smartWallet.toLowerCase();
+      debugLog(
+        "zyfai:onboard",
+        `wallet class: ${isPool ? "PREDEPLOYED (new flow)" : "OLD (legacy flow)"}`,
+        {
+          source: "getSmartWalletByEOA fallback",
+          poolRecord: byEoa?.smartWallet
+        }
+      );
+      return isPool;
     } catch (error) {
       console.warn(
         "[zyfai] getSmartWalletByEOA failed; assuming a legacy wallet:",
@@ -1413,7 +1447,17 @@ var ZyfaiAgent = class {
         ownerAddress,
         chainId
       );
-      if (!wallet.isDeployed) return;
+      debugLog("zyfai:onboard", `activation check on chain ${chainId}`, {
+        smartWallet: wallet.address,
+        isDeployed: wallet.isDeployed
+      });
+      if (!wallet.isDeployed) {
+        debugLog(
+          "zyfai:onboard",
+          "Safe not deployed on this chain; activation does nothing (deposit owns deploys)"
+        );
+        return;
+      }
       const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
       await this.ensureSessionKey(
         ownerAddress,
@@ -1429,23 +1473,50 @@ var ZyfaiAgent = class {
     }
   }
   async ensureSessionKey(ownerAddress, chainId, smartWallet, hasActiveSessionKey) {
+    const attemptKey = `${ownerAddress.toLowerCase()}:${chainId}`;
+    if (this.sessionKeyAttempts.has(attemptKey)) {
+      debugLog(
+        "zyfai:onboard",
+        "session key: already attempted this session, skipping",
+        { chainId }
+      );
+      return;
+    }
     try {
-      if (hasActiveSessionKey === false) {
-        console.warn(
-          `[zyfai] no session key on record for ${ownerAddress}; creating one for chain ${chainId}.`
+      if (hasActiveSessionKey === true) {
+        debugLog(
+          "zyfai:onboard",
+          "session key: already on record -> nothing to do",
+          { chainId }
         );
-        await this.sdk.createSessionKey(ownerAddress, chainId);
         return;
       }
-      const installed = await this.readSmartSessionsInstalled(
-        chainId,
-        smartWallet
-      );
-      if (installed) return;
+      if (hasActiveSessionKey === void 0) {
+        const installed = await this.readSmartSessionsInstalled(
+          chainId,
+          smartWallet
+        );
+        debugLog(
+          "zyfai:onboard",
+          `session key: Zyfai state unavailable; on-chain validator ${installed ? "INSTALLED" : "MISSING"}`,
+          { smartWallet, chainId }
+        );
+        if (installed) return;
+      }
+      this.sessionKeyAttempts.add(attemptKey);
       console.warn(
-        `[zyfai] Safe ${smartWallet} has no smart-sessions validator on chain ${chainId}; creating a session key so the agent can allocate.`
+        `[zyfai] no session key for ${smartWallet} on chain ${chainId}; creating one so the agent can allocate.`
       );
+      debugLog("zyfai:onboard", "session key: calling createSessionKey", {
+        chainId,
+        smartWallet,
+        hasActiveSessionKey
+      });
       await this.sdk.createSessionKey(ownerAddress, chainId);
+      debugLog("zyfai:onboard", "session key: createSessionKey succeeded", {
+        chainId,
+        smartWallet
+      });
     } catch (error) {
       console.warn(
         "[zyfai] createSessionKey skipped (non-fatal):",
@@ -1483,7 +1554,17 @@ var ZyfaiAgent = class {
    */
   async ensureWalletDeployed(ownerAddress, chainId) {
     const wallet = await this.sdk.getSmartWalletAddress(ownerAddress, chainId);
+    debugLog("zyfai:onboard", `--- deposit onboarding, chain ${chainId} ---`, {
+      eoa: ownerAddress,
+      smartWallet: wallet.address,
+      isDeployed: wallet.isDeployed,
+      isOwner: wallet.isOwner
+    });
     if (wallet.isDeployed) {
+      debugLog(
+        "zyfai:onboard",
+        "Safe already has code -> no deploy needed, checking the session key"
+      );
       const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
       await this.ensureSessionKey(
         ownerAddress,
@@ -1506,14 +1587,27 @@ var ZyfaiAgent = class {
       this.sdk.deploySafe(ownerAddress, chainId, "aggressive", true)
     );
     const [first, second] = poolFirst ? [deployAsPool, deployAsLegacy] : [deployAsLegacy, deployAsPool];
+    debugLog(
+      "zyfai:onboard",
+      `Safe has no code on chain ${chainId} -> deploying via ${poolFirst ? "deployOnChains (pool path)" : "deploySafe(createSessionKey=true) (legacy path)"}`
+    );
     try {
       await first();
+      debugLog(
+        "zyfai:onboard",
+        `${poolFirst ? "deployOnChains" : "deploySafe"} succeeded`
+      );
     } catch (error) {
       console.warn(
         `[zyfai] ${poolFirst ? "deployOnChains" : "deploySafe"} failed on chain ${chainId}; trying the other deploy path:`,
         error instanceof Error ? error.message : String(error)
       );
+      debugLog(
+        "zyfai:onboard",
+        `falling back to ${poolFirst ? "deploySafe (legacy path)" : "deployOnChains (pool path)"}`
+      );
       await second();
+      debugLog("zyfai:onboard", "fallback deploy path succeeded");
     }
     const redeployed = await this.sdk.getSmartWalletAddress(
       ownerAddress,

package/dist/index.js

@@ -846,6 +846,12 @@ var ZyfaiAgent = class {
   connectedAddress = null;
   connectedChainId = null;
   smartWalletCache = /* @__PURE__ */ new Map();
+  /**
+   * `${eoa}:${chainId}` keys we have already tried createSessionKey for. Guards
+   * against re-running it on every activation/deposit when Zyfai's
+   * `hasActiveSessionKey` does not flip to true — see ensureSessionKey.
+   */
+  sessionKeyAttempts = /* @__PURE__ */ new Set();
   connectAuthPromise = null;
   rpcUrls;
   publicClients = /* @__PURE__ */ new Map();
@@ -1321,6 +1327,10 @@ var ZyfaiAgent = class {
     try {
       const { portfolio } = await this.sdk.getPositions(ownerAddress);
       const raw = portfolio;
+      debugLog("zyfai:onboard", "wallet state from getPositions", {
+        predeployed: raw?.predeployed,
+        hasActiveSessionKey: raw?.hasActiveSessionKey
+      });
       return {
         predeployed: raw?.predeployed,
         hasActiveSessionKey: raw?.hasActiveSessionKey
@@ -1335,14 +1345,38 @@ var ZyfaiAgent = class {
   }
   async isPredeployedPoolWallet(ownerAddress, smartWallet) {
     const { predeployed } = await this.readWalletState(ownerAddress);
-    if (typeof predeployed === "boolean") return predeployed;
+    if (typeof predeployed === "boolean") {
+      debugLog(
+        "zyfai:onboard",
+        `wallet class: ${predeployed ? "PREDEPLOYED (new flow)" : "OLD (legacy flow)"}`,
+        { source: "getPositions.predeployed", predeployed }
+      );
+      return predeployed;
+    }
     const internals = this.sdk;
     if (typeof internals.isPredeployed === "boolean") {
+      debugLog(
+        "zyfai:onboard",
+        `wallet class: ${internals.isPredeployed ? "PREDEPLOYED (new flow)" : "OLD (legacy flow)"}`,
+        {
+          source: "login response (cached)",
+          predeployed: internals.isPredeployed
+        }
+      );
       return internals.isPredeployed;
     }
     try {
       const byEoa = await this.sdk.getSmartWalletByEOA(ownerAddress);
-      return typeof byEoa?.smartWallet === "string" && byEoa.smartWallet.toLowerCase() === smartWallet.toLowerCase();
+      const isPool = typeof byEoa?.smartWallet === "string" && byEoa.smartWallet.toLowerCase() === smartWallet.toLowerCase();
+      debugLog(
+        "zyfai:onboard",
+        `wallet class: ${isPool ? "PREDEPLOYED (new flow)" : "OLD (legacy flow)"}`,
+        {
+          source: "getSmartWalletByEOA fallback",
+          poolRecord: byEoa?.smartWallet
+        }
+      );
+      return isPool;
     } catch (error) {
       console.warn(
         "[zyfai] getSmartWalletByEOA failed; assuming a legacy wallet:",
@@ -1380,7 +1414,17 @@ var ZyfaiAgent = class {
         ownerAddress,
         chainId
       );
-      if (!wallet.isDeployed) return;
+      debugLog("zyfai:onboard", `activation check on chain ${chainId}`, {
+        smartWallet: wallet.address,
+        isDeployed: wallet.isDeployed
+      });
+      if (!wallet.isDeployed) {
+        debugLog(
+          "zyfai:onboard",
+          "Safe not deployed on this chain; activation does nothing (deposit owns deploys)"
+        );
+        return;
+      }
       const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
       await this.ensureSessionKey(
         ownerAddress,
@@ -1396,23 +1440,50 @@ var ZyfaiAgent = class {
     }
   }
   async ensureSessionKey(ownerAddress, chainId, smartWallet, hasActiveSessionKey) {
+    const attemptKey = `${ownerAddress.toLowerCase()}:${chainId}`;
+    if (this.sessionKeyAttempts.has(attemptKey)) {
+      debugLog(
+        "zyfai:onboard",
+        "session key: already attempted this session, skipping",
+        { chainId }
+      );
+      return;
+    }
     try {
-      if (hasActiveSessionKey === false) {
-        console.warn(
-          `[zyfai] no session key on record for ${ownerAddress}; creating one for chain ${chainId}.`
+      if (hasActiveSessionKey === true) {
+        debugLog(
+          "zyfai:onboard",
+          "session key: already on record -> nothing to do",
+          { chainId }
         );
-        await this.sdk.createSessionKey(ownerAddress, chainId);
         return;
       }
-      const installed = await this.readSmartSessionsInstalled(
-        chainId,
-        smartWallet
-      );
-      if (installed) return;
+      if (hasActiveSessionKey === void 0) {
+        const installed = await this.readSmartSessionsInstalled(
+          chainId,
+          smartWallet
+        );
+        debugLog(
+          "zyfai:onboard",
+          `session key: Zyfai state unavailable; on-chain validator ${installed ? "INSTALLED" : "MISSING"}`,
+          { smartWallet, chainId }
+        );
+        if (installed) return;
+      }
+      this.sessionKeyAttempts.add(attemptKey);
       console.warn(
-        `[zyfai] Safe ${smartWallet} has no smart-sessions validator on chain ${chainId}; creating a session key so the agent can allocate.`
+        `[zyfai] no session key for ${smartWallet} on chain ${chainId}; creating one so the agent can allocate.`
       );
+      debugLog("zyfai:onboard", "session key: calling createSessionKey", {
+        chainId,
+        smartWallet,
+        hasActiveSessionKey
+      });
       await this.sdk.createSessionKey(ownerAddress, chainId);
+      debugLog("zyfai:onboard", "session key: createSessionKey succeeded", {
+        chainId,
+        smartWallet
+      });
     } catch (error) {
       console.warn(
         "[zyfai] createSessionKey skipped (non-fatal):",
@@ -1450,7 +1521,17 @@ var ZyfaiAgent = class {
    */
   async ensureWalletDeployed(ownerAddress, chainId) {
     const wallet = await this.sdk.getSmartWalletAddress(ownerAddress, chainId);
+    debugLog("zyfai:onboard", `--- deposit onboarding, chain ${chainId} ---`, {
+      eoa: ownerAddress,
+      smartWallet: wallet.address,
+      isDeployed: wallet.isDeployed,
+      isOwner: wallet.isOwner
+    });
     if (wallet.isDeployed) {
+      debugLog(
+        "zyfai:onboard",
+        "Safe already has code -> no deploy needed, checking the session key"
+      );
       const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
       await this.ensureSessionKey(
         ownerAddress,
@@ -1473,14 +1554,27 @@ var ZyfaiAgent = class {
       this.sdk.deploySafe(ownerAddress, chainId, "aggressive", true)
     );
     const [first, second] = poolFirst ? [deployAsPool, deployAsLegacy] : [deployAsLegacy, deployAsPool];
+    debugLog(
+      "zyfai:onboard",
+      `Safe has no code on chain ${chainId} -> deploying via ${poolFirst ? "deployOnChains (pool path)" : "deploySafe(createSessionKey=true) (legacy path)"}`
+    );
     try {
       await first();
+      debugLog(
+        "zyfai:onboard",
+        `${poolFirst ? "deployOnChains" : "deploySafe"} succeeded`
+      );
     } catch (error) {
       console.warn(
         `[zyfai] ${poolFirst ? "deployOnChains" : "deploySafe"} failed on chain ${chainId}; trying the other deploy path:`,
         error instanceof Error ? error.message : String(error)
       );
+      debugLog(
+        "zyfai:onboard",
+        `falling back to ${poolFirst ? "deploySafe (legacy path)" : "deployOnChains (pool path)"}`
+      );
       await second();
+      debugLog("zyfai:onboard", "fallback deploy path succeeded");
     }
     const redeployed = await this.sdk.getSmartWalletAddress(
       ownerAddress,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.7.7-beta.1",
+  "version": "0.7.7-beta.3",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",