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

update onbefalf function

Browse Source
This commit is contained in:
q1q0 2023-11-20 12:28:42 -05:00
parent 84f395ba3e
commit 3bba96ff3f
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
contracts/mainnet/connectors/morpho-blue/main.sol
View File

@ -85,15 +85,15 @@ abstract contract MorphoBlue is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
( if (_marketParams.loanToken == ethAddr) {
TokenInterface _tokenContract, _marketParams.loanToken = wethAddr;
uint256 _amt, }
) = _performEthToWethConversion(_marketParams.loanToken, _assets, _getId); uint256 _amt = getUint(_getId, _assets);
if (_amt == uint256(-1)) _amt = TokenInterface(_marketParams.loanToken).balanceOf(_onBehalf);
bytes32 _id = id(_marketParams); bytes32 _id = id(_marketParams);
uint256 _approveAmount = _getApproveAmount(_id, _amt, _shares); uint256 _approveAmount = _getApproveAmount(_id, _amt, _shares);
approve(_tokenContract, address(MORPHO_BLUE), _approveAmount); approve(TokenInterface(_marketParams.loanToken), address(MORPHO_BLUE), _approveAmount);
_marketParams.loanToken = address(_tokenContract);
(_assets, _shares) = MORPHO_BLUE.supply(_marketParams, _amt, _shares, _onBehalf, _data); (_assets, _shares) = MORPHO_BLUE.supply(_marketParams, _amt, _shares, _onBehalf, _data);
@ -174,13 +174,12 @@ abstract contract MorphoBlue is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
( if (_marketParams.loanToken == ethAddr) {
TokenInterface _tokenContract, _marketParams.loanToken = wethAddr;
uint256 _amt, }
) = _performEthToWethConversion(_marketParams.loanToken, _assets, _getId); uint256 _amt = getUint(_getId, _assets);
if (_amt == uint256(-1)) _amt = TokenInterface(_marketParams.loanToken).balanceOf(_onBehalf);
approve(_tokenContract, address(MORPHO_BLUE), _amt); approve(TokenInterface(_marketParams.loanToken), address(MORPHO_BLUE), _amt);
_marketParams.loanToken = address(_tokenContract);
MORPHO_BLUE.supplyCollateral(_marketParams, _amt, _onBehalf, _data); MORPHO_BLUE.supplyCollateral(_marketParams, _amt, _onBehalf, _data);
@ -218,7 +217,9 @@ abstract contract MorphoBlue is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
if (_marketParams.loanToken == ethAddr) {
_marketParams.loanToken = wethAddr;
}
uint256 _amt = getUint(_getId, _assets); uint256 _amt = getUint(_getId, _assets);
if (_amt == uint256(-1)) { if (_amt == uint256(-1)) {
bytes32 _id = id(_marketParams); bytes32 _id = id(_marketParams);
@ -295,7 +296,7 @@ abstract contract MorphoBlue is Helpers, Events {
/** /**
* @notice Supplies `assets` or `shares` on behalf of `onBehalf`, optionally calling back the caller's `onMorphoSupply` function with the given `data`. * @notice Supplies `assets` or `shares` on behalf of `onBehalf`, optionally calling back the caller's `onMorphoSupply` function with the given `data`.
* @dev Supplying a large amount can revert for overflow. * @dev Supplying a large amount can revert for overflow.
* @dev 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE native token is not allowed in this mode cause of failing in withdraw of WETH. * @dev The market to supply assets to.(For ETH of loanToken in _marketParams: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param _marketParams The market to supply assets to. * @param _marketParams The market to supply assets to.
* @param _assets The amount of assets to supply. * @param _assets The amount of assets to supply.
* @param _shares The amount of shares to mint. * @param _shares The amount of shares to mint.
@ -315,7 +316,9 @@ abstract contract MorphoBlue is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
if (_marketParams.loanToken == ethAddr) {
_marketParams.loanToken = wethAddr;
}
uint256 _amt = getUint(_getId, _assets); uint256 _amt = getUint(_getId, _assets);
bool _isMax; bool _isMax;
if (_amt == uint256(-1)) { if (_amt == uint256(-1)) {
@ -407,12 +410,14 @@ abstract contract MorphoBlue is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
( if (_marketParams.loanToken == ethAddr) {
TokenInterface _tokenContract, _marketParams.loanToken = wethAddr;
uint256 _amt, }
) = _performEthToWethConversion(_marketParams.loanToken, _assets, _getId); uint256 _amt = getUint(_getId, _assets);
if (_amt == uint256(-1)) {
_amt = TokenInterface(_marketParams.loanToken).balanceOf(_onBehalf);
}
_marketParams.loanToken = address(_tokenContract);
(_assets, _shares) = MORPHO_BLUE.borrow(_marketParams, _amt, _shares, _onBehalf, address(this)); (_assets, _shares) = MORPHO_BLUE.borrow(_marketParams, _amt, _shares, _onBehalf, address(this));
@ -567,12 +572,11 @@ abstract contract MorphoBlue is Helpers, Events {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
( uint256 _amt = getUint(_getId, _assets);
TokenInterface _tokenContract, bool _isMax;
uint256 _amt, if (_marketParams.loanToken == ethAddr) {
bool _isMax _marketParams.loanToken = wethAddr;
) = _performEthToWethConversion(_marketParams.loanToken, _assets, _getId); }
_marketParams.loanToken = address(_tokenContract);
if (_amt == uint256(-1)) { if (_amt == uint256(-1)) {
_amt = TokenInterface(_marketParams.loanToken).balanceOf(_onBehalf); _amt = TokenInterface(_marketParams.loanToken).balanceOf(_onBehalf);
_isMax = true; _isMax = true;