Commit Graph

350 Commits

Author SHA1 Message Date
The3D
b7c4a255a9 Refactored aToken 2020-09-21 15:58:19 +02:00
The3D
6f9ff11e49 Fixed credit delegation tests 2020-09-21 15:35:22 +02:00
The3D
c7f0dfbaa9 Merge branch 'master' into fix/34 2020-09-21 10:03:18 +02:00
The3D
7c5de62910 Merge branch 'master' into 40-refactor-the-storage-of-lp 2020-09-21 09:31:54 +02:00
The3D
5868a4844f Updated testsW 2020-09-18 17:56:33 +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
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
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
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
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
David Racero
6cbcf39454 Fixed conflicts and merge changes 2020-09-15 17:24:50 +02: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
5af23057fa Fix conflicts. 2020-09-14 15:53:34 +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
andyk
35bff4bea2 add comment for getDebtTokenAddress function 2020-09-14 15:50:46 +03:00
andyk
d135c25b39 add borrowRateMode check on credit delegation 2020-09-14 15:41:44 +03:00
David Racero
b8a7237458 Remove whenNotPaused modifier for configurator functions. Added more test cases. 2020-09-14 14:36:12 +02:00
David Racero
4a6517dce1 Inherit Pausable from LendingPoolLiquidationManager to match same storage layout as LendingPool. 2020-09-14 13:17:06 +02:00
David Racero
bbc11eb092 Added pausable to Pool actions and aTokens at transfer, triggered by LendingPoolConfigurator. Added basic test to aToken transfer. 2020-09-14 13:03:39 +02:00
andyk
c0c3133763 makecredit delegation per debt token 2020-09-14 13:52:05 +03:00
The3D
6e92575ac2 add code to _mintToTreasury 2020-09-14 11:41:14 +02:00
The3D
13f77ec0d2 Fixed repay 2020-09-14 11:34:40 +02:00
The3D
d1ffac6380 Merge branch 'master' into fix/34 2020-09-14 11:33:34 +02:00
The3D
a64edb3011 Removed interest redirection leftovers 2020-09-14 11:13:53 +02:00
The3D
5061aab9cc Added the total supply on stable debt token 2020-09-14 11:09:47 +02:00
eboado
e2500d1532 - Refactored validation logic of liquidationCall() and repayWithCollateral() to ValidationLogic. 2020-09-14 10:52:31 +02:00
David Racero
1fbe84df49 Remove unused parameter to allow compilation without optimization for coverage. 2020-09-14 10:46:57 +02:00
The3D
3c8018fab9 Cleaned up code, converted addressesProvider to immutable in LendingPool 2020-09-14 10:43:30 +02:00
The3D
fc2852e94e Rename updateIndexesAndTimestamp to updateState 2020-09-14 09:53:21 +02:00
The3D
162c7924a9 Added index to mint and burn of variableDebtToken 2020-09-14 09:33:53 +02:00
The3D
dbf1a0b9e7 Merge branch 'master' into fix/34 2020-09-14 09:22:39 +02:00
eboado
7a8a0d6ac5 Merge branch 'master' into 30-collateral-swap 2020-09-14 08:58:37 +02:00
The3D
f3856bac12 Refactored variable names, reordered the ReserveData struct 2020-09-13 11:58:45 +02:00
The3D
edfcdd6db4 Removed timestamp from stableDebtToken 2020-09-13 10:58:36 +02:00
eboado
0911f907a8 Fixes #35 2020-09-13 10:08:14 +02:00
The3D
70e1f88ce4 removed comment 2020-09-12 13:19:41 +02:00
The3D
0d9a18813f Added optimization on mint and burn 2020-09-12 13:18:17 +02:00
The3D
7383fc9786 Merge branch 'master' into fix/29 2020-09-11 16:47:47 +02:00
The3D
b5efaa740f Added total supply timestamp on the stable debt token 2020-09-11 15:22:54 +02:00
David Racero
4058a7284c Update storage layout of LendingPoolLiquidationManager to add new mapping from LendingPool. Fixes delegatecall liquidation error. 2020-09-11 12:59:19 +02:00
eboado
f355ae219f Merge branch 'master' into 33-add-native-credit-delegation 2020-09-11 11:25:42 +02:00
eboado
d3f9cd2191 Merge branch 'master' into 32-deposit-on-behalf-of 2020-09-10 21:40:26 +02:00
David Racero
167f02533f Delete "if" condition due always will be true. Delete unreachable "else" code at repayWithCollateral. 2020-09-10 13:30:57 +00:00
The3D
73d7ca001c added configurator tests 2020-09-10 13:52:07 +02:00
The3D
3563f1379d Updated configurator for the reserve factor 2020-09-10 13:26:02 +02:00