Skip to content

liquidator info improvement #124

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
yaronvel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

liquidator info improvement #124

Show file tree
Hide file tree
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
31 changes: 17 additions & 14 deletions contracts/bprotocol/info/LiquidatorInfo.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ contract LiquidatorInfo {

struct CurrentPrices {
uint[] currPrices;
string[] symbols;
address[] ctokens;
}

struct Info {
Expand All @@ -84,16 +84,16 @@ contract LiquidatorInfo {
}
}

function getCurrentPrices(IUniswapAnchoredView oracle, string[] memory symbols)
function getCurrentPrices(IUniswapAnchoredView oracle, address[] memory ctokens)
public
view
returns (CurrentPrices memory info)
{
info.currPrices = new uint[](symbols.length);
info.symbols = symbols;
info.currPrices = new uint[](ctokens.length);
info.ctokens = ctokens;

for(uint i = 0 ; i < symbols.length ; i++) {
info.currPrices[i] = oracle.price(symbols[i]);
for(uint i = 0 ; i < ctokens.length ; i++) {
info.currPrices[i] = oracle.getUnderlyingPrice(ctokens[i]);
}
}

Expand Down Expand Up @@ -226,7 +226,8 @@ contract LiquidatorInfo {
address me,
address avatar,
address[] memory cTokens,
uint[] memory priceFeed
uint[] memory priceFeed,
IUniswapAnchoredView oracle
)
public
returns(AccountInfo memory info)
Expand All @@ -247,7 +248,10 @@ contract LiquidatorInfo {
info.liquidationInfo = getLiquidationInfo(pool, avatar);
info.blockNumber = block.number;

if(info.avatarInfo.totalDebt > info.avatarInfo.weightedCollateral) {
CurrentPrices memory realPrices = getCurrentPrices(oracle, cTokens);
AvatarInfo memory realAvatarInfo = getAvatarInfo(registry, bComptroller, cTokens, realPrices.currPrices, avatar);

if(realAvatarInfo.totalDebt > realAvatarInfo.weightedCollateral) {
if(info.liquidationInfo.remainingLiquidationSize == 0) {
info.liquidationInfo.remainingLiquidationSize = info.cushionInfo.cushionTokenTotalDebt / 2;
}
Expand All @@ -261,7 +265,7 @@ contract LiquidatorInfo {
Pool pool,
address[] memory cTokens,
uint[] memory priceFeed,
string[] memory symbols
string[] memory /* symbols */ // this is obselete now
)
public
returns(Info memory info)
Expand All @@ -271,17 +275,16 @@ contract LiquidatorInfo {
Registry registry = Registry(address(pool.registry()));
BComptroller bComptroller = BComptroller(address(pool.bComptroller()));

IUniswapAnchoredView oracle = IUniswapAnchoredView(IComptroller(BComptroller(bComptroller).comptroller()).oracle());

for(uint i = 0 ; i + startAccount <= endAccount ; i++) {
uint accountNumber = i + startAccount;
address avatar = registry.avatars(accountNumber);
info.accountInfo[i] = getSingleAccountInfo(pool, registry, bComptroller, me, avatar, cTokens, priceFeed);
info.accountInfo[i] = getSingleAccountInfo(pool, registry, bComptroller, me, avatar, cTokens, priceFeed, oracle);
}

IComptroller comptroller = IComptroller(BComptroller(bComptroller).comptroller());
IUniswapAnchoredView oracle = IUniswapAnchoredView(comptroller.oracle());

info.c2bMapping = getCTokenToBTokenList(bComptroller);
info.currPrices = getCurrentPrices(oracle, symbols);
info.currPrices = getCurrentPrices(oracle, cTokens);
info.numAvatars = registry.avatarLength();
}

Expand Down
1 change: 1 addition & 0 deletions contracts/bprotocol/interfaces/IUniswapAnchoredView.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ pragma solidity 0.5.16;
interface IUniswapAnchoredView {
function postPrices(bytes[] calldata messages, bytes[] calldata signatures, string[] calldata symbols) external;
function price(string calldata symbol) external view returns (uint);
function getUnderlyingPrice(address cToken) external view returns (uint);
}