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

Morpho-Compound: changes added

Browse Source
This commit is contained in:
Shriya Tyagi 2022-10-15 08:09:53 +04:00
parent 3eba9e8d71
commit bc9abcd4d6
5 changed files with 80 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,5 +71,9 @@ contract Events {
uint256 setId uint256 setId
); );
event LogClaimed(address[] tokenAddresses, bool tradeForMorphoToken); event LogClaimed(
address[] tokenAddresses,
bool tradeForMorphoToken,
uint256 amountOfRewards
);
} }

24
contracts/mainnet/connectors/morpho-compound/helpers.sol
View File

@ -10,6 +10,28 @@ abstract contract Helpers is Stores, Basic {
IMorphoCore public constant MORPHO_COMPOUND = IMorphoCore public constant MORPHO_COMPOUND =
IMorphoCore(0x8888882f8f843896699869179fB6E4f7e3B58888); IMorphoCore(0x8888882f8f843896699869179fB6E4f7e3B58888);
IMorphoCompoundLens public constant morphoCompoundLens = IMorphoCompoundLens public constant MORPHO_COMPOUND_LENS =
IMorphoCompoundLens(0x930f1b46e1D081Ec1524efD95752bE3eCe51EF67); IMorphoCompoundLens(0x930f1b46e1D081Ec1524efD95752bE3eCe51EF67);
function _performEthToWethConversion(
address _tokenAddress,
uint256 _amount,
uint256 _getId
) internal returns (TokenInterface _tokenContract, uint256 _amt) {
_amt = getUint(_getId, _amount);
bool _isETH = _tokenAddress == ethAddr;
_tokenContract = _isETH
? TokenInterface(wethAddr)
: TokenInterface(_tokenAddress);
if (_amt == uint256(-1)) {
_amt = _isETH
? address(this).balance
: _tokenContract.balanceOf(address(this));
}
if (_isETH) convertEthToWeth(_isETH, _tokenContract, _amt);
}
} }

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

