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

code refactor

Browse Source
This commit is contained in:
Thrilok kumar 2022-09-03 00:30:04 +05:30 committed by GitHub
parent 8250831342
commit 52c07d27e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
contracts/mainnet/connectors/compound/v3/main.sol
View File

@ -50,6 +50,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
"debt-not-repaid" "debt-not-repaid"
); );
} }
if (isEth) { if (isEth) {
amt_ = amt_ == uint256(-1) ? address(this).balance : amt_; amt_ = amt_ == uint256(-1) ? address(this).balance : amt_;
convertEthToWeth(isEth, tokenContract, amt_); convertEthToWeth(isEth, tokenContract, amt_);
@ -222,19 +223,21 @@ abstract contract CompoundV3Resolver is Events, Helpers {
token_ token_
); );
amt_ = amt_ == uint256(-1) ? initialBal : amt_;
if (token_ == getBaseToken(market)) { if (token_ == getBaseToken(market)) {
uint256 balance = CometInterface(market).balanceOf(address(this));
//if there are supplies, ensure withdrawn amount is not greater than supplied i.e can't borrow using withdraw. //if there are supplies, ensure withdrawn amount is not greater than supplied i.e can't borrow using withdraw.
if (balance > 0) { if (amt_ == uint256(-1)) {
require(amt_ <= balance, "withdraw-amt-greater-than-supplies"); amt_ = initialBal;
} else {
require(amt_ <= initialBal, "withdraw-amt-greater-than-supplies");
} }
//if borrow balance > 0, there are no supplies so no withdraw, borrow instead. //if borrow balance > 0, there are no supplies so no withdraw, borrow instead.
require( require(
CometInterface(market).borrowBalanceOf(address(this)) == 0, CometInterface(market).borrowBalanceOf(address(this)) == 0,
"withdraw-disabled-for-zero-supplies" "withdraw-disabled-for-zero-supplies"
); );
} else {
amt_ = amt_ == uint256(-1) ? initialBal : amt_;
} }
CometInterface(market).withdraw(token_, amt_); CometInterface(market).withdraw(token_, amt_);
@ -402,8 +405,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
TokenInterface tokenContract = TokenInterface(token_); TokenInterface tokenContract = TokenInterface(token_);
if (token_ == getBaseToken(market)) { if (token_ == getBaseToken(market)) {
uint256 balance = CometInterface(market).balanceOf(address(this)); require(CometInterface(market).balanceOf(address(this)) == 0, "borrow-disabled-when-supplied-base");
require(balance == 0, "borrow-disabled-when-supplied-base");
} }
uint256 initialBal = CometInterface(market).borrowBalanceOf( uint256 initialBal = CometInterface(market).borrowBalanceOf(
@ -583,17 +585,20 @@ abstract contract CompoundV3Resolver is Events, Helpers {
TokenInterface tokenContract = TokenInterface(token_); TokenInterface tokenContract = TokenInterface(token_);
amt_ = amt_ == uint256(-1) uint256 borrowedBalance_ = CometInterface(market).borrowBalanceOf(address(this));
? CometInterface(market).borrowBalanceOf(address(this))
: amt_;
uint256 supplyBalance_ = CometInterface(market).balanceOf( if (amt_ == uint256(-1)) {
address(this) amt_ = initialBal;
); } else {
require(supplyBalance_ == 0, "cannot-repay-when-supplied"); require(amt_ <= borrowedBalance_, "withdraw-amt-greater-than-supplies");
}
//if supply balance > 0, there are no borrowing so no repay, withdraw instead.
require(CometInterface(market).balanceOf(address(this)) == 0, "cannot-repay-when-supplied");
convertEthToWeth(isEth, tokenContract, amt_); convertEthToWeth(isEth, tokenContract, amt_);
approve(tokenContract, market, amt_); approve(tokenContract, market, amt_);
CometInterface(market).supply(token_, amt_); CometInterface(market).supply(token_, amt_);
setUint(setId, amt_); setUint(setId, amt_);
@ -636,12 +641,16 @@ abstract contract CompoundV3Resolver is Events, Helpers {
TokenInterface tokenContract = TokenInterface(token_); TokenInterface tokenContract = TokenInterface(token_);
amt_ = amt_ == uint256(-1) uint256 borrowedBalance_ = CometInterface(market).borrowBalanceOf(to);
? CometInterface(market).borrowBalanceOf(to)
: amt_;
uint256 supplyBalance_ = CometInterface(market).balanceOf(to); if (amt_ == uint256(-1)) {
require(supplyBalance_ == 0, "cannot-repay-when-supplied"); amt_ = initialBal;
} else {
require(amt_ <= borrowedBalance_, "withdraw-amt-greater-than-supplies");
}
//if supply balance > 0, there are no borrowing so no repay, withdraw instead.
require(CometInterface(market).balanceOf(to) == 0, "cannot-repay-when-supplied");
convertEthToWeth(isEth, tokenContract, amt_); convertEthToWeth(isEth, tokenContract, amt_);
approve(tokenContract, market, amt_); approve(tokenContract, market, amt_);