Commit Graph

823 Commits

Author SHA1 Message Date
David Racero
49d991b908 pull: pull from feat/curve-treasury and fix conflicts 2021-07-05 17:55:26 +02:00
David Racero
e9174e34fb Merge branch 'feat/curve-treasury' of github.com:aave/protocol-v2 into feat/curve-treasury 2021-06-30 17:41:24 +02:00
David Racero
ed95181e8a remove: console.log from CurveTreasury 2021-06-30 17:41:15 +02:00
David Racero
dba3dd8e6b
Merge branch 'master' into feat/curve-treasury 2021-06-30 17:22:27 +02:00
David Racero
2b92dc8119 remove: Remove console.sol imports 2021-06-30 17:15:54 +02:00
David Racero
5e66335375 feat: Detect extra rewards at AToken when deposit and withdrawal of Curve gauge tokens. 2021-06-30 17:15:01 +02:00
David Racero
5b56182157 feat: adapted prior curve reward aware token tests. Added 3pool support. 2021-06-22 19:10:44 +02:00
David Racero
b5ba303e8f wip: Fix Curve tests to use underlying pool tokens instead of gauges 2021-06-22 13:54:30 +02:00
David Racero
53dc34abd7 feat: added deploy scripts 2021-06-16 12:52:00 +02:00
sendra
5f34943922 fix incentives order 2021-06-16 12:47:12 +02:00
David Racero
8d52a520b0 feat: Adapt reward tokens to Curve Treasury. 2021-06-14 12:06:55 +02:00
sendra
59e5bf418c updated comments 2021-06-14 11:45:56 +02:00
David Racero
d178cc1cea feat: Added first iteration of CurveTreasury.sol to handle Curve LP token gauges 2021-06-09 12:43:16 +02:00
sendra
191e5b4319 case for when there is no user 2021-06-08 15:27:57 +02:00
sendra
07ea0e6434 pulled from master, and solved conflicts 2021-06-07 13:45:34 +02:00
sendra
6319733e82 added 0 address check in case we dont have incentives controller 2021-06-07 13:39:34 +02:00
Lasse Herskind
ad8d1ea817 fix: Gas optimization and refactor of CurveRewardsAwareAToken 2021-06-04 13:21:50 +02:00
David Racero
7d51b97b27 feat: Added AaveOracleV2 with custom quote asset. Support AaveOracleV2 in deployment scripts. 2021-05-27 12:03:19 +02:00
David Racero
0b109da9c6 Revert "feat: Remove WETH mention from AaveOracle. Add QUOTE_CURRENCY and QUOTE_CURRENCY_UNIT to determine the quote currency of the price sources"
This reverts commit b54c6f8a24.
2021-05-27 11:40:28 +02:00
David Racero
50f60a3666 feat: Add OracleQuoteUnit to configs and adapt deployment scripts to support the config change. 2021-05-27 09:35:14 +02:00
David Racero
b54c6f8a24 feat: Remove WETH mention from AaveOracle. Add QUOTE_CURRENCY and QUOTE_CURRENCY_UNIT to determine the quote currency of the price sources 2021-05-27 09:17:36 +02:00
David Racero
e8e9488523 feat: Added Curve LP support for reward aware aTokens 2021-05-17 13:12:23 +02:00
David Racero
cd8c1922f9 fix: Add missing override for UNDERLYING_ASSET_ADDRESS function at AToken.sol 2021-05-12 17:34:28 +02:00
David Racero
f78dce9d2b fix: undo changes at IAToken.sol 2021-05-12 17:23:50 +02:00
David Racero
55a9880c79 feat: Reward aware aToken contracts 2021-05-12 12:55:13 +02:00
David Racero
4f7ce7e202
Merge branch 'master' into polygon-verifier 2021-05-11 12:55:17 +02:00
sendra
c1c2cffd26 remove try catch as it doesnt catch the implementation exeption 2021-04-26 17:51:39 +02:00
sendra
d36b9fd14c added other catch 2021-04-26 16:43:21 +02:00
sendra
f5f3adeb0f removed error from catch so it catches everything 2021-04-26 16:29:30 +02:00
sendra
8b8736dc5a Back to try catch, but with also 0 address catching 2021-04-26 15:26:36 +02:00
sendra
701c0793ce fix: merged with master 2021-04-26 12:51:04 +02:00
sendra
60ee0c54eb fix: added check if incentives contract is 0 2021-04-26 12:39:37 +02:00
sendra
60dc2346c8 fix: added try catch for incentives controller interactions 2021-04-26 12:26:30 +02:00
David Racero
2a19131b7a feat: Updated to new interface of Incentives Controller 2021-04-21 18:00:00 +02:00
sendra
8000d838a3 Updated to new asset struct interface 2021-04-21 17:45:19 +02:00
sendra
21fc210901 fix: updated interface to last version 2021-04-19 17:17:30 +02:00
Zer0dot
5f817c7c09 fix: removed unused hardhat console import 2021-04-19 11:04:04 -04:00
sendra
5e5962372e feature: added emission end timestamp. Return struct instead, to save on stack space 2021-04-16 17:48:19 +02:00
The3D
94790ecc46 Fixed interface update 2021-04-12 11:10:22 +02:00
sendra
717bb133e1 added unclaimed user rewards 2021-04-08 13:55:01 +02:00
sendra
dc2943f2ec removed incentives data, as it is hardcoded on client side 2021-04-07 17:44:29 +02:00
sendra
b84a486d10 removed extra external calls that are not needed 2021-04-06 16:17:04 +02:00
David Racero
ab14a0bc9d Fixed asset borrowing configuration at initialization 2021-03-31 17:39:59 +02:00
sendra
5ba17aa1c1 naming changed to IncentivesUserData 2021-03-30 13:19:47 +02:00
sendra
9ed357662b added public to incentives controller and price oracle so we can remove getters 2021-03-30 12:42:20 +02:00
sendra
99a0d17de4 reused local vars to not fill stack 2021-03-30 12:39:00 +02:00
sendra
e81ddb4e2f Added incentives information to UI data provider contract 2021-03-29 17:10:35 +02:00
sendra
2028631ad7 fixed not needed casting 2021-03-26 13:59:49 +01:00
sendra
83a499f299 added incentives emission for a / v /s tokens 2021-03-26 11:08:07 +01:00
sendra
f9cf541be1 Added incentives data to ui helper 2021-03-23 18:52:51 +01:00