curvance 4.0.4 → 4.1.1

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',
 ]);
@@ -48,9 +46,10 @@ const EXCLUDED_ZAP_SYMBOLS = new Set([
  *
  * 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.
+ * tolerance if not compensated. `KyberSwap.quoteAction` (the DEX adapter)
+ * expands action.slippage by feeBps internally so the fee is absorbed and
+ * the user's chosen tolerance is preserved for actual MEV/routing variance.
+ * Callers pass raw user slippage — the adapter owns the expansion.
  *
  * Asymmetry between leverage up and deleverage
  * --------------------------------------------
@@ -81,10 +80,11 @@ const LEVERAGE = {
      *  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. */
+     *  Fee handling: KyberSwap.quoteAction expands action.slippage by feeBps
+     *  internally so _swapSafe doesn't treat the fee as MEV. Each call site
+     *  still computes contractSlippage (expanded 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 +114,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 +123,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 +145,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 +272,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 +296,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 +348,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 +356,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 +370,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 +383,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 +392,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 +404,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 +415,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 +432,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 +443,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 +519,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 +530,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 +543,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 +562,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 +583,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 +647,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 +673,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 +696,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 +717,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 +731,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}`);
         }
@@ -766,7 +776,7 @@ class CToken extends Calldata_1.Calldata {
         const borrowAmount = rawDebtInUsd.sub(currentDebt).div(borrowPrice);
         // 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,
@@ -813,7 +823,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,
@@ -840,7 +850,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;
@@ -849,7 +859,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,
@@ -857,18 +867,12 @@ 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);
-                    // _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);
-                    }
+                    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);
+                    // 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
+                    // sees as equity loss amplified by (L-1) — handled below.
                     // 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.
@@ -923,8 +927,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;
@@ -949,7 +953,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,
@@ -957,7 +961,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
@@ -987,12 +991,8 @@ class CToken extends Calldata_1.Calldata {
                         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);
-                    }
+                    // Fee-aware slippage expansion for `_swapSafe` is handled by
+                    // KyberSwap.quoteAction. See KyberSwap.ts for rationale.
                     const minRepay = isFullDeleverage ? 1n : quote.min_out;
                     // checkSlippage measures equity-fraction loss. Both the
                     // intentional swap overshoot (full deleverage only) and the
@@ -1058,7 +1058,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,
@@ -1066,14 +1066,10 @@ 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);
-                    // _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 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);
+                    // Fee-aware slippage expansion for `_swapSafe` is handled by
+                    // KyberSwap.quoteAction. See KyberSwap.ts for rationale.
                     // Fee amplification: same pattern as leverageUp.
                     const contractSlippage = feeBps > 0n
                         ? slippage + BigInt(multiplier.sub(1)
@@ -1122,7 +1118,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);
@@ -1130,7 +1126,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);
@@ -1146,7 +1142,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);
@@ -1154,7 +1150,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);
@@ -1215,7 +1211,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.
@@ -1227,7 +1223,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);
             }
@@ -1251,7 +1247,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.
@@ -1263,7 +1259,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);
             }
@@ -1286,7 +1282,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;
@@ -1301,19 +1297,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);
@@ -1372,10 +1366,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.`);
@@ -1383,8 +1377,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();
@@ -1392,18 +1386,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) {
@@ -1412,7 +1406,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);