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

refactor

Browse Source
This commit is contained in:
Richa-iitr 2022-09-02 23:44:51 +05:30
parent b88d9d887a
commit 75c092c266
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/mainnet/connectors/compound/v3/helpers.sol
View File

@ -121,12 +121,16 @@ abstract contract Helpers is DSMath, Basic {
amt_ = amt_ == uint256(-1) ? initialBal : amt_; amt_ = amt_ == uint256(-1) ? initialBal : amt_;
if (token_ == getBaseToken(params.market)) { if (token_ == getBaseToken(params.market)) {
uint256 balance = TokenInterface(params.market).balanceOf( uint256 balance = CometInterface(params.market).balanceOf(params.from);
params.from //if there are supplies, ensure withdrawn amount is not greater than supplied i.e can't borrow using withdraw.
);
if (balance > 0) { if (balance > 0) {
require(amt_ <= balance, "withdraw-amt-greater-than-supplies"); require(amt_ <= balance, "withdraw-amt-greater-than-supplies");
} }
//if borrow balance > 0, there are no supplies so no withdraw, borrow instead.
require(
CometInterface(params.market).borrowBalanceOf(params.from) == 0,
"withdraw-disabled-for-zero-supplies"
);
} }
_withdrawHelper(params.market, token_, params.from, params.to, amt_); _withdrawHelper(params.market, token_, params.from, params.to, amt_);

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

@ -715,7 +715,6 @@ abstract contract CompoundV3Resolver is Events, Helpers {
* @notice Buy collateral asset to increase protocol base reserves until targetReserves is reached. * @notice Buy collateral asset to increase protocol base reserves until targetReserves is reached.
* @param market The address of the market from where to withdraw. * @param market The address of the market from where to withdraw.
* @param asset The collateral asset to purachase. * @param asset The collateral asset to purachase.
* @param dest The address to transfer the purchased assets.
* @param minCollateralAmt Minimum amount of collateral expected to be received. * @param minCollateralAmt Minimum amount of collateral expected to be received.
* @param baseAmt Amount of base asset to be sold for collateral. * @param baseAmt Amount of base asset to be sold for collateral.
* @param getId ID to retrieve amt. * @param getId ID to retrieve amt.
@ -724,7 +723,6 @@ abstract contract CompoundV3Resolver is Events, Helpers {
function buyCollateral( function buyCollateral(
address market, address market,
address asset, address asset,
address dest,
uint256 minCollateralAmt, uint256 minCollateralAmt,
uint256 baseAmt, uint256 baseAmt,
uint256 getId, uint256 getId,
@ -736,8 +734,8 @@ abstract contract CompoundV3Resolver is Events, Helpers {
{ {
uint256 amt_ = getUint(getId, baseAmt); uint256 amt_ = getUint(getId, baseAmt);
require( require(
market != address(0) && asset != address(0) && dest != address(0), market != address(0) && asset != address(0),
"invalid market/token/to address" "invalid market/token address"
); );
bool isEth = asset == ethAddr; bool isEth = asset == ethAddr;
@ -751,7 +749,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
asset, asset,
minCollateralAmt, minCollateralAmt,
amt_, amt_,
dest address(this)
); );
uint256 collAmt = CometInterface(market).quoteCollateral(asset, amt_); uint256 collAmt = CometInterface(market).quoteCollateral(asset, amt_);
@ -832,7 +830,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
* @param getId ID to retrieve amt. * @param getId ID to retrieve amt.
* @param setId ID stores the amount of tokens transferred. * @param setId ID stores the amount of tokens transferred.
*/ */
function transferAssetFromUsingManager( function transferAssetOnBehalf(
address market, address market,
address token, address token,
address src, address src,
@ -868,7 +866,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
setUint(setId, amt_); setUint(setId, amt_);
eventName_ = "LogTransferAssetFromUsingManager(address,address,address,address,uint256,uint256,uint256)"; eventName_ = "LogTransferAssetOnBehalf(address,address,address,address,uint256,uint256,uint256)";
eventParam_ = abi.encode(market, token_, src, dest, amt_, getId, setId); eventParam_ = abi.encode(market, token_, src, dest, amt_, getId, setId);
} }

4
test/mainnet/compound/compound.iii.test.ts
View File

@ -522,7 +522,7 @@ describe("Compound III", function () {
const spells = [ const spells = [
{ {
connector: connectorName, connector: connectorName,
method: "transferAssetFromUsingManager", method: "transferAssetOnBehalf",
args: [market, base, dsaWallet0.address, dsaWallet1.address, ethers.constants.MaxUint256, 0, 0] args: [market, base, dsaWallet0.address, dsaWallet1.address, ethers.constants.MaxUint256, 0, 0]
} }
]; ];
@ -626,7 +626,7 @@ describe("Compound III", function () {
const spells = [ const spells = [
{ {
connector: connectorName, connector: connectorName,
method: "transferAssetFromUsingManager", method: "transferAssetOnBehalf",
args: [market, tokens.eth.address, dsaWallet0.address, dsaWallet1.address, ethers.utils.parseEther("1"), 0, 0] args: [market, tokens.eth.address, dsaWallet0.address, dsaWallet1.address, ethers.utils.parseEther("1"), 0, 0]
} }
]; ];