Commit Graph

434 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
80d09848b3 Prevent buidler.config.ts to load constants and not depend from types, to allow clean repository to compile and generate types. 2020-09-15 13:25:27 +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
41978a9ee5 Fix ci package lock 2020-09-15 12:44:59 +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
The-3D
227c0b4962 Merge branch '30-collateral-swap' into 'master'
Resolve "Collateral swap"

Closes #30

See merge request aave-tech/protocol-v2!38
2020-09-15 08:51:34 +00: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
The-3D
155d249abf Merge branch 'fix/35-isActive-liquidations' into 'master'
Fixes #35

Closes #35

See merge request aave-tech/protocol-v2!43
2020-09-14 19:34:24 +00:00
eboado
fb15afda8e Merge branch 'master' into fix/35-isActive-liquidations 2020-09-14 21:31:22 +02:00