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

Removed claim func + fix cETH

Browse Source
This commit is contained in:
Shriya Tyagi 2022-10-18 03:38:20 +04:00
parent 0289824465
commit e22b0bff0c
6 changed files with 8 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/mainnet/connectors/morpho-aave/events.sol
View File

@ -70,10 +70,4 @@ contract Events {
uint256 getId, uint256 getId,
uint256 setId uint256 setId
); );
event LogClaimed(
address[] tokenAddresses,
bool tradeForMorphoToken,
uint256 claimedAmount
);
} }

4
contracts/mainnet/connectors/morpho-aave/interface.sol
View File

@ -31,10 +31,6 @@ interface IMorphoCore {
address _onBehalf, address _onBehalf,
uint256 _amount uint256 _amount
) external; ) external;
function claimRewards(address[] calldata _assets, bool _tradeForMorphoToken)
external
returns (uint256 claimedAmount);
} }
interface IMorphoAaveLens { interface IMorphoAaveLens {

27
contracts/mainnet/connectors/morpho-aave/main.sol
View File

@ -375,33 +375,6 @@ abstract contract MorphoAaveV2 is Helpers, Events {
_setId _setId
); );
} }
/**
* @dev Claim rewards.
* @notice Claim rewards for the given assets from underlying protocol.
* @param _poolTokenAddresses The assets to claim rewards from (aToken or variable debt token).(For ETH: aToken or variable debt token address of WETH)
* @param _tradeForMorphoToken Whether or not to trade reward tokens for MORPHO tokens.
*/
function claim(
address[] calldata _poolTokenAddresses,
bool _tradeForMorphoToken
)
external
payable
returns (string memory _eventName, bytes memory _eventParam)
{
uint256 _claimedAmount = MORPHO_AAVE.claimRewards(
_poolTokenAddresses,
_tradeForMorphoToken
);
_eventName = "LogClaimed(address[],bool,uint256)";
_eventParam = abi.encode(
_poolTokenAddresses,
_tradeForMorphoToken,
_claimedAmount
);
}
} }
contract ConnectV2MorphoAaveV2 is MorphoAaveV2 { contract ConnectV2MorphoAaveV2 is MorphoAaveV2 {

6
contracts/mainnet/connectors/morpho-compound/events.sol
View File

@ -70,10 +70,4 @@ contract Events {
uint256 getId, uint256 getId,
uint256 setId uint256 setId
); );
event LogClaimed(
address[] tokenAddresses,
bool tradeForMorphoToken,
uint256 amountOfRewards
);
} }

5
contracts/mainnet/connectors/morpho-compound/interface.sol
View File

