@owney/sdk 0.7.5 → 0.7.7-beta.0

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;
@@ -1340,6 +1348,65 @@ 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;
+      await this.ensureSessionKey(ownerAddress, chainId, wallet.address);
+    } 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) {
+    try {
+      const installed = await 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"]
+      });
+      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)
+      );
+    }
+  }
   /**
    * Guarantee the user's Safe has code on `chainId` before anything transfers
    * funds into it, and return its address.
@@ -1360,17 +1427,21 @@ var ZyfaiAgent = class {
    */
   async ensureWalletDeployed(ownerAddress, chainId) {
     const wallet = await this.sdk.getSmartWalletAddress(ownerAddress, chainId);
-    if (wallet.isDeployed) return wallet.address;
+    if (wallet.isDeployed) {
+      await this.ensureSessionKey(ownerAddress, chainId, wallet.address);
+      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 +1465,7 @@ var ZyfaiAgent = class {
         this.id
       );
     }
+    await this.ensureSessionKey(ownerAddress, chainId, redeployed.address);
     return redeployed.address;
   }
   async deposit(state, chainId, amount, asset, depositCallback) {
@@ -1840,9 +1912,12 @@ async function postSponsorTransferAuth(input) {
       {
         statusCode: res.status,
         responseBody: text.slice(0, 500),
-        // 503 SPONSOR_UNAVAILABLE = relayer out of gas; the tx was rejected
-        // before broadcast, so it is safe to fall back to a user-paid deposit.
-        safeToFallback: res.status === 503
+        // A 4xx is an explicit refusal before execution (DTO validation,
+        // signature rejection, simulation) — nothing was broadcast, so a
+        // user-paid retry cannot double-spend. 503 SPONSOR_UNAVAILABLE means
+        // the relayer was out of gas, also pre-broadcast. Any other 5xx stays
+        // ambiguous: the transfer may already be in flight.
+        safeToFallback: res.status >= 400 && res.status < 500 || res.status === 503
       }
     );
   }
@@ -2114,9 +2189,9 @@ function makeSponsoredDepositCallback(deps) {
   };
 }
 
-// src/lib/sponsored-weth-deposit.ts
+// src/lib/sponsored-permit2-deposit.ts
 var PERMIT_WINDOW_SECONDS = 15 * 60;
