@owney/sdk 0.7.3 → 0.7.5

package/dist/index.cjs

@@ -1318,20 +1318,94 @@ var ZyfaiAgent = class {
       );
     }
   }
+  /**
+   * True when `smartWallet` is the backend-managed pool wallet Zyfai assigned
+   * to this EOA — the "new wallet" kind that is predeployed on the chains it
+   * was onboarded to. Legacy wallets (created before @zyfai/sdk 0.2.44) have no
+   * pool record.
+   *
+   * A failed lookup returns false rather than throwing: misclassifying is
+   * recoverable (ensureWalletDeployed tries the other deploy call), but
+   * failing the deposit outright is not.
+   */
+  async isPredeployedPoolWallet(ownerAddress, smartWallet) {
+    try {
+      const byEoa = await this.sdk.getSmartWalletByEOA(ownerAddress);
+      return typeof byEoa?.smartWallet === "string" && byEoa.smartWallet.toLowerCase() === smartWallet.toLowerCase();
+    } catch (error) {
+      console.warn(
+        "[zyfai] getSmartWalletByEOA failed; assuming a legacy wallet:",
+        error instanceof Error ? error.message : String(error)
+      );
+      return false;
+    }
+  }
+  /**
+   * Guarantee the user's Safe has code on `chainId` before anything transfers
+   * funds into it, and return its address.
+   *
+   * Zyfai predeploys wallets created since @zyfai/sdk 0.2.44, but ONLY on the
+   * chains they were onboarded to. Legacy wallets, and any chain a pool wallet
+   * has not been onboarded to, are *counterfactual*: `getSmartWalletAddress`
+   * returns a real deterministic address that holds no code yet. Depositing
+   * there strands the funds until the Safe is deployed, and Owney's own sponsor
+   * relayer refuses to broadcast to an address with no bytecode
+   * (`to-address.guard-helper.ts`), so the deposit fails as an opaque 500.
+   *
+   * ROUT-320 removed the old deploySafe step believing every wallet was
+   * predeployed from 0.2.44 on. Zyf later clarified that only NEW wallets are;
+   * old ones still need the legacy flow. Hence the gate is on the per-chain
+   * `isDeployed` flag rather than on the wallet's age — that covers both a
+   * legacy wallet and a pool wallet on a fresh chain.
+   */
+  async ensureWalletDeployed(ownerAddress, chainId) {
+    const wallet = await this.sdk.getSmartWalletAddress(ownerAddress, chainId);
+    if (wallet.isDeployed) 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)
+    );
+    const [first, second] = poolFirst ? [deployAsPool, deployAsLegacy] : [deployAsLegacy, deployAsPool];
+    try {
+      await first();
+    } catch (error) {
+      console.warn(
+        `[zyfai] ${poolFirst ? "deployOnChains" : "deploySafe"} failed on chain ${chainId}; trying the other deploy path:`,
+        error instanceof Error ? error.message : String(error)
+      );
+      await second();
+    }
+    const redeployed = await this.sdk.getSmartWalletAddress(
+      ownerAddress,
+      chainId
+    );
+    if (!redeployed.isDeployed) {
+      throw new OwneyError(
+        "WALLET_NOT_DEPLOYED",
+        `Smart wallet ${redeployed.address} is still not deployed on chain ${chainId}. Depositing would send funds to an address with no code.`,
+        { chainId, smartWallet: redeployed.address },
+        this.id
+      );
+    }
+    return redeployed.address;
+  }
   async deposit(state, chainId, amount, asset, depositCallback) {
     try {
       const validChainId = isValidChainId(chainId);
       await this.ensureConnected(state, validChainId);
       if (depositCallback) {
-        const wallet = await this.sdk.getSmartWalletAddress(
+        const smartWallet = await this.ensureWalletDeployed(
           this.getAddress(),
           validChainId
         );
-        const txHash = await depositCallback(
-          wallet.address,
-          validChainId,
-          amount
-        );
+        const txHash = await depositCallback(smartWallet, validChainId, amount);
         const tokenAddress = asset === "WETH" ? WETH_ADDRESS_BY_CHAIN[validChainId] : void 0;
         try {
           await (tokenAddress ? this.sdk.logDeposit(validChainId, txHash, amount, tokenAddress) : this.sdk.logDeposit(validChainId, txHash, amount));
@@ -1341,8 +1415,9 @@ var ZyfaiAgent = class {
             logError
           );
         }
-        return { txHash, smartWallet: wallet.address, amount };
+        return { txHash, smartWallet, amount };
       }
+      await this.ensureWalletDeployed(this.getAddress(), validChainId);
       const raw = await this.sdk.depositFunds(
         this.getAddress(),
         validChainId,
@@ -1926,6 +2001,41 @@ async function readErc20Balance(publicClient, token, owner) {
   });
 }
 
+// src/lib/chain-guard.ts
+var CHAIN_NAMES = {
+  1: "Ethereum",
+  8453: "Base",
+  42161: "Arbitrum"
+};
+function chainName(chainId) {
+  return CHAIN_NAMES[chainId] ?? `chain ${chainId}`;
+}
+async function ensureWalletOnChain(pub, wallet, expected) {
+  const actual = await pub.getChainId();
+  if (actual === expected) return;
+  try {
+    await wallet.switchChain({ id: expected });
+  } catch (error) {
+    throw new OwneyError(
+      "CHAIN_MISMATCH",
+      `Your wallet is on ${chainName(actual)}. Switch it to ${chainName(expected)} and try again.`,
+      {
+        expectedChainId: expected,
+        actualChainId: actual,
+        cause: error instanceof Error ? error.message : String(error)
+      }
+    );
+  }
+  const after = await pub.getChainId();
+  if (after !== expected) {
+    throw new OwneyError(
+      "CHAIN_MISMATCH",
+      `Your wallet is still on ${chainName(after)}. Switch it to ${chainName(expected)} and try again.`,
+      { expectedChainId: expected, actualChainId: after }
+    );
+  }
+}
+
 // src/lib/sponsored-deposit.ts
 var AUTH_WINDOW_SECONDS = 15 * 60;
 function makeSponsoredDepositCallback(deps) {
@@ -1941,6 +2051,7 @@ function makeSponsoredDepositCallback(deps) {
     }
     const pub = deps.getPublicClient(cid);
     const wallet = deps.getWalletClient(cid);
+    await ensureWalletOnChain(pub, wallet, cid);
     try {
       const balance = await readErc20Balance(pub, token, deps.ownerAddress);
       if (balance < BigInt(amount)) {
@@ -1952,6 +2063,10 @@ function makeSponsoredDepositCallback(deps) {
       }
     } catch (err) {
       if (err instanceof OwneyError) throw err;
+      console.warn(
+        "[owney-sdk] Deposit balance pre-check failed (non-fatal):",
+        err instanceof Error ? err.message : String(err)
+      );
     }
     const { tokenName, tokenVersion } = await readTokenMeta(pub, token);
     const validAfter = 0n;
@@ -2015,6 +2130,8 @@ function makeSponsoredWethCallback(deps) {
     }
     const amountWei = BigInt(amount);
     const pub = deps.getPublicClient(cid);
+    const wallet = deps.getWalletClient(cid);
+    await ensureWalletOnChain(pub, wallet, cid);
     try {
       const balance = await readErc20Balance(pub, token, deps.ownerAddress);
       if (balance < amountWei) {
@@ -2026,6 +2143,10 @@ function makeSponsoredWethCallback(deps) {
       }
     } catch (err) {
       if (err instanceof OwneyError) throw err;
+      console.warn(
+        "[owney-sdk] WETH balance pre-check failed (non-fatal):",
+        err instanceof Error ? err.message : String(err)
+      );
     }
     const allowance = await readPermit2Allowance(pub, token, deps.ownerAddress);
     if (allowance < amountWei) {
@@ -2053,7 +2174,6 @@ function makeSponsoredWethCallback(deps) {
         deadline
       }
     });
-    const wallet = deps.getWalletClient(cid);
     const signature = await wallet.signTypedData({
       account: deps.ownerAddress,
       ...typedData

package/dist/index.d.cts

@@ -609,7 +609,7 @@ declare class OwneySDK {
     getAllocationApy({ agentId, }?: AllocationApyOptions): Promise<OwneyAllocationApy>;
 }
 
-type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
+type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
 declare class OwneyError extends Error {
     readonly code: OwneyErrorCode;
     readonly details?: Record<string, unknown>;

package/dist/index.d.ts

@@ -609,7 +609,7 @@ declare class OwneySDK {
     getAllocationApy({ agentId, }?: AllocationApyOptions): Promise<OwneyAllocationApy>;
 }
 
-type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
+type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
 declare class OwneyError extends Error {
     readonly code: OwneyErrorCode;
     readonly details?: Record<string, unknown>;

package/dist/index.js

@@ -1285,20 +1285,94 @@ var ZyfaiAgent = class {
       );
     }
   }
+  /**
+   * True when `smartWallet` is the backend-managed pool wallet Zyfai assigned
+   * to this EOA — the "new wallet" kind that is predeployed on the chains it
+   * was onboarded to. Legacy wallets (created before @zyfai/sdk 0.2.44) have no
+   * pool record.
+   *
+   * A failed lookup returns false rather than throwing: misclassifying is
+   * recoverable (ensureWalletDeployed tries the other deploy call), but
+   * failing the deposit outright is not.
+   */
+  async isPredeployedPoolWallet(ownerAddress, smartWallet) {
+    try {
+      const byEoa = await this.sdk.getSmartWalletByEOA(ownerAddress);
+      return typeof byEoa?.smartWallet === "string" && byEoa.smartWallet.toLowerCase() === smartWallet.toLowerCase();
+    } catch (error) {
+      console.warn(
+        "[zyfai] getSmartWalletByEOA failed; assuming a legacy wallet:",
+        error instanceof Error ? error.message : String(error)
+      );
+      return false;
+    }
+  }
+  /**
+   * Guarantee the user's Safe has code on `chainId` before anything transfers
+   * funds into it, and return its address.
+   *
+   * Zyfai predeploys wallets created since @zyfai/sdk 0.2.44, but ONLY on the
+   * chains they were onboarded to. Legacy wallets, and any chain a pool wallet
+   * has not been onboarded to, are *counterfactual*: `getSmartWalletAddress`
+   * returns a real deterministic address that holds no code yet. Depositing
+   * there strands the funds until the Safe is deployed, and Owney's own sponsor
+   * relayer refuses to broadcast to an address with no bytecode
+   * (`to-address.guard-helper.ts`), so the deposit fails as an opaque 500.
+   *
+   * ROUT-320 removed the old deploySafe step believing every wallet was
+   * predeployed from 0.2.44 on. Zyf later clarified that only NEW wallets are;
+   * old ones still need the legacy flow. Hence the gate is on the per-chain
+   * `isDeployed` flag rather than on the wallet's age — that covers both a
+   * legacy wallet and a pool wallet on a fresh chain.
+   */
+  async ensureWalletDeployed(ownerAddress, chainId) {
+    const wallet = await this.sdk.getSmartWalletAddress(ownerAddress, chainId);
+    if (wallet.isDeployed) 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)
+    );
+    const [first, second] = poolFirst ? [deployAsPool, deployAsLegacy] : [deployAsLegacy, deployAsPool];
+    try {
+      await first();
+    } catch (error) {
+      console.warn(
+        `[zyfai] ${poolFirst ? "deployOnChains" : "deploySafe"} failed on chain ${chainId}; trying the other deploy path:`,
+        error instanceof Error ? error.message : String(error)
+      );
+      await second();
+    }
+    const redeployed = await this.sdk.getSmartWalletAddress(
+      ownerAddress,
+      chainId
+    );
+    if (!redeployed.isDeployed) {
+      throw new OwneyError(
+        "WALLET_NOT_DEPLOYED",
+        `Smart wallet ${redeployed.address} is still not deployed on chain ${chainId}. Depositing would send funds to an address with no code.`,
+        { chainId, smartWallet: redeployed.address },
+        this.id
+      );
+    }
+    return redeployed.address;
+  }
   async deposit(state, chainId, amount, asset, depositCallback) {
     try {
       const validChainId = isValidChainId(chainId);
       await this.ensureConnected(state, validChainId);
       if (depositCallback) {
-        const wallet = await this.sdk.getSmartWalletAddress(
+        const smartWallet = await this.ensureWalletDeployed(
           this.getAddress(),
           validChainId
         );
-        const txHash = await depositCallback(
-          wallet.address,
-          validChainId,
-          amount
-        );
+        const txHash = await depositCallback(smartWallet, validChainId, amount);
         const tokenAddress = asset === "WETH" ? WETH_ADDRESS_BY_CHAIN[validChainId] : void 0;
         try {
           await (tokenAddress ? this.sdk.logDeposit(validChainId, txHash, amount, tokenAddress) : this.sdk.logDeposit(validChainId, txHash, amount));
@@ -1308,8 +1382,9 @@ var ZyfaiAgent = class {
             logError
           );
         }
-        return { txHash, smartWallet: wallet.address, amount };
+        return { txHash, smartWallet, amount };
       }
+      await this.ensureWalletDeployed(this.getAddress(), validChainId);
       const raw = await this.sdk.depositFunds(
         this.getAddress(),
         validChainId,
@@ -1897,6 +1972,41 @@ async function readErc20Balance(publicClient, token, owner) {
   });
 }
 
+// src/lib/chain-guard.ts
+var CHAIN_NAMES = {
+  1: "Ethereum",
+  8453: "Base",
+  42161: "Arbitrum"
+};
+function chainName(chainId) {
+  return CHAIN_NAMES[chainId] ?? `chain ${chainId}`;
+}
+async function ensureWalletOnChain(pub, wallet, expected) {
+  const actual = await pub.getChainId();
+  if (actual === expected) return;
+  try {
+    await wallet.switchChain({ id: expected });
+  } catch (error) {
+    throw new OwneyError(
+      "CHAIN_MISMATCH",
+      `Your wallet is on ${chainName(actual)}. Switch it to ${chainName(expected)} and try again.`,
+      {
+        expectedChainId: expected,
+        actualChainId: actual,
+        cause: error instanceof Error ? error.message : String(error)
+      }
+    );
+  }
+  const after = await pub.getChainId();
+  if (after !== expected) {
+    throw new OwneyError(
+      "CHAIN_MISMATCH",
+      `Your wallet is still on ${chainName(after)}. Switch it to ${chainName(expected)} and try again.`,
+      { expectedChainId: expected, actualChainId: after }
+    );
+  }
+}
+
 // src/lib/sponsored-deposit.ts
 var AUTH_WINDOW_SECONDS = 15 * 60;
 function makeSponsoredDepositCallback(deps) {
@@ -1912,6 +2022,7 @@ function makeSponsoredDepositCallback(deps) {
     }
     const pub = deps.getPublicClient(cid);
     const wallet = deps.getWalletClient(cid);
+    await ensureWalletOnChain(pub, wallet, cid);
     try {
       const balance = await readErc20Balance(pub, token, deps.ownerAddress);
       if (balance < BigInt(amount)) {
@@ -1923,6 +2034,10 @@ function makeSponsoredDepositCallback(deps) {
       }
     } catch (err) {
       if (err instanceof OwneyError) throw err;
+      console.warn(
+        "[owney-sdk] Deposit balance pre-check failed (non-fatal):",
+        err instanceof Error ? err.message : String(err)
+      );
     }
     const { tokenName, tokenVersion } = await readTokenMeta(pub, token);
     const validAfter = 0n;
@@ -1986,6 +2101,8 @@ function makeSponsoredWethCallback(deps) {
     }
     const amountWei = BigInt(amount);
     const pub = deps.getPublicClient(cid);
+    const wallet = deps.getWalletClient(cid);
+    await ensureWalletOnChain(pub, wallet, cid);
     try {
       const balance = await readErc20Balance(pub, token, deps.ownerAddress);
       if (balance < amountWei) {
@@ -1997,6 +2114,10 @@ function makeSponsoredWethCallback(deps) {
       }
     } catch (err) {
       if (err instanceof OwneyError) throw err;
+      console.warn(
+        "[owney-sdk] WETH balance pre-check failed (non-fatal):",
+        err instanceof Error ? err.message : String(err)
+      );
     }
     const allowance = await readPermit2Allowance(pub, token, deps.ownerAddress);
     if (allowance < amountWei) {
@@ -2024,7 +2145,6 @@ function makeSponsoredWethCallback(deps) {
         deadline
       }
     });
-    const wallet = deps.getWalletClient(cid);
     const signature = await wallet.signTypedData({
       account: deps.ownerAddress,
       ...typedData

package/package.json

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