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

Merge pull request #314 from Instadapp/morpho-v3-update

Browse Source 
Update morpho v3
This commit is contained in:
Shriya Tyagi 2023-09-20 20:45:26 +05:30 committed by GitHub
commit 9dc60af184
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,14 +18,6 @@ contract Events {
uint256 setId
);
event LogDepositOnBehalf(
address tokenAddress,
uint256 amount,
address onBehalf,
uint256 getId,
uint256 setId
);
event LogDepositOnBehalfWithMaxIterations(
address tokenAddress,
uint256 amount,
@ -57,19 +49,9 @@ contract Events {
uint256 setId
);
event LogBorrowOnBehalf(
address tokenAddress,
uint256 amount,
address onBehalf,
address receiver,
uint256 getId,
uint256 setId
);
event LogBorrowWithMaxIterations(
address tokenAddress,
uint256 amount,
address receiver,
uint256 maxIteration,
uint256 getId,
uint256 setId
@ -92,11 +74,10 @@ contract Events {
uint256 setId
);
event LogWithdrawOnBehalf(
event LogWithdrawWithMaxIterations(
address tokenAddress,
uint256 amount,
address onBehalf,
address receiver,
uint256 maxIteration,
uint256 getId,
uint256 setId
);
@ -114,7 +95,6 @@ contract Events {
event LogWithdrawCollateral(
address tokenAddress,
uint256 amount,
address receiver,
uint256 getId,
uint256 setId
);
@ -144,9 +124,4 @@ contract Events {
);
event LogApproveManger(address manger, bool isAllowed);
event LogUpdateMaxIterations(
uint256 oldIterations,
uint256 newIterations
);
}

2
contracts/mainnet/connectors/morpho-aave-v3/helpers.sol
View File

@ -10,7 +10,7 @@ abstract contract Helpers is Stores, Basic {
IMorphoCore public constant MORPHO_AAVE_V3 =
IMorphoCore(0x33333aea097c193e66081E930c33020272b33333);
uint256 public max_iteration = 4;
uint256 public constant MAX_ITERATIONS = 4;
function _performEthToWethConversion(
address _tokenAddress,

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

@ -6,8 +6,8 @@ import "./events.sol";
abstract contract MorphoAaveV3 is Helpers, Events {
/**
* @dev Deposit ETH/ERC20_Token.
* @notice Deposit a token to Morpho Aave for lending.
* @dev Supply ETH/ERC20 Token for lending.
* @notice Supply ETH/ERC20 Token to Morpho Aave for lending. It will be elible for P2P matching but will not have nay borrowing power.
* @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`)
* @param _getId ID to retrieve amt.
@ -30,7 +30,7 @@ abstract contract MorphoAaveV3 is Helpers, Events {
approve(_tokenContract, address(MORPHO_AAVE_V3), _amt);
MORPHO_AAVE_V3.supply(address(_tokenContract), _amt, address(this), max_iteration);
MORPHO_AAVE_V3.supply(address(_tokenContract), _amt, address(this), MAX_ITERATIONS);
setUint(_setId, _amt);
@ -44,8 +44,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Deposit ETH/ERC20_Token.
* @notice Deposit a token to Morpho Aave for lending.
* @dev Supply ETH/ERC20 Token for lending with max iterations.
* @notice Supply ETH/ERC20 Token to Morpho Aave for lending with max iterations. It will be elible for P2P matching but will not have nay borrowing power.
* @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`)
* @param _maxIteration The maximum number of iterations allowed during the matching process.
@ -85,49 +85,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Deposit ETH/ERC20_Token on behalf of a user.
* @notice Deposit a token to Morpho Aave for lending on behalf of a user.
* @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`)
* @param _onBehalf The address of user on behalf of whom we want to deposit.
* @param _getId ID to retrieve amt.
* @param _setId ID stores the amount of tokens deposited.
*/
function depositOnBehalf(
address _tokenAddress,
uint256 _amount,
address _onBehalf,
uint256 _getId,
uint256 _setId
)
external
payable
returns (string memory _eventName, bytes memory _eventParam)
{
(
TokenInterface _tokenContract,
uint256 _amt
) = _performEthToWethConversion(_tokenAddress, _amount, _getId);
approve(_tokenContract, address(MORPHO_AAVE_V3), _amt);
MORPHO_AAVE_V3.supply(address(_tokenContract), _amt, _onBehalf, max_iteration);
setUint(_setId, _amt);
_eventName = "LogDepositOnBehalf(address,uint256,address,uint256,uint256)";
_eventParam = abi.encode(
_tokenAddress,
_amt,
_onBehalf,
_getId,
_setId
);
}
/**
* @dev Deposit ETH/ERC20_Token on behalf of a user.
* @notice Deposit a token to Morpho Aave for lending on behalf of a user with max iterations.
* @dev Supply ETH/ERC20 Token on Behalf for lending with max iterations.
* @notice Supply ETH/ERC20 Token on behalf to Morpho Aave for lending with max iterations. It will be elible for P2P matching but will not have nay borrowing power.
* @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`)
* @param _onBehalf The address of user on behalf of whom we want to deposit.
@ -170,8 +129,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Deposit ETH/ERC20_Token on behalf of a user.
* @notice Deposit a token to Morpho Aave for lending / collaterization.
* @dev Deposit ETH/ERC20 Token for collateralization.
* @notice Deposit a token to Morpho Aave for collaterization. It will not be eligible for P2P matching.
* @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`)
* @param _getId ID to retrieve amt.
@ -208,8 +167,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Deposit ETH/ERC20_Token on behalf of a user.
* @notice Deposit a token to Morpho Aave for lending / collaterization on behalf of a user.
* @dev Deposit ETH/ERC20 Token on behalf for collateralization.
* @notice Deposit a token on behalf to Morpho Aave for collaterization. It will not be eligible for P2P matching.
* @param _tokenAddress The address of underlying token to deposit.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to deposit. (For max: `uint256(-1)`)
* @param _onBehalf The address of user on behalf to deposit.
@ -249,8 +208,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Borrow ETH/ERC20_Token.
* @notice Borrow a token from Morpho Aave.
* @dev Borrow ETH/ERC20 Token.
* @notice Borrow a token from Morpho Aave V3.
* @param _tokenAddress The address of underlying token to borrow.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to borrow.
* @param _getId ID to retrieve amt.
@ -270,7 +229,7 @@ abstract contract MorphoAaveV3 is Helpers, Events {
bool _isETH = _tokenAddress == ethAddr;
address _token = _isETH ? wethAddr : _tokenAddress;
uint256 _borrowed = MORPHO_AAVE_V3.borrow(_token, _amt, address(this), address(this), max_iteration);
uint256 _borrowed = MORPHO_AAVE_V3.borrow(_token, _amt, address(this), address(this), MAX_ITERATIONS);
convertWethToEth(_isETH, TokenInterface(_token), _borrowed);
@ -286,56 +245,10 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Borrow ETH/ERC20_Token.
* @notice Borrow a token from Morpho Aave V3.
* @dev Borrow ETH/ERC20 Token.
* @notice Borrow a token from Morpho Aave V3 with max iterations.
* @param _tokenAddress The address of underlying token to borrow.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to borrow.
* @param _onBehalf The address of user on behalf to borrow.
* @param _receiver The address of receiver to receive the borrowed tokens.
Note that if receiver is not the same as the borrower, receiver will receive WETH instead of ETH.
* @param _getId ID to retrieve amt.
* @param _setId ID stores the amount of tokens borrowed.
*/
function borrowOnBehalf(
address _tokenAddress,
uint256 _amount,
address _onBehalf,
address _receiver,
uint256 _getId,
uint256 _setId
)
external
payable
returns (string memory _eventName, bytes memory _eventParam)
{
uint256 _amt = getUint(_getId, _amount);
bool _isETH = _tokenAddress == ethAddr;
address _token = _isETH ? wethAddr : _tokenAddress;
uint256 _borrowed = MORPHO_AAVE_V3.borrow(_token, _amt, _onBehalf, _receiver, max_iteration);
if(_receiver == address(this)) convertWethToEth(_isETH, TokenInterface(_token), _borrowed);
setUint(_setId, _borrowed);
_eventName = "LogBorrowOnBehalf(address,uint256,addresss,address,uint256,uint256)";
_eventParam = abi.encode(
_tokenAddress,
_borrowed,
_onBehalf,
_receiver,
_getId,
_setId
);
}
/**
* @dev Borrow ETH/ERC20_Token.
* @notice Borrow a token from Morpho Aave.
* @param _tokenAddress The address of underlying token to borrow.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to borrow.
* @param _receiver The address of receiver to receive the borrowed tokens.
Note that if receiver is not the same as the borrower, receiver will receive WETH instead of ETH.
* @param _maxIteration The maximum number of iterations to be used for borrow.
* @param _getId ID to retrieve amt.
* @param _setId ID stores the amount of tokens borrowed.
@ -343,7 +256,6 @@ abstract contract MorphoAaveV3 is Helpers, Events {
function borrowWithMaxIterations(
address _tokenAddress,
uint256 _amount,
address _receiver,
uint256 _maxIteration,
uint256 _getId,
uint256 _setId
@ -356,17 +268,16 @@ abstract contract MorphoAaveV3 is Helpers, Events {
bool _isETH = _tokenAddress == ethAddr;
address _token = _isETH ? wethAddr : _tokenAddress;
uint256 _borrowed = MORPHO_AAVE_V3.borrow(_token, _amt, address(this), _receiver, _maxIteration);
uint256 _borrowed = MORPHO_AAVE_V3.borrow(_token, _amt, address(this), address(this), _maxIteration);
if(_receiver == address(this)) convertWethToEth(_isETH, TokenInterface(_token), _borrowed);
convertWethToEth(_isETH, TokenInterface(_token), _borrowed);
setUint(_setId, _borrowed);
_eventName = "LogBorrowWithMaxIterations(address,uint256,addresss,uint256,uint256,uint256)";
_eventName = "LogBorrowWithMaxIterations(address,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(
_tokenAddress,
_borrowed,
_receiver,
_maxIteration,
_getId,
_setId
@ -374,8 +285,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Borrow ETH/ERC20_Token.
* @notice Borrow a token from Morpho Aave.
* @dev Borrow ETH/ERC20 Token.
* @notice Borrow a token from Morpho Aave V3 on behalf with max iterations.
* @param _tokenAddress The address of underlying token to borrow.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to borrow.
* @param _onBehalf The address of user on behalf to borrow.
@ -421,8 +332,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Withdraw ETH/ERC20_Token.
* @notice Withdraw a token from Morpho Aave.
* @dev Withdraw ETH/ERC20 "Supplied" Token.
* @notice Withdraw a supplied token from Morpho Aave V3.
* @param _tokenAddress The address of underlying token to withdraw.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to withdraw. (For max: `uint256(-1)`)
* @param _getId ID to retrieve amt.
@ -443,7 +354,7 @@ abstract contract MorphoAaveV3 is Helpers, Events {
address _token = _isEth? wethAddr : _tokenAddress;
// Morpho will internally handle max amount conversion by taking the minimum of amount or supplied collateral.
uint256 _withdrawn = MORPHO_AAVE_V3.withdraw(_token, _amt, address(this), address(this), max_iteration);
uint256 _withdrawn = MORPHO_AAVE_V3.withdraw(_token, _amt, address(this), address(this), MAX_ITERATIONS);
convertWethToEth(_isEth, TokenInterface(_token), _withdrawn);
@ -459,21 +370,18 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Withdraw ETH/ERC20_Token.
* @notice Withdraw a token from Morpho Aave.
* @dev Withdraw ETH/ERC20 "Supplied" Token.
* @notice Withdraw a supplied token from Morpho Aave V3 with max iterations.
* @param _tokenAddress The address of underlying token to withdraw.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to withdraw. (For max: `uint256(-1)`)
* @param _onBehalf Address for which tokens are being withdrawn.
* @param _receiver Address to which tokens are being transferred.
Note that if receiver is not the same as the supplier, receiver will receive WETH instead of ETH.
* @param _maxIteration Max number of iterations to run.
* @param _getId ID to retrieve amt.
* @param _setId ID stores the amount of tokens withdrawed.
*/
function withdrawOnBehalf(
function withdrawWithMaxIterations(
address _tokenAddress,
uint256 _amount,
address _onBehalf,
address _receiver,
uint256 _maxIteration,
uint256 _getId,
uint256 _setId
)
@ -486,26 +394,25 @@ abstract contract MorphoAaveV3 is Helpers, Events {
address _token = _isEth ? wethAddr : _tokenAddress;
// Morpho will internally handle max amount conversion by taking the minimum of amount or supplied collateral.
uint256 _withdrawn = MORPHO_AAVE_V3.withdraw(_token, _amt, _onBehalf, _receiver, max_iteration);
uint256 _withdrawn = MORPHO_AAVE_V3.withdraw(_token, _amt, address(this), address(this), _maxIteration);
if(_receiver == address(this)) convertWethToEth(_isEth, TokenInterface(_token), _withdrawn);
convertWethToEth(_isEth, TokenInterface(_token), _withdrawn);
setUint(_setId, _withdrawn);
_eventName = "LogWithdrawOnBehalf(address,uint256,address,address,uint256,uint256)";
_eventName = "LogWithdrawWithMaxIterations(address,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(
_tokenAddress,
_withdrawn,
_onBehalf,
_receiver,
_maxIteration,
_getId,
_setId
);
}
/**
* @dev Withdraw ETH/ERC20_Token.
* @notice Withdraw a token from Morpho Aave.
* @dev Withdraw ETH/ERC20 "Supplied" Token.
* @notice Withdraw a supplied token from Morpho Aave V3 on behalf with max iterations.
* @param _tokenAddress The address of underlying token to withdraw.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to withdraw. (For max: `uint256(-1)`)
* @param _onBehalf Address for which tokens are being withdrawn.
@ -552,19 +459,16 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Withdraw ETH/ERC20 collateral token.
* @notice Withdraw a token from Morpho Aave.
* @dev Withdraw ETH/ERC20 "collateral" token.
* @notice Withdraw a collateral token from Morpho Aave V3.
* @param _tokenAddress The address of underlying token to withdraw.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to withdraw. (For max: `uint256(-1)`)
* @param _receiver Address to which tokens are being transferred.
Note that if receiver is not the same as the supplier, receiver will receive WETH instead of ETH.
* @param _getId ID to retrieve amt.
* @param _setId ID stores the amount of tokens withdrawed.
*/
function withdrawCollateral(
address _tokenAddress,
uint256 _amount,
address _receiver,
uint256 _getId,
uint256 _setId
)
@ -576,25 +480,24 @@ abstract contract MorphoAaveV3 is Helpers, Events {
bool _isEth = _tokenAddress == ethAddr;
address _token = _isEth ? wethAddr : _tokenAddress;
uint256 _withdrawn = MORPHO_AAVE_V3.withdrawCollateral(_token, _amt, address(this), _receiver);
uint256 _withdrawn = MORPHO_AAVE_V3.withdrawCollateral(_token, _amt, address(this), address(this));
if(_receiver == address(this)) convertWethToEth(_isEth, TokenInterface(_token), _withdrawn);
convertWethToEth(_isEth, TokenInterface(_token), _withdrawn);
setUint(_setId, _withdrawn);
_eventName = "LogWithdrawCollateral(address,uint256,address,uint256,uint256)";
_eventName = "LogWithdrawCollateral(address,uint256,uint256,uint256)";
_eventParam = abi.encode(
_tokenAddress,
_withdrawn,
_receiver,
_getId,
_setId
);
}
/**
* @dev Withdraw ETH/ERC20 collateral token.
* @notice Withdraw a token from Morpho Aave.
* @dev Withdraw ETH/ERC20 "collateral" token on behalf.
* @notice Withdraw a collateral token on behalf from Morpho Aave V3.
* @param _tokenAddress The address of underlying token to withdraw.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to withdraw. (For max: `uint256(-1)`)
* @param _onBehalf Address for which tokens are being withdrawn.
@ -637,8 +540,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Payback ETH/ERC20_Token.
* @notice Payback a token to Morpho Aave.
* @dev Payback ETH/ERC20 Token.
* @notice Payback borrowed token to Morpho Aave V3.
* @param _tokenAddress The address of underlying token to payback.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _amount The amount of the token (in underlying) to payback. (For max: `uint256(-1)`)
* @param _getId ID to retrieve amt.
@ -675,8 +578,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
}
/**
* @dev Payback ETH/ERC20_Token.
* @notice Payback a token to Morpho Aave.
* @dev Payback ETH/ERC20 Token on behalf.
* @notice Payback borrowed token on bahelf to Morpho Aave V3.
* @param _tokenAddress The address of underlying token to payback.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @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)`)
@ -730,24 +633,8 @@ abstract contract MorphoAaveV3 is Helpers, Events {
_isAllowed
);
}
/// @notice Updates the max iterations for a `repay` or a `withdraw`.
/// @param _iterations New iteration count.
function updateMaxIterations(uint256 _iterations)
external
returns (string memory _eventName, bytes memory _eventParam)
{
uint256 _oldIterations = max_iteration;
max_iteration = _iterations;
_eventName = "LogUpdateMaxIterations(uint256,uint256)";
_eventParam = abi.encode(
_oldIterations,
max_iteration
);
}
}
contract ConnectV2MorphoAaveV3 is MorphoAaveV3 {
string public constant name = "Morpho-AaveV3-v1.0";
string public constant name = "Morpho-AaveV3-v1.1";
}

16
test/mainnet/morpho/morpho-aave-v3.test.ts
View File

@ -156,8 +156,8 @@ describe("Morpho-Aave-v3", function () {
const spells = [
{
connector: connectorName,
method: "depositOnBehalf",
args: [tokens.eth.address, "10000000000000000000", user, "0", "0"], // 1 ETH
method: "depositOnBehalfWithMaxIterations",
args: [tokens.eth.address, "10000000000000000000", user, 4, "0", "0"], // 1 ETH
},
];
@ -254,8 +254,8 @@ describe("Morpho-Aave-v3", function () {
const spells = [
{
connector: connectorName,
method: "withdrawOnBehalf",
args: [tokens.eth.address, dsaMaxValue, dsaWallet0.address, user, "0", "0"], // Max ETH
method: "withdrawOnBehalfWithMaxIterations",
args: [tokens.eth.address, dsaMaxValue, dsaWallet0.address, user, 4, "0", "0"], // Max ETH
},
];
@ -293,8 +293,8 @@ describe("Morpho-Aave-v3", function () {
const spells = [
{
connector: connectorName,
method: "borrowOnBehalf",
args: [tokens.eth.address, "200000000000000000", dsaWallet0.address, user, "0", "0"], // 0.7 WETH
method: "borrowOnBehalfWithMaxIterations",
args: [tokens.eth.address, "200000000000000000", dsaWallet0.address, user, 4, "0", "0"], // 0.7 WETH
},
];
@ -313,7 +313,7 @@ describe("Morpho-Aave-v3", function () {
{
connector: connectorName,
method: "borrowWithMaxIterations",
args: [tokens.weth.address, "20000000000000000", dsaWallet0.address, 10, "0", "0"], // 0.02 WETH
args: [tokens.weth.address, "20000000000000000", 10, "0", "0"], // 0.02 WETH
},
];
@ -355,7 +355,7 @@ describe("Morpho-Aave-v3", function () {
{
connector: connectorName,
method: "withdrawCollateral",
args: [tokens.usdc.address, "19000000", dsaWallet0.address, "0", "0"], // 19 USDC
args: [tokens.usdc.address, "19000000", "0", "0"], // 19 USDC
},
];