Skip to content
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

feat: account for aura and beefy stakes #1786

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Conversation

gosuto-inzasheru
Copy link
Collaborator

@gosuto-inzasheru gosuto-inzasheru commented Feb 17, 2025

closes #1731

@gosuto-inzasheru gosuto-inzasheru changed the title feat: account for aura stakes feat: account for aura and beefy stakes Feb 18, 2025
Copy link
Contributor

github-actions bot commented Feb 20, 2025

FILENAME: MaxiOps/merkl/payloads/epoch_1-morpho-1-csUSDC-csUSDT.json
COMMIT: c555b6b9f97a2b876448428a2434599d9735262b

Validator Result
validate_contains_msig
validate_msig_in_address_book
validate_chain_specified

Copy link
Contributor

github-actions bot commented Feb 20, 2025

FILENAME: MaxiOps/merkl/payloads/epoch_1-morpho-1-csUSDC-csUSDT.json
MULTISIG: multisigs/maxi_omni (mainnet:0x9ff471F9f98F42E5151C7855fD1b5aa906b1AF7e)
COMMIT: c555b6b9f97a2b876448428a2434599d9735262b
CHAIN(S): mainnet
TENDERLY: 🟪 SKIPPED (Web3ValidationError("\nCould not identify the intended function with name createCampaign, positional arguments with type(s) ((str,address,address,int,int,int,int,str))and keyword arguments with type(s){}.\nFound 1 function(s) with the name createCampaign: ['createCampaign((bytes32,address,address,uint256,uint32,uint32,uint32,bytes))']\nFunction invocation failed due to no matching argument types."))

+------------------+-------------------------------------------------------------------------+-------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------+----------+
| fx_name          | to                                                                      | value | inputs                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | bip_number | tx_index |
+------------------+-------------------------------------------------------------------------+-------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------+----------+
| multicall        | 0x4095F064B8d3c3548A3bebfd0Bbfd04750E30077 (morpho/eth_bundler_v2)      | 0     | {                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | N/A        |   N/A    |
|                  |                                                                         |       |   "data": [                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |            |          |
|                  |                                                                         |       |     "0x6b89026a000000000000000000000000330eefa8a787552dc5cad3c3ca644844b1e61ddb0000000000000000000000009ff471f9f98f42e5151c7855fd1b5aa906b1af7e00000000000000000000000058d97b57bb95320f9a05dc918aef65434969c2b20000000000000000000000000000000000000000000000bbd632c3440d13af7c00000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000fcf02eb1205e5582a479de3abd640822e7ab300d3641814778c6e7da32ebd9a4b36ea4751f29c91c15109a9131cfea55b5ab0c4518aa49ce980411eb839a9385aab66e17a2f3d76e4600097e32a0cb83c93002cc65df3e780235c41dae65b4e5ec739fdc4fe50cb18a04cb7e4f0b15930280df8f7bf6fb8676083fa31b3b26d67cdfdd0a1398af44fc8499583cdadecd55e507e369c0dc1aaffc90932c8e46a86af438b074047558666ab6d85204ab6f87e410b34f015a0b7486a661195203dd4514a433ab622489c17796332eb8f338d5f17bd9a3a475e4d6d2192203258658adb7e91f50751748c085074a783536dc25cfa645c227ce61be271d15187dde41a392257a0e1fb847912af031aacebf277800c8f46a74fa66f6910681eef002b003fd9eba21a6af513e7c9458ec3525ab843e8e6f31bdac818b2ccf393ed5d1e82d6e84362b3291865034f2b895990c3fae9980bcce0bd7543d518c1e23c044b2b4a671d63aca0da1c43f421af5d998a45802fe6c134e070ae64443adf50e9978c343e059220a41a56020fbff628ed42d7a4306e115dec42d0b1a46709da1ba04bdd4784dd1e22d57c07776772c36d50e4fac9d6431281ab21cd7bf5b552769abbe9d36f5bb64490817d9da4172bebae18dca017def3ca0b30f410c22a8f44ec3d" |            |          |
|                  |                                                                         |       |   ]                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |            |          |
|                  |                                                                         |       | }                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |            |          |
| approve          | 0x58D97B57BB95320F9a05dC918Aef65434969c2B2 (tokens/MORPHO)              | 0     | {                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | N/A        |   N/A    |
|                  |                                                                         |       |   "spender": [                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |            |          |
|                  |                                                                         |       |     "0x8BB4C975Ff3c250e0ceEA271728547f3802B36Fd (angle/distribution_creator)"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |            |          |
|                  |                                                                         |       |   ],                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |            |          |
|                  |                                                                         |       |   "amount": [                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |            |          |
|                  |                                                                         |       |     "raw:2054422028667260065830, 18 decimals:2054.42202866726006583, 6 decimals: 2054422028667260.06583"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |            |          |
|                  |                                                                         |       |   ]                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |            |          |
|                  |                                                                         |       | }                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |            |          |
| acceptConditions | 0x8BB4C975Ff3c250e0ceEA271728547f3802B36Fd (angle/distribution_creator) | 0     | "N/A"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | N/A        |   N/A    |
| createCampaign   | 0x8BB4C975Ff3c250e0ceEA271728547f3802B36Fd (angle/distribution_creator) | 0     | {                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | N/A        |   N/A    |
|                  |                                                                         |       |   "newCampaign": [                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |            |          |
|                  |                                                                         |       |     "\"0x0000000000000000000000000000000000000000000000000000000000000000\"",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |            |          |
|                  |                                                                         |       |     "\"0x0000000000000000000000000000000000000000\"",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |            |          |
|                  |                                                                         |       |     "\"0x58D97B57BB95320F9a05dC918Aef65434969c2B2\"",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |            |          |
|                  |                                                                         |       |     "\"2054422028667260065830\"",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |            |          |
|                  |                                                                         |       |     "4",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |            |          |
|                  |                                                                         |       |     "1740074400",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |            |          |
|                  |                                                                         |       |     "3600",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |            |          |
|                  |                                                                         |       |     "\"0x0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000005568747470733a2f2f616e676c652d626c6f672e696e667572612d697066732e696f2f697066732f516d5832546a6b457066417451346964584c74485866564c426236464768747168596f57316471516355653958760000000000000000000000000000000000000000000000000000000000000000000000000000000000000765706f63685f310000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\""                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |            |          |
|                  |                                                                         |       |   ]                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |            |          |
|                  |                                                                         |       | }                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |            |          |
+------------------+-------------------------------------------------------------------------+-------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------+----------+

