forked from aave/interface
-
Notifications
You must be signed in to change notification settings - Fork 0
Feat/add base masiv incentives #29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
NandyBa
wants to merge
16
commits into
main
Choose a base branch
from
feat/add-base-masiv-incentives
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
d838255
feat: add base supply gho incentive
NandyBa d51ef91
feat: add base supply wETH incentive
NandyBa 244ce35
feat: add base cbBTC campaigns
NandyBa b4700a1
feat: register aBasCBBTC as aToken
NandyBa 1496f38
feat: add Base wstETH campaigns
NandyBa 11de70d
feat: add aBasUSDC as aToken
NandyBa a88d2ce
feat: update some Merit incentive messages
NandyBa 9af3dd5
feat: improve incentive messages
NandyBa 24d3c73
refactor: typo
NandyBa e9c6c11
feat: details Base supply ETH campaign
NandyBa 77660da
Merge branch 'feat/add-base-masiv-incentives' of https://github.com/A…
NandyBa 1d3f2c6
feat: apply Martin review recommendations
NandyBa b0076e2
feat: update incentive key for better incentive display on ACI dashboard
NandyBa 81638e5
fix: weth text
MartinGbz bebe4c2
feat: add new eurc campaign mainnet
MartinGbz 167cc1f
feat: display incentive for ETH as well as they are for wETH
NandyBa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -24,6 +24,7 @@ export enum MeritAction { | |||||
| SUPPLY_CBBTC_BORROW_USDC = 'ethereum-supply-cbbtc-borrow-usdc', | ||||||
| SUPPLY_WBTC_BORROW_USDT = 'ethereum-supply-wbtc-borrow-usdt', | ||||||
| SUPPLY_WEETH_BORROW_USDC = 'ethereum-supply-weeth-borrow-usdc', | ||||||
| ETHEREUM_BORROW_EURC = 'ethereum-borrow-eurc', | ||||||
| ARBITRUM_SUPPLY_ETH = 'arbitrum-supply-weth', | ||||||
| ARBITRUM_SUPPLY_WSTETH = 'arbitrum-supply-wsteth', | ||||||
| ARBITRUM_SUPPLY_EZETH = 'arbitrum-supply-ezeth', | ||||||
|
|
@@ -33,7 +34,11 @@ export enum MeritAction { | |||||
| BASE_SUPPLY_WEETH = 'base-supply-weeth', | ||||||
| BASE_SUPPLY_EZETH = 'base-supply-ezeth', | ||||||
| BASE_SUPPLY_EURC = 'base-supply-eurc', | ||||||
| BASE_SUPPLY_GHO = 'base-supply-gho', | ||||||
| BASE_SUPPLY_LBTC_BORROW_CBBTC = 'base-supply-lbtc-borrow-cbbtc', | ||||||
| BASE_SUPPLY_CBBTC_BORROW_MULTIPLE = 'base-supply-cbbtc-borrow-multiple', | ||||||
| BASE_SUPPLY_WSTETH_BORROW_MULTIPLE = 'base-supply-wsteth-borrow-multiple', | ||||||
| BASE_SUPPLY_WETH_BORROW_MULTIPLE = 'base-supply-weth-borrow-multiple', | ||||||
| BASE_BORROW_EURC = 'base-borrow-eurc', | ||||||
| BASE_BORROW_USDC = 'base-borrow-usdc', | ||||||
| BASE_BORROW_WSTETH = 'base-borrow-wsteth', | ||||||
|
|
@@ -82,10 +87,10 @@ const getMeritData = (market: string, symbol: string): MeritReserveIncentiveData | |||||
| MERIT_DATA_MAP[market]?.[symbol]; | ||||||
|
|
||||||
| const antiLoopMessage = | ||||||
| 'Borrowing of some assets may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; | ||||||
| 'Borrowing of some assets or holding of some token may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; | ||||||
|
|
||||||
| const antiLoopBorrowMessage = | ||||||
| 'Supplying of some assets may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; | ||||||
| 'Supplying of some assets or holding of some token may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; | ||||||
|
||||||
| 'Supplying of some assets or holding of some token may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; | |
| 'Supplying of some assets or holding of some tokens may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Grammar error: 'holding of some token' should be 'holding of some tokens' (plural) to match the pattern with 'some assets'.