@oydual31/more-vaults-sdk 1.1.17 → 1.1.19

package/dist/ethers/index.cjs

@@ -600,6 +600,12 @@ var NotWhitelistedError = class extends MoreVaultsError {
     this.name = "NotWhitelistedError";
   }
 };
+var WhitelistQuotaExhaustedError = class extends MoreVaultsError {
+  constructor(vault, user) {
+    super(`[MoreVaults] Address ${user} has no remaining whitelist deposit quota on vault ${vault}. Ask the vault owner to increase your deposit cap.`);
+    this.name = "WhitelistQuotaExhaustedError";
+  }
+};
 var InsufficientLiquidityError = class extends MoreVaultsError {
   hubLiquid;
   required;
@@ -742,6 +748,12 @@ var ComposeTimeoutError = class extends MoreVaultsError {
     this.guid = guid;
   }
 };
+var ComposeAlreadyExecutedError = class extends MoreVaultsError {
+  constructor() {
+    super("[MoreVaults] Compose already executed \u2014 deposit is complete, no action needed.");
+    this.name = "ComposeAlreadyExecutedError";
+  }
+};
 var WithdrawalTimelockActiveError = class extends MoreVaultsError {
   timelockEndsAt;
   requestTxHash;
@@ -1186,7 +1198,11 @@ async function waitForCompose(hubProvider, composeData, receiver, pollIntervalMs
                   logGuid,
                   logIndex
                 );
-                if (hash !== EMPTY_HASH && hash !== RECEIVED_HASH) {
+                if (hash === RECEIVED_HASH) {
+                  console.log(`[more-vaults-sdk] waitForCompose compose already executed (RECEIVED_HASH) \u2014 signaling done`);
+                  throw new ComposeAlreadyExecutedError();
+                }
+                if (hash !== EMPTY_HASH) {
                   console.log(`[${elapsed}s] Poll #${attempt} \u2014 compose found! (block ${log.blockNumber})`);
                   return {
                     ...composeData,
@@ -1198,16 +1214,19 @@ async function waitForCompose(hubProvider, composeData, receiver, pollIntervalMs
                   };
                 }
               }
-            } catch {
+            } catch (e) {
+              if (e instanceof ComposeAlreadyExecutedError) throw e;
             }
           }
-        } catch {
+        } catch (e) {
+          if (e instanceof ComposeAlreadyExecutedError) throw e;
           break;
         }
         from = chunkEnd + 1n;
       }
       scannedUpTo = currentBlock;
-    } catch {
+    } catch (e) {
+      if (e instanceof ComposeAlreadyExecutedError) throw e;
     }
     let guidMatchFound = false;
     for (const fromAddr of knownFromAddresses) {
@@ -1284,17 +1303,26 @@ async function preflightRedeemLiquidity(provider, vault, shares) {
     throw new InsufficientLiquidityError(vault, hubLiquid, assetsNeeded);
   }
 }
-async function preflightSync(provider, vault) {
+async function preflightSync(provider, vault, user) {
   const config = new ethers.Contract(vault, CONFIG_ABI, provider);
   const [isPaused, depositCapResult] = await Promise.all([
     config.paused(),
-    config.maxDeposit(ethers.ZeroAddress).catch(() => null)
+    config.maxDeposit(user).catch(() => null)
   ]);
   if (isPaused) {
     throw new VaultPausedError(vault);
   }
-  if (depositCapResult !== null && depositCapResult === 0n) {
-    throw new CapacityFullError(vault);
+  if (depositCapResult === null) return;
+  if (depositCapResult === 0n) {
+    const vaultContract = new ethers.Contract(vault, VAULT_ABI, provider);
+    const [capacity, assets] = await Promise.all([
+      config.depositCapacity(),
+      vaultContract.totalAssets()
+    ]);
+    if (capacity > 0n && assets >= capacity) {
+      throw new CapacityFullError(vault);
+    }
+    throw new WhitelistQuotaExhaustedError(vault, user);
   }
 }
 async function preflightSpokeDeposit(spokeProvider, vault, spokeOFT, hubEid, spokeEid, amount, userAddress, lzFee) {
@@ -1466,7 +1494,7 @@ async function depositSimple(signer, addresses, assets, receiver) {
   if (assets === 0n) throw new InvalidInputError("deposit amount must be greater than zero");
   const provider = signer.provider;
   await validateWalletChain(signer, addresses.hubChainId);
-  await preflightSync(provider, addresses.vault);
+  await preflightSync(provider, addresses.vault, receiver);
   const vault = new ethers.Contract(addresses.vault, VAULT_ABI, signer);
   const underlying = await vault.asset();
   await ensureAllowance3(signer, underlying, addresses.vault, assets);
@@ -3690,6 +3718,7 @@ exports.CHAIN_ID_TO_EID = CHAIN_ID_TO_EID;
 exports.CONFIG_ABI = CONFIG_ABI;
 exports.CURATOR_CONFIG_ABI = CURATOR_CONFIG_ABI;
 exports.CapacityFullError = CapacityFullError;
+exports.ComposeAlreadyExecutedError = ComposeAlreadyExecutedError;
 exports.ComposeTimeoutError = ComposeTimeoutError;
 exports.ComposerNotConfiguredError = ComposerNotConfiguredError;
 exports.DEX_ABI = DEX_ABI;
@@ -3729,6 +3758,7 @@ exports.UnsupportedChainError = UnsupportedChainError;
 exports.VAULT_ABI = VAULT_ABI;
 exports.VAULT_ANALYSIS_ABI = VAULT_ANALYSIS_ABI;
 exports.VaultPausedError = VaultPausedError;
+exports.WhitelistQuotaExhaustedError = WhitelistQuotaExhaustedError;
 exports.WithdrawalTimelockActiveError = WithdrawalTimelockActiveError;
 exports.WrongChainError = WrongChainError;
 exports.acceptOwnership = acceptOwnership;