@gosuto-inzasheru gosuto-inzasheru marked this pull request as ready for review February 20, 2025 17:56
Copy link
Collaborator

@Xeonus Xeonus left a comment

Choose a reason for hiding this comment

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

  • need complete boosted pool list
  • address issue with link between boosted pool effective earned secondary rewards and airdrop watchlist config

@@ -4,7 +4,7 @@
"pools": {
"csUSDC-csUSDT": {
Copy link
Collaborator

@Xeonus Xeonus Feb 21, 2025

Choose a reason for hiding this comment

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

How can we make the link between how much our vault earned for each specific pool?
For the total of claimable amounts, we need to potentially run agains this complete list to correctly distribute to all depositors (as of Feb 21st):

Mainnet:
csUDSC-csUSDT: 0x10a04efba5b880e169920fd4348527c64fb29d4d - created Jan 14th
pxETH-gtWETHe: 0x5512fddc40842b257e2a7742be3dadcf31574d53 - created Jan 16th
steakUSDTlite-steakUSDR-steakUSDQ: 0xf028ac624074d6793c36dc8a06ecec0f5a39a718 - created Feb 1st
pufETH-gtWETHe: 0xe8769d62a5ab42f1cbdfa7002e64e4f5896fc6af - created Jan 17th
slpETH-gtWETHe: 0x2b261c98a81cfda61bee7bfcf941a3d336be7957 - created Feb 11th

Base (dust amounts):
sUSDS-smUSDC: 0x4147d8aeecb75bc9f5c973c3b73d2dfc4dcce131 - created Jan 31st

@@ -4,7 +4,7 @@
"pools": {
"csUSDC-csUSDT": {
"address": "0x10A04efbA5B880e169920Fd4348527C64FB29d4D",
"reward_wei": "1410348263937287967617"
"reward_wei": "2054627491416394882043"
Copy link
Collaborator

Choose a reason for hiding this comment

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

How is this amount derived? If I look at the distributions data, I can't see how to derive it for a specific pool, it's simply the totals?
What we need is to know how much rewards our vault earned in total for that specific pool, as there is a set of boosted pools.
Bigger issue I see now is that we have a set of boosted pools using the same underlying vault (e.g. gtWETHe). For Morpho that is one deposit, for us that is a set of x boosted pools. The correct link here is missing so far. How can we retrieve that data?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

this is the total rewards claimable from the morpho tree. they cannot provide a breakdown on a pool by pool basis. we will have to cook something up ourselves

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.

feat: add support for aura (and beefy) gauge in merkl snapshots generation
2 participants