Instadapp/dsa-resolvers-deprecated
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-resolvers-deprecated.git synced 2024-07-29 22:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from DakshMiglani/master

Browse Source 
feat: 🎸 add fetchETHPrice and refactor old functions to use it
This commit is contained in:
Edward Mulraney 2021-07-03 18:51:04 -04:00 committed by GitHub
commit eac7c980d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contracts/protocols/mainnet/liquity.sol
View File

@ -1,6 +1,10 @@
pragma solidity ^0.6.0; pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
interface PriceFeedOracle {
function fetchPrice() external returns (uint);
}
interface TroveManagerLike { interface TroveManagerLike {
function getBorrowingRateWithDecay() external view returns (uint); function getBorrowingRateWithDecay() external view returns (uint);
function getTCR(uint _price) external view returns (uint); function getTCR(uint _price) external view returns (uint);
@ -97,7 +101,10 @@ contract Helpers is Math {
SortedTrovesLike internal constant sortedTroves = SortedTrovesLike internal constant sortedTroves =
SortedTrovesLike(0x8FdD3fbFEb32b28fb73555518f8b361bCeA741A6); SortedTrovesLike(0x8FdD3fbFEb32b28fb73555518f8b361bCeA741A6);
PriceFeedOracle internal constant priceFeedOracle =
PriceFeedOracle(0x4c517D4e2C851CA76d7eC94B805269Df0f2201De);
struct Trove { struct Trove {
uint collateral; uint collateral;
uint debt; uint debt;
@ -132,7 +139,13 @@ contract Helpers is Math {
contract Resolver is Helpers { contract Resolver is Helpers {
function getTrove(address owner, uint oracleEthPrice) public view returns (Trove memory) {
function fetchETHPrice() public returns (uint) {
return priceFeedOracle.fetchPrice();
}
function getTrove(address owner) public returns (Trove memory) {
uint oracleEthPrice = fetchETHPrice();
(uint debt, uint collateral, , ) = troveManager.getEntireDebtAndColl(owner); (uint debt, uint collateral, , ) = troveManager.getEntireDebtAndColl(owner);
uint icr = troveManager.getCurrentICR(owner, oracleEthPrice); uint icr = troveManager.getCurrentICR(owner, oracleEthPrice);
return Trove(collateral, debt, icr); return Trove(collateral, debt, icr);
@ -152,14 +165,15 @@ contract Resolver is Helpers {
return Stake(amount, ethGain, lusdGain); return Stake(amount, ethGain, lusdGain);
} }
function getPosition(address owner, uint oracleEthPrice) external view returns (Position memory) { function getPosition(address owner) external returns (Position memory) {
Trove memory trove = getTrove(owner, oracleEthPrice); Trove memory trove = getTrove(owner);
StabilityDeposit memory stability = getStabilityDeposit(owner); StabilityDeposit memory stability = getStabilityDeposit(owner);
Stake memory stake = getStake(owner); Stake memory stake = getStake(owner);
return Position(trove, stability, stake); return Position(trove, stability, stake);
} }
function getSystemState(uint oracleEthPrice) external view returns (System memory) { function getSystemState() external returns (System memory) {
uint oracleEthPrice = fetchETHPrice();
uint borrowFee = troveManager.getBorrowingRateWithDecay(); uint borrowFee = troveManager.getBorrowingRateWithDecay();
uint ethTvl = add(activePool.getETH(), defaultPool.getETH()); uint ethTvl = add(activePool.getETH(), defaultPool.getETH());
uint tcr = troveManager.getTCR(oracleEthPrice); uint tcr = troveManager.getTCR(oracleEthPrice);
@ -179,12 +193,14 @@ contract Resolver is Helpers {
return sortedTroves.findInsertPosition(nominalCr, hintAddress, hintAddress); return sortedTroves.findInsertPosition(nominalCr, hintAddress, hintAddress);
} }
function getRedemptionPositionHints(uint amount, uint oracleEthPrice, uint searchIterations, uint randomSeed) external view returns ( function getRedemptionPositionHints(uint amount, uint searchIterations, uint randomSeed) external returns (
uint partialHintNicr, uint partialHintNicr,
address firstHint, address firstHint,
address upperHint, address upperHint,
address lowerHint address lowerHint
) { ) {
uint oracleEthPrice = fetchETHPrice();
// See: https://github.com/liquity/dev#hints-for-redeemcollateral // See: https://github.com/liquity/dev#hints-for-redeemcollateral
(firstHint, partialHintNicr, ) = hintHelpers.getRedemptionHints(amount, oracleEthPrice, 0); (firstHint, partialHintNicr, ) = hintHelpers.getRedemptionHints(amount, oracleEthPrice, 0);
searchIterations = searchIterations == 0 ? mul(10, sqrt(sortedTroves.getSize())) : searchIterations; searchIterations = searchIterations == 0 ? mul(10, sqrt(sortedTroves.getSize())) : searchIterations;