curvance 5.1.9 → 5.2.1

package/dist/classes/CToken.js

@@ -15,9 +15,6 @@ const PositionManager_1 = require("./PositionManager");
 const NativeToken_1 = require("./NativeToken");
 const ERC4626_1 = require("./ERC4626");
 const FormatConverter_1 = __importDefault(require("./FormatConverter"));
-const EXCLUDED_ZAP_SYMBOLS = new Set([
-    'eBTC', 'vUSD', 'ezETH', 'YZM', 'wsrUSD', 'sAUSD',
-]);
 const EXECUTION_DEBT_BUFFER_TIME = 100n;
 function ceilDiv(numerator, denominator) {
     if (denominator <= 0n) {
@@ -182,27 +179,44 @@ class CToken extends Calldata_1.Calldata {
         this.contract = (0, helpers_1.contractSetup)(this.provider, address, BaseCToken_json_1.default);
         this.cache = cache;
         this.market = market;
-        const chainSettings = this.currentChainConfig;
+        const chainSettings = this.currentChainAssets;
         const assetAddr = this.asset.address.toLowerCase();
         this.isNativeVault = chainSettings.native_vaults.some(vault => vault.contract.toLowerCase() == assetAddr);
         this.isVault = chainSettings.vaults.some(vault => vault.contract.toLowerCase() == assetAddr);
         this.isWrappedNative = chainSettings.wrapped_native.toLowerCase() == assetAddr;
-        if (EXCLUDED_ZAP_SYMBOLS.has(this.asset.symbol)) {
+        this.refreshRouteCapabilities();
+    }
+    refreshRouteCapabilities() {
+        this.zapTypes = [];
+        this.leverageTypes = [];
+        if (this.isZapSymbolExcluded(this.asset.symbol)) {
             return;
         }
-        if (this.isNativeVault)
+        const zappers = this.setup.contracts.zappers;
+        const nativeVaultZapper = zappers?.nativeVaultZapper;
+        const vaultZapper = zappers?.vaultZapper;
+        const simpleZapper = zappers?.simpleZapper;
+        const supportsNativeVaultZaps = typeof nativeVaultZapper === 'string'
+            && nativeVaultZapper.toLowerCase() !== helpers_1.EMPTY_ADDRESS.toLowerCase();
+        const supportsVaultZaps = typeof vaultZapper === 'string'
+            && vaultZapper.toLowerCase() !== helpers_1.EMPTY_ADDRESS.toLowerCase();
+        const supportsSimpleZaps = typeof simpleZapper === 'string'
+            && simpleZapper.toLowerCase() !== helpers_1.EMPTY_ADDRESS.toLowerCase()
+            && this.hasExecutableDexRoute;
+        if (supportsNativeVaultZaps && this.isNativeVault)
             this.zapTypes.push('native-vault');
         if ("nativeVaultPositionManager" in this.market.plugins && this.isNativeVault)
             this.leverageTypes.push('native-vault');
-        if (this.isWrappedNative)
+        if (supportsSimpleZaps && this.isWrappedNative)
             this.zapTypes.push('native-simple');
-        if (this.isVault)
+        if (supportsVaultZaps && this.isVault)
             this.zapTypes.push('vault');
         if ("vaultPositionManager" in this.market.plugins && this.isVault)
             this.leverageTypes.push('vault');
-        if ("simplePositionManager" in this.market.plugins)
+        if (supportsSimpleZaps && "simplePositionManager" in this.market.plugins)
             this.leverageTypes.push('simple');
-        this.zapTypes.push('simple');
+        if (supportsSimpleZaps)
+            this.zapTypes.push('simple');
     }
     getUserCacheFreshness() {
         if (this.userCacheFreshness == undefined) {
@@ -231,7 +245,28 @@ class CToken extends Calldata_1.Calldata {
     }
     get setup() { return this.market.setup; }
     get currentChain() { return this.setup.chain; }
-    get currentChainConfig() { return (0, helpers_1.getChainConfig)(this.currentChain); }
+    get currentChainAssets() { return this.setup.assets; }
+    isZapSymbolExcluded(symbol) {
+        if (symbol == null) {
+            return false;
+        }
+        const excludedSymbols = this.setup.assets
+            ?.excluded_zap_symbols ?? [];
+        return excludedSymbols.some((excluded) => excluded.toLowerCase() === symbol.toLowerCase());
+    }
+    get boundDexAgg() { return this.market.dexAgg ?? null; }
+    get currentDexAgg() {
+        const dexAgg = this.boundDexAgg;
+        if (dexAgg == null) {
+            throw new Error(`DEX aggregator is not bound for token ${this.address} on ${this.currentChain}. ` +
+                `Use setupChain(...) result markets or attach a setup-bound dexAgg before route discovery/execution.`);
+        }
+        return dexAgg;
+    }
+    get hasExecutableDexRoute() {
+        const router = this.boundDexAgg?.router;
+        return typeof router === "string" && router.toLowerCase() !== helpers_1.EMPTY_ADDRESS.toLowerCase();
+    }
     requireSigner() { return (0, helpers_1.requireSigner)(this.signer); }
     getAccountOrThrow(account = null) {
         return (0, helpers_1.requireAccount)(account ?? this.account, this.signer);
@@ -239,6 +274,31 @@ class CToken extends Calldata_1.Calldata {
     getWriteContract() {
         return (0, helpers_1.contractSetup)(this.requireSigner(), this.address, BaseCToken_json_1.default);
     }
+    assertBorrowTokenBelongsToMarket(borrow, label = "Borrow") {
+        if (borrow == null) {
+            return;
+        }
+        const borrowMarket = borrow.market;
+        if (borrowMarket == undefined) {
+            return;
+        }
+        if (borrowMarket === this.market) {
+            return;
+        }
+        const borrowChain = borrowMarket.setup?.chain;
+        const collateralChain = this.market.setup?.chain;
+        const sameMarket = borrowMarket.address?.toLowerCase() === this.market.address.toLowerCase();
+        const sameChain = borrowChain != null && collateralChain != null && borrowChain === collateralChain;
+        const borrowReaderKey = borrowMarket.reader?.batchKey ?? null;
+        const collateralReaderKey = this.market.reader?.batchKey ?? null;
+        const sameReaderDeployment = borrowMarket.reader === this.market.reader ||
+            (borrowReaderKey != null && borrowReaderKey === collateralReaderKey);
+        if (!sameMarket || !sameChain || !sameReaderDeployment) {
+            throw new Error(`${label} token ${borrow.address} belongs to market ${borrowMarket.address} ` +
+                `on ${borrowChain ?? "unknown"}, not market ${this.market.address} on ${collateralChain ?? "unknown"} ` +
+                `with the same reader deployment.`);
+        }
+    }
     getZapType(zap) {
         return typeof zap === "object" ? zap.type : zap;
     }
@@ -264,7 +324,7 @@ class CToken extends Calldata_1.Calldata {
                 if (zap.inputToken.toLowerCase() === helpers_1.NATIVE_ADDRESS.toLowerCase()) {
                     return 18n;
                 }
-                const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, undefined, this.signer);
+                const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, this.setup.contracts.OracleManager, this.signer);
                 return inputErc20.decimals ?? await inputErc20.contract.decimals();
         }
     }
@@ -272,8 +332,9 @@ class CToken extends Calldata_1.Calldata {
         return FormatConverter_1.default.decimalToBigInt(amount, await this.getZapInputDecimals(zap));
     }
     async assertVaultLeverageBorrowAssetSupported(borrow, type) {
+        this.assertBorrowTokenBelongsToMarket(borrow);
         const expectedAsset = type === "native-vault"
-            ? this.currentChainConfig.wrapped_native
+            ? this.currentChainAssets.wrapped_native
             : await this.getVaultAsset(false);
         const actualAsset = borrow.asset.address;
         if (actualAsset.toLowerCase() === expectedAsset.toLowerCase()) {
@@ -382,11 +443,15 @@ class CToken extends Calldata_1.Calldata {
         const shares = this.totalSupply === 0n || this.totalAssets === 0n
             ? assets
             : (assets * this.totalSupply) / this.totalAssets;
-        return bufferBps > 0n ? shares * (10000n - bufferBps) / 10000n : shares;
-    }
-    getMarketLeverageState() {
-        const currentCollateralInUsd = this.market.userCollateral;
-        const currentDebt = this.market.userDebt;
+        return bufferBps > 0n ? shares * (helpers_1.BPS - bufferBps) / helpers_1.BPS : shares;
+    }
+    getMarketLeverageState(leverageState) {
+        const currentCollateralInUsd = leverageState?.collateralUsd != null
+            ? (0, helpers_1.toDecimal)(leverageState.collateralUsd, 18n)
+            : this.market.userCollateral;
+        const currentDebt = leverageState?.debtUsd != null
+            ? (0, helpers_1.toDecimal)(leverageState.debtUsd, 18n)
+            : this.market.userDebt;
         const equity = currentCollateralInUsd.sub(currentDebt);
         if (currentCollateralInUsd.lte(0) || equity.lte(0)) {
             return {
@@ -523,7 +588,7 @@ class CToken extends Calldata_1.Calldata {
         // into Curvance shares. Buffer the inner preview so exchange-rate drift
         // between quote time and inclusion cannot trip the outer expectedShares
         // check on otherwise-valid deposits/leverage/zaps.
-        const vaultShares = vaultSharesRaw * (10000n - exports.LEVERAGE.SHARES_BUFFER_BPS) / 10000n;
+        const vaultShares = vaultSharesRaw * (helpers_1.BPS - exports.LEVERAGE.SHARES_BUFFER_BPS) / helpers_1.BPS;
         return this.convertToShares(vaultShares);
     }
     getAsset(asErc20) {
@@ -586,7 +651,7 @@ class CToken extends Calldata_1.Calldata {
         if (zap_contract == null) {
             return null;
         }
-        return new Zapper_1.Zapper(zap_contract, signer, type, this.setup);
+        return new Zapper_1.Zapper(zap_contract, signer, type, this.setup, this.currentDexAgg);
     }
     async isZapAssetApproved(instructions, amount) {
         if (instructions == 'none') {
@@ -653,7 +718,7 @@ class CToken extends Calldata_1.Calldata {
     }
     async getAllowance(check_contract, underlying = true) {
         const signer = this.requireSigner();
-        const erc20 = new ERC20_1.ERC20(this.provider, underlying ? this.asset.address : this.address, undefined, undefined, this.signer);
+        const erc20 = new ERC20_1.ERC20(this.provider, underlying ? this.asset.address : this.address, undefined, this.setup.contracts.OracleManager, this.signer);
         const allowance = await erc20.allowance(signer.address, check_contract);
         return allowance;
     }
@@ -663,12 +728,12 @@ class CToken extends Calldata_1.Calldata {
      * @returns tx
      */
     async approveUnderlying(amount = null, target = null) {
-        const erc20 = new ERC20_1.ERC20(this.provider, this.asset.address, undefined, undefined, this.signer);
+        const erc20 = new ERC20_1.ERC20(this.provider, this.asset.address, undefined, this.setup.contracts.OracleManager, this.signer);
         const tx = await erc20.approve(target ? target : this.address, amount);
         return tx;
     }
     async approve(amount = null, spender) {
-        const erc20 = new ERC20_1.ERC20(this.provider, this.address, undefined, undefined, this.signer);
+        const erc20 = new ERC20_1.ERC20(this.provider, this.address, undefined, this.setup.contracts.OracleManager, this.signer);
         const tx = await erc20.approve(spender, amount);
         return tx;
     }
@@ -739,7 +804,8 @@ class CToken extends Calldata_1.Calldata {
     }
     async transfer(receiver, amount) {
         const shares = this.convertTokenInputToShares(amount);
-        return this.getWriteContract().transfer(receiver, shares);
+        const calldata = this.getCallData("transfer", [receiver, shares]);
+        return this.oracleRoute(calldata);
     }
     async redeemCollateral(amount, receiver = null, owner = null) {
         const signer = this.requireSigner();
@@ -773,21 +839,47 @@ class CToken extends Calldata_1.Calldata {
         if (max_shares <= 0n) {
             throw new Error("No cToken shares available to post as collateral.");
         }
+        this.assertCollateralCapacity(max_shares);
         const calldata = this.getCallData("postCollateral", [max_shares]);
         const tx = await this.oracleRoute(calldata);
         // Reload collateral state after execution
         await this.fetchUserCollateral();
         return tx;
     }
+    assertCollateralCapacity(shares) {
+        const collateralCapError = "There is not enough collateral left in this tokens collateral cap for this deposit.";
+        const remainingCollateral = this.getRemainingCollateral(false);
+        if (remainingCollateral <= 0n)
+            throw new Error(collateralCapError);
+        if (shares != undefined && shares > remainingCollateral) {
+            throw new Error(collateralCapError);
+        }
+    }
+    getZapperExpectedShares(zapper, calldata) {
+        if (zapper == null)
+            return undefined;
+        let expectedShares;
+        try {
+            const decoded = zapper.contract.interface.decodeFunctionData("swapAndDeposit", calldata);
+            expectedShares = BigInt(decoded[3]);
+        }
+        catch {
+            return undefined;
+        }
+        if (expectedShares <= 0n) {
+            throw new Error("Zap expected shares must be greater than zero.");
+        }
+        return expectedShares;
+    }
     async getZapBalance(zap) {
         const signer = this.requireSigner();
         let asset;
         if (typeof zap === 'object') {
             if (zap.type === 'native-vault' || zap.type === 'native-simple' || zap.inputToken.toLowerCase() === helpers_1.NATIVE_ADDRESS.toLowerCase()) {
-                asset = new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account);
+                asset = new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account, this.currentChainAssets);
             }
             else {
-                asset = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, undefined, this.signer);
+                asset = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, this.setup.contracts.OracleManager, this.signer);
             }
         }
         else {
@@ -799,10 +891,10 @@ class CToken extends Calldata_1.Calldata {
                     asset = await this.getVaultAsset(true);
                     break;
                 case 'native-vault':
-                    asset = new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account);
+                    asset = new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account, this.currentChainAssets);
                     break;
                 case 'native-simple':
-                    asset = new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account);
+                    asset = new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account, this.currentChainAssets);
                     break;
                 default: throw new Error("Unsupported zap type for balance fetch");
             }
@@ -881,7 +973,7 @@ class CToken extends Calldata_1.Calldata {
     }
     async convertToShares(assets, bufferBps = exports.LEVERAGE.SHARES_BUFFER_BPS) {
         const shares = await this.contract.convertToShares(assets);
-        return bufferBps > 0n ? shares * (10000n - bufferBps) / 10000n : shares;
+        return bufferBps > 0n ? shares * (helpers_1.BPS - bufferBps) / helpers_1.BPS : shares;
     }
     async maxRedemption(in_shares = false, bufferTime = 0n, breakdown = false) {
         const data = await this.market.reader.maxRedemptionOf(this.getAccountOrThrow(), this, bufferTime);
@@ -910,14 +1002,14 @@ class CToken extends Calldata_1.Calldata {
         let tokens_exclude = [this.asset.address.toLocaleLowerCase()];
         if (this.zapTypes.includes('native-vault')) {
             tokens.push({
-                interface: new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account),
+                interface: new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account, this.currentChainAssets),
                 type: 'native-vault'
             });
             tokens_exclude.push(helpers_1.EMPTY_ADDRESS.toLowerCase(), helpers_1.NATIVE_ADDRESS.toLowerCase());
         }
         if (this.zapTypes.includes('native-simple')) {
             tokens.push({
-                interface: new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account),
+                interface: new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account, this.currentChainAssets),
                 type: 'native-simple'
             });
             if (!this.zapTypes.includes('native-vault')) {
@@ -932,20 +1024,20 @@ class CToken extends Calldata_1.Calldata {
             });
             tokens_exclude.push(vault_asset.address.toLocaleLowerCase());
         }
-        if (this.zapTypes.includes('simple') && this.currentChainConfig.dexAgg.router !== helpers_1.EMPTY_ADDRESS) {
-            let dexAggSearch = await this.currentChainConfig.dexAgg.getAvailableTokens(this.provider, search, this.account);
+        if (this.zapTypes.includes('simple') && this.hasExecutableDexRoute) {
+            let dexAggSearch = await this.currentDexAgg.getAvailableTokens(this.provider, search, this.account);
             tokens = tokens.concat(dexAggSearch.filter(token => !tokens_exclude.includes(token.interface.address.toLocaleLowerCase())));
             // Add native MON as a zap option for any token with a simple zapper
             // (not just wrapped native). The simple zapper handles wrapping + swapping.
             if (!tokens_exclude.includes(helpers_1.NATIVE_ADDRESS.toLowerCase()) && !this.isWrappedNative) {
                 tokens.push({
-                    interface: new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account),
+                    interface: new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account, this.currentChainAssets),
                     type: 'simple'
                 });
                 tokens_exclude.push(helpers_1.NATIVE_ADDRESS.toLowerCase());
             }
         }
-        tokens = tokens.filter(token => token.type === 'none' || !EXCLUDED_ZAP_SYMBOLS.has(token.interface.symbol ?? ''));
+        tokens = tokens.filter(token => token.type === 'none' || !this.isZapSymbolExcluded(token.interface.symbol));
         if (search) {
             const lowerSearch = search.toLowerCase();
             tokens = tokens.filter(token => (token.interface.name ?? '').toLowerCase().includes(lowerSearch) ||
@@ -961,23 +1053,22 @@ class CToken extends Calldata_1.Calldata {
      * Single-RPC snapshot of fresh position state for leverage operations.
      * Calls ProtocolReader.getLeverageSnapshot which internally uses
      * hypotheticalLiquidityOf for aggregate position + fresh oracle prices
-     * + projected debt balance. Updates the local cache so downstream
-     * preview computations (previewLeverageUp/Down) read fresh values.
+     * + projected debt balance. Updates only token price/share caches; leverage
+     * previews consume the returned aggregate values explicitly so failed or
+     * simulated plans cannot leave market user totals ahead of token user rows.
      *
      * Returns the snapshot for direct use where needed (e.g. debtTokenBalance
      * for full deleverage swap sizing).
      */
     async _getLeverageSnapshot(borrow) {
+        this.assertBorrowTokenBelongsToMarket(borrow);
         const snapshot = await this.market.reader.getLeverageSnapshot(this.getAccountOrThrow(), this.address, borrow.address, 120n);
         if (snapshot.oracleError) {
             throw new Error(`Oracle error fetching leverage snapshot for ${this.symbol}/${borrow.symbol}`);
         }
-        // Update cache so preview functions read fresh values
         this.cache.assetPrice = snapshot.collateralAssetPrice;
         this.cache.sharePrice = snapshot.sharePrice;
         borrow.cache.assetPrice = snapshot.debtAssetPrice;
-        this.market.cache.user.collateral = snapshot.collateralUsd;
-        this.market.cache.user.debt = snapshot.debtUsd;
         return snapshot;
     }
     /**
@@ -1008,11 +1099,13 @@ class CToken extends Calldata_1.Calldata {
         return slippage + exports.LEVERAGE.LEVERAGE_UP_BUFFER_BPS;
     }
     assertSimpleLeverageSwapAssetsDiffer(borrow) {
+        this.assertBorrowTokenBelongsToMarket(borrow);
         if (borrow.asset.address.toLowerCase() === this.asset.address.toLowerCase()) {
             throw new Error("Simple leverage requires distinct collateral and borrow assets.");
         }
     }
     async assertLeverageBorrowCapacity(borrow, borrowAssets) {
+        this.assertBorrowTokenBelongsToMarket(borrow);
         if (borrowAssets === 0n) {
             return;
         }
@@ -1029,6 +1122,7 @@ class CToken extends Calldata_1.Calldata {
         }
     }
     assertSelectedBorrowDebtCanDeleverage(borrow, selectedDebtAssets, requiredDebtReductionUsd) {
+        this.assertBorrowTokenBelongsToMarket(borrow);
         if (requiredDebtReductionUsd.lte(0)) {
             return;
         }
@@ -1050,15 +1144,16 @@ class CToken extends Calldata_1.Calldata {
             return (0, decimal_js_1.default)(1);
         return collateralAfterDeposit.div(equityAfterDeposit);
     }
-    resolveLeverageUpPreview({ operation, targetLeverage, borrow, depositAssets = 0n, positionManagerType, }) {
-        const leverageState = this.getMarketLeverageState();
-        const currentLeverage = leverageState.currentLeverage ?? (0, decimal_js_1.default)(1);
-        const currentCollateralInUsd = leverageState.currentCollateralInUsd;
+    resolveLeverageUpPreview({ operation, targetLeverage, borrow, depositAssets = 0n, positionManagerType, leverageState, }) {
+        this.assertBorrowTokenBelongsToMarket(borrow);
+        const currentState = this.getMarketLeverageState(leverageState);
+        const currentLeverage = currentState.currentLeverage ?? (0, decimal_js_1.default)(1);
+        const currentCollateralInUsd = currentState.currentCollateralInUsd;
         const depositInAssets = FormatConverter_1.default.bigIntToDecimal(depositAssets, this.asset.decimals);
         const depositInUsd = depositAssets > 0n
             ? this.convertTokensToUsd(depositAssets, true)
             : (0, decimal_js_1.default)(0);
-        const currentDebt = leverageState.currentDebt;
+        const currentDebt = currentState.currentDebt;
         const effectiveCurrentLeverage = depositAssets > 0n
             ? this.computePostDepositNaturalLeverage(currentCollateralInUsd, currentDebt, depositInUsd)
             : currentLeverage;
@@ -1099,7 +1194,7 @@ class CToken extends Calldata_1.Calldata {
                 targetLeverage: resolvedTargetLeverage,
             })
             : 0n;
-        const feeAssets = borrowAmount.mul((0, decimal_js_1.default)(Number(feeBps))).div((0, decimal_js_1.default)(10000));
+        const feeAssets = borrowAmount.mul((0, decimal_js_1.default)(Number(feeBps))).div(helpers_1.BPS_DECIMAL);
         const feeUsd = feeAssets.mul(borrowPrice);
         const collateralIncreaseFromBorrow = decimal_js_1.default.max(debtIncrease.sub(feeUsd), (0, decimal_js_1.default)(0));
         const collateralIncrease = depositInUsd.add(collateralIncreaseFromBorrow);
@@ -1124,36 +1219,39 @@ class CToken extends Calldata_1.Calldata {
             feeUsd,
         };
     }
-    previewDepositAndLeverage(newLeverage, borrow, depositAmount, positionManagerType) {
+    previewDepositAndLeverage(newLeverage, borrow, depositAmount, positionManagerType, leverageState) {
         return this.resolveLeverageUpPreview({
             operation: 'deposit-and-leverage',
             targetLeverage: newLeverage,
             borrow,
             depositAssets: depositAmount,
             positionManagerType,
+            leverageState,
         });
     }
-    previewLeverageUp(newLeverage, borrow, depositAmount, positionManagerType) {
+    previewLeverageUp(newLeverage, borrow, depositAmount, positionManagerType, leverageState) {
         if ((depositAmount ?? 0n) > 0n) {
-            return this.previewDepositAndLeverage(newLeverage, borrow, depositAmount, positionManagerType);
+            return this.previewDepositAndLeverage(newLeverage, borrow, depositAmount, positionManagerType, leverageState);
         }
         return this.resolveLeverageUpPreview({
             operation: 'leverage-up',
             targetLeverage: newLeverage,
             borrow,
             positionManagerType,
+            leverageState,
         });
     }
-    previewLeverageDown(newLeverage, currentLeverage, borrow) {
+    previewLeverageDown(newLeverage, currentLeverage, borrow, leverageState) {
+        this.assertBorrowTokenBelongsToMarket(borrow);
         if (newLeverage.gte(currentLeverage)) {
             throw new Error("New leverage must be less than current leverage");
         }
         if (newLeverage.lt((0, decimal_js_1.default)(1))) {
             throw new Error("New leverage must be at least 1");
         }
-        const leverageState = this.getMarketLeverageState();
-        const collateralInUsd = leverageState.currentCollateralInUsd;
-        const currentDebt = leverageState.currentDebt;
+        const currentState = this.getMarketLeverageState(leverageState);
+        const collateralInUsd = currentState.currentCollateralInUsd;
+        const currentDebt = currentState.currentDebt;
         const equity = collateralInUsd.sub(currentDebt);
         if (equity.lte(0)) {
             throw new Error("Position has no positive equity to deleverage.");
@@ -1178,7 +1276,7 @@ class CToken extends Calldata_1.Calldata {
             currentLeverage,
             targetLeverage: newLeverage,
         }) : 0n;
-        const feeUsd = collateralAssetReductionUsd.mul((0, decimal_js_1.default)(Number(feeBps))).div((0, decimal_js_1.default)(10000));
+        const feeUsd = collateralAssetReductionUsd.mul((0, decimal_js_1.default)(Number(feeBps))).div(helpers_1.BPS_DECIMAL);
         const feeAssets = this.getPrice(true).gt(0)
             ? feeUsd.div(this.getPrice(true))
             : (0, decimal_js_1.default)(0);
@@ -1197,6 +1295,7 @@ class CToken extends Calldata_1.Calldata {
     }
     async leverageUp(borrow, newLeverage, type, slippage_ = (0, decimal_js_1.default)(0.05), simulate = false) {
         try {
+            this.assertBorrowTokenBelongsToMarket(borrow);
             this.requireSigner();
             const manager = this.getPositionManager(type);
             if (type === 'vault' || type === 'native-vault') {
@@ -1206,8 +1305,8 @@ class CToken extends Calldata_1.Calldata {
                 this.assertSimpleLeverageSwapAssetsDiffer(borrow);
             }
             let calldata;
-            await this._getLeverageSnapshot(borrow);
-            const preview = this.previewLeverageUp(newLeverage, borrow, undefined, type);
+            const snapshot = await this._getLeverageSnapshot(borrow);
+            const preview = this.previewLeverageUp(newLeverage, borrow, undefined, type, snapshot);
             const slippage = this._leverageUpSlippage(FormatConverter_1.default.percentageToBps(slippage_), preview.targetLeverage);
             const { borrowAmount, borrowAssets, feeBps, targetLeverage } = preview;
             if (borrowAssets === 0n) {
@@ -1223,7 +1322,7 @@ class CToken extends Calldata_1.Calldata {
             switch (type) {
                 case 'simple': {
                     const feeReceiver = feeBps > 0n ? this.setup.feePolicy.feeReceiver : undefined;
-                    const { action, quote } = await this.currentChainConfig.dexAgg.quoteAction(manager.address, borrow.asset.address, this.asset.address, borrowAssets, slippage, feeBps, feeReceiver);
+                    const { action, quote } = await this.currentDexAgg.quoteAction(manager.address, borrow.asset.address, this.asset.address, borrowAssets, slippage, feeBps, feeReceiver);
                     // Fee-aware slippage expansion now lives inside KyberSwap.quoteAction
                     // so any caller inherits correct behavior. See KyberSwap.ts for the
                     // rationale. The fee still reduces swap output, which checkSlippage
@@ -1278,13 +1377,13 @@ class CToken extends Calldata_1.Calldata {
     }
     async leverageDown(borrowToken, currentLeverage, newLeverage, type, slippage_ = (0, decimal_js_1.default)(0.05), simulate = false) {
         try {
+            this.assertBorrowTokenBelongsToMarket(borrowToken);
             if (newLeverage.gte(currentLeverage)) {
                 if (simulate)
                     return { success: false, error: "New leverage must be less than current leverage" };
                 throw new Error("New leverage must be less than current leverage");
             }
             this.requireSigner();
-            const config = this.currentChainConfig;
             const slippage = (0, helpers_1.toBps)(slippage_);
             const manager = this.getPositionManager(type);
             if (type === 'simple') {
@@ -1292,7 +1391,7 @@ class CToken extends Calldata_1.Calldata {
             }
             let calldata;
             const snapshot = await this._getLeverageSnapshot(borrowToken);
-            const preview = this.previewLeverageDown(newLeverage, currentLeverage);
+            const preview = this.previewLeverageDown(newLeverage, currentLeverage, undefined, snapshot);
             const { collateralAssetReduction } = preview;
             const isFullDeleverage = newLeverage.equals(1);
             const maxTokenCollateral = this.virtualConvertToAssets(this.readFreshUserCache("userCollateral", "executing leverage down"));
@@ -1337,7 +1436,7 @@ class CToken extends Calldata_1.Calldata {
                         // Additive approximation is accurate to sub-bp at typical
                         // fee+overhead magnitudes (< 100 bps combined).
                         const overheadBps = exports.LEVERAGE.DELEVERAGE_OVERHEAD_BPS + feeBps;
-                        swapCollateral = ceilDiv(debtInCollateral * (10000n + overheadBps), 10000n);
+                        swapCollateral = ceilDiv(debtInCollateral * (helpers_1.BPS + overheadBps), helpers_1.BPS);
                         if (swapCollateral > maxTokenCollateral) {
                             const error = "Selected collateral token does not have enough posted collateral to fully deleverage.";
                             if (simulate) {
@@ -1354,7 +1453,7 @@ class CToken extends Calldata_1.Calldata {
                             // from input before swapping, so without compensation
                             // the swap underdelivers and actual leverage is slightly
                             // higher than target.
-                            swapCollateral = ceilDiv(swapCollateral * 10000n, 10000n - feeBps);
+                            swapCollateral = ceilDiv(swapCollateral * helpers_1.BPS, helpers_1.BPS - feeBps);
                         }
                     }
                     if (!isFullDeleverage && swapCollateral > maxTokenCollateral) {
@@ -1364,7 +1463,7 @@ class CToken extends Calldata_1.Calldata {
                         }
                         throw new Error(error);
                     }
-                    const { action, quote } = await config.dexAgg.quoteAction(manager.address, this.asset.address, borrowToken.asset.address, swapCollateral, slippage, feeBps, feeReceiver);
+                    const { action, quote } = await this.currentDexAgg.quoteAction(manager.address, this.asset.address, borrowToken.asset.address, swapCollateral, slippage, feeBps, feeReceiver);
                     // Fee-aware slippage expansion for `_swapSafe` is handled by
                     // KyberSwap.quoteAction. See KyberSwap.ts for rationale.
                     // In the current PositionManager, `repayAssets` is only a
@@ -1421,6 +1520,7 @@ class CToken extends Calldata_1.Calldata {
     }
     async depositAndLeverage(depositAmount, borrow, multiplier, type, slippage_ = (0, decimal_js_1.default)(0.05), simulate = false) {
         try {
+            this.assertBorrowTokenBelongsToMarket(borrow);
             if (multiplier.lte((0, decimal_js_1.default)(1))) {
                 if (simulate)
                     return { success: false, error: "Multiplier must be greater than 1" };
@@ -1436,9 +1536,14 @@ class CToken extends Calldata_1.Calldata {
             }
             let calldata;
             const depositAssets = FormatConverter_1.default.decimalToBigInt(depositAmount, this.asset.decimals);
+            if (depositAssets <= 0n) {
+                if (simulate)
+                    return { success: false, error: "Deposit amount must be greater than zero." };
+                throw new Error("Deposit amount must be greater than zero.");
+            }
             await this._checkTokenApproval(this.getPositionManagerDepositApprovalTarget(manager), depositAssets);
-            await this._getLeverageSnapshot(borrow);
-            const preview = this.previewDepositAndLeverage(multiplier, borrow, depositAssets, type);
+            const snapshot = await this._getLeverageSnapshot(borrow);
+            const preview = this.previewDepositAndLeverage(multiplier, borrow, depositAssets, type, snapshot);
             if (preview.borrowAssets === 0n) {
                 if (simulate) {
                     return {
@@ -1454,7 +1559,7 @@ class CToken extends Calldata_1.Calldata {
             switch (type) {
                 case 'simple': {
                     const feeReceiver = feeBps > 0n ? this.setup.feePolicy.feeReceiver : undefined;
-                    const { action, quote } = await this.currentChainConfig.dexAgg.quoteAction(manager.address, borrow.asset.address, this.asset.address, borrowAssets, slippage, feeBps, feeReceiver);
+                    const { action, quote } = await this.currentDexAgg.quoteAction(manager.address, borrow.asset.address, this.asset.address, borrowAssets, slippage, feeBps, feeReceiver);
                     // Fee-aware slippage expansion for `_swapSafe` is handled by
                     // KyberSwap.quoteAction. See KyberSwap.ts for rationale.
                     // Fee amplification: same pattern as leverageUp. See
@@ -1510,6 +1615,9 @@ class CToken extends Calldata_1.Calldata {
             receiver ??= signer.address;
             const depositAssets = FormatConverter_1.default.decimalToBigInt(amount, this.asset.decimals);
             const zapAssets = await this.getZapAssetAmount(amount, zap);
+            if (zapAssets <= 0n) {
+                throw new Error("Deposit amount must be greater than zero.");
+            }
             const default_calldata = this.getCallData("deposit", [depositAssets, receiver]);
             const { calldata, calldata_overrides } = await this.zap(zapAssets, zap, false, default_calldata, receiver);
             return this.simulateOracleRoute(calldata, calldata_overrides);
@@ -1525,11 +1633,20 @@ class CToken extends Calldata_1.Calldata {
             receiver ??= signer.address;
             const depositAssets = FormatConverter_1.default.decimalToBigInt(amount, this.asset.decimals);
             const zapAssets = await this.getZapAssetAmount(amount, zap);
+            if (zapAssets <= 0n) {
+                throw new Error("Deposit amount must be greater than zero.");
+            }
+            const depositShares = this.isZapInstruction(zap) ? undefined : this.virtualConvertToShares(depositAssets);
+            this.assertCollateralCapacity(depositShares);
             const collateralMethod = receiver.toLowerCase() === signer.address.toLowerCase()
                 ? "depositAsCollateral"
                 : "depositAsCollateralFor";
             const default_calldata = this.getCallData(collateralMethod, [depositAssets, receiver]);
-            const { calldata, calldata_overrides } = await this.zap(zapAssets, zap, true, default_calldata, receiver);
+            const { calldata, calldata_overrides, expectedShares } = await this.zap(zapAssets, zap, true, default_calldata, receiver);
+            if (expectedShares !== undefined && expectedShares <= 0n) {
+                throw new Error("Zap expected shares must be greater than zero.");
+            }
+            this.assertCollateralCapacity(expectedShares ?? depositShares);
             return this.simulateOracleRoute(calldata, calldata_overrides);
         }
         catch (error) {
@@ -1580,7 +1697,12 @@ class CToken extends Calldata_1.Calldata {
             default:
                 throw new Error("This zap type is not supported: " + type_of_zap);
         }
-        return { calldata, calldata_overrides, zapper };
+        return {
+            calldata,
+            calldata_overrides,
+            zapper,
+            expectedShares: this.getZapperExpectedShares(zapper, calldata),
+        };
     }
     async deposit(amount, zap = 'none', receiver = null) {
         amount = await this.ensureUnderlyingAmount(amount, zap);
@@ -1588,6 +1710,9 @@ class CToken extends Calldata_1.Calldata {
         receiver ??= signer.address;
         const depositAssets = FormatConverter_1.default.decimalToBigInt(amount, this.asset.decimals);
         const zapAssets = await this.getZapAssetAmount(amount, zap);
+        if (zapAssets <= 0n) {
+            throw new Error("Deposit amount must be greater than zero.");
+        }
         await this._checkDepositApprovals(zap, depositAssets, zapAssets);
         const default_calldata = this.getCallData("deposit", [depositAssets, receiver]);
         const { calldata, calldata_overrides } = await this.zap(zapAssets, zap, false, default_calldata, receiver);
@@ -1599,43 +1724,49 @@ class CToken extends Calldata_1.Calldata {
         receiver ??= signer.address;
         const depositAssets = FormatConverter_1.default.decimalToBigInt(amount, this.asset.decimals);
         const zapAssets = await this.getZapAssetAmount(amount, zap);
-        if (!this.isZapInstruction(zap)) {
-            const collateralCapError = "There is not enough collateral left in this tokens collateral cap for this deposit.";
-            const remainingCollateral = this.getRemainingCollateral(false);
-            if (remainingCollateral <= 0n)
-                throw new Error(collateralCapError);
-            if (remainingCollateral > 0n) {
-                const shares = this.virtualConvertToShares(depositAssets);
-                if (shares > remainingCollateral) {
-                    throw new Error(collateralCapError);
-                }
-            }
+        if (zapAssets <= 0n) {
+            throw new Error("Deposit amount must be greater than zero.");
         }
+        const depositShares = this.isZapInstruction(zap) ? undefined : this.virtualConvertToShares(depositAssets);
+        this.assertCollateralCapacity(depositShares);
         await this._checkDepositApprovals(zap, depositAssets, zapAssets, true, receiver);
         const collateralMethod = receiver.toLowerCase() === signer.address.toLowerCase()
             ? "depositAsCollateral"
             : "depositAsCollateralFor";
         const default_calldata = this.getCallData(collateralMethod, [depositAssets, receiver]);
-        const { calldata, calldata_overrides } = await this.zap(zapAssets, zap, true, default_calldata, receiver);
+        const { calldata, calldata_overrides, expectedShares } = await this.zap(zapAssets, zap, true, default_calldata, receiver);
+        if (expectedShares !== undefined && expectedShares <= 0n) {
+            throw new Error("Zap expected shares must be greater than zero.");
+        }
+        this.assertCollateralCapacity(expectedShares ?? depositShares);
         return this.oracleRoute(calldata, calldata_overrides, receiver);
     }
     async redeem(amount) {
         const signer = this.requireSigner();
         const receiver = signer.address;
         const owner = signer.address;
+        const converted_shares = this.convertTokenInputToShares(amount);
+        if (converted_shares <= 0n) {
+            throw new Error("Redeem amount must be greater than zero.");
+        }
         const buffer = this.getExecutionDebtBufferTime();
         const balance_avail = await this.balanceOf(signer.address);
         const max_shares = await this.maxRedemption(true, buffer);
-        const converted_shares = this.convertTokenInputToShares(amount);
         const maxExecutableShares = max_shares < balance_avail ? max_shares : balance_avail;
         let shares = maxExecutableShares < converted_shares ? maxExecutableShares : converted_shares;
         if (maxExecutableShares === balance_avail && balance_avail - shares <= 10n) {
             shares = balance_avail;
         }
+        if (shares <= 0n) {
+            throw new Error("No redeemable cToken shares available.");
+        }
         const calldata = this.getCallData("redeem", [shares, receiver, owner]);
         return this.oracleRoute(calldata);
     }
     async redeemShares(amount) {
+        if (amount <= 0n) {
+            throw new Error("Redeem amount must be greater than zero.");
+        }
         const signer = this.requireSigner();
         const receiver = signer.address;
         const owner = signer.address;
@@ -1759,7 +1890,7 @@ class CToken extends Calldata_1.Calldata {
                     return null;
                 }
                 return {
-                    token: new ERC20_1.ERC20(this.provider, instructions.inputToken, undefined, undefined, this.signer),
+                    token: new ERC20_1.ERC20(this.provider, instructions.inputToken, undefined, this.setup.contracts.OracleManager, this.signer),
                     spender,
                     spenderLabel: `${zapType} Zapper`,
                 };
@@ -1823,10 +1954,11 @@ class CToken extends Calldata_1.Calldata {
         if (typeof tx.wait === "function") {
             await tx.wait();
         }
-        const refreshAccount = reloadAccount ?? signer.address;
-        await this.market.reloadUserData(refreshAccount, {
-            allowSignerMismatch: refreshAccount.toLowerCase() !== signer.address.toLowerCase(),
-        });
+        const signerAddress = signer.address;
+        const refreshAccount = reloadAccount?.toLowerCase() === signerAddress.toLowerCase()
+            ? reloadAccount
+            : signerAddress;
+        await this.market.reloadUserData(refreshAccount);
         return tx;
     }
     async simulateOracleRoute(calldata, override = {}) {