Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix getUserWalletBalances of WalletBalanceProvider

Browse Source
This commit is contained in:
andyk 2020-11-06 18:01:19 +03:00
parent 47569dccfe
commit d7f4998f52
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
contracts/misc/WalletBalanceProvider.sol
View File

@ -46,12 +46,13 @@ contract WalletBalanceProvider {
- return 0 on non-contract address - return 0 on non-contract address
**/ **/
function balanceOf(address user, address token) public view returns (uint256) { function balanceOf(address user, address token) public view returns (uint256) {
// check if token is actually a contract if (token == MOCK_ETH_ADDRESS) {
if (token.isContract()) { return user.balance; // ETH balance
// check if token is actually a contract
} else if (token.isContract()) {
return IERC20(token).balanceOf(user); return IERC20(token).balanceOf(user);
} else {
return 0;
} }
revert('INVALID_TOKEN');
} }
/** /**
@ -69,16 +70,7 @@ contract WalletBalanceProvider {
for (uint256 i = 0; i < users.length; i++) { for (uint256 i = 0; i < users.length; i++) {
for (uint256 j = 0; j < tokens.length; j++) { for (uint256 j = 0; j < tokens.length; j++) {
uint256 offset = i * tokens.length; balances[i * tokens.length + j] = balanceOf(users[i], tokens[j]);
if (tokens[j] == MOCK_ETH_ADDRESS) {
balances[offset + j] = users[i].balance; // ETH balance
} else {
if (!tokens[j].isContract()) {
revert('INVALID_TOKEN');
} else {
balances[offset + j] = balanceOf(users[i], tokens[j]);
}
}
} }
} }
@ -113,9 +105,9 @@ contract WalletBalanceProvider {
balances[j] = 0; balances[j] = 0;
continue; continue;
} }
balances[j] = balanceOf(user, reserves[j]); balances[j] = balanceOf(user, reservesWithEth[j]);
} }
return (reserves, balances); return (reservesWithEth, balances);
} }
} }