Skip to content

Commit a73e817

Browse files
authored
Merge pull request #42 from morpho-org/refactor/usz-oz-version
Switch `mulDiv` version to OZ
2 parents e8105b3 + c9ca695 commit a73e817

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
[submodule "lib/morpho-blue"]
55
path = lib/morpho-blue
66
url = https://github.com/morpho-org/morpho-blue
7-
[submodule "lib/v3-core"]
8-
path = lib/v3-core
9-
url = https://github.com/uniswap/v3-core
7+
[submodule "lib/openzeppelin-contracts"]
8+
path = lib/openzeppelin-contracts
9+
url = https://github.com/OpenZeppelin/openzeppelin-contracts

lib/openzeppelin-contracts

Submodule openzeppelin-contracts added at 932fddf

lib/v3-core

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/ChainlinkOracle.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
2-
pragma solidity 0.8.19;
2+
pragma solidity 0.8.21;
33

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

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

1111
/// @title ChainlinkOracle
1212
/// @author Morpho Labs
1313
/// @custom:contact [email protected]
1414
/// @notice Morpho Blue oracle using Chainlink-compliant feeds.
1515
contract ChainlinkOracle is IOracle {
16-
using FullMath for uint256;
16+
using Math for uint256;
1717
using VaultLib for IERC4626;
1818
using ChainlinkDataFeedLib for AggregatorV3Interface;
1919

0 commit comments

Comments
 (0)