morpho-contracts-helper 0.0.20 → 0.0.21

package/contracts/MorphoMarketDataFetcher.sol

@@ -1,53 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-struct MarketParams {
-    address loanToken;
-    address collateralToken;
-    address oracle;
-    address irm;
-    uint256 lltv;
-}
-
-interface IChainlinkAggregator {
-    function decimals() external view returns (uint8);
-
-    function latestRoundData()
-        external
-        view
-        returns (
-            uint80 roundId,
-            int256 answer,
-            uint256 startedAt,
-            uint256 updatedAt,
-            uint80 answeredInRound
-        );
-}
-
-interface IERC20Metadata {
-    function name() external view returns (string memory);
-    function symbol() external view returns (string memory);
-    function decimals() external view returns (uint8);
-    function allowance(address owner, address spender) external view returns (uint256);
-}
-
-interface IMorphoChainlinkOracleV2 {
-    function BASE_FEED_1() external view returns (address);
-    function BASE_FEED_2() external view returns (address);
-    function BASE_VAULT() external view returns (address);
-    function BASE_VAULT_CONVERSION_SAMPLE() external view returns (address);
-    function QUOTE_FEED_1() external view returns (address);
-    function QUOTE_FEED_2() external view returns (address);
-    function QUOTE_VAULT() external view returns (address);
-    function QUOTE_VAULT_CONVERSION_SAMPLE() external view returns (address);
-    function SCALE_FACTOR() external view returns (uint256);
-    function price() external view returns (uint256);
-}
-
-interface IMorpho {
-    function position(bytes32 marketId, address account) external view returns (uint128 supplyShares, uint128 borrowShares, uint128 collateral);
-    function idToMarketParams(bytes32 marketId) external view returns (MarketParams memory);
-}
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
+import {AggregatorV3Interface} from "./external/morpho/interfaces/AggregatorV3Interface.sol";
+import {IMorpho, MarketParams, Market,  Id, Position} from "./external/morpho/interfaces/IMorpho.sol";
+import {IMorphoChainlinkOracleV2} from "./external/morpho/interfaces/IMorphoChainlinkOracleV2.sol";
+import {IERC4626} from "./external/morpho/interfaces/IERC4626.sol";
 
 contract MorphoMarketDataFetcher {
 
@@ -74,14 +33,14 @@ contract MorphoMarketDataFetcher {
 
     struct OracleInfo {
         address oracleAddress;
-        address baseFeed1;
-        address baseFeed2;
-        address baseVault;
-        address baseVaultConversionSample;
-        address quoteFeed1;
-        address quoteFeed2;
-        address quoteVault;
-        address quoteVaultConversionSample;
+        AggregatorV3Interface baseFeed1;
+        AggregatorV3Interface baseFeed2;
+        IERC4626 baseVault;
+        uint256 baseVaultConversionSample;
+        AggregatorV3Interface quoteFeed1;
+        AggregatorV3Interface quoteFeed2;
+        IERC4626 quoteVault;
+        uint256 quoteVaultConversionSample;
         uint256 scaleFactor;
         uint256 currentPrice;
         MockOracleInfo baseFeed;
@@ -101,7 +60,7 @@ contract MorphoMarketDataFetcher {
         address user
     ) external view returns (MarketData memory data) {
 
-        MarketParams memory params = IMorpho(morphoAddress).idToMarketParams(marketId);
+        MarketParams memory params = IMorpho(morphoAddress).idToMarketParams(Id.wrap(marketId));
         
         data.marketParams = params;
         
@@ -123,49 +82,49 @@ contract MorphoMarketDataFetcher {
 
         if (params.oracle != address(0)) {
             data.oracle.oracleAddress = params.oracle;
-            try IMorphoChainlinkOracleV2(params.oracle).BASE_FEED_1() returns (address a) { data.oracle.baseFeed1 = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).BASE_FEED_2() returns (address a) { data.oracle.baseFeed2 = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).BASE_VAULT() returns (address a) { data.oracle.baseVault = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).BASE_VAULT_CONVERSION_SAMPLE() returns (address a) { data.oracle.baseVaultConversionSample = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_FEED_1() returns (address a) { data.oracle.quoteFeed1 = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_FEED_2() returns (address a) { data.oracle.quoteFeed2 = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_VAULT() returns (address a) { data.oracle.quoteVault = a; } catch {}
-            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_VAULT_CONVERSION_SAMPLE() returns (address a) { data.oracle.quoteVaultConversionSample = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).BASE_FEED_1() returns (AggregatorV3Interface a) { data.oracle.baseFeed1 = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).BASE_FEED_2() returns (AggregatorV3Interface a) { data.oracle.baseFeed2 = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).BASE_VAULT() returns (IERC4626 a) { data.oracle.baseVault = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).BASE_VAULT_CONVERSION_SAMPLE() returns (uint256 a) { data.oracle.baseVaultConversionSample = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_FEED_1() returns (AggregatorV3Interface a) { data.oracle.quoteFeed1 = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_FEED_2() returns (AggregatorV3Interface a) { data.oracle.quoteFeed2 = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_VAULT() returns (IERC4626 a) { data.oracle.quoteVault = a; } catch {}
+            try IMorphoChainlinkOracleV2(params.oracle).QUOTE_VAULT_CONVERSION_SAMPLE() returns (uint256 a) { data.oracle.quoteVaultConversionSample = a; } catch {}
             try IMorphoChainlinkOracleV2(params.oracle).SCALE_FACTOR() returns (uint256 s) { data.oracle.scaleFactor = s; } catch {}
             try IMorphoChainlinkOracleV2(params.oracle).price() returns (uint256 p) { data.oracle.currentPrice = p; } catch {}
         }
         
-        if (data.oracle.baseFeed1 != address(0)) {
-            data.oracle.baseFeed.oracleAddress = data.oracle.baseFeed1;
+        if (address(data.oracle.baseFeed1) != address(0)) {
+            data.oracle.baseFeed.oracleAddress = address(data.oracle.baseFeed1);
             
-            try IChainlinkAggregator(data.oracle.baseFeed1).latestRoundData() returns (
+            try data.oracle.baseFeed1.latestRoundData() returns (
                 uint80, int256 answer, uint256, uint256, uint80
             ) { 
                 data.oracle.baseFeed.price = answer > 0 ? uint256(answer) : 0; 
             } catch {}
 
-            try IChainlinkAggregator(data.oracle.baseFeed1).decimals() returns (uint8 _dec) { data.oracle.baseFeed.decimals = _dec; } catch {}
-            try IERC20Metadata(data.oracle.baseFeed1).symbol() returns (string memory _sym) { data.oracle.baseFeed.symbol = _sym; } catch {}
+            try data.oracle.baseFeed1.decimals() returns (uint8 _dec) { data.oracle.baseFeed.decimals = _dec; } catch {}
+            try data.oracle.baseFeed1.description() returns (string memory _sym) { data.oracle.baseFeed.symbol = _sym; } catch {}
         }
 
-        if (data.oracle.quoteFeed1 != address(0)) {
-            data.oracle.quoteFeed.oracleAddress = data.oracle.quoteFeed1;
+        if (address(data.oracle.quoteFeed1) != address(0)) {
+            data.oracle.quoteFeed.oracleAddress = address(data.oracle.quoteFeed1);
             
-            try IChainlinkAggregator(data.oracle.quoteFeed1).latestRoundData() returns (
+            try data.oracle.quoteFeed1.latestRoundData() returns (
                 uint80, int256 answer, uint256, uint256, uint80
             ) { 
                 data.oracle.quoteFeed.price = answer > 0 ? uint256(answer) : 0; 
             } catch {}
 
-            try IChainlinkAggregator(data.oracle.quoteFeed1).decimals() returns (uint8 _dec) { data.oracle.quoteFeed.decimals = _dec; } catch {}
-            try IERC20Metadata(data.oracle.quoteFeed1).symbol() returns (string memory _sym) { data.oracle.quoteFeed.symbol = _sym; } catch {}
+            try data.oracle.quoteFeed1.decimals() returns (uint8 _dec) { data.oracle.quoteFeed.decimals = _dec; } catch {}
+            try data.oracle.quoteFeed1.description() returns (string memory _sym) { data.oracle.quoteFeed.symbol = _sym; } catch {}
         }
 
         if (morphoAddress != address(0) && marketId != bytes32(0)) {
             address deadAddress = 0x000000000000000000000000000000000000dEaD;
-            try IMorpho(morphoAddress).position(marketId, deadAddress) returns (uint128 supplyShares, uint128, uint128) {
-                data.deadAddressSupply = uint256(supplyShares);
-            } catch {}
+
+            Position memory deadPosition = IMorpho(morphoAddress).position(Id.wrap(marketId), deadAddress);
+            data.deadAddressSupply = deadPosition.supplyShares;
         }
     }
 }

package/contracts/OracleFactory.sol

@@ -1,141 +1,379 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-interface IChainlinkAggregator {
-    function decimals() external view returns (uint8);
+import {AggregatorV3Interface} from "./external/morpho/interfaces/AggregatorV3Interface.sol";
 
-    function latestRoundData()
-        external
-        view
-        returns (
-            uint80 roundId,
-            int256 answer,
-            uint256 startedAt,
-            uint256 updatedAt,
-            uint80 answeredInRound
-        );
-}
 
 /**
  * @title ManualChainlinkMockFeed
- * @notice Mock Chainlink feed with manual price updates
+ * @notice Mock Chainlink feed with manual price updates and automated simulation modes.
+ *
+ * SIMULATION MODES:
+ * ─────────────────────────────────────────────────────────────────────
+ *  0 = MANUAL            → Price is manually updated via setPrice()
+ *  1 = TRENDING_UP       → Price compounds by `basisPoints` every 5 minutes (STEP)
+ *  2 = TRENDING_DOWN     → Price compounds down by `basisPoints` every 5 minutes (STEP)
+ *  3 = CRASH_AND_RECOVER → Hourly-based custom curve:
+ *        [0h – 23h)  : Gradual compound growth (+basisPoints per hour)
+ *        [23h – 24h) : Sharp linear crash down to 75% of the initial base price
+ *        [24h – 25h) : Linear recovery from the crashed price back to the initial base price
+ *        ≥ 25h       : Remains flat at the initial base price
+ * ─────────────────────────────────────────────────────────────────────
+ *
+ * simStartTime: Timestamp of t=0 for the simulation (automatically set on setMode() or deployment)
+ * basisPoints : Rate of change (1 bp = 0.01%, e.g., 50 = 0.5% per STEP/HOUR)
  */
-contract ManualChainlinkMockFeed is IChainlinkAggregator {
+contract ManualChainlinkMockFeed is AggregatorV3Interface {
+
+    // ── Enums & Constants ────────────────────────────────────────────
+    uint8 public constant MODE_MANUAL           = 0;
+    uint8 public constant MODE_TRENDING_UP      = 1;
+    uint8 public constant MODE_TRENDING_DOWN    = 2;
+    uint8 public constant MODE_CRASH_AND_RECOVER = 3;
+
+    uint256 private constant STEP = 300; // 5 minutes step for trending modes
+    uint256 private constant HOUR = 3600; // 1 hour step for crash & recover mode
+    uint256 private constant BPS_DENOM = 10_000;
+
+    // ── Storage ──────────────────────────────────────────────────────
     mapping(address => bool) public isOwner;
 
-    int256 private _price;
-    uint8 private immutable _decimals;
+    int256  private _price;
+    uint8   private immutable _decimals;
+    string public description;
 
-    string public symbol;
+    uint8   public  simMode;
+    uint256 public  simStartTime;
+    uint256 public  basisPoints;
 
+    // ── Events ───────────────────────────────────────────────────────
     event PriceUpdated(int256 newPrice, address indexed updatedBy);
+    event ModeChanged(uint8 newMode, uint256 startTime, uint256 basisPoints);
     event OwnerAdded(address indexed newOwner);
 
+    // ── Modifiers ────────────────────────────────────────────────────
     modifier onlyOwner() {
         require(isOwner[msg.sender], "Unauthorized");
         _;
     }
 
+    // ── Constructor ──────────────────────────────────────────────────
     constructor(
         int256 initialPrice,
-        uint8 decimals_,
-        string memory symbol_,
-        address[] memory owners_
+        uint8  decimals_,
+        string memory description_,
+        address[] memory owners_,
+        uint8 simMode_
     ) {
         require(owners_.length > 0, "No owners provided");
-
         for (uint256 i = 0; i < owners_.length; i++) {
             require(owners_[i] != address(0), "Zero address");
-
             isOwner[owners_[i]] = true;
-
             emit OwnerAdded(owners_[i]);
         }
+        _price      = initialPrice;
+        _decimals   = decimals_;
+        description = description_;
+        simMode     = simMode_;
+        basisPoints = 50; // default: 0.5%
 
-        _price = initialPrice;
-        _decimals = decimals_;
-        symbol = symbol_;
+        if (simMode_ != MODE_MANUAL) {
+            simStartTime = block.timestamp;
+        }
     }
 
+    // ── IChainlinkAggregator ─────────────────────────────────────────
+
     function latestRoundData()
         external
         view
         override
         returns (
-            uint80 roundId,
-            int256 answer,
+            uint80  roundId,
+            int256  answer,
             uint256 startedAt,
             uint256 updatedAt,
-            uint80 answeredInRound
+            uint80  answeredInRound
         )
     {
-        return (1, _price, block.timestamp, block.timestamp, 1);
+        answer = _computePrice();
+        
+        // Default roundId for MANUAL mode
+        uint256 dynamicRoundId = 1; 
+        
+        // For simulation modes, generate a realistic incrementing roundId
+        if (simMode != MODE_MANUAL) {
+            uint256 elapsed = block.timestamp - simStartTime;
+            uint256 currentStep = (simMode == MODE_CRASH_AND_RECOVER) ? HOUR : STEP;
+            dynamicRoundId = (elapsed / currentStep) + 1; 
+        }
+
+        // Explicitly cast uint256 to uint80 to prevent compilation errors
+        uint80 castedRoundId = uint80(dynamicRoundId);
+
+        return (
+            castedRoundId, 
+            answer, 
+            block.timestamp, 
+            block.timestamp, 
+            castedRoundId
+        );
     }
 
     function decimals() external view override returns (uint8) {
         return _decimals;
     }
 
+    // ── Price Computation ────────────────────────────────────────────
+
+    /**
+     * @dev Dynamically computes the current price based on the active simulation mode.
+     *      All calculations happen inside this view function without modifying the state.
+     */
+    function _computePrice() internal view returns (int256) {
+        if (simMode == MODE_MANUAL) {
+            return _price;
+        }
+
+        int256  base = _price;
+        uint256 elapsed = block.timestamp - simStartTime;
+
+        if (simMode == MODE_TRENDING_UP) {
+            // compound: base * (1 + bp/10000)^steps (every 5 mins)
+            uint256 stepsElapsed = elapsed / STEP;
+            return _compoundGrow(base, basisPoints, stepsElapsed);
+        }
+
+        if (simMode == MODE_TRENDING_DOWN) {
+            // compound: base * (1 - bp/10000)^steps (every 5 mins)
+            uint256 stepsElapsed = elapsed / STEP;
+            return _compoundDecay(base, basisPoints, stepsElapsed);
+        }
+
+        if (simMode == MODE_CRASH_AND_RECOVER) {
+            return _crashAndRecover(base, elapsed);
+        }
+
+        return base;
+    }
+
+    /**
+     * @dev CRASH_AND_RECOVER price curve (Hourly based):
+     *
+     * Phase A  [0 – 23h)   : Compound growth (+basisPoints per hour)
+     * Phase B  [23h – 24h) : Starts at Phase A peak, linear drop to base * 0.75 within 1 hour
+     * Phase C  [24h – 25h) : Linear recovery from base * 0.75 back to the original base price
+     * Phase D  ≥ 25h       : Stays flat at the original base price
+     */
+    function _crashAndRecover(int256 base, uint256 elapsed)
+        internal
+        view
+        returns (int256)
+    {
+        if (base == 0) return 0;
+
+        uint256 PHASE_A_END = 23 * HOUR;
+        uint256 PHASE_B_END = 24 * HOUR;
+        uint256 PHASE_C_END = 25 * HOUR;
+
+        // Peak price calculation strictly uses 23 hourly intervals
+        int256 peakPrice = _compoundGrow(base, basisPoints, 23);
+        int256 crashPrice = (base * 75) / 100;
+
+        if (elapsed < PHASE_A_END) {
+            uint256 h = elapsed / HOUR;
+            return _compoundGrow(base, basisPoints, h);
+        }
+
+        if (elapsed < PHASE_B_END) {
+            uint256 phaseElapsed = elapsed - PHASE_A_END;
+            return _lerp(peakPrice, crashPrice, phaseElapsed, HOUR);
+        }
+
+        if (elapsed < PHASE_C_END) {
+            uint256 phaseElapsed = elapsed - PHASE_B_END;
+            return _lerp(crashPrice, base, phaseElapsed, HOUR);
+        }
+
+        return base;
+    }
+
+    // ── Math Helpers ─────────────────────────────────────────────────
+
+    /**
+     * @dev Integer linear interpolation:
+     *      result = from + (to - from) * t / duration
+     */
+    function _lerp(
+        int256  from,
+        int256  to,
+        uint256 t,
+        uint256 duration
+    ) internal pure returns (int256) {
+        if (t >= duration) return to;
+        int256 delta = to - from;
+        return from + (delta * int256(t)) / int256(duration);
+    }
+
+    /**
+     * @dev Compound Growth: value * ((10000 + bp) / 10000)^n
+     *      Iterative approach used to manage precision and avoid overflow.
+     */
+    function _compoundGrow(
+        int256  value,
+        uint256 bp,
+        uint256 n
+    ) internal pure returns (int256) {
+        if (n == 0 || value == 0) return value;
+        
+        uint256 baseRate = BPS_DENOM + bp;
+        uint256 multiplier = BPS_DENOM;
+        
+        // Exponentiation by squaring
+        while (n > 0) {
+            if (n % 2 == 1) {
+                multiplier = (multiplier * baseRate) / BPS_DENOM;
+            }
+            baseRate = (baseRate * baseRate) / BPS_DENOM;
+            n /= 2;
+        }
+        
+        return (value * int256(multiplier)) / int256(BPS_DENOM);
+    }
+
+    /**
+     * @dev Compound Decay: value * ((10000 - bp) / 10000)^n
+     */
+    function _compoundDecay(
+        int256  value,
+        uint256 bp,
+        uint256 n
+    ) internal pure returns (int256) {
+        if (n == 0 || value == 0) return value;
+        
+        uint256 baseRate = BPS_DENOM - bp;
+        uint256 multiplier = BPS_DENOM;
+        
+        while (n > 0) {
+            if (n % 2 == 1) {
+                multiplier = (multiplier * baseRate) / BPS_DENOM;
+            }
+            baseRate = (baseRate * baseRate) / BPS_DENOM;
+            n /= 2;
+        }
+        
+        return (value * int256(multiplier)) / int256(BPS_DENOM);
+    }
+
+    // ── Owner Functions ──────────────────────────────────────────────
+
+    /**
+     * @notice Updates the simulation mode and resets the timer to current timestamp.
+     * @param mode_        New mode (0-3)
+     * @param basisPoints_ Rate of change (bp). Ignored in MANUAL mode.
+     */
+    function setMode(uint8 mode_, uint256 basisPoints_) external onlyOwner {
+        require(mode_ <= MODE_CRASH_AND_RECOVER, "Invalid mode");
+        simMode     = mode_;
+        simStartTime = block.timestamp;
+        basisPoints = basisPoints_;
+        emit ModeChanged(mode_, block.timestamp, basisPoints_);
+    }
+
+    /**
+     * @notice Updates the static price. Only allowed in MANUAL mode.
+     */
     function setPrice(int256 newPrice) external onlyOwner {
+        require(simMode == MODE_MANUAL, "Not in MANUAL mode");
         _price = newPrice;
-
         emit PriceUpdated(newPrice, msg.sender);
     }
 
+    /**
+     * @notice Updates the initial base price for automated simulation modes without resetting the timer.
+     */
+    function setBasePrice(int256 newBasePrice) external onlyOwner {
+        _price = newBasePrice;
+        
+        if (simMode != MODE_MANUAL) {
+            simStartTime = block.timestamp;
+        }
+        
+        emit PriceUpdated(newBasePrice, msg.sender);
+    }
+
+    /**
+     * @notice Restarts the simulation from the current timestamp (mode remains unchanged).
+     */
+    function restartSimulation() external onlyOwner {
+        require(simMode != MODE_MANUAL, "Use setPrice for MANUAL mode");
+        simStartTime = block.timestamp;
+        emit ModeChanged(simMode, block.timestamp, basisPoints);
+    }
+
     function addOwner(address newOwner) external onlyOwner {
         require(newOwner != address(0), "Zero address");
-
         isOwner[newOwner] = true;
-
         emit OwnerAdded(newOwner);
     }
+
+    // ── View Helpers ─────────────────────────────────────────────────
+
+    /// @notice Returns the dynamically computed current price (matches latestRoundData().answer)
+    function currentPrice() external view returns (int256) {
+        return _computePrice();
+    }
+
+    /// @notice Returns the seconds elapsed since the start of the current simulation
+    function elapsedSeconds() external view returns (uint256) {
+        if (simMode == MODE_MANUAL) return 0;
+        return block.timestamp - simStartTime;
+    }
+
+    function version() external pure returns (uint256) {
+        return 1; 
+    }
+
+    function getRoundData(uint80 _roundId)
+    external
+    view
+    returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound) {
+        return (_roundId, _price, block.timestamp, block.timestamp, 1);
+    }
 }
 
+// ─────────────────────────────────────────────────────────────────────────────
+
 /**
  * @title ManualChainlinkMockFeedFactory
  */
 contract ManualChainlinkMockFeedFactory {
-    address[] public allFeeds;
 
     event FeedCreated(
         address indexed feed,
-        string symbol,
-        int256 initialPrice,
-        uint8 decimals,
+        string  description,
+        int256  initialPrice,
+        uint8   decimals,
         address[] owners
     );
 
     function createFeed(
-        int256 initialPrice,
-        uint8 decimals_,
-        string memory symbol_,
-        address[] memory owners_
+        int256  initialPrice,
+        uint8   decimals_,
+        string memory description_,
+        address[] memory owners_,
+        uint8 simMode_
     ) external returns (address feedAddress) {
+        require(simMode_ < 4, "Please enter a valid simulation mode. Enter 0 for manual.");
+
         ManualChainlinkMockFeed feed = new ManualChainlinkMockFeed(
             initialPrice,
             decimals_,
-            symbol_,
-            owners_
+            description_,
+            owners_,
+            simMode_
         );
-
         feedAddress = address(feed);
-
-        allFeeds.push(feedAddress);
-
-        emit FeedCreated(
-            feedAddress,
-            symbol_,
-            initialPrice,
-            decimals_,
-            owners_
-        );
-    }
-
-    function getAllFeeds() external view returns (address[] memory) {
-        return allFeeds;
-    }
-
-    function totalFeeds() external view returns (uint256) {
-        return allFeeds.length;
+        emit FeedCreated(feedAddress, description_, initialPrice, decimals_, owners_);
     }
 }

package/dist/typechain-types/contracts/{MorphoMarketDataFetcher.sol/MorphoMarketDataFetcher.d.ts → MorphoMarketDataFetcher.d.ts}

@@ -1,5 +1,5 @@
 import type { BaseContract, BigNumberish, BytesLike, FunctionFragment, Result, Interface, AddressLike, ContractRunner, ContractMethod, Listener } from "ethers";
-import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener, TypedContractMethod } from "../../common";
+import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, TypedListener, TypedContractMethod } from "../common";
 export type MarketParamsStruct = {
     loanToken: AddressLike;
     collateralToken: AddressLike;
@@ -63,11 +63,11 @@ export declare namespace MorphoMarketDataFetcher {
         baseFeed1: AddressLike;
         baseFeed2: AddressLike;
         baseVault: AddressLike;
-        baseVaultConversionSample: AddressLike;
+        baseVaultConversionSample: BigNumberish;
         quoteFeed1: AddressLike;
         quoteFeed2: AddressLike;
         quoteVault: AddressLike;
-        quoteVaultConversionSample: AddressLike;
+        quoteVaultConversionSample: BigNumberish;
         scaleFactor: BigNumberish;
         currentPrice: BigNumberish;
         baseFeed: MorphoMarketDataFetcher.MockOracleInfoStruct;
@@ -78,11 +78,11 @@ export declare namespace MorphoMarketDataFetcher {
         baseFeed1: string,
         baseFeed2: string,
         baseVault: string,
-        baseVaultConversionSample: string,
+        baseVaultConversionSample: bigint,
         quoteFeed1: string,
         quoteFeed2: string,
         quoteVault: string,
-        quoteVaultConversionSample: string,
+        quoteVaultConversionSample: bigint,
         scaleFactor: bigint,
         currentPrice: bigint,
         baseFeed: MorphoMarketDataFetcher.MockOracleInfoStructOutput,
@@ -92,11 +92,11 @@ export declare namespace MorphoMarketDataFetcher {
         baseFeed1: string;
         baseFeed2: string;
         baseVault: string;
-        baseVaultConversionSample: string;
+        baseVaultConversionSample: bigint;
         quoteFeed1: string;
         quoteFeed2: string;
         quoteVault: string;
-        quoteVaultConversionSample: string;
+        quoteVaultConversionSample: bigint;
         scaleFactor: bigint;
         currentPrice: bigint;
         baseFeed: MorphoMarketDataFetcher.MockOracleInfoStructOutput;

package/dist/typechain-types/contracts/MorphoMarketDataFetcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MorphoMarketDataFetcher.d.ts","sourceRoot":"","sources":["../../../typechain-types/contracts/MorphoMarketDataFetcher.ts"],"names":[],"mappings":"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"}

package/dist/typechain-types/contracts/MorphoMarketDataFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MorphoMarketDataFetcher.js","sourceRoot":"","sources":["../../../typechain-types/contracts/MorphoMarketDataFetcher.ts"],"names":[],"mappings":""}