279 Commits

Author	SHA1	Message	Date
The3D	274b63713d	Merge branch 'master' into fix/34	2020-09-16 16:34:29 +02:00
The3D	d06e3a39fc	Merge branch 'master' of gitlab.com:aave-tech/protocol-v2	2020-09-16 16:04:19 +02:00
Ernesto Boado	b182731074	Merge branch 'feat/pei-integration' into 'master' ... Integration of pei See merge request aave-tech/protocol-v2!49	2020-09-16 11:17:05 +00:00
andyk	83e0318bc6	add logic to set usageAsCollateralEnabled for the user if his balance was 0 before swap	2020-09-16 13:30:57 +03:00
andyk	214c51f365	disallow liquiditySwap with freezed reserve as to	2020-09-16 10:22:46 +03:00
The3D	d873b63082	Removed unused flashloan vars	2020-09-15 18:54:59 +02:00
The3D	04a67d3df0	updated stabledebttoken	2020-09-15 18:49:53 +02:00
andyk	125644cc54	Merge branch 'master' into feat/pei-integration	2020-09-15 18:43:55 +03:00
andyk	fba2f03c03	rename ERC20 to IncentivizedERC20	2020-09-15 18:08:28 +03:00
andyk	6af1e0923f	fix _incentivesController call in _transfer	2020-09-15 17:49:53 +03:00
andyk	3340bb14fb	typo 0x0 -> 0	2020-09-15 17:40:40 +03:00
andyk	43c8ef02db	initial integration of pei, no tests	2020-09-15 16:53:20 +03:00
eboado	aef8e68ce0	- Changed _paused visibility and added getter.	2020-09-15 15:46:19 +02:00
The3D	c6a3588792	Merge branch 'master' into fix/34	2020-09-15 15:33:09 +02:00
David Racero	89ca48e0b2	Merge branch 'master' into 'feat/pausable' ... # Conflicts: # contracts/tokenization/AToken.sol	2020-09-15 13:27:21 +00:00
The3D	3c3a01b80f	Updated events on debt tokens	2020-09-15 15:20:32 +02:00
Ernesto Boado	191f65c7f0	Merge branch 'feat/modifier-to-function' into 'master' ... Change modifier to function to save code size See merge request aave-tech/protocol-v2!47	2020-09-15 12:53:28 +00:00
The3D	b963afb0fb	Updated AToken, ERC20	2020-09-15 14:36:02 +02:00
David Racero	0150ba70e7	Merge feat/modifier-to-function fixes	2020-09-15 14:35:50 +02:00
David Racero	bfc46daadd	Change modifier to function to save code size	2020-09-15 14:25:00 +02:00
David Racero	38bec0b8de	Save some extra codesize.	2020-09-15 14:21:17 +02:00
David Racero	aa834ee904	Added missing whenNotPaused to new functions. Changed IS_PAUSED error code to 58 to prevent error collision. Added new pausable tests.	2020-09-15 13:13:28 +02:00
David Racero	83bf3e5677	Trim PausablePool into LendingPool to save code size.	2020-09-15 11:56:08 +02:00
David Racero	eea47aedde	Minimize Pausable contract	2020-09-15 11:03:04 +02:00
David Racero	6842978706	Merge and fix conflicts	2020-09-15 10:57:04 +02:00
eboado	0c94b24700	- Fixed description on swapLiquidity().	2020-09-15 10:43:22 +02:00
eboado	59996e1ece	- Refactor validation of swapLiquidity() to ValidationLogic. ... - Added extra check on active reserves on swapLiquidity().	2020-09-15 10:28:39 +02:00
eboado	8d391b9ab5	Merge branch 'master' into 30-collateral-swap	2020-09-15 09:56:41 +02:00
eboado	172cb05b64	- Renamed collateralSwap() to swapDeposit(). ... - Added docs to sw	2020-09-15 09:51:23 +02:00
The3D	f428f69ebd	Merge branch 'master' into fix/34	2020-09-15 09:34:00 +02:00
andyk	65775ca3bf	update collateralSwap signature in the delegate call	2020-09-15 09:46:24 +03:00
eboado	fb15afda8e	Merge branch 'master' into fix/35-isActive-liquidations	2020-09-14 21:31:22 +02:00
eboado	c4904bc41c	Merge branch 'master' into 30-collateral-swap	2020-09-14 21:06:16 +02:00
David Racero	59bfdc39f2	Fix conflicts	2020-09-14 19:59:00 +02:00
David Racero	4ec61ee993	When transfer, check pause at pool to save one external call.	2020-09-14 19:46:27 +02:00
The3D	d542f098c1	fixed deposit, withdraw tests	2020-09-14 19:25:45 +02:00
eboado	0d36eab807	Merge branch 'master' into feat/36-permit-atoken	2020-09-14 17:27:12 +02:00
eboado	721dc1c832	- Fixed comment on permit().	2020-09-14 17:27:08 +02:00
eboado	a87dae445f	Merge branch 'master' into 33-add-native-credit-delegation	2020-09-14 17:24:55 +02:00
eboado	6d96be5f42	- Added extra natspecs	2020-09-14 17:18:57 +02:00
andyk	9d757aaa37	fix docustring	2020-09-14 17:57:59 +03:00
David Racero	64066a14ec	Rename IS_ACTIVE to NOT_PAUSED error.	2020-09-14 16:09:57 +02:00
eboado	c531b87703	Merge branch 'master' into feat/36-permit-atoken	2020-09-14 16:02:53 +02:00
David Racero	98ed475000	Remove Context and account from PausablePool events.	2020-09-14 15:59:11 +02:00
eboado	748312cf20	- Added permit() to aToken.	2020-09-14 15:57:11 +02:00
David Racero	775d003cc0	Keep standard paused() name function.	2020-09-14 15:33:24 +02:00
David Racero	6e0091a668	Added PausablePool contract to support errors by number.	2020-09-14 15:24:30 +02:00
andyk	7c67e0221c	extra comment	2020-09-14 16:16:54 +03:00
The3D	b2ec4dd2fa	Renamed totalBorrowsStable, totalBorrowsVariable	2020-09-14 15:13:30 +02:00
The3D	bb4e1b5c4b	Fixed errors	2020-09-14 15:09:16 +02:00