@ -33,9 +33,9 @@ interface IMorphoCore {
) external; ) external;
function claimRewards( function claimRewards(
address[] calldata _tokenAddresses, address[] calldata _cTokenAddresses,
bool _tradeForMorphoToken bool _tradeForMorphoToken
) external; ) external returns (uint256 amountOfRewards);
} }
interface IMorphoCompoundLens { interface IMorphoCompoundLens {

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

@ -25,24 +25,14 @@ abstract contract MorphoCompound is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
uint256 _amt = getUint(_getId, _amount); (
TokenInterface _tokenContract,
uint256 _amt
) = _performEthToWethConversion(_tokenAddress, _amount, _getId);
bool _isETH = _tokenAddress == ethAddr; approve(_tokenContract, address(MORPHO_COMPOUND), _amt);
TokenInterface _tokenContract = _isETH MORPHO_COMPOUND.supply(_poolTokenAddress, address(this), _amt);
? TokenInterface(wethAddr)
: TokenInterface(_tokenAddress);
if (_amt == uint256(-1)) {
_amt = _isETH
? address(this).balance
: _tokenContract.balanceOf(address(this));
}
convertEthToWeth(_isETH, _tokenContract, _amt);
approve(_tokenContract, address(morphoCompound), _amt);
morphoCompound.supply(_poolTokenAddress, address(this), _amt);
setUint(_setId, _amt); setUint(_setId, _amt);
@ -78,24 +68,14 @@ abstract contract MorphoCompound is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
uint256 _amt = getUint(_getId, _amount); (
TokenInterface _tokenContract,
uint256 _amt
) = _performEthToWethConversion(_tokenAddress, _amount, _getId);
bool _isETH = _tokenAddress == ethAddr; approve(_tokenContract, address(MORPHO_COMPOUND), _amt);
TokenInterface _tokenContract = _isETH MORPHO_COMPOUND.supply(
? TokenInterface(wethAddr)
: TokenInterface(_tokenAddress);
if (_amt == uint256(-1)) {
_amt = _isETH
? address(this).balance
: _tokenContract.balanceOf(address(this));
}
convertEthToWeth(_isETH, _tokenContract, _amt);
approve(_tokenContract, address(morphoCompound), _amt);
morphoCompound.supply(
_poolTokenAddress, _poolTokenAddress,
address(this), address(this),
_amt, _amt,
@ -137,24 +117,14 @@ abstract contract MorphoCompound is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
uint256 _amt = getUint(_getId, _amount); (
TokenInterface _tokenContract,
uint256 _amt
) = _performEthToWethConversion(_tokenAddress, _amount, _getId);
bool _isETH = _tokenAddress == ethAddr; approve(_tokenContract, address(MORPHO_COMPOUND), _amt);
TokenInterface _tokenContract = _isETH MORPHO_COMPOUND.supply(_poolTokenAddress, _onBehalf, _amt);
? TokenInterface(wethAddr)
: TokenInterface(_tokenAddress);
if (_amt == uint256(-1)) {
_amt = _isETH
? address(this).balance
: _tokenContract.balanceOf(address(this));
}
convertEthToWeth(_isETH, _tokenContract, _amt);
approve(_tokenContract, address(morphoCompound), _amt);
morphoCompound.supply(_poolTokenAddress, _onBehalf, _amt);
setUint(_setId, _amt); setUint(_setId, _amt);
@ -193,9 +163,9 @@ abstract contract MorphoCompound is Helpers, Events {
bool _isETH = _tokenAddress == ethAddr; bool _isETH = _tokenAddress == ethAddr;
morphoCompound.borrow(_poolTokenAddress, _amt); MORPHO_COMPOUND.borrow(_poolTokenAddress, _amt);
convertWethToEth(_isETH, TokenInterface(wethAddr), _amt); if (_isETH) convertWethToEth(_isETH, TokenInterface(wethAddr), _amt);
setUint(_setId, _amt); setUint(_setId, _amt);
@ -235,9 +205,9 @@ abstract contract MorphoCompound is Helpers, Events {
bool _isETH = _tokenAddress == ethAddr; bool _isETH = _tokenAddress == ethAddr;
morphoCompound.borrow(_poolTokenAddress, _amt, _maxGasForMatching); MORPHO_COMPOUND.borrow(_poolTokenAddress, _amt, _maxGasForMatching);
convertWethToEth(_isETH, TokenInterface(wethAddr), _amt); if (_isETH) convertWethToEth(_isETH, TokenInterface(wethAddr), _amt);
setUint(_setId, _amt); setUint(_setId, _amt);
@ -274,18 +244,17 @@ abstract contract MorphoCompound is Helpers, Events {
{ {
uint256 _amt = getUint(_getId, _amount); uint256 _amt = getUint(_getId, _amount);
bool _isETH = _tokenAddress == ethAddr; bool _isETH = _tokenAddress == ethAddr;
address _token = _isETH ? wethAddr : _tokenAddress;
if (_amt == uint256(-1)) { if (_amt == uint256(-1)) {
(, , _amt) = morphoCompoundLens.getCurrentSupplyBalanceInOf( (, , _amt) = MORPHO_COMPOUND_LENS.getCurrentSupplyBalanceInOf(
_poolTokenAddress, _poolTokenAddress,
address(this) address(this)
); );
} }
morphoCompound.withdraw(_poolTokenAddress, _amt); MORPHO_COMPOUND.withdraw(_poolTokenAddress, _amt);
convertWethToEth(_isETH, TokenInterface(_token), _amt); if (_isETH) convertWethToEth(_isETH, TokenInterface(wethAddr), _amt);
setUint(_setId, _amt); setUint(_setId, _amt);
@ -322,8 +291,8 @@ abstract contract MorphoCompound is Helpers, Events {
bool _isETH = _tokenAddress == ethAddr; bool _isETH = _tokenAddress == ethAddr;
uint256 _amt = getUint(_getId, _amount); uint256 _amt = getUint(_getId, _amount);
TokenInterface _tokenContract = _isETH TokenInterface _tokenContract = _isETH
? TokenInterface(wethAddr) ? TokenInterface(wethAddr)
: TokenInterface(_tokenAddress); : TokenInterface(_tokenAddress);
if (_amt == uint256(-1)) { if (_amt == uint256(-1)) {
@ -331,17 +300,17 @@ abstract contract MorphoCompound is Helpers, Events {
? address(this).balance ? address(this).balance
: _tokenContract.balanceOf(address(this)); : _tokenContract.balanceOf(address(this));
(, , uint256 _amtDebt) = morphoCompoundLens (, , uint256 _amtDebt) = MORPHO_COMPOUND_LENS
.getCurrentBorrowBalanceInOf(_poolTokenAddress, address(this)); .getCurrentBorrowBalanceInOf(_poolTokenAddress, address(this));
_amt = _amtDSA <= _amtDebt ? _amtDSA : _amtDebt; _amt = _amtDSA < _amtDebt ? _amtDSA : _amtDebt;
} }
convertEthToWeth(_isETH, _tokenContract, _amt); if (_isETH) convertEthToWeth(_isETH, _tokenContract, _amt);
approve(_tokenContract, address(morphoCompound), _amt); approve(_tokenContract, address(MORPHO_COMPOUND), _amt);
morphoCompound.repay(_poolTokenAddress, address(this), _amt); MORPHO_COMPOUND.repay(_poolTokenAddress, address(this), _amt);
setUint(_setId, _amt); setUint(_setId, _amt);
@ -379,9 +348,9 @@ abstract contract MorphoCompound is Helpers, Events {
{ {
bool _isETH = _tokenAddress == ethAddr; bool _isETH = _tokenAddress == ethAddr;
uint256 _amt = getUint(_getId, _amount); uint256 _amt = getUint(_getId, _amount);
TokenInterface _tokenContract = _isETH TokenInterface _tokenContract = _isETH
? TokenInterface(wethAddr) ? TokenInterface(wethAddr)
: TokenInterface(_tokenAddress); : TokenInterface(_tokenAddress);
if (_amt == uint256(-1)) { if (_amt == uint256(-1)) {
@ -389,17 +358,17 @@ abstract contract MorphoCompound is Helpers, Events {
? address(this).balance ? address(this).balance
: _tokenContract.balanceOf(address(this)); : _tokenContract.balanceOf(address(this));
(, , uint256 _amtDebt) = morphoCompoundLens (, , uint256 _amtDebt) = MORPHO_COMPOUND_LENS
.getCurrentBorrowBalanceInOf(_poolTokenAddress, _onBehalf); .getCurrentBorrowBalanceInOf(_poolTokenAddress, _onBehalf);
_amt = _amtDSA <= _amtDebt ? _amtDSA : _amtDebt; _amt = _amtDSA < _amtDebt ? _amtDSA : _amtDebt;
} }
convertEthToWeth(_isETH, _tokenContract, _amt); if (_isETH) convertEthToWeth(_isETH, _tokenContract, _amt);
approve(_tokenContract, address(morphoCompound), _amt); approve(_tokenContract, address(MORPHO_COMPOUND), _amt);
morphoCompound.repay(_poolTokenAddress, _onBehalf, _amt); MORPHO_COMPOUND.repay(_poolTokenAddress, _onBehalf, _amt);
setUint(_setId, _amt); setUint(_setId, _amt);
@ -428,10 +397,17 @@ abstract contract MorphoCompound is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
morphoCompound.claimRewards(_poolTokenAddresses, _tradeForMorphoToken); uint256 _amountOfRewards = MORPHO_COMPOUND.claimRewards(
_poolTokenAddresses,
_tradeForMorphoToken
);
_eventName = "LogClaimed(address[],bool)"; _eventName = "LogClaimed(address[],bool,uint256)";
_eventParam = abi.encode(_poolTokenAddresses, _tradeForMorphoToken); _eventParam = abi.encode(
_poolTokenAddresses,
_tradeForMorphoToken,
_amountOfRewards
);
} }
} }

0
test/mainnet/morpho/morpho-compound.tets.ts → test/mainnet/morpho/morpho-compound.test.ts
View File