@ -31,11 +31,6 @@ interface IMorphoCore {
address _onBehalf, address _onBehalf,
uint256 _amount uint256 _amount
) external; ) external;
function claimRewards(
address[] calldata _cTokenAddresses,
bool _tradeForMorphoToken
) external returns (uint256 amountOfRewards);
} }
interface IMorphoCompoundLens { interface IMorphoCompoundLens {

43
contracts/mainnet/connectors/morpho-compound/main.sol
View File

@ -9,7 +9,7 @@ abstract contract MorphoCompound is Helpers, Events {
* @dev Deposit ETH/ERC20_Token. * @dev Deposit ETH/ERC20_Token.
* @notice Deposit a token to Morpho Compound for lending / collaterization. * @notice Deposit a token to Morpho Compound for lending / collaterization.
* @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _poolTokenAddress The address of cToken to deposit.(For ETH: cWETH address) * @param _poolTokenAddress The address of cToken to deposit.(For ETH: cETH address)
* @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`) * @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`)
* @param _getId ID to retrieve amt. * @param _getId ID to retrieve amt.
* @param _setId ID stores the amount of tokens deposited. * @param _setId ID stores the amount of tokens deposited.
@ -50,7 +50,7 @@ abstract contract MorphoCompound is Helpers, Events {
* @dev Deposit ETH/ERC20_Token. * @dev Deposit ETH/ERC20_Token.
* @notice Deposit a token to Morpho Compound for lending / collaterization with max gas. * @notice Deposit a token to Morpho Compound for lending / collaterization with max gas.
* @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _poolTokenAddress The address of cToken to deposit.(For ETH: cWETH address). * @param _poolTokenAddress The address of cToken to deposit.(For ETH: cETH address).
* @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`). * @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`).
* @param _maxGasForMatching The maximum amount of gas to consume within a matching engine loop. * @param _maxGasForMatching The maximum amount of gas to consume within a matching engine loop.
* @param _getId ID to retrieve amt. * @param _getId ID to retrieve amt.
@ -99,7 +99,7 @@ abstract contract MorphoCompound is Helpers, Events {
* @dev Deposit ETH/ERC20_Token. * @dev Deposit ETH/ERC20_Token.
* @notice Deposit a token to Morpho Compound for lending / collaterization on behalf of a user. * @notice Deposit a token to Morpho Compound for lending / collaterization on behalf of a user.
* @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _poolTokenAddress The address of cToken to deposit.(For ETH: cWETH address) * @param _poolTokenAddress The address of cToken to deposit.(For ETH: cETH address)
* @param _onBehalf The address of user on behalf to deposit. * @param _onBehalf The address of user on behalf to deposit.
* @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`) * @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`)
* @param _getId ID to retrieve amt. * @param _getId ID to retrieve amt.
@ -143,7 +143,7 @@ abstract contract MorphoCompound is Helpers, Events {
* @dev Borrow ETH/ERC20_Token. * @dev Borrow ETH/ERC20_Token.
* @notice Borrow a token from Morpho Compound. * @notice Borrow a token from Morpho Compound.
* @param _tokenAddress The address of underlying token to borrow.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param _tokenAddress The address of underlying token to borrow.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _poolTokenAddress The address of cToken to borrow.(For ETH: cWETH address) * @param _poolTokenAddress The address of cToken to borrow.(For ETH: cETH address)
* @param _amount The amount of the token (in underlying) to borrow. * @param _amount The amount of the token (in underlying) to borrow.
* @param _getId ID to retrieve amt. * @param _getId ID to retrieve amt.
* @param _setId ID stores the amount of tokens borrowed. * @param _setId ID stores the amount of tokens borrowed.
@ -181,7 +181,7 @@ abstract contract MorphoCompound is Helpers, Events {
* @dev Borrow ETH/ERC20_Token. * @dev Borrow ETH/ERC20_Token.
* @notice Borrow a token from Morpho Compound with max gas. * @notice Borrow a token from Morpho Compound with max gas.
* @param _tokenAddress The address of underlying token to borrow.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param _tokenAddress The address of underlying token to borrow.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _poolTokenAddress The address of cToken to borrow.(For ETH: cWETH address) * @param _poolTokenAddress The address of cToken to borrow.(For ETH: cETH address)
* @param _amount The amount of the token (in underlying) to borrow. * @param _amount The amount of the token (in underlying) to borrow.
* @param _maxGasForMatching The maximum amount of gas to consume within a matching engine loop. * @param _maxGasForMatching The maximum amount of gas to consume within a matching engine loop.
* @param _getId ID to retrieve amt. * @param _getId ID to retrieve amt.
@ -222,7 +222,7 @@ abstract contract MorphoCompound is Helpers, Events {
* @dev Withdraw ETH/ERC20_Token. * @dev Withdraw ETH/ERC20_Token.
* @notice Withdraw a token from Morpho Compound. * @notice Withdraw a token from Morpho Compound.
* @param _tokenAddress The address of underlying token to withdraw.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param _tokenAddress The address of underlying token to withdraw.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _poolTokenAddress The address of cToken to withdraw.(For ETH: cWETH address) * @param _poolTokenAddress The address of cToken to withdraw.(For ETH: cETH address)
* @param _amount The amount of the token (in underlying) to withdraw. (For max: `uint256(-1)`) * @param _amount The amount of the token (in underlying) to withdraw. (For max: `uint256(-1)`)
* @param _getId ID to retrieve amt. * @param _getId ID to retrieve amt.
* @param _setId ID stores the amount of tokens withdrawed. * @param _setId ID stores the amount of tokens withdrawed.
@ -268,7 +268,7 @@ abstract contract MorphoCompound is Helpers, Events {
* @dev Payback ETH/ERC20_Token. * @dev Payback ETH/ERC20_Token.
* @notice Payback a token to Morpho Compound. * @notice Payback a token to Morpho Compound.
* @param _tokenAddress The address of underlying token to payback.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param _tokenAddress The address of underlying token to payback.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _poolTokenAddress The address of cToken to payback.(For ETH: cWETH address) * @param _poolTokenAddress The address of cToken to payback.(For ETH: cETH address)
* @param _amount The amount of the token (in underlying) to payback. (For max: `uint256(-1)`) * @param _amount The amount of the token (in underlying) to payback. (For max: `uint256(-1)`)
* @param _getId ID to retrieve amt. * @param _getId ID to retrieve amt.
* @param _setId ID stores the amount of tokens paid back. * @param _setId ID stores the amount of tokens paid back.
@ -324,7 +324,7 @@ abstract contract MorphoCompound is Helpers, Events {
* @dev Payback ETH/ERC20_Token. * @dev Payback ETH/ERC20_Token.
* @notice Payback a token to Morpho Compound on behalf of a user. * @notice Payback a token to Morpho Compound on behalf of a user.
* @param _tokenAddress The address of underlying token to payback.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param _tokenAddress The address of underlying token to payback.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _poolTokenAddress The address of cToken to payback.(For ETH: cWETH address) * @param _poolTokenAddress The address of cToken to payback.(For ETH: cETH address)
* @param _onBehalf The address of user who's debt to repay. * @param _onBehalf The address of user who's debt to repay.
* @param _amount The amount of the token (in underlying) to payback. (For max: `uint256(-1)`) * @param _amount The amount of the token (in underlying) to payback. (For max: `uint256(-1)`)
* @param _getId ID to retrieve amt. * @param _getId ID to retrieve amt.
@ -378,33 +378,6 @@ abstract contract MorphoCompound is Helpers, Events {
_setId _setId
); );
} }
/**
* @dev Claim rewards.
* @notice Claim rewards for the given assets from underlying protocol.
* @param _poolTokenAddresses The cToken addresses to claim rewards from..(For ETH: cToken address of WETH)
* @param _tradeForMorphoToken Whether or not to trade COMP tokens for MORPHO tokens.
*/
function claim(
address[] calldata _poolTokenAddresses,
bool _tradeForMorphoToken
)
external
payable
returns (string memory _eventName, bytes memory _eventParam)
{
uint256 _amountOfRewards = MORPHO_COMPOUND.claimRewards(
_poolTokenAddresses,
_tradeForMorphoToken
);
_eventName = "LogClaimed(address[],bool,uint256)";
_eventParam = abi.encode(
_poolTokenAddresses,
_tradeForMorphoToken,
_amountOfRewards
);
}
} }
contract ConnectV2MorphoCompound is MorphoCompound { contract ConnectV2MorphoCompound is MorphoCompound {