Skip to content

Commit

Permalink
Merge pull request #42 from morpho-org/refactor/usz-oz-version
Browse files Browse the repository at this point in the history
Switch `mulDiv` version to OZ
  • Loading branch information
Rubilmax authored Nov 10, 2023
2 parents e8105b3 + c9ca695 commit a73e817
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
[submodule "lib/morpho-blue"]
path = lib/morpho-blue
url = https://github.com/morpho-org/morpho-blue
[submodule "lib/v3-core"]
path = lib/v3-core
url = https://github.com/uniswap/v3-core
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
1 change: 1 addition & 0 deletions lib/openzeppelin-contracts
Submodule openzeppelin-contracts added at 932fdd
1 change: 0 additions & 1 deletion lib/v3-core
Submodule v3-core deleted from 6562c5
6 changes: 3 additions & 3 deletions src/ChainlinkOracle.sol
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity 0.8.19;
pragma solidity 0.8.21;

import {IOracle} from "../lib/morpho-blue/src/interfaces/IOracle.sol";

import {AggregatorV3Interface, ChainlinkDataFeedLib} from "./libraries/ChainlinkDataFeedLib.sol";
import {IERC4626, VaultLib} from "./libraries/VaultLib.sol";
import {ErrorsLib} from "./libraries/ErrorsLib.sol";
import {FullMath} from "../lib/v3-core/contracts/libraries/FullMath.sol";
import {Math} from "../lib/openzeppelin-contracts/contracts/utils/math/Math.sol";

/// @title ChainlinkOracle
/// @author Morpho Labs
/// @custom:contact [email protected]
/// @notice Morpho Blue oracle using Chainlink-compliant feeds.
contract ChainlinkOracle is IOracle {
using FullMath for uint256;
using Math for uint256;
using VaultLib for IERC4626;
using ChainlinkDataFeedLib for AggregatorV3Interface;

Expand Down

0 comments on commit a73e817

Please sign in to comment.