@oydual31/more-vaults-sdk 1.1.21 → 1.1.23

package/package.json

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

package/src/ethers/abis.ts

@@ -4,6 +4,11 @@
  */
 
 export const VAULT_ABI = [
+  // Errors (for proper revert decoding)
+  "error WithdrawalQueueDisabled()",
+  "error WithdrawalQueueEnabled()",
+  "error RequestWithdrawDisabled()",
+
   // ERC4626 core
   "function deposit(uint256 assets, address receiver) returns (uint256 shares)",
   "function mint(uint256 shares, address receiver) returns (uint256 assets)",

package/src/ethers/errorParser.ts

@@ -10,6 +10,7 @@ import {
   NoSuchActionsError,
   CapacityFullError,
   InvalidInputError,
+  WithdrawalQueueDisabledError,
 } from './errors.js'
 
 /**
@@ -46,6 +47,13 @@ export function parseContractError(err: unknown, vault: string, caller?: string)
     throw new VaultPausedError(vault)
   }
 
+  // Withdrawal queue disabled — caller used requestRedeem/requestWithdraw on a vault
+  // where the queue is off. Should use redeemShares/withdrawAssets directly, or smartRedeem.
+  // 0xdbb22fbf is the selector for WithdrawalQueueDisabled().
+  if (msg.includes('WithdrawalQueueDisabled') || msg.includes('0xdbb22fbf')) {
+    throw new WithdrawalQueueDisabledError(vault)
+  }
+
   // Role checks
   if (msg.includes('NotCurator') || msg.includes('OwnableUnauthorizedAccount')) {
     if (msg.includes('NotCurator')) {

package/src/ethers/errors.ts

@@ -42,6 +42,13 @@ export class WhitelistQuotaExhaustedError extends MoreVaultsError {
   }
 }
 
+export class WithdrawalQueueDisabledError extends MoreVaultsError {
+  constructor(vault: string) {
+    super(`[MoreVaults] Withdrawal queue is disabled on vault ${vault}. Cannot call requestRedeem/requestWithdraw — use redeemShares/withdrawAssets directly, or smartRedeem which auto-selects the correct flow.`)
+    this.name = 'WithdrawalQueueDisabledError'
+  }
+}
+
 export class InsufficientLiquidityError extends MoreVaultsError {
   hubLiquid: bigint
   required: bigint

package/src/ethers/index.ts

@@ -93,6 +93,7 @@ export {
   ComposeTimeoutError,
   ComposeAlreadyExecutedError,
   WithdrawalTimelockActiveError,
+  WithdrawalQueueDisabledError,
 } from "./errors";
 
 // --- Deposit flows ---

package/src/ethers/redeemFlows.ts

@@ -15,7 +15,7 @@ import {
 } from "./types";
 import type { ContractTransactionReceipt } from "ethers";
 import { preflightAsync, preflightRedeemLiquidity } from "./preflight";
-import { EscrowNotConfiguredError, InvalidInputError, VaultPausedError, WithdrawalTimelockActiveError } from "./errors";
+import { EscrowNotConfiguredError, InvalidInputError, VaultPausedError, WithdrawalTimelockActiveError, WithdrawalQueueDisabledError } from "./errors";
 import { validateWalletChain } from "./chainValidation";
 import { getVaultStatus, quoteLzFee, detectStargateOft } from "./utils";
 import { CHAIN_ID_TO_EID, OFT_ROUTES, createChainProvider } from "./chains";
@@ -159,6 +159,16 @@ export async function requestRedeem(
   // Validate wallet is on the correct chain (opt-in via hubChainId)
   await validateWalletChain(signer, addresses.hubChainId);
 
+  // Pre-check: vault must have withdrawal queue enabled — otherwise the contract
+  // reverts with WithdrawalQueueDisabled (0xdbb22fbf). Use redeemShares directly
+  // or smartRedeem which auto-selects the correct flow.
+  const provider = signer.provider!
+  const configRead = new Contract(addresses.vault, ['function getWithdrawalQueueStatus() view returns (bool)'], provider)
+  const queueEnabled: boolean = await configRead.getWithdrawalQueueStatus()
+  if (!queueEnabled) {
+    throw new WithdrawalQueueDisabledError(addresses.vault)
+  }
+
   // Detect which signature the vault supports: new (uint256, address) or legacy (uint256)
   let useLegacy = false
   const vaultNew = new Contract(addresses.vault, VAULT_ABI, signer)

package/src/viem/abis.ts

@@ -4,6 +4,10 @@
  */
 
 export const VAULT_ABI = [
+  // ── Errors (for proper revert decoding) ──
+  { type: 'error', name: 'WithdrawalQueueDisabled', inputs: [] },
+  { type: 'error', name: 'WithdrawalQueueEnabled', inputs: [] },
+  { type: 'error', name: 'RequestWithdrawDisabled', inputs: [] },
   {
     type: 'function',
     name: 'deposit',

package/src/viem/adminActions.ts

@@ -126,7 +126,7 @@ export async function addAvailableAssets(
 ): Promise<{ txHash: `0x${string}` }> {
   const account = walletClient.account!
   const v = getAddress(vault)
-  const checksummed = assets.map(getAddress)
+  const checksummed = assets.map(a => getAddress(a))
 
   try {
     await publicClient.simulateContract({
@@ -268,7 +268,7 @@ export async function setDepositWhitelist(
     throw new InvalidInputError('depositors and caps arrays must have the same length')
   }
 
-  const checksummed = depositors.map(getAddress)
+  const checksummed = depositors.map(a => getAddress(a))
 
   try {
     await publicClient.simulateContract({

package/src/viem/chains.ts

@@ -267,8 +267,9 @@ export const LZ_TIMEOUTS = {
  *
  * Note on struct differences:
  *   - SwapRouter (Eth/Arb/Op, 0xE592...): exactInputSingle struct includes `deadline`
- *   - SwapRouter02 (Base, 0x2626...): exactInputSingle struct does NOT include `deadline`
- *   - FlowSwap V3 (Flow EVM, 0xeEDC...): derived from original UniV3, includes `deadline`
+ *   - SwapRouter02 (Base/Flow, 0x2626.../0xeEDC...): struct does NOT include `deadline`
+ *     Flow EVM confirmed via PUSH4 scan: router only dispatches 0x04e45aaf (SwapRouter02),
+ *     not 0x414bf389 (SwapRouter). Both are in curatorSwaps.ts SWAP_ROUTER02_CHAINS.
  */
 export const UNISWAP_V3_ROUTERS: Record<number, `0x${string}`> = {
   [8453]:  '0x2626664c2603336E57B271c5C0b26F421741e481', // Base — SwapRouter02 (no deadline)

package/src/viem/curatorMulticall.ts

@@ -138,7 +138,7 @@ export function encodeCuratorAction(action: CuratorAction): `0x${string}` {
       return encodeFunctionData({
         abi: ADMIN_WRITE_ABI,
         functionName: 'addAvailableAssets',
-        args: [action.assets.map(getAddress)],
+        args: [action.assets.map(a => getAddress(a))],
       })
 
     case 'disableAssetToDeposit':

package/src/viem/curatorStatus.ts

@@ -55,7 +55,7 @@ export async function getCuratorVaultStatus(
     timeLockPeriod,
     maxSlippagePercent,
     currentNonce,
-    availableAssets: availableAssets.map(getAddress),
+    availableAssets: availableAssets.map(a => getAddress(a)),
     lzAdapter: getAddress(lzAdapter),
     paused,
   }
@@ -177,8 +177,8 @@ export async function getVaultAnalysis(
       }).catch(() => null),
     ])
 
-  const availableAddresses = (availableRaw as Address[]).map(getAddress)
-  const depositableAddresses = (depositableRaw as Address[]).map(getAddress)
+  const availableAddresses = (availableRaw as Address[]).map(a => getAddress(a))
+  const depositableAddresses = (depositableRaw as Address[]).map(a => getAddress(a))
 
   // Deduplicated set of all asset addresses we need metadata for
   const allAddresses = Array.from(new Set([...availableAddresses, ...depositableAddresses]))
@@ -302,7 +302,7 @@ export async function getVaultAssetBreakdown(
     return { assets: [], totalAssets: 0n, totalSupply: 0n, underlyingDecimals: 6 }
   }
 
-  const addresses = availableRaw.map(getAddress)
+  const addresses = availableRaw.map(a => getAddress(a))
 
   // Step 2: multicall — balanceOf + metadata for each asset + totalAssets + totalSupply + vault decimals
   const results = await publicClient.multicall({

package/src/viem/curatorSubVaults.ts

@@ -86,8 +86,8 @@ export async function getSubVaultPositions(
       .catch(() => [] as Address[]),
   ])
 
-  const erc4626Vaults = (erc4626Raw as Address[]).map(getAddress)
-  const erc7540Vaults = (erc7540Raw as Address[]).map(getAddress)
+  const erc4626Vaults = (erc4626Raw as Address[]).map(a => getAddress(a))
+  const erc7540Vaults = (erc7540Raw as Address[]).map(a => getAddress(a))
 
   const allSubVaults: Array<{ address: Address; type: 'erc4626' | 'erc7540' }> = [
     ...erc4626Vaults.map((a) => ({ address: a, type: 'erc4626' as const })),
@@ -465,7 +465,7 @@ export async function getVaultPortfolio(
     ? getAddress(vaultTotals[2].result as Address)
     : zeroAddress
 
-  const availableAddresses = (availableRaw as Address[]).map(getAddress)
+  const availableAddresses = (availableRaw as Address[]).map(a => getAddress(a))
 
   // Sub-vault share addresses to exclude from liquid assets (avoid double-counting)
   const subVaultAddressSet = new Set(subVaultPositions.map((p) => p.address.toLowerCase()))

package/src/viem/curatorSwaps.ts

@@ -10,7 +10,7 @@
  *   - Ethereum (1):       SwapRouter   0xE592...  — HAS deadline field
  *   - Arbitrum (42161):   SwapRouter   0xE592...  — HAS deadline field
  *   - Optimism (10):      SwapRouter   0xE592...  — HAS deadline field
- *   - Flow EVM (747):     FlowSwap V3  0xeEDC...  — HAS deadline field
+ *   - Flow EVM (747):     FlowSwap V3  0xeEDC...  — NO deadline field (SwapRouter02-compatible)
  *
  * @module curatorSwaps
  */
@@ -89,8 +89,10 @@ const UNISWAP_V3_SWAP_ROUTER02_ABI = [
 /**
  * Chains that use SwapRouter02 (no deadline in struct).
  * All other chains in UNISWAP_V3_ROUTERS use the original SwapRouter.
+ *
+ * Flow EVM (747): FlowSwap V3 router exposes exactInputSingle with selector 0x04e45aaf
  */
-const SWAP_ROUTER02_CHAINS = new Set([8453])
+const SWAP_ROUTER02_CHAINS = new Set([8453, 747])
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Calldata encoding

package/src/viem/errorParser.ts

@@ -10,6 +10,7 @@ import {
   NoSuchActionsError,
   CapacityFullError,
   InvalidInputError,
+  WithdrawalQueueDisabledError,
 } from './errors.js'
 
 /**
@@ -45,6 +46,13 @@ export function parseContractError(err: unknown, vault: string, caller?: string)
     throw new VaultPausedError(vault)
   }
 
+  // Withdrawal queue disabled — caller used requestRedeem/requestWithdraw on a vault
+  // where the queue is off. Should use redeemShares/withdrawAssets directly, or smartRedeem.
+  // 0xdbb22fbf is the selector for WithdrawalQueueDisabled().
+  if (msg.includes('WithdrawalQueueDisabled') || msg.includes('0xdbb22fbf')) {
+    throw new WithdrawalQueueDisabledError(vault)
+  }
+
   // Role checks
   if (msg.includes('NotCurator') || msg.includes('OwnableUnauthorizedAccount')) {
     // Distinguish curator vs owner by checking the specific error

package/src/viem/errors.ts

@@ -42,6 +42,13 @@ export class WhitelistQuotaExhaustedError extends MoreVaultsError {
   }
 }
 
+export class WithdrawalQueueDisabledError extends MoreVaultsError {
+  constructor(vault: string) {
+    super(`[MoreVaults] Withdrawal queue is disabled on vault ${vault}. Cannot call requestRedeem/requestWithdraw — use redeemShares/withdrawAssets directly, or smartRedeem which auto-selects the correct flow.`)
+    this.name = 'WithdrawalQueueDisabledError'
+  }
+}
+
 export class InsufficientLiquidityError extends MoreVaultsError {
   hubLiquid: bigint
   required: bigint

package/src/viem/index.ts

@@ -89,6 +89,7 @@ export {
   ComposeTimeoutError,
   ComposeAlreadyExecutedError,
   WithdrawalTimelockActiveError,
+  WithdrawalQueueDisabledError,
 } from './errors'
 
 // --- Deposit Flows ---

package/src/viem/redeemFlows.ts

@@ -18,7 +18,7 @@ import type {
 import { ActionType } from './types'
 import { ensureAllowance, getVaultStatus, quoteLzFee, detectStargateOft } from './utils'
 import { preflightAsync, preflightRedeemLiquidity } from './preflight'
-import { EscrowNotConfiguredError, VaultPausedError, InvalidInputError, WithdrawalTimelockActiveError } from './errors'
+import { EscrowNotConfiguredError, VaultPausedError, InvalidInputError, WithdrawalTimelockActiveError, WithdrawalQueueDisabledError } from './errors'
 import { validateWalletChain } from './chainValidation'
 import { parseContractError } from './errorParser'
 import { OFT_ROUTES, CHAIN_ID_TO_EID } from './chains'
@@ -175,6 +175,18 @@ export async function requestRedeem(
   // Validate wallet is on the correct chain (opt-in via hubChainId)
   validateWalletChain(walletClient, addresses.hubChainId)
 
+  // Pre-check: vault must have withdrawal queue enabled — otherwise the contract
+  // reverts with WithdrawalQueueDisabled (0xdbb22fbf). Use redeemShares directly
+  // or smartRedeem which auto-selects the correct flow.
+  const queueEnabled = await publicClient.readContract({
+    address: vault,
+    abi: CONFIG_ABI,
+    functionName: 'getWithdrawalQueueStatus',
+  })
+  if (!queueEnabled) {
+    throw new WithdrawalQueueDisabledError(vault)
+  }
+
   // Detect which signature the vault supports: new (uint256, address) or legacy (uint256)
   let useLegacy = false
 

package/src/viem/vaultConfig.ts

@@ -93,7 +93,7 @@ export async function getVaultConfiguration(
   const num_ = (i: number): number =>
     results[i].status === 'success' ? Number(results[i].result) : 0
   const addrArray = (i: number): Address[] =>
-    results[i].status === 'success' ? (results[i].result as Address[]).map(getAddress) : []
+    results[i].status === 'success' ? (results[i].result as Address[]).map(a => getAddress(a)) : []
 
   return {
     // Roles