Skip to content

fix: prevent getPrice from revert in UniswapPairPriceAdapter #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent getPrice from revert in UniswapPairPriceAdapter #235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion contracts/protocol/integration/oracles/UniswapPairPriceAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ contract UniswapPairPriceAdapter is Ownable {
* @param _assetOne Address of first asset in pair
* @param _assetTwo Address of second asset in pair
*/
function getPrice(address _assetOne, address _assetTwo) external view returns (bool, uint256) {
function getPoolPrice(address _assetOne, address _assetTwo) external view returns (bool, uint256) {
require(controller.isSystemContract(msg.sender), "Must be system contract");

bool isAllowedUniswapPoolOne = uniswapPoolsToSettings[_assetOne].isValid;
Expand Down Expand Up @@ -148,6 +148,14 @@ contract UniswapPairPriceAdapter is Ownable {
return (true, assetOnePriceToMaster.preciseDiv(assetTwoPriceToMaster));
}

function getPrice(address _assetOne, address _assetTwo) external view returns (bool, uint256) {
try this.getPoolPrice(_assetOne, _assetTwo) returns (bool found, uint256 price) {
if (found) {
return (true, price);
}
} catch {}
}

function addPool(address _poolAddress) external onlyOwner {
require (
!uniswapPoolsToSettings[_poolAddress].isValid,
Expand Down