@owney/sdk 0.7.5 → 0.7.7-beta.1

package/dist/index.cjs

@@ -825,6 +825,9 @@ function debugLog(scope, message, data) {
 }
 
 // src/agents/zyfai/zyfai.agent.ts
+var ERC7579_IS_MODULE_INSTALLED_ABI = (0, import_viem.parseAbi)([
+  "function isModuleInstalled(uint256 moduleTypeId, address module, bytes additionalContext) view returns (bool)"
+]);
 var DEFAULT_ZYFAI_RPC_URLS = {
   8453: "https://base-mainnet.g.alchemy.com/v2/ZWyVU-9XfS3z8Rn-xkq7V",
   42161: "https://arb-mainnet.g.alchemy.com/v2/ZWyVU-9XfS3z8Rn-xkq7V",
@@ -1142,7 +1145,12 @@ var ZyfaiAgent = class {
       const validChainId = isValidChainId(chainId);
       await Promise.all([
         this.ensureProtocolsSynced(validChainId, "USDC"),
-        this.ensureProtocolsSynced(validChainId, "WETH")
+        this.ensureProtocolsSynced(validChainId, "WETH"),
+        // Retrofit a session key for old wallets that are already deployed and
+        // funded but never got one — otherwise their balance stays idle until
+        // they happen to deposit again. Only touches Safes that are missing the
+        // validator, so pool-wallet users see no prompt. Non-fatal.
+        this.ensureSessionKeyIfDeployed(validChainId)
       ]);
     } catch (error) {
       throw error;
@@ -1328,7 +1336,43 @@ var ZyfaiAgent = class {
    * recoverable (ensureWalletDeployed tries the other deploy call), but
    * failing the deposit outright is not.
    */
+  /**
+   * Zyfai's own answer to "what kind of wallet is this, and can the agent act on
+   * it", read from the positions payload (`GET /data/position`, which
+   * `getPositions` wraps).
+   *
+   * `predeployed` and `hasActiveSessionKey` are both returned at runtime but
+   * declared on neither `Portfolio` nor their docs, hence the cast. Verified
+   * live: an old wallet reports `{predeployed: false, hasActiveSessionKey:
+   * false}` while a pool wallet reports `{true, true}`.
+   *
+   * Preferred over the SDK's private `isPredeployed`, which is cached from the
+   * login response and can go stale mid-session. Returns an empty object on any
+   * failure so every caller degrades to its own fallback.
+   */
+  async readWalletState(ownerAddress) {
+    try {
+      const { portfolio } = await this.sdk.getPositions(ownerAddress);
+      const raw = portfolio;
+      return {
+        predeployed: raw?.predeployed,
+        hasActiveSessionKey: raw?.hasActiveSessionKey
+      };
+    } catch (error) {
+      console.warn(
+        "[zyfai] getPositions wallet-state read failed (non-fatal):",
+        error instanceof Error ? error.message : String(error)
+      );
+      return {};
+    }
+  }
   async isPredeployedPoolWallet(ownerAddress, smartWallet) {
+    const { predeployed } = await this.readWalletState(ownerAddress);
+    if (typeof predeployed === "boolean") return predeployed;
+    const internals = this.sdk;
+    if (typeof internals.isPredeployed === "boolean") {
+      return internals.isPredeployed;
+    }
     try {
       const byEoa = await this.sdk.getSmartWalletByEOA(ownerAddress);
       return typeof byEoa?.smartWallet === "string" && byEoa.smartWallet.toLowerCase() === smartWallet.toLowerCase();
@@ -1340,6 +1384,85 @@ var ZyfaiAgent = class {
       return false;
     }
   }
+  /**
+   * Ensure Zyfai's automation can actually act on the user's Safe for this
+   * chain, by making sure a session key exists.
+   *
+   * Old wallets (pre-0.2.44) are deployed WITHOUT the smart-sessions validator,
+   * so Zyfai's rebalancer has no authorised path to move funds: deposits land
+   * and then sit as raw tokens forever. Pre-deployed pool wallets ship with the
+   * module already installed, which is why they never needed this.
+   *
+   * The gate is the on-chain module, not the wallet's class: it is the exact
+   * condition that matters, it needs no guessing from API shapes, and it means
+   * pool-wallet users are never prompted for a signature they don't need.
+   *
+   * Non-fatal by design. A failure here must not block a deposit — the funds
+   * still arrive safely in the Safe, they just won't be deployed into a pool
+   * until a session key exists.
+   */
+  /**
+   * Activation-time variant: only acts when the Safe already has code on this
+   * chain. Activation must never deploy anything — that is deposit's job, and it
+   * would mean surprise on-chain work just for opening the app.
+   */
+  async ensureSessionKeyIfDeployed(chainId) {
+    try {
+      const ownerAddress = this.getAddress();
+      const wallet = await this.sdk.getSmartWalletAddress(
+        ownerAddress,
+        chainId
+      );
+      if (!wallet.isDeployed) return;
+      const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
+      await this.ensureSessionKey(
+        ownerAddress,
+        chainId,
+        wallet.address,
+        hasActiveSessionKey
+      );
+    } catch (error) {
+      console.warn(
+        "[zyfai] session-key check at activation failed (non-fatal):",
+        error instanceof Error ? error.message : String(error)
+      );
+    }
+  }
+  async ensureSessionKey(ownerAddress, chainId, smartWallet, hasActiveSessionKey) {
+    try {
+      if (hasActiveSessionKey === false) {
+        console.warn(
+          `[zyfai] no session key on record for ${ownerAddress}; creating one for chain ${chainId}.`
+        );
+        await this.sdk.createSessionKey(ownerAddress, chainId);
+        return;
+      }
+      const installed = await this.readSmartSessionsInstalled(
+        chainId,
+        smartWallet
+      );
+      if (installed) return;
+      console.warn(
+        `[zyfai] Safe ${smartWallet} has no smart-sessions validator on chain ${chainId}; creating a session key so the agent can allocate.`
+      );
+      await this.sdk.createSessionKey(ownerAddress, chainId);
+    } catch (error) {
+      console.warn(
+        "[zyfai] createSessionKey skipped (non-fatal):",
+        error instanceof Error ? error.message : String(error)
+      );
+    }
+  }
+  /** Ground truth for "can Zyfai's automation act on this Safe, on this chain". */
+  async readSmartSessionsInstalled(chainId, smartWallet) {
+    return this.getPublicClient(chainId).readContract({
+      address: smartWallet,
+      abi: ERC7579_IS_MODULE_INSTALLED_ABI,
+      functionName: "isModuleInstalled",
+      // moduleTypeId 1 = validator (ERC-7579)
+      args: [1n, import_sdk.SMART_SESSIONS_VALIDATOR, "0x"]
+    });
+  }
   /**
    * Guarantee the user's Safe has code on `chainId` before anything transfers
    * funds into it, and return its address.
@@ -1360,17 +1483,27 @@ var ZyfaiAgent = class {
    */
   async ensureWalletDeployed(ownerAddress, chainId) {
     const wallet = await this.sdk.getSmartWalletAddress(ownerAddress, chainId);
-    if (wallet.isDeployed) return wallet.address;
+    if (wallet.isDeployed) {
+      const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
+      await this.ensureSessionKey(
+        ownerAddress,
+        chainId,
+        wallet.address,
+        hasActiveSessionKey
+      );
+      return wallet.address;
+    }
     const poolFirst = await this.isPredeployedPoolWallet(
       ownerAddress,
       wallet.address
     );
     const deployAsPool = () => this.sdk.deployOnChains([chainId]);
     const deployAsLegacy = () => (
-      // `createSessionKey: false` — session keys are backend-owned since the
-      // predeployed-pool rollout; asking for one here costs a signature prompt
-      // and is rejected anyway.
-      this.sdk.deploySafe(ownerAddress, chainId, "aggressive", false)
+      // `createSessionKey: true` — per Zyfai, the old-wallet flow is
+      // deploySafe(true) -> createSessionKey() -> deposit. Passing false (which
+      // this did originally) deploys a Safe with no smart-sessions validator, so
+      // deposits land and are never allocated into a pool.
+      this.sdk.deploySafe(ownerAddress, chainId, "aggressive", true)
     );
     const [first, second] = poolFirst ? [deployAsPool, deployAsLegacy] : [deployAsLegacy, deployAsPool];
     try {
@@ -1394,6 +1527,7 @@ var ZyfaiAgent = class {
         this.id
       );
     }
+    await this.ensureSessionKey(ownerAddress, chainId, redeployed.address);
     return redeployed.address;
   }
   async deposit(state, chainId, amount, asset, depositCallback) {

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/agents/zyfai/zyfai.agent.ts
-import { ZyfaiSDK } from "@zyfai/sdk";
-import { createPublicClient, http } from "viem";
+import { SMART_SESSIONS_VALIDATOR, ZyfaiSDK } from "@zyfai/sdk";
+import { createPublicClient, http, parseAbi } from "viem";
 import { base, arbitrum, mainnet } from "viem/chains";
 
 // src/types/config.ts
@@ -792,6 +792,9 @@ function debugLog(scope, message, data) {
 }
 
 // src/agents/zyfai/zyfai.agent.ts
+var ERC7579_IS_MODULE_INSTALLED_ABI = parseAbi([
+  "function isModuleInstalled(uint256 moduleTypeId, address module, bytes additionalContext) view returns (bool)"
+]);
 var DEFAULT_ZYFAI_RPC_URLS = {
   8453: "https://base-mainnet.g.alchemy.com/v2/ZWyVU-9XfS3z8Rn-xkq7V",
   42161: "https://arb-mainnet.g.alchemy.com/v2/ZWyVU-9XfS3z8Rn-xkq7V",
@@ -1109,7 +1112,12 @@ var ZyfaiAgent = class {
       const validChainId = isValidChainId(chainId);
       await Promise.all([
         this.ensureProtocolsSynced(validChainId, "USDC"),
-        this.ensureProtocolsSynced(validChainId, "WETH")
+        this.ensureProtocolsSynced(validChainId, "WETH"),
+        // Retrofit a session key for old wallets that are already deployed and
+        // funded but never got one — otherwise their balance stays idle until
+        // they happen to deposit again. Only touches Safes that are missing the
+        // validator, so pool-wallet users see no prompt. Non-fatal.
+        this.ensureSessionKeyIfDeployed(validChainId)
       ]);
     } catch (error) {
       throw error;
@@ -1295,7 +1303,43 @@ var ZyfaiAgent = class {
    * recoverable (ensureWalletDeployed tries the other deploy call), but
    * failing the deposit outright is not.
    */
+  /**
+   * Zyfai's own answer to "what kind of wallet is this, and can the agent act on
+   * it", read from the positions payload (`GET /data/position`, which
+   * `getPositions` wraps).
+   *
+   * `predeployed` and `hasActiveSessionKey` are both returned at runtime but
+   * declared on neither `Portfolio` nor their docs, hence the cast. Verified
+   * live: an old wallet reports `{predeployed: false, hasActiveSessionKey:
+   * false}` while a pool wallet reports `{true, true}`.
+   *
+   * Preferred over the SDK's private `isPredeployed`, which is cached from the
+   * login response and can go stale mid-session. Returns an empty object on any
+   * failure so every caller degrades to its own fallback.
+   */
+  async readWalletState(ownerAddress) {
+    try {
+      const { portfolio } = await this.sdk.getPositions(ownerAddress);
+      const raw = portfolio;
+      return {
+        predeployed: raw?.predeployed,
+        hasActiveSessionKey: raw?.hasActiveSessionKey
+      };
+    } catch (error) {
+      console.warn(
+        "[zyfai] getPositions wallet-state read failed (non-fatal):",
+        error instanceof Error ? error.message : String(error)
+      );
+      return {};
+    }
+  }
   async isPredeployedPoolWallet(ownerAddress, smartWallet) {
+    const { predeployed } = await this.readWalletState(ownerAddress);
+    if (typeof predeployed === "boolean") return predeployed;
+    const internals = this.sdk;
+    if (typeof internals.isPredeployed === "boolean") {
+      return internals.isPredeployed;
+    }
     try {
       const byEoa = await this.sdk.getSmartWalletByEOA(ownerAddress);
       return typeof byEoa?.smartWallet === "string" && byEoa.smartWallet.toLowerCase() === smartWallet.toLowerCase();
@@ -1307,6 +1351,85 @@ var ZyfaiAgent = class {
       return false;
     }
   }
+  /**
+   * Ensure Zyfai's automation can actually act on the user's Safe for this
+   * chain, by making sure a session key exists.
+   *
+   * Old wallets (pre-0.2.44) are deployed WITHOUT the smart-sessions validator,
+   * so Zyfai's rebalancer has no authorised path to move funds: deposits land
+   * and then sit as raw tokens forever. Pre-deployed pool wallets ship with the
+   * module already installed, which is why they never needed this.
+   *
+   * The gate is the on-chain module, not the wallet's class: it is the exact
+   * condition that matters, it needs no guessing from API shapes, and it means
+   * pool-wallet users are never prompted for a signature they don't need.
+   *
+   * Non-fatal by design. A failure here must not block a deposit — the funds
+   * still arrive safely in the Safe, they just won't be deployed into a pool
+   * until a session key exists.
+   */
+  /**
+   * Activation-time variant: only acts when the Safe already has code on this
+   * chain. Activation must never deploy anything — that is deposit's job, and it
+   * would mean surprise on-chain work just for opening the app.
+   */
+  async ensureSessionKeyIfDeployed(chainId) {
+    try {
+      const ownerAddress = this.getAddress();
+      const wallet = await this.sdk.getSmartWalletAddress(
+        ownerAddress,
+        chainId
+      );
+      if (!wallet.isDeployed) return;
+      const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
+      await this.ensureSessionKey(
+        ownerAddress,
+        chainId,
+        wallet.address,
+        hasActiveSessionKey
+      );
+    } catch (error) {
+      console.warn(
+        "[zyfai] session-key check at activation failed (non-fatal):",
+        error instanceof Error ? error.message : String(error)
+      );
+    }
+  }
+  async ensureSessionKey(ownerAddress, chainId, smartWallet, hasActiveSessionKey) {
+    try {
+      if (hasActiveSessionKey === false) {
+        console.warn(
+          `[zyfai] no session key on record for ${ownerAddress}; creating one for chain ${chainId}.`
+        );
+        await this.sdk.createSessionKey(ownerAddress, chainId);
+        return;
+      }
+      const installed = await this.readSmartSessionsInstalled(
+        chainId,
+        smartWallet
+      );
+      if (installed) return;
+      console.warn(
+        `[zyfai] Safe ${smartWallet} has no smart-sessions validator on chain ${chainId}; creating a session key so the agent can allocate.`
+      );
+      await this.sdk.createSessionKey(ownerAddress, chainId);
+    } catch (error) {
+      console.warn(
+        "[zyfai] createSessionKey skipped (non-fatal):",
+        error instanceof Error ? error.message : String(error)
+      );
+    }
+  }
+  /** Ground truth for "can Zyfai's automation act on this Safe, on this chain". */
+  async readSmartSessionsInstalled(chainId, smartWallet) {
+    return this.getPublicClient(chainId).readContract({
+      address: smartWallet,
+      abi: ERC7579_IS_MODULE_INSTALLED_ABI,
+      functionName: "isModuleInstalled",
+      // moduleTypeId 1 = validator (ERC-7579)
+      args: [1n, SMART_SESSIONS_VALIDATOR, "0x"]
+    });
+  }
   /**
    * Guarantee the user's Safe has code on `chainId` before anything transfers
    * funds into it, and return its address.
@@ -1327,17 +1450,27 @@ var ZyfaiAgent = class {
    */
   async ensureWalletDeployed(ownerAddress, chainId) {
     const wallet = await this.sdk.getSmartWalletAddress(ownerAddress, chainId);
-    if (wallet.isDeployed) return wallet.address;
+    if (wallet.isDeployed) {
+      const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
+      await this.ensureSessionKey(
+        ownerAddress,
+        chainId,
+        wallet.address,
+        hasActiveSessionKey
+      );
+      return wallet.address;
+    }
     const poolFirst = await this.isPredeployedPoolWallet(
       ownerAddress,
       wallet.address
     );
     const deployAsPool = () => this.sdk.deployOnChains([chainId]);
     const deployAsLegacy = () => (
-      // `createSessionKey: false` — session keys are backend-owned since the
-      // predeployed-pool rollout; asking for one here costs a signature prompt
-      // and is rejected anyway.
-      this.sdk.deploySafe(ownerAddress, chainId, "aggressive", false)
+      // `createSessionKey: true` — per Zyfai, the old-wallet flow is
+      // deploySafe(true) -> createSessionKey() -> deposit. Passing false (which
+      // this did originally) deploys a Safe with no smart-sessions validator, so
+      // deposits land and are never allocated into a pool.
+      this.sdk.deploySafe(ownerAddress, chainId, "aggressive", true)
     );
     const [first, second] = poolFirst ? [deployAsPool, deployAsLegacy] : [deployAsLegacy, deployAsPool];
     try {
@@ -1361,6 +1494,7 @@ var ZyfaiAgent = class {
         this.id
       );
     }
+    await this.ensureSessionKey(ownerAddress, chainId, redeployed.address);
     return redeployed.address;
   }
   async deposit(state, chainId, amount, asset, depositCallback) {

package/package.json

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