feat: switch to AggregatorV3Interface from smartcontractkit

gitcoindev · Dec 15, 2023 · 9f9cc58 · 9f9cc58
1 parent 3c67ec9
commit 9f9cc58
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 39 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -34,3 +34,7 @@
 	path = packages/contracts/lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
 	branch = release-v4.9
+[submodule "packages/contracts/lib/chainlink-brownie-contracts"]
+	path = packages/contracts/lib/chainlink-brownie-contracts
+	url = https://github.com/smartcontractkit/chainlink-brownie-contracts
+	branch= main
diff --git a/packages/contracts/remappings.txt b/packages/contracts/remappings.txt
@@ -8,3 +8,4 @@ solidity-linked-list/=lib/solidity-linked-list
 @uniswap/v3-periphery/contracts/=lib/Uniswap/v3-periphery/contracts
 abdk/=lib/abdk-libraries-solidity/
 operator-filter-registry/=lib/operator-filter-registry/src
+@chainlink/=lib/chainlink-brownie-contracts/
diff --git a/packages/contracts/src/dollar/interfaces/AggregatorV3Interface.sol b/packages/contracts/src/dollar/interfaces/AggregatorV3Interface.sol
diff --git a/packages/contracts/src/dollar/libraries/LibUbiquityPool.sol b/packages/contracts/src/dollar/libraries/LibUbiquityPool.sol
@@ -10,7 +10,7 @@ import {IERC20Ubiquity} from "../interfaces/IERC20Ubiquity.sol";
 import {UBIQUITY_POOL_PRICE_PRECISION} from "./Constants.sol";
 import {LibAppStorage} from "./LibAppStorage.sol";
 import {LibTWAPOracle} from "./LibTWAPOracle.sol";
-import {AggregatorV3Interface} from "../../dollar/interfaces/AggregatorV3Interface.sol";
+import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
 
 /**
  * @notice Ubiquity pool library

diff --git a/packages/contracts/src/dollar/mocks/MockChainLinkFeed.sol b/packages/contracts/src/dollar/mocks/MockChainLinkFeed.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import "../interfaces/AggregatorV3Interface.sol";
+import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
 
 contract MockChainLinkFeed is AggregatorV3Interface {
     uint80 roundId;