curvance 4.0.3 → 4.1.0

package/dist/classes/CToken.js

@@ -12,12 +12,10 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const BaseCToken_json_1 = __importDefault(require("../abis/BaseCToken.json"));
 const Redstone_1 = require("./Redstone");
 const Zapper_1 = require("./Zapper");
-const setup_1 = require("../setup");
 const PositionManager_1 = require("./PositionManager");
 const NativeToken_1 = require("./NativeToken");
 const ERC4626_1 = require("./ERC4626");
 const FormatConverter_1 = __importDefault(require("./FormatConverter"));
-const chains_1 = require("../chains");
 const EXCLUDED_ZAP_SYMBOLS = new Set([
     'eBTC', 'earnAUSD', 'vUSD', 'syzUSD', 'ezETH', 'YZM', 'wsrUSD', 'sAUSD',
 ]);
@@ -44,12 +42,13 @@ const EXCLUDED_ZAP_SYMBOLS = new Set([
  * docstring "primarily a sanity check rather than a security guarantee."
  * Real MEV protection comes from SwapperLib._swapSafe, which oracle-prices
  * the swap input and output and reverts if realized slippage exceeds the
- * Swap.slippage parameter we pass (= the user's raw slippage in WAD).
+ * Swap.slippage parameter we pass.
  *
- * That swap-level check bounds any sandwich extraction to the user's
- * tolerance regardless of how the buffers below are tuned. The buffers
- * here only adjust the contract-level sanity check so it doesn't fire
- * false-positives from intentional or unavoidable forced losses.
+ * Because _swapSafe measures value loss against the FULL input (pre-fee),
+ * the deterministic KyberSwap fee would consume feeBps of the user's MEV
+ * tolerance if not compensated. Each call site expands action.slippage by
+ * feeBps after quoting so the fee is absorbed and the user's chosen
+ * tolerance is preserved for actual MEV/routing variance.
  *
  * Asymmetry between leverage up and deleverage
  * --------------------------------------------
@@ -75,16 +74,15 @@ const LEVERAGE = {
      *  the slippage buffers below — protects post-op position health, not
      *  in-op slippage. */
     MAX_LEVERAGE_FACTOR: (0, decimal_js_1.default)(0.995),
-    /** Flat BPS buffer added to leverage-up contract slippage tolerance.
-     *  Under single-oracle, the only forced loss comes from wei-level share
-     *  rounding plus possible Redstone price drift between the snapshot RPC
-     *  and the tx broadcast block (typically same-block or 1-3 blocks
-     *  later). Both are small constants in absolute terms; the equity-
-     *  fraction amplification at high leverage happens automatically inside
-     *  checkSlippage's denominator and does not require leverage-scaling
-     *  the buffer itself. Conservative starting value — reduce after
-     *  empirically observing successful leverage-up across the leverage
-     *  range, especially at L > 5 with low (1%) user slippage. */
+    /** Flat BPS buffer added to leverage-up DEX/swapSafe slippage tolerance.
+     *  Under single-oracle, the only forced loss at the swap level comes from
+     *  wei-level share rounding plus possible Redstone price drift between
+     *  snapshot RPC and tx broadcast block. Both are small constants.
+     *
+     *  Fee handling: each call site expands both action.slippage (by feeBps,
+     *  so _swapSafe doesn't treat the fee as MEV) and contractSlippage (by
+     *  (L-1) × feeBps, so checkSlippage doesn't fire from equity-fraction
+     *  amplification). This buffer covers rounding/drift only. */
     LEVERAGE_UP_BUFFER_BPS: 10n,
     /** BPS overhead on full deleverage swap sizing — absolute terms.
      *  Oversizes the collateral→debt swap so DEX impact + drift doesn't
@@ -114,6 +112,8 @@ class CToken extends Calldata_1.Calldata {
     nativeApy = (0, decimal_js_1.default)(0);
     incentiveSupplyApy = (0, decimal_js_1.default)(0);
     incentiveBorrowApy = (0, decimal_js_1.default)(0);
+    get signer() { return this.market.signer; }
+    get account() { return this.market.account; }
     constructor(provider, address, cache, market) {
         super();
         this.provider = provider;
@@ -121,11 +121,11 @@ class CToken extends Calldata_1.Calldata {
         this.contract = (0, helpers_1.contractSetup)(provider, address, BaseCToken_json_1.default);
         this.cache = cache;
         this.market = market;
-        const chain_config = (0, helpers_1.getChainConfig)();
+        const chainSettings = this.currentChainConfig;
         const assetAddr = this.asset.address.toLowerCase();
-        this.isNativeVault = chain_config.native_vaults.some(vault => vault.contract.toLowerCase() == assetAddr);
-        this.isVault = chain_config.vaults.some(vault => vault.contract.toLowerCase() == assetAddr);
-        this.isWrappedNative = chain_config.wrapped_native.toLowerCase() == assetAddr;
+        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)) {
             return;
         }
@@ -143,6 +143,16 @@ class CToken extends Calldata_1.Calldata {
             this.leverageTypes.push('simple');
         this.zapTypes.push('simple');
     }
+    get setup() { return this.market.setup; }
+    get currentChain() { return this.setup.chain; }
+    get currentChainConfig() { return (0, helpers_1.getChainConfig)(this.currentChain); }
+    requireSigner() { return (0, helpers_1.requireSigner)(this.signer); }
+    getAccountOrThrow(account = null) {
+        return (0, helpers_1.requireAccount)(account ?? this.account, this.signer);
+    }
+    getWriteContract() {
+        return (0, helpers_1.contractSetup)(this.requireSigner(), this.address, BaseCToken_json_1.default);
+    }
     get adapters() { return this.cache.adapters; }
     get borrowPaused() { return this.cache.borrowPaused; }
     get collateralizationPaused() { return this.cache.collateralizationPaused; }
@@ -260,8 +270,7 @@ class CToken extends Calldata_1.Calldata {
         return inUSD ? this.convertTokensToUsd(this.cache.userCollateral, false) : FormatConverter_1.default.bigIntToDecimal(this.cache.userCollateral, this.decimals);
     }
     async fetchUserCollateral(formatted = false) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
-        const collateral = await this.contract.collateralPosted(signer.address);
+        const collateral = await this.contract.collateralPosted(this.getAccountOrThrow());
         this.cache.userCollateral = collateral;
         return formatted ? (0, helpers_1.toDecimal)(collateral, this.decimals) : collateral;
     }
@@ -285,13 +294,15 @@ class CToken extends Calldata_1.Calldata {
         if (!this.isVault && !this.isNativeVault) {
             throw new Error("CToken does not use a vault asset as its underlying asset");
         }
-        return new ERC4626_1.ERC4626(this.provider, this.getAsset(false));
+        return new ERC4626_1.ERC4626(this.provider, this.getAsset(false), undefined, this.setup.contracts.OracleManager, this.signer);
     }
     async getVaultAsset(asErc20) {
         return asErc20 ? await this.getUnderlyingVault().fetchAsset(true) : await this.getUnderlyingVault().fetchAsset(false);
     }
     getAsset(asErc20) {
-        return asErc20 ? new ERC20_1.ERC20(this.provider, this.cache.asset.address, this.cache.asset) : this.cache.asset.address;
+        return asErc20
+            ? new ERC20_1.ERC20(this.provider, this.cache.asset.address, this.cache.asset, this.setup.contracts.OracleManager, this.signer)
+            : this.cache.asset.address;
     }
     getPrice(asset = false, lower = false, formatted = true) {
         let price = asset ? this.cache.assetPrice : this.cache.sharePrice;
@@ -335,7 +346,7 @@ class CToken extends Calldata_1.Calldata {
         return inUSD ? this.fetchConvertTokensToUsd(totalCollateral) : totalCollateral;
     }
     getPositionManager(type) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         let manager_contract = this.getPluginAddress(type, 'positionManager');
         if (manager_contract == null) {
             throw new Error("Plugin does not have an associated contract");
@@ -343,12 +354,12 @@ class CToken extends Calldata_1.Calldata {
         return new PositionManager_1.PositionManager(manager_contract, signer, type);
     }
     getZapper(type) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         const zap_contract = this.getPluginAddress(type, 'zapper');
         if (zap_contract == null) {
             return null;
         }
-        return new Zapper_1.Zapper(zap_contract, signer, type);
+        return new Zapper_1.Zapper(zap_contract, signer, type, this.setup);
     }
     async isZapAssetApproved(instructions, amount) {
         if (instructions == 'none' || typeof instructions != 'object') {
@@ -357,8 +368,8 @@ class CToken extends Calldata_1.Calldata {
         if (instructions.inputToken.toLowerCase() === helpers_1.NATIVE_ADDRESS.toLowerCase()) {
             return true;
         }
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
-        const asset = new ERC20_1.ERC20(signer, instructions.inputToken);
+        const signer = this.requireSigner();
+        const asset = new ERC20_1.ERC20(this.provider, instructions.inputToken, undefined, undefined, signer);
         const plugin = this.getPluginAddress(instructions.type, 'zapper');
         const allowance = await asset.allowance(signer.address, plugin);
         return allowance >= amount;
@@ -370,8 +381,8 @@ class CToken extends Calldata_1.Calldata {
         if (instructions.inputToken.toLowerCase() === helpers_1.NATIVE_ADDRESS.toLowerCase()) {
             return;
         }
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
-        const asset = new ERC20_1.ERC20(signer, instructions.inputToken);
+        const signer = this.requireSigner();
+        const asset = new ERC20_1.ERC20(this.provider, instructions.inputToken, undefined, undefined, signer);
         const plugin = this.getPluginAddress(instructions.type, 'zapper');
         return asset.approve(plugin, amount);
     }
@@ -379,7 +390,7 @@ class CToken extends Calldata_1.Calldata {
         if (plugin == 'none') {
             return true;
         }
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         const plugin_address = this.getPluginAddress(plugin, type);
         if (plugin_address == null) {
             throw new Error("Plugin does not have an associated contract");
@@ -391,7 +402,7 @@ class CToken extends Calldata_1.Calldata {
         if (plugin_address == null) {
             throw new Error("Plugin does not have an associated contract");
         }
-        return this.contract.setDelegateApproval(plugin_address, true);
+        return this.getWriteContract().setDelegateApproval(plugin_address, true);
     }
     getPluginAddress(plugin, type) {
         switch (type) {
@@ -402,10 +413,10 @@ class CToken extends Calldata_1.Calldata {
                     throw new Error("Plugin does not have a contract to map too");
                 }
                 const plugin_name = Zapper_1.zapperTypeToName.get(plugin);
-                if (!plugin_name || !setup_1.setup_config.contracts.zappers || !(plugin_name in setup_1.setup_config.contracts.zappers)) {
+                if (!plugin_name || !this.setup.contracts.zappers || !(plugin_name in this.setup.contracts.zappers)) {
                     throw new Error(`Plugin ${plugin_name} not found in zappers`);
                 }
-                return setup_1.setup_config.contracts.zappers[plugin_name];
+                return this.setup.contracts.zappers[plugin_name];
             }
             case 'positionManager': {
                 switch (plugin) {
@@ -419,8 +430,8 @@ class CToken extends Calldata_1.Calldata {
         }
     }
     async getAllowance(check_contract, underlying = true) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
-        const erc20 = new ERC20_1.ERC20(this.provider, underlying ? this.asset.address : this.address);
+        const signer = this.requireSigner();
+        const erc20 = new ERC20_1.ERC20(this.provider, underlying ? this.asset.address : this.address, undefined, undefined, this.signer);
         const allowance = await erc20.allowance(signer.address, check_contract);
         return allowance;
     }
@@ -430,12 +441,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);
+        const erc20 = new ERC20_1.ERC20(this.provider, this.asset.address, undefined, undefined, 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);
+        const erc20 = new ERC20_1.ERC20(this.provider, this.address, undefined, undefined, this.signer);
         const tx = await erc20.approve(spender, amount);
         return tx;
     }
@@ -506,10 +517,10 @@ class CToken extends Calldata_1.Calldata {
     }
     async transfer(receiver, amount) {
         const shares = this.convertTokenInputToShares(amount);
-        return this.contract.transfer(receiver, shares);
+        return this.getWriteContract().transfer(receiver, shares);
     }
     async redeemCollateral(amount, receiver = null, owner = null) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         receiver ??= signer.address;
         owner ??= signer.address;
         const shares = this.convertTokenInputToShares(amount);
@@ -517,7 +528,7 @@ class CToken extends Calldata_1.Calldata {
         return this.oracleRoute(calldata);
     }
     async postCollateral(amount) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         const shares = this.convertTokenInputToShares(amount);
         const balance = await this.balanceOf(signer.address);
         const collateral = await this.fetchUserCollateral();
@@ -530,14 +541,14 @@ class CToken extends Calldata_1.Calldata {
         return tx;
     }
     async getZapBalance(zap) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        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(setup_1.setup_config.chain, this.provider);
+                asset = new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account);
             }
             else {
-                asset = new ERC20_1.ERC20(this.provider, zap.inputToken);
+                asset = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, undefined, this.signer);
             }
         }
         else {
@@ -549,10 +560,10 @@ class CToken extends Calldata_1.Calldata {
                     asset = await this.getVaultAsset(true);
                     break;
                 case 'native-vault':
-                    asset = new NativeToken_1.NativeToken(setup_1.setup_config.chain, this.provider);
+                    asset = new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account);
                     break;
                 case 'native-simple':
-                    asset = new NativeToken_1.NativeToken(setup_1.setup_config.chain, this.provider);
+                    asset = new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account);
                     break;
                 default: throw new Error("Unsupported zap type for balance fetch");
             }
@@ -570,7 +581,7 @@ class CToken extends Calldata_1.Calldata {
                 decimals = 18n;
             }
             else {
-                const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken);
+                const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, undefined, this.signer);
                 decimals = inputErc20.decimals ?? await inputErc20.contract.decimals();
             }
         }
@@ -634,8 +645,7 @@ class CToken extends Calldata_1.Calldata {
         return bufferBps > 0n ? shares * (10000n - bufferBps) / 10000n : shares;
     }
     async maxRedemption(in_shares = false, bufferTime = 0n, breakdown = false) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
-        const data = await this.market.reader.maxRedemptionOf(signer.address, this, bufferTime);
+        const data = await this.market.reader.maxRedemptionOf(this.getAccountOrThrow(), this, bufferTime);
         if (data.errorCodeHit) {
             throw new Error(`Error fetching max redemption. Possible stale price or other issues...`);
         }
@@ -661,14 +671,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(setup_1.setup_config.chain, this.provider),
+                interface: new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account),
                 type: 'native-vault'
             });
             tokens_exclude.push(helpers_1.EMPTY_ADDRESS, helpers_1.NATIVE_ADDRESS);
         }
         if (this.zapTypes.includes('native-simple')) {
             tokens.push({
-                interface: new NativeToken_1.NativeToken(setup_1.setup_config.chain, this.provider),
+                interface: new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account),
                 type: 'native-simple'
             });
             if (!this.zapTypes.includes('native-vault')) {
@@ -684,13 +694,13 @@ class CToken extends Calldata_1.Calldata {
             tokens_exclude.push(vault_asset.address.toLocaleLowerCase());
         }
         if (this.zapTypes.includes('simple')) {
-            let dexAggSearch = await chains_1.chain_config[setup_1.setup_config.chain].dexAgg.getAvailableTokens(this.provider, search);
+            let dexAggSearch = await this.currentChainConfig.dexAgg.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(setup_1.setup_config.chain, this.provider),
+                    interface: new NativeToken_1.NativeToken(this.currentChain, this.provider, this.setup.contracts.OracleManager, this.signer, this.account),
                     type: 'simple'
                 });
                 tokens_exclude.push(helpers_1.NATIVE_ADDRESS.toLowerCase());
@@ -705,9 +715,8 @@ class CToken extends Calldata_1.Calldata {
         return tokens;
     }
     async hypotheticalRedemptionOf(amount) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
         const shares = this.convertTokenInputToShares(amount);
-        return this.market.reader.hypotheticalRedemptionOf(signer.address, this, shares);
+        return this.market.reader.hypotheticalRedemptionOf(this.getAccountOrThrow(), this, shares);
     }
     /**
      * Single-RPC snapshot of fresh position state for leverage operations.
@@ -720,8 +729,7 @@ class CToken extends Calldata_1.Calldata {
      * for full deleverage swap sizing).
      */
     async _getLeverageSnapshot(borrow) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
-        const snapshot = await this.market.reader.getLeverageSnapshot(signer.address, this.address, borrow.address, 120n);
+        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}`);
         }
@@ -764,13 +772,9 @@ class CToken extends Calldata_1.Calldata {
         const borrowPrice = borrow.getPrice(true);
         const rawDebtInUsd = notional.mul(newLeverage).sub(notional);
         const borrowAmount = rawDebtInUsd.sub(currentDebt).div(borrowPrice);
-        const newCollateralInUsd = notional.add(rawDebtInUsd);
-        // Fee preview: queried from the configured fee policy. Returned as
-        // ancillary fields so callers can display "you'll be charged $X in
-        // fees" without requiring the SDK's primary preview math (which
-        // preserves the equity-conservation invariant) to change.
+        // Fee preview: queried from the configured fee policy.
         const borrowAssets = FormatConverter_1.default.decimalToBigInt(borrowAmount, borrow.asset.decimals);
-        const feeBps = setup_1.setup_config.feePolicy.getFeeBps({
+        const feeBps = this.setup.feePolicy.getFeeBps({
             operation: 'leverage-up',
             inputToken: borrow.asset.address,
             outputToken: this.asset.address,
@@ -780,6 +784,9 @@ class CToken extends Calldata_1.Calldata {
         });
         const feeAssets = borrowAmount.mul((0, decimal_js_1.default)(Number(feeBps))).div((0, decimal_js_1.default)(10000));
         const feeUsd = feeAssets.mul(borrowPrice);
+        // Subtract fee from displayed collateral — the fee reduces swap
+        // output, so the user receives less collateral than rawDebtInUsd.
+        const newCollateralInUsd = notional.add(rawDebtInUsd).sub(feeUsd);
         return {
             borrowAmount,
             newDebt: rawDebtInUsd,
@@ -814,7 +821,7 @@ class CToken extends Calldata_1.Calldata {
         // (exact for partial; for full deleverage the actual swap is sized
         // by leverageDown using the snapshot, but the preview is close enough
         // for display purposes).
-        const feeBps = borrow ? setup_1.setup_config.feePolicy.getFeeBps({
+        const feeBps = borrow ? this.setup.feePolicy.getFeeBps({
             operation: 'leverage-down',
             inputToken: this.asset.address,
             outputToken: borrow.asset.address,
@@ -841,7 +848,7 @@ class CToken extends Calldata_1.Calldata {
     }
     async leverageUp(borrow, newLeverage, type, slippage_ = (0, decimal_js_1.default)(0.05), simulate = false) {
         try {
-            (0, helpers_1.validateProviderAsSigner)(this.provider);
+            this.requireSigner();
             const slippage = this._leverageUpSlippage(FormatConverter_1.default.percentageToBps(slippage_), newLeverage);
             const manager = this.getPositionManager(type);
             let calldata;
@@ -850,7 +857,7 @@ class CToken extends Calldata_1.Calldata {
             switch (type) {
                 case 'simple': {
                     const borrowAssets = FormatConverter_1.default.decimalToBigInt(borrowAmount, borrow.asset.decimals);
-                    const feeBps = setup_1.setup_config.feePolicy.getFeeBps({
+                    const feeBps = this.setup.feePolicy.getFeeBps({
                         operation: 'leverage-up',
                         inputToken: borrow.asset.address,
                         outputToken: this.asset.address,
@@ -858,8 +865,27 @@ class CToken extends Calldata_1.Calldata {
                         currentLeverage: this.getLeverage() ?? (0, decimal_js_1.default)(1),
                         targetLeverage: newLeverage,
                     });
-                    const feeReceiver = feeBps > 0n ? setup_1.setup_config.feePolicy.feeReceiver : undefined;
-                    const { action, quote } = await chains_1.chain_config[setup_1.setup_config.chain].dexAgg.quoteAction(manager.address, borrow.asset.address, this.asset.address, borrowAssets, slippage, feeBps, feeReceiver);
+                    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);
+                    // _swapSafe measures value loss as (valueIn - valueOut) / valueIn
+                    // where valueIn is the FULL input (pre-fee). KyberSwap deducts
+                    // the fee before swapping, so _swapSafe sees feeBps as "slippage"
+                    // even though it's a known, deterministic cost. Expand
+                    // action.slippage by feeBps so the fee doesn't consume the user's
+                    // MEV protection budget. The KyberSwap quote already used the
+                    // user's raw slippage for minReturnAmount (DEX-level protection).
+                    if (feeBps > 0n) {
+                        action.slippage = FormatConverter_1.default.bpsToBpsWad(slippage + feeBps);
+                    }
+                    // The fee also reduces swap output, which checkSlippage sees
+                    // as equity loss amplified by (L-1) — same pattern as
+                    // deleverage. Expand the contract-level tolerance to absorb it.
+                    const contractSlippage = feeBps > 0n
+                        ? slippage + BigInt(newLeverage.sub(1)
+                            .mul(Number(feeBps))
+                            .ceil()
+                            .toFixed(0))
+                        : slippage;
                     calldata = manager.getLeverageCalldata({
                         borrowableCToken: borrow.address,
                         borrowAssets: FormatConverter_1.default.decimalToBigInt(borrowAmount, borrow.asset.decimals),
@@ -867,7 +893,7 @@ class CToken extends Calldata_1.Calldata {
                         expectedShares: this.virtualConvertToShares(BigInt(quote.min_out), LEVERAGE.SHARES_BUFFER_BPS),
                         swapAction: action,
                         auxData: "0x",
-                    }, FormatConverter_1.default.bpsToBpsWad(slippage));
+                    }, FormatConverter_1.default.bpsToBpsWad(contractSlippage));
                     break;
                 }
                 case 'native-vault':
@@ -905,8 +931,8 @@ class CToken extends Calldata_1.Calldata {
                     return { success: false, error: "New leverage must be less than current leverage" };
                 throw new Error("New leverage must be less than current leverage");
             }
-            (0, helpers_1.validateProviderAsSigner)(this.provider);
-            const config = (0, helpers_1.getChainConfig)();
+            this.requireSigner();
+            const config = this.currentChainConfig;
             const slippage = (0, helpers_1.toBps)(slippage_);
             const manager = this.getPositionManager(type);
             let calldata;
@@ -931,7 +957,7 @@ class CToken extends Calldata_1.Calldata {
                     // exact for current callers. Future notional-tiered policies
                     // should be aware that for full deleverage the inputAmount
                     // passed here is an underestimate.
-                    const feeBps = setup_1.setup_config.feePolicy.getFeeBps({
+                    const feeBps = this.setup.feePolicy.getFeeBps({
                         operation: 'leverage-down',
                         inputToken: this.asset.address,
                         outputToken: borrowToken.asset.address,
@@ -939,7 +965,7 @@ class CToken extends Calldata_1.Calldata {
                         currentLeverage: currentLeverage,
                         targetLeverage: newLeverage,
                     });
-                    const feeReceiver = feeBps > 0n ? setup_1.setup_config.feePolicy.feeReceiver : undefined;
+                    const feeReceiver = feeBps > 0n ? this.setup.feePolicy.feeReceiver : undefined;
                     if (isFullDeleverage) {
                         // Use exact projected debt from snapshot to size the swap.
                         // debtTokenBalance is in debt-token native decimals, projected
@@ -960,25 +986,40 @@ class CToken extends Calldata_1.Calldata {
                             swapCollateral = maxCollateral;
                         }
                     }
+                    else if (feeBps > 0n) {
+                        // Partial deleverage: inflate swap size to compensate
+                        // for fee deduction on input. KyberSwap deducts feeBps
+                        // from input before swapping, so without compensation
+                        // the swap underdelivers and actual leverage is slightly
+                        // higher than target.
+                        swapCollateral = swapCollateral * 10000n / (10000n - feeBps);
+                    }
                     const { action, quote } = await config.dexAgg.quoteAction(manager.address, this.asset.address, borrowToken.asset.address, swapCollateral, slippage, feeBps, feeReceiver);
+                    // _swapSafe: expand action.slippage by feeBps so the
+                    // deterministic fee cost doesn't eat the user's MEV budget.
+                    // Same rationale as leverageUp — see comment there.
+                    if (feeBps > 0n) {
+                        action.slippage = FormatConverter_1.default.bpsToBpsWad(slippage + feeBps);
+                    }
                     const minRepay = isFullDeleverage ? 1n : quote.min_out;
-                    // Full deleverage oversizes the swap by (DELEVERAGE_OVERHEAD_BPS +
-                    // feeBps) in absolute terms to prevent dust debt. The contract's
-                    // checkSlippage modifier compares equity-before vs equity-after
-                    // as a fraction of starting equity, so the absolute overshoot
-                    // becomes (L-1) × overhead in equity-fraction terms. We expand
-                    // the contract slippage tolerance by exactly that forced amount,
-                    // leaving the user's `slippage` budget available for variable
+                    // checkSlippage measures equity-fraction loss. Both the
+                    // intentional swap overshoot (full deleverage only) and the
+                    // DEX fee (always) are real equity losses amplified by
+                    // leverage. Expand contractSlippage to absorb them so the
+                    // user's `slippage` budget is preserved for variable
                     // DEX impact + oracle drift.
                     //
-                    // This does NOT loosen MEV protection — that lives at the
-                    // _swapSafe layer (which still receives raw user slippage).
-                    // The contract checkSlippage is sanity-only per its docstring.
-                    // Note: the contract returns excess debt token to the user's
-                    // wallet, so the economic loss from the overshoot is zero.
-                    const contractSlippage = isFullDeleverage
-                        ? slippage + BigInt(currentLeverage.sub(1)
-                            .mul(Number(LEVERAGE.DELEVERAGE_OVERHEAD_BPS + feeBps))
+                    // Full:    (L-1) × (overhead + fee)  — overshoot + fee
+                    // Partial: (ΔL)  × fee               — fee only, no overshoot
+                    const leverageDelta = isFullDeleverage
+                        ? currentLeverage.sub(1)
+                        : currentLeverage.sub(newLeverage);
+                    const forcedBps = isFullDeleverage
+                        ? LEVERAGE.DELEVERAGE_OVERHEAD_BPS + feeBps
+                        : feeBps;
+                    const contractSlippage = forcedBps > 0n
+                        ? slippage + BigInt(leverageDelta
+                            .mul(Number(forcedBps))
                             .ceil()
                             .toFixed(0))
                         : slippage;
@@ -1025,7 +1066,7 @@ class CToken extends Calldata_1.Calldata {
             switch (type) {
                 case 'simple': {
                     const borrowAssets = FormatConverter_1.default.decimalToBigInt(borrowAmount, borrow.asset.decimals);
-                    const feeBps = setup_1.setup_config.feePolicy.getFeeBps({
+                    const feeBps = this.setup.feePolicy.getFeeBps({
                         operation: 'deposit-and-leverage',
                         inputToken: borrow.asset.address,
                         outputToken: this.asset.address,
@@ -1033,8 +1074,21 @@ class CToken extends Calldata_1.Calldata {
                         currentLeverage: this.getLeverage() ?? (0, decimal_js_1.default)(1),
                         targetLeverage: multiplier,
                     });
-                    const feeReceiver = feeBps > 0n ? setup_1.setup_config.feePolicy.feeReceiver : undefined;
-                    const { action, quote } = await chains_1.chain_config[setup_1.setup_config.chain].dexAgg.quoteAction(manager.address, borrow.asset.address, this.asset.address, borrowAssets, slippage, feeBps, feeReceiver);
+                    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);
+                    // _swapSafe: expand action.slippage by feeBps so the
+                    // deterministic fee cost doesn't eat the user's MEV budget.
+                    // Same rationale as leverageUp — see comment there.
+                    if (feeBps > 0n) {
+                        action.slippage = FormatConverter_1.default.bpsToBpsWad(slippage + feeBps);
+                    }
+                    // Fee amplification: same pattern as leverageUp.
+                    const contractSlippage = feeBps > 0n
+                        ? slippage + BigInt(multiplier.sub(1)
+                            .mul(Number(feeBps))
+                            .ceil()
+                            .toFixed(0))
+                        : slippage;
                     calldata = manager.getDepositAndLeverageCalldata(FormatConverter_1.default.decimalToBigInt(depositAmount, this.asset.decimals), {
                         borrowableCToken: borrow.address,
                         borrowAssets: borrowAssets,
@@ -1042,7 +1096,7 @@ class CToken extends Calldata_1.Calldata {
                         expectedShares: this.virtualConvertToShares(BigInt(quote.min_out), LEVERAGE.SHARES_BUFFER_BPS),
                         swapAction: action,
                         auxData: "0x",
-                    }, FormatConverter_1.default.bpsToBpsWad(slippage));
+                    }, FormatConverter_1.default.bpsToBpsWad(contractSlippage));
                     break;
                 }
                 case 'native-vault':
@@ -1076,7 +1130,7 @@ class CToken extends Calldata_1.Calldata {
     async simulateDeposit(amount, zap = 'none', receiver = null) {
         try {
             amount = await this.ensureUnderlyingAmount(amount, zap);
-            const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+            const signer = this.requireSigner();
             receiver ??= signer.address;
             const isZapping = typeof zap === 'object' && zap.type !== 'none';
             const depositAssets = FormatConverter_1.default.decimalToBigInt(amount, this.asset.decimals);
@@ -1084,7 +1138,7 @@ class CToken extends Calldata_1.Calldata {
             if (isZapping && zap.inputToken) {
                 const isNative = zap.inputToken.toLowerCase() === helpers_1.NATIVE_ADDRESS.toLowerCase();
                 const zapDecimals = isNative ? 18n : (() => {
-                    const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken);
+                    const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, undefined, this.signer);
                     return inputErc20.decimals ?? inputErc20.contract.decimals();
                 })();
                 zapAssets = FormatConverter_1.default.decimalToBigInt(amount, await zapDecimals);
@@ -1100,7 +1154,7 @@ class CToken extends Calldata_1.Calldata {
     async simulateDepositAsCollateral(amount, zap = 'none', receiver = null) {
         try {
             amount = await this.ensureUnderlyingAmount(amount, zap);
-            const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+            const signer = this.requireSigner();
             receiver ??= signer.address;
             const isZapping = typeof zap === 'object' && zap.type !== 'none';
             const depositAssets = FormatConverter_1.default.decimalToBigInt(amount, this.asset.decimals);
@@ -1108,7 +1162,7 @@ class CToken extends Calldata_1.Calldata {
             if (isZapping && zap.inputToken) {
                 const isNative = zap.inputToken.toLowerCase() === helpers_1.NATIVE_ADDRESS.toLowerCase();
                 const zapDecimals = isNative ? 18n : (() => {
-                    const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken);
+                    const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, undefined, this.signer);
                     return inputErc20.decimals ?? inputErc20.contract.decimals();
                 })();
                 zapAssets = FormatConverter_1.default.decimalToBigInt(amount, await zapDecimals);
@@ -1169,7 +1223,7 @@ class CToken extends Calldata_1.Calldata {
     }
     async deposit(amount, zap = 'none', receiver = null) {
         amount = await this.ensureUnderlyingAmount(amount, zap);
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         receiver ??= signer.address;
         // When zapping, the swap amount uses input token decimals, but the
         // default deposit calldata uses the deposit token decimals.
@@ -1181,7 +1235,7 @@ class CToken extends Calldata_1.Calldata {
                 zapAssets = FormatConverter_1.default.decimalToBigInt(amount, 18n);
             }
             else {
-                const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken);
+                const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, undefined, this.signer);
                 const zapDecimals = inputErc20.decimals ?? await inputErc20.contract.decimals();
                 zapAssets = FormatConverter_1.default.decimalToBigInt(amount, zapDecimals);
             }
@@ -1205,7 +1259,7 @@ class CToken extends Calldata_1.Calldata {
     }
     async depositAsCollateral(amount, zap = 'none', receiver = null) {
         amount = await this.ensureUnderlyingAmount(amount, zap);
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         receiver ??= signer.address;
         // When zapping, the swap amount uses input token decimals, but collateral
         // cap checks and the default deposit calldata use the deposit token decimals.
@@ -1217,7 +1271,7 @@ class CToken extends Calldata_1.Calldata {
                 zapAssets = FormatConverter_1.default.decimalToBigInt(amount, 18n);
             }
             else {
-                const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken);
+                const inputErc20 = new ERC20_1.ERC20(this.provider, zap.inputToken, undefined, undefined, this.signer);
                 const zapDecimals = inputErc20.decimals ?? await inputErc20.contract.decimals();
                 zapAssets = FormatConverter_1.default.decimalToBigInt(amount, zapDecimals);
             }
@@ -1240,7 +1294,7 @@ class CToken extends Calldata_1.Calldata {
         return this.oracleRoute(calldata, calldata_overrides);
     }
     async redeem(amount) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         const receiver = signer.address;
         const owner = signer.address;
         const buffer = this.market.userDebt.greaterThan(0) ? 100n : 0n;
@@ -1255,19 +1309,17 @@ class CToken extends Calldata_1.Calldata {
         return this.oracleRoute(calldata);
     }
     async redeemShares(amount) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         const receiver = signer.address;
         const owner = signer.address;
         const calldata = this.getCallData("redeem", [amount, receiver, owner]);
         return this.oracleRoute(calldata);
     }
     async collateralPosted(account = null) {
-        if (!account)
-            account = (0, helpers_1.validateProviderAsSigner)(this.provider).address;
-        return this.contract.collateralPosted(account);
+        return this.contract.collateralPosted(this.getAccountOrThrow(account));
     }
     async multicall(calls) {
-        return this.contract.multicall(calls);
+        return this.getWriteContract().multicall(calls);
     }
     async getSnapshot(account) {
         const snapshot = await this.contract.getSnapshot(account);
@@ -1326,10 +1378,10 @@ class CToken extends Calldata_1.Calldata {
         }
     }
     async _checkZapperApproval(zapper) {
-        if (!setup_1.setup_config.approval_protection) {
+        if (!this.setup.approval_protection) {
             return;
         }
-        if (setup_1.setup_config.approval_protection && zapper) {
+        if (this.setup.approval_protection && zapper) {
             const plugin_allowed = await this.isPluginApproved(zapper.type, 'zapper');
             if (!plugin_allowed) {
                 throw new Error(`Please approve the ${zapper.type} Zapper to be able to move ${this.symbol} on your behalf.`);
@@ -1337,8 +1389,8 @@ class CToken extends Calldata_1.Calldata {
         }
     }
     async _checkErc20Approval(erc20_address, amount, spender) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
-        const erc20 = new ERC20_1.ERC20(signer, erc20_address);
+        const signer = this.requireSigner();
+        const erc20 = new ERC20_1.ERC20(this.provider, erc20_address, undefined, undefined, signer);
         const allowance = await erc20.allowance(signer.address, spender);
         if (allowance < amount) {
             const symbol = await erc20.fetchSymbol();
@@ -1346,18 +1398,18 @@ class CToken extends Calldata_1.Calldata {
         }
     }
     async _checkAssetApproval(assets) {
-        if (!setup_1.setup_config.approval_protection) {
+        if (!this.setup.approval_protection) {
             return;
         }
         const asset = this.getAsset(true);
-        const owner = (0, helpers_1.validateProviderAsSigner)(this.provider).address;
+        const owner = this.getAccountOrThrow();
         const allowance = await asset.allowance(owner, this.address);
         if (allowance < assets) {
             throw new Error(`Please approve the ${asset.symbol} token for ${this.symbol}`);
         }
     }
     async _checkDepositApprovals(zapper, assets) {
-        if (!setup_1.setup_config.approval_protection) {
+        if (!this.setup.approval_protection) {
             return;
         }
         if (zapper) {
@@ -1366,7 +1418,7 @@ class CToken extends Calldata_1.Calldata {
         await this._checkAssetApproval(assets);
     }
     async oracleRoute(calldata, override = {}) {
-        const signer = (0, helpers_1.validateProviderAsSigner)(this.provider);
+        const signer = this.requireSigner();
         const price_updates = await this.getPriceUpdates();
         if (price_updates.length > 0) {
             const token_action = this.buildMultiCallAction(calldata);