-function makeSponsoredWethCallback(deps) {
+function makeSponsoredPermit2Callback(deps) {
   const get = deps.httpGet ?? getSponsorRelayerAddress;
   const post = deps.httpPost ?? postSponsorPermit2Transfer;
   return async (smartWallet, chainId, amount) => {
@@ -2125,7 +2200,7 @@ function makeSponsoredWethCallback(deps) {
     if (!token) {
       throw new OwneyError(
         "CHAIN_UNSUPPORTED",
-        `No sponsored WETH configured for chain ${chainId}`
+        `No sponsored ${deps.assetLabel} configured for chain ${chainId}`
       );
     }
     const amountWei = BigInt(amount);
@@ -2137,14 +2212,14 @@ function makeSponsoredWethCallback(deps) {
       if (balance < amountWei) {
         throw new OwneyError(
           "DEPOSIT_INSUFFICIENT_BALANCE",
-          "Insufficient WETH balance for this deposit.",
+          `Insufficient ${deps.assetLabel} balance for this deposit.`,
           { token, chainId: cid, balance: balance.toString(), amount }
         );
       }
     } catch (err) {
       if (err instanceof OwneyError) throw err;
       console.warn(
-        "[owney-sdk] WETH balance pre-check failed (non-fatal):",
+        `[owney-sdk] ${deps.assetLabel} balance pre-check failed (non-fatal):`,
         err instanceof Error ? err.message : String(err)
       );
     }
@@ -2152,7 +2227,7 @@ function makeSponsoredWethCallback(deps) {
     if (allowance < amountWei) {
       throw new OwneyError(
         "PERMIT2_APPROVAL_REQUIRED",
-        "WETH gasless deposits need a one-time Permit2 approval; call approvePermit2() first",
+        `${deps.assetLabel} gasless deposits need a one-time Permit2 approval; call approvePermit2("${deps.assetLabel}") first`,
         { token, chainId: cid, allowance: allowance.toString(), amount }
       );
     }
@@ -2257,7 +2332,7 @@ var OwneySDK = class {
   routingApiBaseUrl;
   referralSource;
   cachedSponsoredCallback = null;
-  cachedWethSponsoredCallback = null;
+  cachedPermit2Callbacks = /* @__PURE__ */ new Map();
   initializingAgentsPromise = null;
   constructor(config) {
     this.apiKey = config.apiKey;
@@ -2285,7 +2360,7 @@ var OwneySDK = class {
     }
     this.state = { provider, walletAddress, chainId: null };
     this.cachedSponsoredCallback = null;
-    this.cachedWethSponsoredCallback = null;
+    this.cachedPermit2Callbacks.clear();
   }
   /**
    * Disconnect from all agents and clear connection state.
@@ -2299,7 +2374,7 @@ var OwneySDK = class {
     this.disabledAgents.clear();
     this.state = null;
     this.cachedSponsoredCallback = null;
-    this.cachedWethSponsoredCallback = null;
+    this.cachedPermit2Callbacks.clear();
   }
   isAgentDisabled(agentId) {
     return this.disabledAgents.has(agentId);
@@ -2376,25 +2451,23 @@ var OwneySDK = class {
     return callback;
   }
   /**
-   * Lazily builds (and caches) the default Permit2 sponsored WETH deposit
-   * callback used when the caller omits `depositCallback` for a WETH
-   * deposit. Mirrors `getDefaultSponsoredCallback()` but signs a Permit2
-   * `PermitTransferFrom` instead of an EIP-3009 authorization.
+   * Lazily builds (and caches) the Permit2 sponsored callback for one asset.
+   * Used for WETH always, and for USDC when the connected owner is a smart
+   * account — EIP-3009 verifies with ecrecover inside USDC and cannot accept a
+   * contract signature, while Permit2 supports ERC-1271.
    */
-  getDefaultWethSponsoredCallback(onApproved) {
-    if (!onApproved && this.cachedWethSponsoredCallback)
-      return this.cachedWethSponsoredCallback;
+  getDefaultPermit2Callback(asset, onApproved) {
+    const cached = this.cachedPermit2Callbacks.get(asset);
+    if (!onApproved && cached) return cached;
     const provider = this.requireConnectedProvider();
     const owner = this.state.walletAddress;
-    const callback = makeSponsoredWethCallback({
+    const callback = makeSponsoredPermit2Callback({
       apiKey: this.apiKey,
       baseUrl: this.routingApiBaseUrl,
       ownerAddress: owner,
+      assetLabel: asset,
       onApproved,
-      tokenAddressByChain: SPONSORED_WETH_BY_CHAIN,
-      // Casts work around viem's chain-narrowed Client vs the generic
-      // PublicClient/WalletClient param types — structurally identical at
-      // runtime, but the two share a name TS treats as unrelated.
+      tokenAddressByChain: asset === "USDC" ? SPONSORED_USDC_BY_CHAIN : SPONSORED_WETH_BY_CHAIN,
       getPublicClient: (cid) => (0, import_viem5.createPublicClient)({
         chain: VIEM_CHAIN2[cid],
         transport: (0, import_viem5.custom)(provider)
@@ -2405,9 +2478,34 @@ var OwneySDK = class {
         transport: (0, import_viem5.custom)(provider)
       })
     });
-    if (!onApproved) this.cachedWethSponsoredCallback = callback;
+    if (!onApproved) this.cachedPermit2Callbacks.set(asset, callback);
     return callback;
   }
+  /**
+   * True when the connected owner has bytecode — a deployed smart wallet, or an
+   * EOA carrying an EIP-7702 delegation (the Base app's "Upgrade your wallet").
+   * Such wallets sign via ERC-1271, which EIP-3009 cannot verify.
+   *
+   * Fails OPEN: an unreadable code check returns false so a working EOA deposit
+   * is never blocked by a flaky provider.
+   */
+  async ownerHasCode() {
+    try {
+      const provider = this.requireConnectedProvider();
+      const code = await provider.request({
+        method: "eth_getCode",
+        params: [this.state.walletAddress, "latest"]
+      });
+      return Boolean(code) && code !== "0x";
+    } catch (error) {
+      debugLog(
+        "deposit",
+        "owner code check failed; assuming EOA",
+        error instanceof Error ? error.message : String(error)
+      );
+      return false;
+    }
+  }
   getAgent(agentId) {
     const agent = this.agents.get(agentId);
     if (!agent) {
@@ -2603,7 +2701,11 @@ var OwneySDK = class {
     }
     const state = this.requireState();
     const chainId = this.requireChainId();
-    const effectiveCallback = depositCallback ?? (asset === "WETH" ? this.getDefaultWethSponsoredCallback(onApproved) : this.getDefaultSponsoredCallback(onApproved));
+    const ownerIsSmartAccount = depositCallback === void 0 && asset !== "WETH" ? await this.ownerHasCode() : false;
+    const effectiveCallback = depositCallback ?? (asset === "WETH" || ownerIsSmartAccount ? this.getDefaultPermit2Callback(
+      asset === "WETH" ? "WETH" : "USDC",
+      onApproved
+    ) : this.getDefaultSponsoredCallback(onApproved));
     if (agentId) {
       if (this.isAgentDisabled(agentId)) {
         throw new OwneyError(
@@ -2707,12 +2809,12 @@ var OwneySDK = class {
       try {
         return await attempt(effectiveCallback);
       } catch (error) {
-        if (!approvalAttempted && appCallback === void 0 && asset === "WETH" && error instanceof OwneyError && error.code === "PERMIT2_APPROVAL_REQUIRED") {
+        if (!approvalAttempted && appCallback === void 0 && (asset === "WETH" || asset === "USDC") && error instanceof OwneyError && error.code === "PERMIT2_APPROVAL_REQUIRED") {
           approvalAttempted = true;
           console.warn(
-            "[owney-sdk] First WETH deposit: sending one-time Permit2 approval..."
+            `[owney-sdk] First ${asset} gasless deposit: sending one-time Permit2 approval...`
           );
-          await this.approvePermit2();
+          await this.approvePermit2(asset);
           continue;
         }
         if (!shouldFallbackToUserPaid(error, asset, appCallback)) throw error;
@@ -3226,23 +3328,32 @@ var OwneySDK = class {
     return agent.ensureAutoSelectProtocols(state, chainId, asset);
   }
   /**
-   * One-time, user-paid approval of Permit2 on the sponsored WETH token for
-   * the active chain. Required once per wallet per chain before gasless WETH
-   * deposits; afterwards deposit() is signature-only. Resolves only after the
-   * approval transaction is mined (1 confirmation), so a subsequent deposit()
-   * will see the new allowance; throws if the transaction reverted.
+   * One-time, user-paid approval of Permit2 on the given sponsored token for
+   * the active chain. Required once per wallet per chain per token before a
+   * gasless deposit of that asset over Permit2; afterwards deposit() is
+   * signature-only for it. This call itself is a real transaction the user
+   * pays gas for. Resolves only after the approval transaction is mined (1
+   * confirmation), so a subsequent deposit() will see the new allowance;
+   * throws if the transaction reverted.
    * @returns the approval transaction hash.
    */
   async approvePermit2(asset = "WETH") {
-    void asset;
     const state = this.requireState();
     const chainId = this.requireChainId();
-    this.validateAssetSupport(this.getAgent("zyfai"), chainId, "WETH");
-    const token = SPONSORED_WETH_BY_CHAIN[chainId];
+    let guard = this.agents.get("zyfai");
+    if (!guard) {
+      try {
+        guard = this.getEligibleAgents(chainId, asset)[0];
+      } catch {
+        guard = void 0;
+      }
+    }
+    if (guard) this.validateAssetSupport(guard, chainId, asset);
+    const token = asset === "USDC" ? SPONSORED_USDC_BY_CHAIN[chainId] : SPONSORED_WETH_BY_CHAIN[chainId];
     if (!token) {
       throw new OwneyError(
         "CHAIN_UNSUPPORTED",
-        `No sponsored WETH on chain ${chainId}`
+        `No sponsored ${asset} on chain ${chainId}`
       );
     }
     const provider = this.requireConnectedProvider();

package/dist/index.d.cts

@@ -392,7 +392,7 @@ declare class OwneySDK {
     private routingApiBaseUrl?;
     private referralSource?;
     private cachedSponsoredCallback;
-    private cachedWethSponsoredCallback;
+    private cachedPermit2Callbacks;
     private initializingAgentsPromise;
     constructor(config: OwneySDKConfig);
     /**
@@ -428,12 +428,21 @@ declare class OwneySDK {
      */
     private getDefaultSponsoredCallback;
     /**
-     * Lazily builds (and caches) the default Permit2 sponsored WETH deposit
-     * callback used when the caller omits `depositCallback` for a WETH
-     * deposit. Mirrors `getDefaultSponsoredCallback()` but signs a Permit2
-     * `PermitTransferFrom` instead of an EIP-3009 authorization.
+     * Lazily builds (and caches) the Permit2 sponsored callback for one asset.
+     * Used for WETH always, and for USDC when the connected owner is a smart
+     * account — EIP-3009 verifies with ecrecover inside USDC and cannot accept a
+     * contract signature, while Permit2 supports ERC-1271.
      */
-    private getDefaultWethSponsoredCallback;
+    private getDefaultPermit2Callback;
+    /**
+     * True when the connected owner has bytecode — a deployed smart wallet, or an
+     * EOA carrying an EIP-7702 delegation (the Base app's "Upgrade your wallet").
+     * Such wallets sign via ERC-1271, which EIP-3009 cannot verify.
+     *
+     * Fails OPEN: an unreadable code check returns false so a working EOA deposit
+     * is never blocked by a flaky provider.
+     */
+    private ownerHasCode;
     private getAgent;
     private getActiveAgents;
     /**
@@ -578,14 +587,16 @@ declare class OwneySDK {
      */
     ensureAutoSelectProtocols(asset: "USDC" | "WETH", agentId?: AgentId): Promise<boolean>;
     /**
-     * One-time, user-paid approval of Permit2 on the sponsored WETH token for
-     * the active chain. Required once per wallet per chain before gasless WETH
-     * deposits; afterwards deposit() is signature-only. Resolves only after the
-     * approval transaction is mined (1 confirmation), so a subsequent deposit()
-     * will see the new allowance; throws if the transaction reverted.
+     * One-time, user-paid approval of Permit2 on the given sponsored token for
+     * the active chain. Required once per wallet per chain per token before a
+     * gasless deposit of that asset over Permit2; afterwards deposit() is
+     * signature-only for it. This call itself is a real transaction the user
+     * pays gas for. Resolves only after the approval transaction is mined (1
+     * confirmation), so a subsequent deposit() will see the new allowance;
+     * throws if the transaction reverted.
      * @returns the approval transaction hash.
      */
-    approvePermit2(asset?: "WETH"): Promise<`0x${string}`>;
+    approvePermit2(asset?: "WETH" | "USDC"): Promise<`0x${string}`>;
     /**
      * Get the agent's average APY performance over a time period. Does not require a wallet connection.
      * @param options - Contains agentId (optional) and days ("7D", "14D", or "30D")

package/dist/index.d.ts

@@ -392,7 +392,7 @@ declare class OwneySDK {
     private routingApiBaseUrl?;
     private referralSource?;
     private cachedSponsoredCallback;
-    private cachedWethSponsoredCallback;
+    private cachedPermit2Callbacks;
     private initializingAgentsPromise;
     constructor(config: OwneySDKConfig);
     /**
@@ -428,12 +428,21 @@ declare class OwneySDK {
      */
     private getDefaultSponsoredCallback;
     /**
-     * Lazily builds (and caches) the default Permit2 sponsored WETH deposit
-     * callback used when the caller omits `depositCallback` for a WETH
-     * deposit. Mirrors `getDefaultSponsoredCallback()` but signs a Permit2
-     * `PermitTransferFrom` instead of an EIP-3009 authorization.
+     * Lazily builds (and caches) the Permit2 sponsored callback for one asset.
+     * Used for WETH always, and for USDC when the connected owner is a smart
+     * account — EIP-3009 verifies with ecrecover inside USDC and cannot accept a
+     * contract signature, while Permit2 supports ERC-1271.
      */
-    private getDefaultWethSponsoredCallback;
+    private getDefaultPermit2Callback;
+    /**
+     * True when the connected owner has bytecode — a deployed smart wallet, or an
+     * EOA carrying an EIP-7702 delegation (the Base app's "Upgrade your wallet").
+     * Such wallets sign via ERC-1271, which EIP-3009 cannot verify.
+     *
+     * Fails OPEN: an unreadable code check returns false so a working EOA deposit
+     * is never blocked by a flaky provider.
+     */
+    private ownerHasCode;
     private getAgent;
     private getActiveAgents;
     /**
@@ -578,14 +587,16 @@ declare class OwneySDK {
      */
     ensureAutoSelectProtocols(asset: "USDC" | "WETH", agentId?: AgentId): Promise<boolean>;
     /**
-     * One-time, user-paid approval of Permit2 on the sponsored WETH token for
-     * the active chain. Required once per wallet per chain before gasless WETH
-     * deposits; afterwards deposit() is signature-only. Resolves only after the
-     * approval transaction is mined (1 confirmation), so a subsequent deposit()
-     * will see the new allowance; throws if the transaction reverted.
+     * One-time, user-paid approval of Permit2 on the given sponsored token for
+     * the active chain. Required once per wallet per chain per token before a
+     * gasless deposit of that asset over Permit2; afterwards deposit() is
+     * signature-only for it. This call itself is a real transaction the user
+     * pays gas for. Resolves only after the approval transaction is mined (1
+     * confirmation), so a subsequent deposit() will see the new allowance;
+     * throws if the transaction reverted.
      * @returns the approval transaction hash.
      */
-    approvePermit2(asset?: "WETH"): Promise<`0x${string}`>;
+    approvePermit2(asset?: "WETH" | "USDC"): Promise<`0x${string}`>;
     /**
      * Get the agent's average APY performance over a time period. Does not require a wallet connection.
      * @param options - Contains agentId (optional) and days ("7D", "14D", or "30D")

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;
@@ -1307,6 +1315,65 @@ 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;
+      await this.ensureSessionKey(ownerAddress, chainId, wallet.address);
+    } 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) {
+    try {
+      const installed = await 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"]
+      });
+      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)
+      );
+    }
+  }
   /**
    * Guarantee the user's Safe has code on `chainId` before anything transfers
    * funds into it, and return its address.
@@ -1327,17 +1394,21 @@ var ZyfaiAgent = class {
    */
   async ensureWalletDeployed(ownerAddress, chainId) {
     const wallet = await this.sdk.getSmartWalletAddress(ownerAddress, chainId);
-    if (wallet.isDeployed) return wallet.address;
+    if (wallet.isDeployed) {
+      await this.ensureSessionKey(ownerAddress, chainId, wallet.address);
+      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 +1432,7 @@ var ZyfaiAgent = class {
         this.id
       );
     }
+    await this.ensureSessionKey(ownerAddress, chainId, redeployed.address);
     return redeployed.address;
   }
   async deposit(state, chainId, amount, asset, depositCallback) {
@@ -1811,9 +1883,12 @@ async function postSponsorTransferAuth(input) {
       {
         statusCode: res.status,
         responseBody: text.slice(0, 500),
-        // 503 SPONSOR_UNAVAILABLE = relayer out of gas; the tx was rejected
-        // before broadcast, so it is safe to fall back to a user-paid deposit.
-        safeToFallback: res.status === 503
+        // A 4xx is an explicit refusal before execution (DTO validation,
+        // signature rejection, simulation) — nothing was broadcast, so a
+        // user-paid retry cannot double-spend. 503 SPONSOR_UNAVAILABLE means
+        // the relayer was out of gas, also pre-broadcast. Any other 5xx stays
+        // ambiguous: the transfer may already be in flight.
+        safeToFallback: res.status >= 400 && res.status < 500 || res.status === 503
       }
     );
   }
@@ -2085,9 +2160,9 @@ function makeSponsoredDepositCallback(deps) {
   };
 }
 
-// src/lib/sponsored-weth-deposit.ts
+// src/lib/sponsored-permit2-deposit.ts
 var PERMIT_WINDOW_SECONDS = 15 * 60;
-function makeSponsoredWethCallback(deps) {
+function makeSponsoredPermit2Callback(deps) {
   const get = deps.httpGet ?? getSponsorRelayerAddress;
   const post = deps.httpPost ?? postSponsorPermit2Transfer;
   return async (smartWallet, chainId, amount) => {
@@ -2096,7 +2171,7 @@ function makeSponsoredWethCallback(deps) {
     if (!token) {
       throw new OwneyError(
         "CHAIN_UNSUPPORTED",
-        `No sponsored WETH configured for chain ${chainId}`
+        `No sponsored ${deps.assetLabel} configured for chain ${chainId}`
       );
     }
     const amountWei = BigInt(amount);
@@ -2108,14 +2183,14 @@ function makeSponsoredWethCallback(deps) {
       if (balance < amountWei) {
         throw new OwneyError(
           "DEPOSIT_INSUFFICIENT_BALANCE",
-          "Insufficient WETH balance for this deposit.",
+          `Insufficient ${deps.assetLabel} balance for this deposit.`,
           { token, chainId: cid, balance: balance.toString(), amount }
         );
       }
     } catch (err) {
       if (err instanceof OwneyError) throw err;
       console.warn(
-        "[owney-sdk] WETH balance pre-check failed (non-fatal):",
+        `[owney-sdk] ${deps.assetLabel} balance pre-check failed (non-fatal):`,
         err instanceof Error ? err.message : String(err)
       );
     }
@@ -2123,7 +2198,7 @@ function makeSponsoredWethCallback(deps) {
     if (allowance < amountWei) {
       throw new OwneyError(
         "PERMIT2_APPROVAL_REQUIRED",
-        "WETH gasless deposits need a one-time Permit2 approval; call approvePermit2() first",
+        `${deps.assetLabel} gasless deposits need a one-time Permit2 approval; call approvePermit2("${deps.assetLabel}") first`,
         { token, chainId: cid, allowance: allowance.toString(), amount }
       );
     }
@@ -2228,7 +2303,7 @@ var OwneySDK = class {
   routingApiBaseUrl;
   referralSource;
   cachedSponsoredCallback = null;
-  cachedWethSponsoredCallback = null;
+  cachedPermit2Callbacks = /* @__PURE__ */ new Map();
   initializingAgentsPromise = null;
   constructor(config) {
     this.apiKey = config.apiKey;
@@ -2256,7 +2331,7 @@ var OwneySDK = class {
     }
     this.state = { provider, walletAddress, chainId: null };
     this.cachedSponsoredCallback = null;
-    this.cachedWethSponsoredCallback = null;
+    this.cachedPermit2Callbacks.clear();
   }
   /**
    * Disconnect from all agents and clear connection state.
@@ -2270,7 +2345,7 @@ var OwneySDK = class {
     this.disabledAgents.clear();
     this.state = null;
     this.cachedSponsoredCallback = null;
-    this.cachedWethSponsoredCallback = null;
+    this.cachedPermit2Callbacks.clear();
   }
   isAgentDisabled(agentId) {
     return this.disabledAgents.has(agentId);
@@ -2347,25 +2422,23 @@ var OwneySDK = class {
     return callback;
   }
   /**
-   * Lazily builds (and caches) the default Permit2 sponsored WETH deposit
-   * callback used when the caller omits `depositCallback` for a WETH
-   * deposit. Mirrors `getDefaultSponsoredCallback()` but signs a Permit2
-   * `PermitTransferFrom` instead of an EIP-3009 authorization.
+   * Lazily builds (and caches) the Permit2 sponsored callback for one asset.
+   * Used for WETH always, and for USDC when the connected owner is a smart
+   * account — EIP-3009 verifies with ecrecover inside USDC and cannot accept a
+   * contract signature, while Permit2 supports ERC-1271.
    */
-  getDefaultWethSponsoredCallback(onApproved) {
-    if (!onApproved && this.cachedWethSponsoredCallback)
-      return this.cachedWethSponsoredCallback;
+  getDefaultPermit2Callback(asset, onApproved) {
+    const cached = this.cachedPermit2Callbacks.get(asset);
+    if (!onApproved && cached) return cached;
     const provider = this.requireConnectedProvider();
     const owner = this.state.walletAddress;
-    const callback = makeSponsoredWethCallback({
+    const callback = makeSponsoredPermit2Callback({
       apiKey: this.apiKey,
       baseUrl: this.routingApiBaseUrl,
       ownerAddress: owner,
+      assetLabel: asset,
       onApproved,
-      tokenAddressByChain: SPONSORED_WETH_BY_CHAIN,
-      // Casts work around viem's chain-narrowed Client vs the generic
-      // PublicClient/WalletClient param types — structurally identical at
-      // runtime, but the two share a name TS treats as unrelated.
+      tokenAddressByChain: asset === "USDC" ? SPONSORED_USDC_BY_CHAIN : SPONSORED_WETH_BY_CHAIN,
       getPublicClient: (cid) => createPublicClient2({
         chain: VIEM_CHAIN2[cid],
         transport: custom(provider)
@@ -2376,9 +2449,34 @@ var OwneySDK = class {
         transport: custom(provider)
       })
     });
-    if (!onApproved) this.cachedWethSponsoredCallback = callback;
+    if (!onApproved) this.cachedPermit2Callbacks.set(asset, callback);
     return callback;
   }
+  /**
+   * True when the connected owner has bytecode — a deployed smart wallet, or an
+   * EOA carrying an EIP-7702 delegation (the Base app's "Upgrade your wallet").
+   * Such wallets sign via ERC-1271, which EIP-3009 cannot verify.
+   *
+   * Fails OPEN: an unreadable code check returns false so a working EOA deposit
+   * is never blocked by a flaky provider.
+   */
+  async ownerHasCode() {
+    try {
+      const provider = this.requireConnectedProvider();
+      const code = await provider.request({
+        method: "eth_getCode",
+        params: [this.state.walletAddress, "latest"]
+      });
+      return Boolean(code) && code !== "0x";
+    } catch (error) {
+      debugLog(
+        "deposit",
+        "owner code check failed; assuming EOA",
+        error instanceof Error ? error.message : String(error)
+      );
+      return false;
+    }
+  }
   getAgent(agentId) {
     const agent = this.agents.get(agentId);
     if (!agent) {
@@ -2574,7 +2672,11 @@ var OwneySDK = class {
     }
     const state = this.requireState();
     const chainId = this.requireChainId();
-    const effectiveCallback = depositCallback ?? (asset === "WETH" ? this.getDefaultWethSponsoredCallback(onApproved) : this.getDefaultSponsoredCallback(onApproved));
+    const ownerIsSmartAccount = depositCallback === void 0 && asset !== "WETH" ? await this.ownerHasCode() : false;
+    const effectiveCallback = depositCallback ?? (asset === "WETH" || ownerIsSmartAccount ? this.getDefaultPermit2Callback(
+      asset === "WETH" ? "WETH" : "USDC",
+      onApproved
+    ) : this.getDefaultSponsoredCallback(onApproved));
     if (agentId) {
       if (this.isAgentDisabled(agentId)) {
         throw new OwneyError(
@@ -2678,12 +2780,12 @@ var OwneySDK = class {
       try {
         return await attempt(effectiveCallback);
       } catch (error) {
-        if (!approvalAttempted && appCallback === void 0 && asset === "WETH" && error instanceof OwneyError && error.code === "PERMIT2_APPROVAL_REQUIRED") {
+        if (!approvalAttempted && appCallback === void 0 && (asset === "WETH" || asset === "USDC") && error instanceof OwneyError && error.code === "PERMIT2_APPROVAL_REQUIRED") {
           approvalAttempted = true;
           console.warn(
-            "[owney-sdk] First WETH deposit: sending one-time Permit2 approval..."
+            `[owney-sdk] First ${asset} gasless deposit: sending one-time Permit2 approval...`
           );
-          await this.approvePermit2();
+          await this.approvePermit2(asset);
           continue;
         }
         if (!shouldFallbackToUserPaid(error, asset, appCallback)) throw error;
@@ -3197,23 +3299,32 @@ var OwneySDK = class {
     return agent.ensureAutoSelectProtocols(state, chainId, asset);
   }
   /**
-   * One-time, user-paid approval of Permit2 on the sponsored WETH token for
-   * the active chain. Required once per wallet per chain before gasless WETH
-   * deposits; afterwards deposit() is signature-only. Resolves only after the
-   * approval transaction is mined (1 confirmation), so a subsequent deposit()
-   * will see the new allowance; throws if the transaction reverted.
+   * One-time, user-paid approval of Permit2 on the given sponsored token for
+   * the active chain. Required once per wallet per chain per token before a
+   * gasless deposit of that asset over Permit2; afterwards deposit() is
+   * signature-only for it. This call itself is a real transaction the user
+   * pays gas for. Resolves only after the approval transaction is mined (1
+   * confirmation), so a subsequent deposit() will see the new allowance;
+   * throws if the transaction reverted.
    * @returns the approval transaction hash.
    */
   async approvePermit2(asset = "WETH") {
-    void asset;
     const state = this.requireState();
     const chainId = this.requireChainId();
-    this.validateAssetSupport(this.getAgent("zyfai"), chainId, "WETH");
-    const token = SPONSORED_WETH_BY_CHAIN[chainId];
+    let guard = this.agents.get("zyfai");
+    if (!guard) {
+      try {
+        guard = this.getEligibleAgents(chainId, asset)[0];
+      } catch {
+        guard = void 0;
+      }
+    }
+    if (guard) this.validateAssetSupport(guard, chainId, asset);
+    const token = asset === "USDC" ? SPONSORED_USDC_BY_CHAIN[chainId] : SPONSORED_WETH_BY_CHAIN[chainId];
     if (!token) {
       throw new OwneyError(
         "CHAIN_UNSUPPORTED",
-        `No sponsored WETH on chain ${chainId}`
+        `No sponsored ${asset} on chain ${chainId}`
       );
     }
     const provider = this.requireConnectedProvider();

package/package.json

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