Skip to content

Conversation

@AGMASO
Copy link
Collaborator

@AGMASO AGMASO commented Nov 10, 2025

General Changes

  • Refactored the incentives Merkl code to support multiple rewarded assets within a single campaign, as well as multiple campaigns targeting the same aToken/vToken with different rewarded tokens.

  • Based the filtering on the onChainCampaignId, which is unique for each rewarded token, simplifying the code and making it agnostic to these different scenarios.

Developer Notes

Screenshot 2025-11-10 at 19 08 42 Screenshot 2025-11-10 at 19 08 49

Reviewer Checklist

Please ensure you, as the reviewer(s), have gone through this checklist to ensure that the code changes are ready to ship safely and to help mitigate any downstream issues that may occur.

  • End-to-end tests are passing without any errors
  • Code changes do not significantly increase the application bundle size
  • If there are new 3rd-party packages, they do not introduce potential security threats
  • If there are new environment variables being added, they have been added to the .env.example file as well as the pertinant .github/actions/* files
  • There are no CI changes, or they have been approved by the DevOps and Engineering team(s)

@vercel
Copy link

vercel bot commented Nov 10, 2025

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Preview Comments Updated (UTC)
interface Ready Ready Preview Comment Nov 10, 2025 6:27pm

@github-actions
Copy link

@github-actions
Copy link

📦 Next.js Bundle Analysis for aave-ui

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

>
<Box sx={{ display: 'inline-flex', alignItems: 'center' }}>
<FormattedNumber
value={merklIncentives.breakdown.isBorrow ? -reward.apr : reward.apr}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we convert apr to apy

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bad variable names from me, I’ve changed them now for clarity.

Comment on lines +266 to +267
? -merklIncentives.breakdown.merklIncentivesAPR
: merklIncentives.breakdown.merklIncentivesAPR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apr to apy?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merklIncentives.breakdown.merklIncentivesAPR represents already APY see here:

Image

@github-actions
Copy link

@github-actions
Copy link

📦 Next.js Bundle Analysis for aave-ui

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

@AGMASO AGMASO merged commit b34d9d8 into main Nov 12, 2025
17 of 21 checks passed
@AGMASO AGMASO deleted the feat/double-reward-assets-for-a-campaign branch November 12, 2025 11:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants