Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

update universalTransferFrom logic, and comments

Browse Source
This commit is contained in:
andyk 2020-06-03 15:48:59 +03:00
parent a41816b32c
commit 43ae2f36e7
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contracts/libraries/UniversalERC20.sol
View File

@ -22,6 +22,8 @@ library UniversalERC20 {
0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE
); );
uint256 private constant DEFAULT_TRANSFER_GAS = 50000;
/** /**
* @dev Moves amount of asset from caller to recipient * @dev Moves amount of asset from caller to recipient
* @param token underlying asset address * @param token underlying asset address
@ -38,7 +40,10 @@ library UniversalERC20 {
} }
if (isETH(token)) { if (isETH(token)) {
(bool result, ) = payable(to).call{value: amount, gas: 50000}(""); (bool result, ) = payable(to).call{
value: amount,
gas: DEFAULT_TRANSFER_GAS
}("");
require(result, "ETH_TRANSFER_FAILED"); require(result, "ETH_TRANSFER_FAILED");
} else { } else {
token.safeTransfer(to, amount); token.safeTransfer(to, amount);
@ -47,6 +52,7 @@ library UniversalERC20 {
/** /**
* @dev Moves amount of asset from sender to recipient * @dev Moves amount of asset from sender to recipient
* in terms of ETH it redirects amount in transaction to recipient
* @param token underlying asset address * @param token underlying asset address
* @param from asset sender * @param from asset sender
* @param to asset recipient * @param to asset recipient
@ -70,15 +76,16 @@ library UniversalERC20 {
"Wrong usage of ETH.universalTransferFrom()" "Wrong usage of ETH.universalTransferFrom()"
); // TODO: think one more time from == msg.sender ); // TODO: think one more time from == msg.sender
if (to != address(this)) { if (to != address(this)) {
(bool result, ) = payable(to).call{value: amount, gas: 50000}( (bool result, ) = payable(to).call{
"" value: amount,
); gas: DEFAULT_TRANSFER_GAS
}("");
require(result, "ETH_TRANSFER_FAILED"); require(result, "ETH_TRANSFER_FAILED");
} }
if (returnExcess && msg.value > amount) { if (returnExcess && msg.value > amount) {
(bool result, ) = msg.sender.call{ (bool result, ) = payable(from).call{
value: msg.value.sub(amount), value: msg.value.sub(amount),
gas: 50000 gas: DEFAULT_TRANSFER_GAS
}(""); }("");
require(result, "ETH_TRANSFER_FAILED"); require(result, "ETH_TRANSFER_FAILED");
} }