diff --git a/config/commons.ts b/config/commons.ts index ed94f188..66fe5f3e 100644 --- a/config/commons.ts +++ b/config/commons.ts @@ -290,4 +290,11 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.ropsten]: '', [eEthereumNetwork.main]: '', }, + WETH: { + [eEthereumNetwork.coverage]: '', // deployed in local evm + [eEthereumNetwork.buidlerevm]: '', // deployed in local evm + [eEthereumNetwork.kovan]: '0xd0a1e359811322d97991e03f863a0c30c2cf029c', + [eEthereumNetwork.ropsten]: '0xc778417e063141139fce010982780140aa0cd5ab', + [eEthereumNetwork.main]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', + }, }; diff --git a/contracts/lendingpool/LendingPool.sol b/contracts/lendingpool/LendingPool.sol index cb7f3682..4c70ca88 100644 --- a/contracts/lendingpool/LendingPool.sol +++ b/contracts/lendingpool/LendingPool.sol @@ -107,6 +107,7 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage if (isFirstDeposit) { _usersConfig[onBehalfOf].setUsingAsCollateral(reserve.id, true); + emit ReserveUsedAsCollateralEnabled(asset, onBehalfOf); } //transfer to the aToken contract @@ -157,6 +158,7 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage if (amountToWithdraw == userBalance) { _usersConfig[msg.sender].setUsingAsCollateral(reserve.id, false); + emit ReserveUsedAsCollateralDisabled(asset, msg.sender); } IAToken(aToken).burn(msg.sender, to, amountToWithdraw, reserve.liquidityIndex); @@ -230,15 +232,6 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage _whenNotPaused(); ReserveLogic.ReserveData storage reserve = _reserves[asset]; - if (onBehalfOf != msg.sender) { - address debtToken = reserve.getDebtTokenAddress(interestRateMode); - - _borrowAllowance[debtToken][onBehalfOf][msg - .sender] = _borrowAllowance[debtToken][onBehalfOf][msg.sender].sub( - amount, - Errors.LP_BORROW_ALLOWANCE_ARE_NOT_ENOUGH - ); - } _executeBorrow( ExecuteBorrowParams( asset, @@ -581,14 +574,6 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage vars.currentAmountPlusPremium ); } else { - if (msg.sender != onBehalfOf) { - vars.debtToken = _reserves[vars.currentAsset].getDebtTokenAddress(modes[vars.i]); - - _borrowAllowance[vars.debtToken][onBehalfOf][msg.sender] = _borrowAllowance[vars - .debtToken][onBehalfOf][msg.sender] - .sub(vars.currentAmount, Errors.LP_BORROW_ALLOWANCE_ARE_NOT_ENOUGH); - } - //if the user didn't choose to return the funds, the system checks if there //is enough collateral and eventually open a position _executeBorrow( @@ -793,11 +778,13 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage if (balanceFromBefore.sub(amount) == 0) { UserConfiguration.Map storage fromConfig = _usersConfig[from]; fromConfig.setUsingAsCollateral(reserveId, false); + emit ReserveUsedAsCollateralDisabled(asset, from); } if (balanceToBefore == 0 && amount != 0) { UserConfiguration.Map storage toConfig = _usersConfig[to]; toConfig.setUsingAsCollateral(reserveId, true); + emit ReserveUsedAsCollateralEnabled(asset, to); } } } @@ -911,6 +898,14 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage oracle ); + if (vars.onBehalfOf != msg.sender) { + address debtToken = reserve.getDebtTokenAddress(vars.interestRateMode); + + _borrowAllowance[debtToken][vars.onBehalfOf][msg.sender] = _borrowAllowance[debtToken][vars + .onBehalfOf][msg.sender] + .sub(vars.amount, Errors.LP_BORROW_ALLOWANCE_NOT_ENOUGH); + } + reserve.updateState(); //caching the current stable borrow rate diff --git a/contracts/libraries/helpers/Errors.sol b/contracts/libraries/helpers/Errors.sol index a0a65762..2b173fff 100644 --- a/contracts/libraries/helpers/Errors.sol +++ b/contracts/libraries/helpers/Errors.sol @@ -79,7 +79,7 @@ library Errors { string public constant AT_INVALID_MINT_AMOUNT = '56'; //invalid amount to mint string public constant LP_FAILED_REPAY_WITH_COLLATERAL = '57'; string public constant AT_INVALID_BURN_AMOUNT = '58'; //invalid amount to burn - string public constant LP_BORROW_ALLOWANCE_ARE_NOT_ENOUGH = '59'; // User borrows on behalf, but allowance are too small + string public constant LP_BORROW_ALLOWANCE_NOT_ENOUGH = '59'; // User borrows on behalf, but allowance are too small string public constant LP_FAILED_COLLATERAL_SWAP = '60'; string public constant LP_INVALID_EQUAL_ASSETS_TO_SWAP = '61'; string public constant LP_REENTRANCY_NOT_ALLOWED = '62'; diff --git a/contracts/libraries/helpers/Helpers.sol b/contracts/libraries/helpers/Helpers.sol index e1d65502..ba8be90c 100644 --- a/contracts/libraries/helpers/Helpers.sol +++ b/contracts/libraries/helpers/Helpers.sol @@ -26,4 +26,15 @@ library Helpers { DebtTokenBase(reserve.variableDebtTokenAddress).balanceOf(user) ); } + + function getUserCurrentDebtMemory(address user, ReserveLogic.ReserveData memory reserve) + internal + view + returns (uint256, uint256) + { + return ( + DebtTokenBase(reserve.stableDebtTokenAddress).balanceOf(user), + DebtTokenBase(reserve.variableDebtTokenAddress).balanceOf(user) + ); + } } diff --git a/contracts/misc/WETHGateway.sol b/contracts/misc/WETHGateway.sol new file mode 100644 index 00000000..ee7d1e7f --- /dev/null +++ b/contracts/misc/WETHGateway.sol @@ -0,0 +1,168 @@ +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.6.8; +pragma experimental ABIEncoderV2; + +import {IWETH} from './interfaces/IWETH.sol'; +import {IWETHGateway} from './interfaces/IWETHGateway.sol'; +import {ILendingPool} from '../interfaces/ILendingPool.sol'; +import {IAToken} from '../tokenization/interfaces/IAToken.sol'; +import {ReserveLogic} from '../libraries/logic/ReserveLogic.sol'; +import {ReserveConfiguration} from '../libraries/configuration/ReserveConfiguration.sol'; +import {UserConfiguration} from '../libraries/configuration/UserConfiguration.sol'; +import {Helpers} from '../libraries/helpers/Helpers.sol'; +import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol'; +import {IERC20} from '../dependencies/openzeppelin/contracts/IERC20.sol'; + +contract WETHGateway is IWETHGateway, Ownable { + using ReserveConfiguration for ReserveConfiguration.Map; + using UserConfiguration for UserConfiguration.Map; + + IWETH internal immutable WETH; + ILendingPool internal immutable POOL; + IAToken internal immutable aWETH; + + /** + * @dev Sets the WETH address and the LendingPoolAddressesProvider address. Infinite approves lending pool. + * @param weth Address of the Wrapped Ether contract + * @param pool Address of the LendingPool contract + **/ + constructor(address weth, address pool) public { + ILendingPool poolInstance = ILendingPool(pool); + WETH = IWETH(weth); + POOL = poolInstance; + aWETH = IAToken(poolInstance.getReserveData(weth).aTokenAddress); + IWETH(weth).approve(pool, uint256(-1)); + } + + /** + * @dev deposits WETH into the reserve, using native ETH. A corresponding amount of the overlying asset (aTokens) + * is minted. + * @param onBehalfOf address of the user who will receive the aTokens representing the deposit + * @param referralCode integrators are assigned a referral code and can potentially receive rewards. + **/ + function depositETH(address onBehalfOf, uint16 referralCode) external override payable { + WETH.deposit{value: msg.value}(); + POOL.deposit(address(WETH), msg.value, onBehalfOf, referralCode); + } + + /** + * @dev withdraws the WETH _reserves of msg.sender. + * @param amount amount of aWETH to withdraw and receive native ETH + * @param to address of the user who will receive native ETH + */ + function withdrawETH(uint256 amount, address to) external override { + uint256 userBalance = aWETH.balanceOf(msg.sender); + uint256 amountToWithdraw = amount; + + // if amount is equal to uint(-1), the user wants to redeem everything + if (amount == type(uint256).max) { + amountToWithdraw = userBalance; + } + aWETH.transferFrom(msg.sender, address(this), amountToWithdraw); + POOL.withdraw(address(WETH), amountToWithdraw, address(this)); + WETH.withdraw(amountToWithdraw); + _safeTransferETH(to, amountToWithdraw); + } + + /** + * @dev repays a borrow on the WETH reserve, for the specified amount (or for the whole amount, if uint256(-1) is specified). + * @param amount the amount to repay, or uint256(-1) if the user wants to repay everything + * @param rateMode the rate mode to repay + * @param onBehalfOf the address for which msg.sender is repaying + */ + function repayETH( + uint256 amount, + uint256 rateMode, + address onBehalfOf + ) external override payable { + (uint256 stableDebt, uint256 variableDebt) = Helpers.getUserCurrentDebtMemory( + onBehalfOf, + POOL.getReserveData(address(WETH)) + ); + + uint256 paybackAmount = ReserveLogic.InterestRateMode(rateMode) == + ReserveLogic.InterestRateMode.STABLE + ? stableDebt + : variableDebt; + + if (amount < paybackAmount) { + paybackAmount = amount; + } + require(msg.value >= paybackAmount, 'msg.value is less than repayment amount'); + WETH.deposit{value: paybackAmount}(); + POOL.repay(address(WETH), msg.value, rateMode, onBehalfOf); + + // refund remaining dust eth + if (msg.value > paybackAmount) _safeTransferETH(msg.sender, msg.value - paybackAmount); + } + + /** + * @dev transfer ETH to an address, revert if it fails. + * @param to recipient of the transfer + * @param value the amount to send + */ + function _safeTransferETH(address to, uint256 value) internal { + (bool success, ) = to.call{value: value}(new bytes(0)); + require(success, 'ETH_TRANSFER_FAILED'); + } + + /** + * @dev transfer ERC20 from the utility contract, for ERC20 recovery in case of stuck tokens due + * direct transfers to the contract address. + * @param token token to transfer + * @param to recipient of the transfer + * @param amount amount to send + */ + function emergencyTokenTransfer( + address token, + address to, + uint256 amount + ) external onlyOwner { + IERC20(token).transfer(to, amount); + } + + /** + * @dev transfer native Ether from the utility contract, for native Ether recovery in case of stuck Ether + * due selfdestructs or transfer ether to pre-computated contract address before deployment. + * @param to recipient of the transfer + * @param amount amount to send + */ + function emergencyEtherTransfer(address to, uint256 amount) external onlyOwner { + _safeTransferETH(to, amount); + } + + /** + * @dev Get WETH address used by WETHGateway + */ + function getWETHAddress() external view returns (address) { + return address(WETH); + } + + /** + * @dev Get aWETH address used by WETHGateway + */ + function getAWETHAddress() external view returns (address) { + return address(aWETH); + } + + /** + * @dev Get LendingPool address used by WETHGateway + */ + function getLendingPoolAddress() external view returns (address) { + return address(POOL); + } + + /** + * @dev Only WETH contract is allowed to transfer ETH here. Prevent other addresses to send Ether to this contract. + */ + receive() external payable { + require(msg.sender == address(WETH), 'Receive not allowed'); + } + + /** + * @dev Revert fallback calls + */ + fallback() external payable { + revert('Fallback not allowed'); + } +} diff --git a/contracts/misc/IERC20DetailedBytes.sol b/contracts/misc/interfaces/IERC20DetailedBytes.sol similarity index 100% rename from contracts/misc/IERC20DetailedBytes.sol rename to contracts/misc/interfaces/IERC20DetailedBytes.sol diff --git a/contracts/misc/interfaces/IWETH.sol b/contracts/misc/interfaces/IWETH.sol new file mode 100644 index 00000000..cb661927 --- /dev/null +++ b/contracts/misc/interfaces/IWETH.sol @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.6.8; + +interface IWETH { + function deposit() external payable; + + function withdraw(uint256) external; + + function approve(address guy, uint256 wad) external returns (bool); + + function transferFrom( + address src, + address dst, + uint256 wad + ) external returns (bool); +} diff --git a/contracts/misc/interfaces/IWETHGateway.sol b/contracts/misc/interfaces/IWETHGateway.sol new file mode 100644 index 00000000..51bdc337 --- /dev/null +++ b/contracts/misc/interfaces/IWETHGateway.sol @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.6.8; + +interface IWETHGateway { + function depositETH(address onBehalfOf, uint16 referralCode) external payable; + + function withdrawETH(uint256 amount, address onBehalfOf) external; + + function repayETH( + uint256 amount, + uint256 rateMode, + address onBehalfOf + ) external payable; +} diff --git a/contracts/mocks/attacks/SefldestructTransfer.sol b/contracts/mocks/attacks/SefldestructTransfer.sol new file mode 100644 index 00000000..5c8750c1 --- /dev/null +++ b/contracts/mocks/attacks/SefldestructTransfer.sol @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.6.8; + +contract SelfdestructTransfer { + function destroyAndTransfer(address payable to) external payable { + selfdestruct(to); + } +} diff --git a/contracts/mocks/dependencies/weth/WETH9.sol b/contracts/mocks/dependencies/weth/WETH9.sol new file mode 100644 index 00000000..1907b736 --- /dev/null +++ b/contracts/mocks/dependencies/weth/WETH9.sol @@ -0,0 +1,758 @@ +// Copyright (C) 2015, 2016, 2017 Dapphub + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +pragma solidity >=0.4.22 <=0.6.8; + +contract WETH9 { + string public name = 'Wrapped Ether'; + string public symbol = 'WETH'; + uint8 public decimals = 18; + + event Approval(address indexed src, address indexed guy, uint256 wad); + event Transfer(address indexed src, address indexed dst, uint256 wad); + event Deposit(address indexed dst, uint256 wad); + event Withdrawal(address indexed src, uint256 wad); + + mapping(address => uint256) public balanceOf; + mapping(address => mapping(address => uint256)) public allowance; + + receive() external payable { + deposit(); + } + + function deposit() public payable { + balanceOf[msg.sender] += msg.value; + emit Deposit(msg.sender, msg.value); + } + + function withdraw(uint256 wad) public { + require(balanceOf[msg.sender] >= wad); + balanceOf[msg.sender] -= wad; + msg.sender.transfer(wad); + emit Withdrawal(msg.sender, wad); + } + + function totalSupply() public view returns (uint256) { + return address(this).balance; + } + + function approve(address guy, uint256 wad) public returns (bool) { + allowance[msg.sender][guy] = wad; + emit Approval(msg.sender, guy, wad); + return true; + } + + function transfer(address dst, uint256 wad) public returns (bool) { + return transferFrom(msg.sender, dst, wad); + } + + function transferFrom( + address src, + address dst, + uint256 wad + ) public returns (bool) { + require(balanceOf[src] >= wad); + + if (src != msg.sender && allowance[src][msg.sender] != uint256(-1)) { + require(allowance[src][msg.sender] >= wad); + allowance[src][msg.sender] -= wad; + } + + balanceOf[src] -= wad; + balanceOf[dst] += wad; + + emit Transfer(src, dst, wad); + + return true; + } +} + +/* + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + +*/ diff --git a/contracts/mocks/flashloan/MockFlashLoanReceiver.sol b/contracts/mocks/flashloan/MockFlashLoanReceiver.sol index 215746ae..cfd16c28 100644 --- a/contracts/mocks/flashloan/MockFlashLoanReceiver.sol +++ b/contracts/mocks/flashloan/MockFlashLoanReceiver.sol @@ -72,7 +72,6 @@ contract MockFlashLoanReceiver is FlashLoanReceiverBase { ? _amountToApprove : amounts[i].add(premiums[i]); //execution does not fail - mint tokens and return them to the _destination - //note: if the reserve is eth, the mock contract must receive at least _fee ETH before calling executeOperation token.mint(premiums[i]); diff --git a/contracts/mocks/tokens/WETH9Mocked.sol b/contracts/mocks/tokens/WETH9Mocked.sol new file mode 100644 index 00000000..edcb1ca5 --- /dev/null +++ b/contracts/mocks/tokens/WETH9Mocked.sol @@ -0,0 +1,11 @@ +pragma solidity >=0.4.22 <=0.6.8; + +import {WETH9} from '../dependencies/weth/WETH9.sol'; + +contract WETH9Mocked is WETH9 { + // Mint not backed by Ether: only for testing purposes + function mint(uint256 value) public returns (bool) { + balanceOf[msg.sender] += value; + emit Transfer(address(0), msg.sender, value); + } +} diff --git a/deployed-contracts.json b/deployed-contracts.json index ceece00e..7144c966 100644 --- a/deployed-contracts.json +++ b/deployed-contracts.json @@ -1,7 +1,7 @@ { "MintableERC20": { "buidlerevm": { - "address": "0x5A0773Ff307Bf7C71a832dBB5312237fD3437f9F", + "address": "0x18b9306737eaf6E8FC8e737F488a1AE077b18053", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, @@ -115,43 +115,43 @@ }, "UNI_DAI_ETH": { "buidlerevm": { - "address": "0x53369fd4680FfE3DfF39Fc6DDa9CfbfD43daeA2E", + "address": "0xB00cC45B4a7d3e1FEE684cFc4417998A1c183e6d", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "UNI_USDC_ETH": { "buidlerevm": { - "address": "0xB00cC45B4a7d3e1FEE684cFc4417998A1c183e6d", + "address": "0x58F132FBB86E21545A4Bace3C19f1C05d86d7A22", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "UNI_SETH_ETH": { "buidlerevm": { - "address": "0x58F132FBB86E21545A4Bace3C19f1C05d86d7A22", + "address": "0xa4bcDF64Cdd5451b6ac3743B414124A6299B65FF", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "UNI_LINK_ETH": { "buidlerevm": { - "address": "0xa4bcDF64Cdd5451b6ac3743B414124A6299B65FF", + "address": "0x22474D350EC2dA53D717E30b96e9a2B7628Ede5b", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "UNI_MKR_ETH": { "buidlerevm": { - "address": "0x22474D350EC2dA53D717E30b96e9a2B7628Ede5b", + "address": "0x5A0773Ff307Bf7C71a832dBB5312237fD3437f9F", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "UNI_LEND_ETH": { "buidlerevm": { - "address": "0x5A0773Ff307Bf7C71a832dBB5312237fD3437f9F", + "address": "0x18b9306737eaf6E8FC8e737F488a1AE077b18053", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "LendingPoolAddressesProvider": { "buidlerevm": { - "address": "0x18b9306737eaf6E8FC8e737F488a1AE077b18053", + "address": "0xFAe0fd738dAbc8a0426F47437322b6d026A9FD95", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { @@ -161,7 +161,7 @@ }, "LendingPoolAddressesProviderRegistry": { "buidlerevm": { - "address": "0x6082731fdAba4761277Fb31299ebC782AD3bCf24", + "address": "0x8456161947DFc1fC159A0B26c025cD2b4bba0c3e", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { @@ -171,7 +171,7 @@ }, "ReserveLogic": { "buidlerevm": { - "address": "0x12080583C4F0211eC382d33a273E6D0f9fAb0F75", + "address": "0x33958cC3535Fc328369EAC2B2Bebd120D67C7fa1", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { @@ -181,7 +181,7 @@ }, "GenericLogic": { "buidlerevm": { - "address": "0x5F6CaC05CDF893f029b29F44d368eAeD40e573B6", + "address": "0x2cBbbBE1B75Ad7848F0844215816F551f429c64f", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { @@ -191,7 +191,7 @@ }, "ValidationLogic": { "buidlerevm": { - "address": "0x92cfBAB5A86631e9F1A6126b42E01A74eadA61Df", + "address": "0xbAc762e2000b6815268587b081Fd17aC25519aD5", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { @@ -201,7 +201,8 @@ }, "LendingPool": { "buidlerevm": { - "address": "0x6e2ec941EC385E56BDea7eD8fBf78610995B6D91" + "address": "0xa43Ba00FCA75B805D17f67F9433b971E9a398690", + "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { "address": "0x59525b17808F0a7eFe62303ca46e596A5a602683" @@ -209,7 +210,7 @@ }, "LendingPoolConfigurator": { "buidlerevm": { - "address": "0x846CDeeb7ce99204788615020a8cAF50c7e389f3" + "address": "0xdbaA15927b1463EdD14Cf51D082BD7703Fd1C238" }, "kovan": { "address": "0x0a9bc0ce44e6473a1B0e30b54b7227de6E75Fd83" @@ -217,7 +218,7 @@ }, "StableAndVariableTokensHelper": { "buidlerevm": { - "address": "0x1750499D05Ed1674d822430FB960d5F6731fDf64", + "address": "0xE4C10Db67595aF2Cb4166c8C274e0140f7E43059", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { @@ -227,7 +228,7 @@ }, "ATokensAndRatesHelper": { "buidlerevm": { - "address": "0xE4C10Db67595aF2Cb4166c8C274e0140f7E43059", + "address": "0x099d9fF8F818290C8b5B7Db5bFca84CEebd2714c", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { @@ -237,31 +238,31 @@ }, "PriceOracle": { "buidlerevm": { - "address": "0x099d9fF8F818290C8b5B7Db5bFca84CEebd2714c", + "address": "0x85bdE212E66e2BAE510E44Ed59116c1eC712795b", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "MockAggregator": { "buidlerevm": { - "address": "0xd5C35F41baD857A2D4F34D7554E78d0391BAcEDF", + "address": "0x8Dd7f10813aC8fCB83ad7ad94e941D53b002fBc7", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "ChainlinkProxyPriceProvider": { "buidlerevm": { - "address": "0xc1cb554de746224c13c1f25478aD0f3fa9e64843", + "address": "0xfA9dbd706c674801F50169f4B5862cCe045408E6", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "LendingRateOracle": { "buidlerevm": { - "address": "0x8Dd7f10813aC8fCB83ad7ad94e941D53b002fBc7", + "address": "0xbFAD7C67855cc0272CC5ED00dAabeFDB31E7190a", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, "AaveProtocolTestHelpers": { "buidlerevm": { - "address": "0x0bcCE4611Bb4118422549f61e344dd38d65084cb" + "address": "0x93472C0e03215F9c33DA240Eb16703C8244eAa8c" }, "kovan": { "address": "0xe875775D75F384944E77086Ea54bAD008ea8004A", @@ -270,7 +271,7 @@ }, "LendingPoolCollateralManager": { "buidlerevm": { - "address": "0xE55aA921A1001f0a19241264a50063683D2e1179", + "address": "0x417fc1038b2AF553D65F4fF2839efE9f93Ec1eac", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { @@ -280,12 +281,12 @@ }, "MockFlashLoanReceiver": { "buidlerevm": { - "address": "0xf89AA2f1397e9A0622c8Fc99aB1947E28b5EF876" + "address": "0x0459c841b02Aee8730730C737582c53B20a27288" } }, "WalletBalanceProvider": { "buidlerevm": { - "address": "0x1a66D6103F8BBf9204E1618F095a80b3E4817C95", + "address": "0x2530ce07D254eA185E8e0bCC37a39e2FbA3bE548", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "kovan": { @@ -311,15 +312,21 @@ "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, - "MintableDelegationERC20": { + "WETHGateway": { "buidlerevm": { - "address": "0x0EBCa695959e5f138Af772FAa44ce1A9C7aEd921", + "address": "0x0Cf45557d25a4e4c0F1aC65EF6c48ae67c61a0E6", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, - "AToken": { + "WETHMocked": { "buidlerevm": { - "address": "0x417fc1038b2AF553D65F4fF2839efE9f93Ec1eac", + "address": "0xf784709d2317D872237C4bC22f867d1BAe2913AB", + "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" + } + }, + "MintableDelegationERC20": { + "buidlerevm": { + "address": "0x7fAeC7791277Ff512c41CA903c177B2Ed952dDAc", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } }, @@ -346,5 +353,23 @@ "address": "0x3521eF8AaB0323004A6dD8b03CE890F4Ea3A13f5", "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" } + }, + "AToken": { + "buidlerevm": { + "address": "0x33958cC3535Fc328369EAC2B2Bebd120D67C7fa1", + "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" + } + }, + "SelfdestructTransferMock": { + "buidlerevm": { + "address": "0x920d847fE49E54C19047ba8bc236C45A8068Bca7", + "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" + } + }, + "ENJ": { + "buidlerevm": { + "address": "0x53369fd4680FfE3DfF39Fc6DDa9CfbfD43daeA2E", + "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" + } } } \ No newline at end of file diff --git a/helpers/configuration.ts b/helpers/configuration.ts index 1665d4a0..b4bda09c 100644 --- a/helpers/configuration.ts +++ b/helpers/configuration.ts @@ -15,6 +15,7 @@ import {ZERO_ADDRESS} from './constants'; import {BRE} from './misc-utils'; import {tEthereumAddress} from './types'; import {getParamPerNetwork} from './contracts-helpers'; +import {deployWETHMocked} from './contracts-deployments'; export enum ConfigNames { Commons = 'Commons', @@ -80,3 +81,16 @@ export const getATokenDomainSeparatorPerNetwork = ( network: eEthereumNetwork, config: ICommonConfiguration ): tEthereumAddress => getParamPerNetwork(config.ATokenDomainSeparator, network); + +export const getWethAddress = async (config: ICommonConfiguration) => { + const currentNetwork = BRE.network.name; + const wethAddress = getParamPerNetwork(config.WETH, currentNetwork); + if (wethAddress) { + return wethAddress; + } + if (currentNetwork.includes('main')) { + throw new Error('WETH not set at mainnet configuration.'); + } + const weth = await deployWETHMocked(); + return weth.address; +}; diff --git a/helpers/contracts-deployments.ts b/helpers/contracts-deployments.ts index 465d7df2..bc5e7d81 100644 --- a/helpers/contracts-deployments.ts +++ b/helpers/contracts-deployments.ts @@ -41,15 +41,20 @@ import { MockVariableDebtTokenFactory, PriceOracleFactory, ReserveLogicFactory, + SelfdestructTransferFactory, StableDebtTokenFactory, VariableDebtTokenFactory, WalletBalanceProviderFactory, + Weth9Factory, + Weth9MockedFactory, + WethGatewayFactory, } from '../types'; import {withSaveAndVerify, registerContractInJsonDb, linkBytecode} from './contracts-helpers'; import {StableAndVariableTokensHelperFactory} from '../types/StableAndVariableTokensHelperFactory'; import {MockStableDebtToken} from '../types/MockStableDebtToken'; import {MockVariableDebtToken} from '../types/MockVariableDebtToken'; import {MintableDelegationErc20} from '../types/MintableDelegationErc20'; +import {SelfdestructTransfer} from '../types/SelfdestructTransfer'; export const deployLendingPoolAddressesProvider = async (verify?: boolean) => withSaveAndVerify( @@ -418,6 +423,17 @@ export const deployATokensAndRatesHelper = async ( verify ); +export const deployWETHGateway = async ( + args: [tEthereumAddress, tEthereumAddress], + verify?: boolean +) => + withSaveAndVerify( + await new WethGatewayFactory(await getFirstSigner()).deploy(...args), + eContractid.WETHGateway, + args, + verify + ); + export const deployMockStableDebtToken = async ( args: [tEthereumAddress, tEthereumAddress, string, string, tEthereumAddress], verify?: boolean @@ -429,6 +445,14 @@ export const deployMockStableDebtToken = async ( verify ); +export const deployWETHMocked = async (verify?: boolean) => + withSaveAndVerify( + await new Weth9MockedFactory(await getFirstSigner()).deploy(), + eContractid.WETHMocked, + [], + verify + ); + export const deployMockVariableDebtToken = async ( args: [tEthereumAddress, tEthereumAddress, string, string, tEthereumAddress], verify?: boolean @@ -450,3 +474,11 @@ export const deployMockAToken = async ( args, verify ); + +export const deploySelfdestructTransferMock = async (verify?: boolean) => + withSaveAndVerify( + await new SelfdestructTransferFactory(await getFirstSigner()).deploy(), + eContractid.SelfdestructTransferMock, + [], + verify + ); diff --git a/helpers/contracts-getters.ts b/helpers/contracts-getters.ts index ed411af5..713fb5cc 100644 --- a/helpers/contracts-getters.ts +++ b/helpers/contracts-getters.ts @@ -16,9 +16,13 @@ import { MockVariableDebtTokenFactory, PriceOracleFactory, ReserveLogicFactory, + SelfdestructTransferFactory, StableAndVariableTokensHelperFactory, StableDebtTokenFactory, VariableDebtTokenFactory, + Weth9Factory, + Weth9MockedFactory, + WethGatewayFactory, } from '../types'; import {Ierc20DetailedFactory} from '../types/Ierc20DetailedFactory'; import {MockTokenMap} from './contracts-helpers'; @@ -226,6 +230,19 @@ export const getATokensAndRatesHelper = async (address?: tEthereumAddress) => await getFirstSigner() ); +export const getWETHGateway = async (address?: tEthereumAddress) => + await WethGatewayFactory.connect( + address || + (await getDb().get(`${eContractid.WETHGateway}.${BRE.network.name}`).value()).address, + await getFirstSigner() + ); + +export const getWETHMocked = async (address?: tEthereumAddress) => + await Weth9MockedFactory.connect( + address || (await getDb().get(`${eContractid.WETHMocked}.${BRE.network.name}`).value()).address, + await getFirstSigner() + ); + export const getMockAToken = async (address?: tEthereumAddress) => await MockATokenFactory.connect( address || (await getDb().get(`${eContractid.MockAToken}.${BRE.network.name}`).value()).address, @@ -239,9 +256,18 @@ export const getMockVariableDebtToken = async (address?: tEthereumAddress) => .address, await getFirstSigner() ); + export const getMockStableDebtToken = async (address?: tEthereumAddress) => await MockStableDebtTokenFactory.connect( address || (await getDb().get(`${eContractid.MockStableDebtToken}.${BRE.network.name}`).value()).address, await getFirstSigner() ); + +export const getSelfdestructTransferMock = async (address?: tEthereumAddress) => + await SelfdestructTransferFactory.connect( + address || + (await getDb().get(`${eContractid.SelfdestructTransferMock}.${BRE.network.name}`).value()) + .address, + await getFirstSigner() + ); diff --git a/helpers/types.ts b/helpers/types.ts index bec26bdf..3670d880 100644 --- a/helpers/types.ts +++ b/helpers/types.ts @@ -59,6 +59,10 @@ export enum eContractid { TokenDistributor = 'TokenDistributor', StableAndVariableTokensHelper = 'StableAndVariableTokensHelper', ATokensAndRatesHelper = 'ATokensAndRatesHelper', + WETHGateway = 'WETHGateway', + WETH = 'WETH', + WETHMocked = 'WETHMocked', + SelfdestructTransferMock = 'SelfdestructTransferMock', } /* @@ -135,7 +139,7 @@ export enum ProtocolErrors { AT_INVALID_MINT_AMOUNT = '56', //invalid amount to mint LP_FAILED_REPAY_WITH_COLLATERAL = '57', AT_INVALID_BURN_AMOUNT = '58', //invalid amount to burn - LP_BORROW_ALLOWANCE_ARE_NOT_ENOUGH = '59', // User borrows on behalf, but allowance are too small + LP_BORROW_ALLOWANCE_NOT_ENOUGH = '59', // User borrows on behalf, but allowance are too small LP_FAILED_COLLATERAL_SWAP = '60', LP_INVALID_EQUAL_ASSETS_TO_SWAP = '61', LP_REENTRANCY_NOT_ALLOWED = '62', @@ -388,6 +392,7 @@ export interface ICommonConfiguration { ReservesConfig: iMultiPoolsAssets; ATokenDomainSeparator: iParamsPerNetwork; ProxyPriceProvider: iParamsPerNetwork; + WETH: iParamsPerNetwork; } export interface IAaveConfiguration extends ICommonConfiguration { diff --git a/package.json b/package.json index 83737b37..71561eb9 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "test-permit": "buidler test test/__setup.spec.ts test/atoken-permit.spec.ts", "test-stable-and-atokens": "buidler test test/__setup.spec.ts test/atoken-transfer.spec.ts test/stable-token.spec.ts", "test-subgraph:scenarios": "buidler --network buidlerevm_docker test test/__setup.spec.ts test/subgraph-scenarios.spec.ts", + "test-weth": "buidler test test/__setup.spec.ts test/weth-gateway.spec.ts", "dev:coverage": "buidler coverage --network coverage", "dev:deployment": "buidler dev-deployment", "dev:deployExample": "buidler deploy-Example", diff --git a/tasks/dev/5_initialize.ts b/tasks/dev/5_initialize.ts index 6d7db574..90368ab5 100644 --- a/tasks/dev/5_initialize.ts +++ b/tasks/dev/5_initialize.ts @@ -4,8 +4,14 @@ import { deployMockFlashLoanReceiver, deployWalletBalancerProvider, deployAaveProtocolTestHelpers, + deployWETHGateway, } from '../../helpers/contracts-deployments'; -import {getReservesConfigByPool} from '../../helpers/configuration'; +import { + ConfigNames, + getReservesConfigByPool, + getWethAddress, + loadPoolConfig, +} from '../../helpers/configuration'; import {tEthereumAddress, AavePools, eContractid} from '../../helpers/types'; import {waitForTx, filterMapBy} from '../../helpers/misc-utils'; @@ -16,22 +22,17 @@ import { } from '../../helpers/init-helpers'; import {getAllTokenAddresses} from '../../helpers/mock-helpers'; import {ZERO_ADDRESS} from '../../helpers/constants'; -import { - getAllMockedTokens, - getLendingPool, - getLendingPoolConfiguratorProxy, - getLendingPoolAddressesProvider, -} from '../../helpers/contracts-getters'; +import {getAllMockedTokens, getLendingPoolAddressesProvider} from '../../helpers/contracts-getters'; import {insertContractAddressInDb} from '../../helpers/contracts-helpers'; task('dev:initialize-lending-pool', 'Initialize lending pool configuration.') .addFlag('verify', 'Verify contracts at Etherscan') - .setAction(async ({verify}, localBRE) => { + .addParam('pool', `Pool name to retrieve configuration, supported: ${Object.values(ConfigNames)}`) + .setAction(async ({verify, pool}, localBRE) => { await localBRE.run('set-bre'); + const poolConfig = loadPoolConfig(pool); const mockTokens = await getAllMockedTokens(); - const lendingPoolProxy = await getLendingPool(); - const lendingPoolConfiguratorProxy = await getLendingPoolConfiguratorProxy(); const allTokenAddresses = getAllTokenAddresses(mockTokens); const addressesProvider = await getLendingPoolAddressesProvider(); @@ -77,4 +78,8 @@ task('dev:initialize-lending-pool', 'Initialize lending pool configuration.') await deployWalletBalancerProvider(addressesProvider.address, verify); await insertContractAddressInDb(eContractid.AaveProtocolTestHelpers, testHelpers.address); + + const lendingPoolAddress = await addressesProvider.getLendingPool(); + const wethAddress = await getWethAddress(poolConfig); + await deployWETHGateway([wethAddress, lendingPoolAddress]); }); diff --git a/tasks/full/5_initialize.ts b/tasks/full/5_initialize.ts index ddc789d1..c9ef9b3b 100644 --- a/tasks/full/5_initialize.ts +++ b/tasks/full/5_initialize.ts @@ -4,8 +4,9 @@ import { deployLendingPoolCollateralManager, deployWalletBalancerProvider, deployAaveProtocolTestHelpers, + deployWETHGateway, } from '../../helpers/contracts-deployments'; -import {loadPoolConfig, ConfigNames} from '../../helpers/configuration'; +import {loadPoolConfig, ConfigNames, getWethAddress} from '../../helpers/configuration'; import {eEthereumNetwork, ICommonConfiguration} from '../../helpers/types'; import {waitForTx} from '../../helpers/misc-utils'; import { @@ -14,11 +15,7 @@ import { enableReservesAsCollateralByHelper, } from '../../helpers/init-helpers'; import {exit} from 'process'; -import { - getLendingPool, - getLendingPoolConfiguratorProxy, - getLendingPoolAddressesProvider, -} from '../../helpers/contracts-getters'; +import {getLendingPoolAddressesProvider} from '../../helpers/contracts-getters'; import {ZERO_ADDRESS} from '../../helpers/constants'; task('full:initialize-lending-pool', 'Initialize lending pool configuration.') @@ -32,8 +29,6 @@ task('full:initialize-lending-pool', 'Initialize lending pool configuration.') const {ReserveAssets, ReservesConfig} = poolConfig as ICommonConfiguration; const reserveAssets = await getParamPerNetwork(ReserveAssets, network); - const lendingPoolProxy = await getLendingPool(); - const lendingPoolConfiguratorProxy = await getLendingPoolConfiguratorProxy(); const addressesProvider = await getLendingPoolAddressesProvider(); @@ -54,6 +49,11 @@ task('full:initialize-lending-pool', 'Initialize lending pool configuration.') ); await deployWalletBalancerProvider(addressesProvider.address, verify); + + const wethAddress = await getWethAddress(poolConfig); + const lendingPoolAddress = await addressesProvider.getLendingPool(); + + await deployWETHGateway([wethAddress, lendingPoolAddress]); } catch (err) { console.error(err); exit(1); diff --git a/tasks/migrations/aave.dev.ts b/tasks/migrations/aave.dev.ts index ed059686..3be0502e 100644 --- a/tasks/migrations/aave.dev.ts +++ b/tasks/migrations/aave.dev.ts @@ -30,7 +30,7 @@ task('aave:dev', 'Deploy development enviroment') await localBRE.run('dev:deploy-oracles', {verify, pool: POOL_NAME}); console.log('5. Initialize lending pool'); - await localBRE.run('dev:initialize-lending-pool', {verify}); + await localBRE.run('dev:initialize-lending-pool', {verify, pool: POOL_NAME}); console.log('\nFinished migration'); printContracts(); diff --git a/tasks/migrations/uniswap.dev.ts b/tasks/migrations/uniswap.dev.ts index e6c5b3e8..5ad2c544 100644 --- a/tasks/migrations/uniswap.dev.ts +++ b/tasks/migrations/uniswap.dev.ts @@ -29,7 +29,7 @@ task('uniswap:dev', 'Deploy development enviroment') await localBRE.run('dev:deploy-oracles', {verify, pool: POOL_NAME}); console.log('5. Initialize lending pool'); - await localBRE.run('dev:initialize-lending-pool', {verify}); + await localBRE.run('dev:initialize-lending-pool', {verify, pool: POOL_NAME}); console.log('\nFinished migration'); }); diff --git a/test/__setup.spec.ts b/test/__setup.spec.ts index 91eb6bd6..f412dec7 100644 --- a/test/__setup.spec.ts +++ b/test/__setup.spec.ts @@ -20,6 +20,8 @@ import { deployLendingRateOracle, deployStableAndVariableTokensHelper, deployATokensAndRatesHelper, + deployWETHGateway, + deployWETHMocked, } from '../helpers/contracts-deployments'; import {Signer} from 'ethers'; import {TokenContractId, eContractid, tEthereumAddress, AavePools} from '../helpers/types'; @@ -45,6 +47,7 @@ import { getLendingPoolConfiguratorProxy, getPairsTokenAggregator, } from '../helpers/contracts-getters'; +import {Weth9Mocked} from '../types/Weth9Mocked'; const MOCK_USD_PRICE_IN_WEI = AaveConfig.ProtocolGlobalParams.MockUsdPriceInWei; const ALL_ASSETS_INITIAL_PRICES = AaveConfig.Mocks.AllAssetsInitialPrices; @@ -53,12 +56,17 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = AaveConfig.Mocks.ChainlinkAggregatorPr const LENDING_RATE_ORACLE_RATES_COMMON = AaveConfig.LendingRateOracleRatesCommon; const deployAllMockTokens = async (deployer: Signer) => { - const tokens: {[symbol: string]: MockContract | MintableERC20} = {}; + const tokens: {[symbol: string]: MockContract | MintableERC20 | Weth9Mocked} = {}; const protoConfigData = getReservesConfigByPool(AavePools.proto); const secondaryConfigData = getReservesConfigByPool(AavePools.secondary); for (const tokenSymbol of Object.keys(TokenContractId)) { + if (tokenSymbol === 'WETH') { + tokens[tokenSymbol] = await deployWETHMocked(); + await registerContractInJsonDb(tokenSymbol.toUpperCase(), tokens[tokenSymbol]); + continue; + } let decimals = 18; let configData = (protoConfigData)[tokenSymbol]; @@ -104,8 +112,8 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => { await waitForTx(await addressesProvider.setLendingPoolImpl(lendingPoolImpl.address)); - const address = await addressesProvider.getLendingPool(); - const lendingPoolProxy = await getLendingPool(address); + const lendingPoolAddress = await addressesProvider.getLendingPool(); + const lendingPoolProxy = await getLendingPool(lendingPoolAddress); await insertContractAddressInDb(eContractid.LendingPool, lendingPoolProxy.address); @@ -249,6 +257,8 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => { await deployWalletBalancerProvider(addressesProvider.address); + await deployWETHGateway([mockTokens.WETH.address, lendingPoolAddress]); + console.timeEnd('setup'); }; diff --git a/test/flashloan.spec.ts b/test/flashloan.spec.ts index 387a091a..887479a8 100644 --- a/test/flashloan.spec.ts +++ b/test/flashloan.spec.ts @@ -24,7 +24,7 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => { LP_INVALID_FLASHLOAN_MODE, SAFEERC20_LOWLEVEL_CALL, LP_INVALID_FLASH_LOAN_EXECUTOR_RETURN, - LP_BORROW_ALLOWANCE_ARE_NOT_ENOUGH, + LP_BORROW_ALLOWANCE_NOT_ENOUGH, } = ProtocolErrors; before(async () => { @@ -443,7 +443,7 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => { '0x10', '0' ) - ).to.be.revertedWith(LP_BORROW_ALLOWANCE_ARE_NOT_ENOUGH); + ).to.be.revertedWith(LP_BORROW_ALLOWANCE_NOT_ENOUGH); }); it('Caller takes a WETH flashloan with mode = 1 onBehalfOf user with allowance. A loan for onBehalfOf is creatd.', async () => { diff --git a/test/helpers/make-suite.ts b/test/helpers/make-suite.ts index 07a7532a..f8b2656c 100644 --- a/test/helpers/make-suite.ts +++ b/test/helpers/make-suite.ts @@ -9,6 +9,8 @@ import { getLendingPoolConfiguratorProxy, getPriceOracle, getLendingPoolAddressesProviderRegistry, + getWETHMocked, + getWETHGateway, } from '../../helpers/contracts-getters'; import {tEthereumAddress} from '../../helpers/types'; import {LendingPool} from '../../types/LendingPool'; @@ -25,8 +27,14 @@ import {PriceOracle} from '../../types/PriceOracle'; import {LendingPoolAddressesProvider} from '../../types/LendingPoolAddressesProvider'; import {LendingPoolAddressesProviderRegistry} from '../../types/LendingPoolAddressesProviderRegistry'; import {getEthersSigners} from '../../helpers/contracts-helpers'; +import {Weth9} from '../../types/Weth9'; +import {Weth9Mocked} from '../../types/Weth9Mocked'; +import {WethGateway} from '../../types/WethGateway'; +import {solidity} from 'ethereum-waffle'; + chai.use(bignumberChai()); chai.use(almostEqual()); +chai.use(solidity); export interface SignerWithAddress { signer: Signer; @@ -39,7 +47,7 @@ export interface TestEnv { configurator: LendingPoolConfigurator; oracle: PriceOracle; helpersContract: AaveProtocolTestHelpers; - weth: MintableERC20; + weth: Weth9Mocked; aWETH: AToken; dai: MintableERC20; aDai: AToken; @@ -47,6 +55,7 @@ export interface TestEnv { aave: MintableERC20; addressesProvider: LendingPoolAddressesProvider; registry: LendingPoolAddressesProviderRegistry; + wethGateway: WethGateway; } let buidlerevmSnapshotId: string = '0x1'; @@ -63,7 +72,7 @@ const testEnv: TestEnv = { configurator: {} as LendingPoolConfigurator, helpersContract: {} as AaveProtocolTestHelpers, oracle: {} as PriceOracle, - weth: {} as MintableERC20, + weth: {} as Weth9Mocked, aWETH: {} as AToken, dai: {} as MintableERC20, aDai: {} as AToken, @@ -71,6 +80,7 @@ const testEnv: TestEnv = { aave: {} as MintableERC20, addressesProvider: {} as LendingPoolAddressesProvider, registry: {} as LendingPoolAddressesProviderRegistry, + wethGateway: {} as WethGateway, } as TestEnv; export async function initializeMakeSuite() { @@ -125,7 +135,8 @@ export async function initializeMakeSuite() { testEnv.dai = await getMintableErc20(daiAddress); testEnv.usdc = await getMintableErc20(usdcAddress); testEnv.aave = await getMintableErc20(aaveAddress); - testEnv.weth = await getMintableErc20(wethAddress); + testEnv.weth = await getWETHMocked(wethAddress); + testEnv.wethGateway = await getWETHGateway(); } export function makeSuite(name: string, tests: (testEnv: TestEnv) => void) { diff --git a/test/liquidation-atoken.spec.ts b/test/liquidation-atoken.spec.ts index 8d4ba803..78b97842 100644 --- a/test/liquidation-atoken.spec.ts +++ b/test/liquidation-atoken.spec.ts @@ -96,7 +96,10 @@ makeSuite('LendingPool liquidation - liquidator receiving aToken', (testEnv) => const userGlobalData = await pool.getUserAccountData(borrower.address); - expect(userGlobalData.healthFactor.toString()).to.be.bignumber.lt(oneEther, INVALID_HF); + expect(userGlobalData.healthFactor.toString()).to.be.bignumber.lt( + oneEther.toString(), + INVALID_HF + ); }); it('LIQUIDATION - Tries to liquidate a different currency than the loan principal', async () => { diff --git a/test/weth-gateway.spec.ts b/test/weth-gateway.spec.ts new file mode 100644 index 00000000..f201a218 --- /dev/null +++ b/test/weth-gateway.spec.ts @@ -0,0 +1,310 @@ +import {MAX_UINT_AMOUNT} from '../helpers/constants'; +import {convertToCurrencyDecimals} from '../helpers/contracts-helpers'; +import {makeSuite, TestEnv} from './helpers/make-suite'; +import {formatEther, parseEther, parseUnits} from 'ethers/lib/utils'; +import {BRE, waitForTx} from '../helpers/misc-utils'; +import {BigNumber} from 'ethers'; +import {getStableDebtToken, getVariableDebtToken} from '../helpers/contracts-getters'; +import {WethGateway} from '../types/WethGateway'; +import {use} from 'chai'; +import {deploySelfdestructTransferMock} from '../helpers/contracts-deployments'; + +const {expect} = require('chai'); + +makeSuite('Use native ETH at LendingPool via WETHGateway', (testEnv: TestEnv) => { + const zero = BigNumber.from('0'); + const depositSize = parseEther('5'); + + it('Deposit WETH', async () => { + const {users, wethGateway, aWETH, pool} = testEnv; + + const user = users[1]; + + // Deposit with native ETH + await wethGateway.connect(user.signer).depositETH(user.address, '0', {value: depositSize}); + + const aTokensBalance = await aWETH.balanceOf(user.address); + + expect(aTokensBalance).to.be.gt(zero); + expect(aTokensBalance).to.be.gte(depositSize); + }); + + it('Withdraw WETH - Partial', async () => { + const {users, wethGateway, aWETH, pool} = testEnv; + + const user = users[1]; + const priorEthersBalance = await user.signer.getBalance(); + const aTokensBalance = await aWETH.balanceOf(user.address); + + expect(aTokensBalance).to.be.gt(zero, 'User should have aTokens.'); + + // Partially withdraw native ETH + const partialWithdraw = await convertToCurrencyDecimals(aWETH.address, '2'); + + // Approve the aTokens to Gateway so Gateway can withdraw and convert to Ether + const approveTx = await aWETH + .connect(user.signer) + .approve(wethGateway.address, MAX_UINT_AMOUNT); + const {gasUsed: approveGas} = await waitForTx(approveTx); + + // Partial Withdraw and send native Ether to user + const {gasUsed: withdrawGas} = await waitForTx( + await wethGateway.connect(user.signer).withdrawETH(partialWithdraw, user.address) + ); + + const afterPartialEtherBalance = await user.signer.getBalance(); + const afterPartialATokensBalance = await aWETH.balanceOf(user.address); + const gasCosts = approveGas.add(withdrawGas).mul(approveTx.gasPrice); + + expect(afterPartialEtherBalance).to.be.equal( + priorEthersBalance.add(partialWithdraw).sub(gasCosts), + 'User ETHER balance should contain the partial withdraw' + ); + expect(afterPartialATokensBalance).to.be.equal( + aTokensBalance.sub(partialWithdraw), + 'User aWETH balance should be substracted' + ); + }); + + it('Withdraw WETH - Full', async () => { + const {users, aWETH, wethGateway, pool} = testEnv; + + const user = users[1]; + const priorEthersBalance = await user.signer.getBalance(); + const aTokensBalance = await aWETH.balanceOf(user.address); + + expect(aTokensBalance).to.be.gt(zero, 'User should have aTokens.'); + + // Approve the aTokens to Gateway so Gateway can withdraw and convert to Ether + const approveTx = await aWETH + .connect(user.signer) + .approve(wethGateway.address, MAX_UINT_AMOUNT); + const {gasUsed: approveGas} = await waitForTx(approveTx); + + // Full withdraw + const {gasUsed: withdrawGas} = await waitForTx( + await wethGateway.connect(user.signer).withdrawETH(MAX_UINT_AMOUNT, user.address) + ); + + const afterFullEtherBalance = await user.signer.getBalance(); + const afterFullATokensBalance = await aWETH.balanceOf(user.address); + const gasCosts = approveGas.add(withdrawGas).mul(approveTx.gasPrice); + + expect(afterFullEtherBalance).to.be.eq( + priorEthersBalance.add(aTokensBalance).sub(gasCosts), + 'User ETHER balance should contain the full withdraw' + ); + expect(afterFullATokensBalance).to.be.eq(0, 'User aWETH balance should be zero'); + }); + + it('Borrow stable WETH and Full Repay with ETH', async () => { + const {users, wethGateway, aWETH, weth, pool, helpersContract} = testEnv; + const borrowSize = parseEther('1'); + const repaySize = borrowSize.add(borrowSize.mul(5).div(100)); + const user = users[1]; + + const {stableDebtTokenAddress} = await helpersContract.getReserveTokensAddresses(weth.address); + + const stableDebtToken = await getStableDebtToken(stableDebtTokenAddress); + + // Deposit with native ETH + await wethGateway.connect(user.signer).depositETH(user.address, '0', {value: depositSize}); + + const aTokensBalance = await aWETH.balanceOf(user.address); + + expect(aTokensBalance).to.be.gt(zero); + expect(aTokensBalance).to.be.gte(depositSize); + + // Borrow WETH with WETH as collateral + await waitForTx( + await pool.connect(user.signer).borrow(weth.address, borrowSize, '1', '0', user.address) + ); + + const debtBalance = await stableDebtToken.balanceOf(user.address); + + expect(debtBalance).to.be.gt(zero); + + // Full Repay WETH with native ETH + await waitForTx( + await wethGateway + .connect(user.signer) + .repayETH(MAX_UINT_AMOUNT, '1', user.address, {value: repaySize}) + ); + + const debtBalanceAfterRepay = await stableDebtToken.balanceOf(user.address); + expect(debtBalanceAfterRepay).to.be.eq(zero); + }); + + it('Borrow variable WETH and Full Repay with ETH', async () => { + const {users, wethGateway, aWETH, weth, pool, helpersContract} = testEnv; + const borrowSize = parseEther('1'); + const repaySize = borrowSize.add(borrowSize.mul(5).div(100)); + const user = users[1]; + + const {variableDebtTokenAddress} = await helpersContract.getReserveTokensAddresses( + weth.address + ); + + const varDebtToken = await getVariableDebtToken(variableDebtTokenAddress); + + // Deposit with native ETH + await wethGateway.connect(user.signer).depositETH(user.address, '0', {value: depositSize}); + + const aTokensBalance = await aWETH.balanceOf(user.address); + + expect(aTokensBalance).to.be.gt(zero); + expect(aTokensBalance).to.be.gte(depositSize); + + // Borrow WETH with WETH as collateral + await waitForTx( + await pool.connect(user.signer).borrow(weth.address, borrowSize, '2', '0', user.address) + ); + + const debtBalance = await varDebtToken.balanceOf(user.address); + + expect(debtBalance).to.be.gt(zero); + + // Partial Repay WETH loan with native ETH + const partialPayment = repaySize.div(2); + await waitForTx( + await wethGateway + .connect(user.signer) + .repayETH(partialPayment, '2', user.address, {value: partialPayment}) + ); + + const debtBalanceAfterPartialRepay = await varDebtToken.balanceOf(user.address); + expect(debtBalanceAfterPartialRepay).to.be.lt(debtBalance); + + // Full Repay WETH loan with native ETH + await waitForTx( + await wethGateway + .connect(user.signer) + .repayETH(MAX_UINT_AMOUNT, '2', user.address, {value: repaySize}) + ); + const debtBalanceAfterFullRepay = await varDebtToken.balanceOf(user.address); + expect(debtBalanceAfterFullRepay).to.be.eq(zero); + }); + + it('Should revert if receiver function receives Ether if not WETH', async () => { + const {users, wethGateway} = testEnv; + const user = users[0]; + const amount = parseEther('1'); + + // Call receiver function (empty data + value) + await expect( + user.signer.sendTransaction({ + to: wethGateway.address, + value: amount, + gasLimit: BRE.network.config.gas, + }) + ).to.be.revertedWith('Receive not allowed'); + }); + + it('Should revert if fallback functions is called with Ether', async () => { + const {users, wethGateway} = testEnv; + const user = users[0]; + const amount = parseEther('1'); + const fakeABI = ['function wantToCallFallback()']; + const abiCoder = new BRE.ethers.utils.Interface(fakeABI); + const fakeMethodEncoded = abiCoder.encodeFunctionData('wantToCallFallback', []); + + // Call fallback function with value + await expect( + user.signer.sendTransaction({ + to: wethGateway.address, + data: fakeMethodEncoded, + value: amount, + gasLimit: BRE.network.config.gas, + }) + ).to.be.revertedWith('Fallback not allowed'); + }); + + it('Should revert if fallback functions is called', async () => { + const {users, wethGateway} = testEnv; + const user = users[0]; + + const fakeABI = ['function wantToCallFallback()']; + const abiCoder = new BRE.ethers.utils.Interface(fakeABI); + const fakeMethodEncoded = abiCoder.encodeFunctionData('wantToCallFallback', []); + + // Call fallback function without value + await expect( + user.signer.sendTransaction({ + to: wethGateway.address, + data: fakeMethodEncoded, + gasLimit: BRE.network.config.gas, + }) + ).to.be.revertedWith('Fallback not allowed'); + }); + + it('Getters should retrieve correct state', async () => { + const {aWETH, weth, pool, wethGateway} = testEnv; + + const WETHAddress = await wethGateway.getWETHAddress(); + const aWETHAddress = await wethGateway.getAWETHAddress(); + const poolAddress = await wethGateway.getLendingPoolAddress(); + + expect(WETHAddress).to.be.equal(weth.address); + expect(aWETHAddress).to.be.equal(aWETH.address); + expect(poolAddress).to.be.equal(pool.address); + }); + + it('Owner can do emergency token recovery', async () => { + const {users, dai, wethGateway, deployer} = testEnv; + const user = users[0]; + const amount = parseEther('1'); + + await dai.connect(user.signer).mint(amount); + const daiBalanceAfterMint = await dai.balanceOf(user.address); + + await dai.connect(user.signer).transfer(wethGateway.address, amount); + const daiBalanceAfterBadTransfer = await dai.balanceOf(user.address); + expect(daiBalanceAfterBadTransfer).to.be.eq( + daiBalanceAfterMint.sub(amount), + 'User should have lost the funds here.' + ); + + await wethGateway + .connect(deployer.signer) + .emergencyTokenTransfer(dai.address, user.address, amount); + const daiBalanceAfterRecovery = await dai.balanceOf(user.address); + + expect(daiBalanceAfterRecovery).to.be.eq( + daiBalanceAfterMint, + 'User should recover the funds due emergency token transfer' + ); + }); + + it('Owner can do emergency native ETH recovery', async () => { + const {users, wethGateway, deployer} = testEnv; + const user = users[0]; + const amount = parseEther('1'); + const userBalancePriorCall = await user.signer.getBalance(); + + // Deploy contract with payable selfdestruct contract + const selfdestructContract = await deploySelfdestructTransferMock(); + + // Selfdestruct the mock, pointing to WETHGateway address + const callTx = await selfdestructContract + .connect(user.signer) + .destroyAndTransfer(wethGateway.address, {value: amount}); + const {gasUsed} = await waitForTx(callTx); + const gasFees = gasUsed.mul(callTx.gasPrice); + const userBalanceAfterCall = await user.signer.getBalance(); + + expect(userBalanceAfterCall).to.be.eq(userBalancePriorCall.sub(amount).sub(gasFees), ''); + 'User should have lost the funds'; + + // Recover the funds from the contract and sends back to the user + await wethGateway.connect(deployer.signer).emergencyEtherTransfer(user.address, amount); + + const userBalanceAfterRecovery = await user.signer.getBalance(); + const wethGatewayAfterRecovery = await BRE.ethers.provider.getBalance(wethGateway.address); + + expect(userBalanceAfterRecovery).to.be.eq( + userBalancePriorCall.sub(gasFees), + 'User should recover the funds due emergency eth transfer.' + ); + expect(wethGatewayAfterRecovery).to.be.eq('0', 'WETHGateway ether balance should be zero.'); + }); +});