Commit Graph

769 Commits

Author SHA1 Message Date
The3D
7c5de62910 Merge branch 'master' into 40-refactor-the-storage-of-lp 2020-09-21 09:31:54 +02:00
The3D
52033bae21 Added console logs 2020-09-18 18:03:38 +02:00
The3D
5868a4844f Updated testsW 2020-09-18 17:56:33 +02:00
The3D
13f6c264b3 Partially fixed repay tests 2020-09-17 19:05:22 +02:00
The3D
72e2102529 removed other console.log 2020-09-17 16:40:23 +02:00
The3D
6df8a7a6e0 Removed console.log 2020-09-17 16:38:15 +02:00
The3D
bfe0657b1a Updated code to fix deposit and withdraw tests 2020-09-17 16:37:51 +02:00
The3D
e4890a14c2 Merge branch 'master' into fix/34 2020-09-17 11:55:38 +02:00
The3D
5c6a8b0926 Merge branch 'master' of gitlab.com:aave-tech/protocol-v2 2020-09-17 11:52:27 +02:00
The3D
5b38bb144b Updated borrow calculations on scenarios 2020-09-17 11:52:10 +02:00
The3D
7986a4704b Fixed mintToTreasury function 2020-09-17 10:53:55 +02:00
The3D
bcdef6fa7e Added change to the stabledebttoken 2020-09-16 20:00:13 +02:00
The3D
5c2ec07b70 Fixes #42 2020-09-16 17:12:07 +02:00
The-3D
faf15605bf Merge branch '41-rename-liqudiationmanager' into 'master'
Misc renaming

Closes #41

See merge request aave-tech/protocol-v2!52
2020-09-16 14:45:52 +00:00
The3D
570a81a1b2 Fixed aToken deployment function 2020-09-16 16:44:27 +02:00
The3D
274b63713d Merge branch 'master' into fix/34 2020-09-16 16:34:29 +02:00
andyk
9594571761 Merge branch 'master' into 41-rename-liqudiationmanager 2020-09-16 15:22:55 +01:00
The3D
d06e3a39fc Merge branch 'master' of gitlab.com:aave-tech/protocol-v2 2020-09-16 16:04:19 +02:00
andyk
373bac109b small comments fixes 2020-09-16 15:45:49 +03:00
andyk
2a6248c6d2 misc renaming 2020-09-16 15:09:42 +03: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
Ernesto Boado
9b2380c5bd Merge branch 'fix/no-swap-to-freezed' into 'master'
Disallow liquiditySwap with freezed reserve as to

See merge request aave-tech/protocol-v2!50
2020-09-16 11:15:48 +00:00
andyk
66113d64a2 rename LendingPoolLiquidationManager -> LendingPoolCollateralManager 2020-09-16 13:41:12 +03: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
77c812b975 Refactor the storage of lendingpool to LendingPoolStorage parent contract 2020-09-16 13:16:51 +03:00
andyk
1b61edc6ff add tests on liquiditySwap validation logic 2020-09-16 11:10:25 +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
5b7b4c517f fix ci:test env 2020-09-15 18:25:34 +03:00
David Racero
6cbcf39454 Fixed conflicts and merge changes 2020-09-15 17:24:50 +02:00
andyk
ee6d017439 update package-lock 2020-09-15 18:11:43 +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
1a7933762f fix Upgradeability tests setup 2020-09-15 17:13:29 +03:00
andyk
84cf68e58e fix deployment and tests 2020-09-15 17:02:21 +03:00
andyk
43c8ef02db initial integration of pei, no tests 2020-09-15 16:53:20 +03:00
Ernesto Boado
6177af3a70 Merge branch 'feat/pausable' into 'master'
Resolve "Add `pause` boolean affecting all actions on the LendingPool and aToken"

Closes #37

See merge request aave-tech/protocol-v2!44
2020-09-15 13:46:53 +00: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
Ernesto Boado
c64c4b732b Merge branch 'fix/39' into 'master'
Resolve "Fix events on the debt side"

Closes #39

See merge request aave-tech/protocol-v2!48
2020-09-15 13:21:32 +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
Ernesto Boado
0beed34b66 Merge branch 'fix/38' into 'master'
Resolve "Fix events on AToken"

Closes #38

See merge request aave-tech/protocol-v2!46
2020-09-15 12:51:20 +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
88ac98ab76 Fixes package-lock ci mistmatch. Fixes buidler config to prevent load types prior compilation. 2020-09-15 14:30:45 +02:00