@oydual31/more-vaults-sdk 1.1.19 → 1.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oydual31/more-vaults-sdk",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "description": "TypeScript SDK for MoreVaults protocol — viem/wagmi and ethers.js",
   "type": "module",
   "exports": {

package/src/ethers/userHelpers.ts

@@ -6,7 +6,7 @@
 
 import { Contract, Interface } from "ethers";
 import type { Provider } from "ethers";
-import { BRIDGE_ABI, CONFIG_ABI, ERC20_ABI, VAULT_ABI, METADATA_ABI } from "./abis";
+import { BRIDGE_ABI, CONFIG_ABI, ERC20_ABI, VAULT_ABI, METADATA_ABI, VAULT_ANALYSIS_ABI } from "./abis";
 import type { CrossChainRequestInfo } from "./types";
 import { getVaultStatus } from "./utils";
 import type { VaultStatus } from "./utils";
@@ -172,6 +172,7 @@ export async function canDeposit(
   user: string
 ): Promise<DepositEligibility> {
   const config = new Contract(vault, CONFIG_ABI, provider);
+  const analysis = new Contract(vault, VAULT_ANALYSIS_ABI, provider);
 
   const isPaused = await (config.paused() as Promise<boolean>);
 
@@ -179,12 +180,35 @@ export async function canDeposit(
     return { allowed: false, reason: "paused" };
   }
 
-  // maxDeposit(user) can REVERT on vaults with whitelist/ACL
+  // Check whitelist via getAvailableToDeposit before the capacity check.
+  // maxDeposit() reverts on cross-chain async hub vaults, so we cannot rely on a maxDeposit()
+  // revert as a whitelist signal — getAvailableToDeposit() is the authoritative per-user check.
+  let whitelistEnabled = false;
+  try {
+    whitelistEnabled = await (analysis.isDepositWhitelistEnabled() as Promise<boolean>);
+  } catch {
+    // Older vaults may not have this function
+  }
+
+  if (whitelistEnabled) {
+    let available = 0n;
+    try {
+      available = await (analysis.getAvailableToDeposit(user) as Promise<bigint>);
+    } catch {
+      // Revert on getAvailableToDeposit — treat as not whitelisted
+      return { allowed: false, reason: "not-whitelisted" };
+    }
+    if (available === 0n) {
+      return { allowed: false, reason: "not-whitelisted" };
+    }
+  }
+
+  // maxDeposit(user) can REVERT on vaults with whitelist/ACL (legacy vaults without
+  // getAvailableToDeposit) or on cross-chain async hubs. Treat any revert as not-whitelisted.
   let maxDepositAmount: bigint;
   try {
     maxDepositAmount = await (config.maxDeposit(user) as Promise<bigint>);
   } catch {
-    // Revert means the vault has whitelist/ACL and this user is not approved
     return { allowed: false, reason: "not-whitelisted" };
   }
 

package/src/ethers/utils.ts

@@ -6,7 +6,7 @@
 
 import { Contract, Interface, ZeroAddress } from "ethers";
 import type { Provider, Signer } from "ethers";
-import { BRIDGE_ABI, CONFIG_ABI, ERC20_ABI, VAULT_ABI } from "./abis";
+import { BRIDGE_ABI, CONFIG_ABI, ERC20_ABI, VAULT_ABI, ADMIN_CONFIG_ABI } from "./abis";
 import { MoreVaultsError, CCManagerNotConfiguredError, AsyncRequestTimeoutError } from "./errors";
 
 // Minimal ABI for Stargate type detection
@@ -288,12 +288,13 @@ export async function getVaultStatus(
   vault: string
 ): Promise<VaultStatus> {
   const mc = new Contract(MULTICALL3_ADDRESS, MULTICALL3_ABI, provider);
-  const configIface   = new Interface(CONFIG_ABI as unknown as string[]);
-  const bridgeIface   = new Interface(BRIDGE_ABI as unknown as string[]);
-  const vaultIface    = new Interface(VAULT_ABI  as unknown as string[]);
-  const decimalsIface = new Interface(["function decimals() view returns (uint8)"]);
+  const configIface      = new Interface(CONFIG_ABI as unknown as string[]);
+  const adminConfigIface = new Interface(ADMIN_CONFIG_ABI as unknown as string[]);
+  const bridgeIface      = new Interface(BRIDGE_ABI as unknown as string[]);
+  const vaultIface       = new Interface(VAULT_ABI  as unknown as string[]);
+  const decimalsIface    = new Interface(["function decimals() view returns (uint8)"]);
 
-  // ── Batch 1: 12 calls → 1 eth_call via Multicall3.aggregate3 ─────────────
+  // ── Batch 1: 13 calls → 1 eth_call via Multicall3.aggregate3 ─────────────
   const b1Calls = [
     { target: vault, allowFailure: false, callData: configIface.encodeFunctionData("isHub") },
     { target: vault, allowFailure: false, callData: configIface.encodeFunctionData("paused") },
@@ -308,6 +309,8 @@ export async function getVaultStatus(
     { target: vault, allowFailure: false, callData: vaultIface.encodeFunctionData("totalAssets") },
     { target: vault, allowFailure: false, callData: vaultIface.encodeFunctionData("totalSupply") },
     { target: vault, allowFailure: false, callData: decimalsIface.encodeFunctionData("decimals") },
+    // allowFailure=true: older vaults may not have depositCapacity
+    { target: vault, allowFailure: true,  callData: adminConfigIface.encodeFunctionData("depositCapacity") },
   ];
 
   const b1: { success: boolean; returnData: string }[] = await mc.aggregate3.staticCall(b1Calls);
@@ -329,6 +332,9 @@ export async function getVaultStatus(
   const decimalsRaw       = decimalsIface.decodeFunctionResult("decimals",    b1[11].returnData)[0];
   const decimalsNum       = Number(decimalsRaw);
   const oneShare          = 10n ** BigInt(decimalsNum);
+  const depositCapacity   = b1[12].success
+    ? adminConfigIface.decodeFunctionResult("depositCapacity", b1[12].returnData)[0] as bigint
+    : 0n;
 
   // ── Batch 2: 2 calls → 1 eth_call (depends on underlying + decimals) ─────
   const erc20Iface = new Interface(ERC20_ABI as unknown as string[]);
@@ -353,11 +359,20 @@ export async function getVaultStatus(
   const depositAccessRestricted = maxDepositRaw === null && !isCrossChainAsync;
   const effectiveCapacity: bigint = maxDepositRaw === null ? MAX_UINT256 : maxDepositRaw!;
 
+  // maxDeposit(address(0)) returns 0 in two distinct cases:
+  //   1. Vault is truly at capacity: depositCapacity > 0 && totalAssets >= depositCapacity
+  //   2. Whitelist is enabled and address(0) has no quota — but vault is NOT full
+  // Only set mode='full' for case 1. Case 2 should remain 'local'/'cross-chain-oracle'
+  // so that smartDeposit proceeds and preflightSync throws WhitelistQuotaExhaustedError.
+  const isTrulyFull = effectiveCapacity === 0n
+    && !isCrossChainAsync
+    && (depositCapacity > 0n && totalAssets >= depositCapacity);
+
   // ── Derive mode ────────────────────────────────────────────────────────────
   let mode: VaultMode;
   if (isPaused) {
     mode = "paused";
-  } else if (effectiveCapacity === 0n) {
+  } else if (isTrulyFull) {
     mode = "full";
   } else if (!isHub) {
     mode = "local";
@@ -389,7 +404,7 @@ export async function getVaultStatus(
   if (isPaused) {
     issues.push("Vault is paused — no deposits or redeems are possible.");
   }
-  if (effectiveCapacity === 0n && !isPaused) {
+  if (isTrulyFull) {
     issues.push(
       "Deposit capacity is full — increase depositCapacity via setDepositCapacity()."
     );

package/src/viem/userHelpers.ts

@@ -209,6 +209,10 @@ export async function canDeposit(
     allowFailure: false,
   })
 
+  if (isPaused) {
+    return { allowed: false, reason: 'paused', whitelistEnabled: false }
+  }
+
   // Read whitelist status (may revert on older vaults — default to false)
   let whitelistEnabled = false
   try {
@@ -221,18 +225,36 @@ export async function canDeposit(
     // Older vaults may not have this function
   }
 
-  if (isPaused) {
-    return { allowed: false, reason: 'paused', whitelistEnabled }
+  // Check whitelist via getAvailableToDeposit BEFORE the isCrossChainAsync short-circuit.
+  // Cross-chain async hub vaults revert on maxDeposit(), so we cannot use a maxDeposit() revert
+  // as a whitelist signal — getAvailableToDeposit() is the authoritative per-user check.
+  if (whitelistEnabled) {
+    let available = 0n
+    try {
+      available = await publicClient.readContract({
+        address: v,
+        abi: VAULT_ANALYSIS_ABI,
+        functionName: 'getAvailableToDeposit',
+        args: [getAddress(user)],
+      }) as bigint
+    } catch {
+      // Revert on getAvailableToDeposit — treat as not whitelisted
+      return { allowed: false, reason: 'not-whitelisted', maxDeposit: 0n, whitelistEnabled }
+    }
+    if (available === 0n) {
+      return { allowed: false, reason: 'not-whitelisted', maxDeposit: 0n, whitelistEnabled }
+    }
   }
 
-  // Cross-chain async hubs revert on maxDeposit — this is expected, not a whitelist block.
-  // The vault accepts deposits via initVaultActionRequest instead of the standard ERC-4626 path.
+  // Cross-chain async hubs accept deposits via initVaultActionRequest, not ERC-4626.
+  // maxDeposit() reverts on these vaults — skip the capacity check.
   const isCrossChainAsync = isHub && !oraclesEnabled
   if (isCrossChainAsync) {
     return { allowed: true, reason: 'ok', whitelistEnabled }
   }
 
-  // maxDeposit(user) can REVERT on vaults with whitelist/ACL
+  // For standard (ERC-4626) vaults: check remaining capacity via maxDeposit.
+  // A revert here catches legacy vaults that use maxDeposit as an ACL gate.
   let maxDepositAmount: bigint
   try {
     maxDepositAmount = await publicClient.readContract({
@@ -242,7 +264,6 @@ export async function canDeposit(
       args: [getAddress(user)],
     })
   } catch {
-    // Revert means the vault has whitelist/ACL and this user is not approved
     return { allowed: false, reason: 'not-whitelisted', maxDeposit: 0n, whitelistEnabled }
   }
 

package/src/viem/utils.ts

@@ -6,7 +6,7 @@ import {
   getAddress,
   zeroAddress,
 } from 'viem'
-import { BRIDGE_ABI, CONFIG_ABI, ERC20_ABI, VAULT_ABI, METADATA_ABI } from './abis'
+import { BRIDGE_ABI, CONFIG_ABI, ERC20_ABI, VAULT_ABI, METADATA_ABI, ADMIN_CONFIG_ABI } from './abis'
 import type { CrossChainRequestInfo } from './types'
 import { MoreVaultsError, CCManagerNotConfiguredError, AsyncRequestTimeoutError } from './errors.js'
 import { getDefaultStorage, clearDepositFlow, type FlowStorage } from './flowStorage'
@@ -174,11 +174,12 @@ export async function getVaultStatus(
       { address: v, abi: CONFIG_ABI,  functionName: 'getEscrow' },
       { address: v, abi: CONFIG_ABI,  functionName: 'getWithdrawalQueueStatus' },
       { address: v, abi: CONFIG_ABI,  functionName: 'getWithdrawalTimelock' },
-      { address: v, abi: CONFIG_ABI,  functionName: 'maxDeposit', args: [zeroAddress] },
-      { address: v, abi: VAULT_ABI,   functionName: 'asset' },
-      { address: v, abi: VAULT_ABI,   functionName: 'totalAssets' },
-      { address: v, abi: VAULT_ABI,   functionName: 'totalSupply' },
-      { address: v, abi: METADATA_ABI, functionName: 'decimals' },
+      { address: v, abi: CONFIG_ABI,       functionName: 'maxDeposit', args: [zeroAddress] },
+      { address: v, abi: VAULT_ABI,        functionName: 'asset' },
+      { address: v, abi: VAULT_ABI,        functionName: 'totalAssets' },
+      { address: v, abi: VAULT_ABI,        functionName: 'totalSupply' },
+      { address: v, abi: METADATA_ABI,     functionName: 'decimals' },
+      { address: v, abi: ADMIN_CONFIG_ABI, functionName: 'depositCapacity' },
     ] as const,
     allowFailure: true,
   })
@@ -196,6 +197,7 @@ export async function getVaultStatus(
   const totalAssets         = b1[9].status  === 'success' ? b1[9].result  as bigint  : 0n
   const totalSupply         = b1[10].status === 'success' ? b1[10].result as bigint  : 0n
   const decimals            = b1[11].status === 'success' ? Number(b1[11].result)    : 18
+  const depositCapacity     = b1[12].status === 'success' ? b1[12].result as bigint  : 0n
 
   // ── Batch 2: depends on underlying + decimals from batch 1 ────────────────
   const oneShare = 10n ** BigInt(decimals)
@@ -221,11 +223,20 @@ export async function getVaultStatus(
   const depositAccessRestricted = maxDepositRaw === null && !isCrossChainAsync
   const effectiveCapacity: bigint = (maxDepositRaw === null) ? MAX_UINT256 : maxDepositRaw
 
+  // maxDeposit(address(0)) returns 0 in two distinct cases:
+  //   1. Vault is truly at capacity: depositCapacity > 0 && totalAssets >= depositCapacity
+  //   2. Whitelist is enabled and address(0) has no quota — but vault is NOT full
+  // Only set mode='full' for case 1. Case 2 should remain 'local'/'cross-chain-oracle'
+  // so that smartDeposit proceeds and preflightSync throws WhitelistQuotaExhaustedError.
+  const isTrulyFull = effectiveCapacity === 0n
+    && !isCrossChainAsync
+    && (depositCapacity > 0n && totalAssets >= depositCapacity)
+
   // ── Derive mode ────────────────────────────────────────────────────────────
   let mode: VaultMode
   if (isPaused) {
     mode = 'paused'
-  } else if (effectiveCapacity === 0n) {
+  } else if (isTrulyFull) {
     mode = 'full'
   } else if (!isHub) {
     mode = 'local'