add restaking, ssv and steth rewards #2093

vvalecha519 · 2024-11-14T03:13:48Z

No description provided.

llamatester · 2024-11-14T03:14:41Z

The ether-fi adapter exports:

> [email protected] test
> ts-node --transpile-only cli/testAdapter.ts fees ether-fi

🦙 Running ETHER-FI adapter 🦙
---------------------------------------------------
Start Date:	Wed, 13 Nov 2024 00:44:10 GMT
End Date:	Thu, 14 Nov 2024 00:44:10 GMT
---------------------------------------------------

23652884640906128290848n
Balances {
  chain: 'ethereum',
  timestamp: undefined,
  _balances: {
    'ethereum:0xec53bf9167f50cdeb3ae105f56099aaab9061f83': '5.669420855609325e+21',
    'ethereum:0x9D65fF81a3c488d585bBfb0Bfe3c7707c7917f54': '788429488030204300000',
    'ethereum:0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2': 4013450174322292000,
    'ethereum:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48': 2790116610.301862,
    'ethereum:0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84': 781524274515754200
  }
}
ETHEREUM 👇
Backfill start time: 12/3/2024
Daily fees: 722.63 k
└─ Methodology: Staking/Restaking rewards earned by all staked ETH + Fees on Liquid Vaults
Daily revenue: 93.88 k
└─ Methodology: Staking/Restaking rewards + Fees on Liquid Vaults
End timestamp: 1731545049 (2024-11-14T00:44:09.000Z)

llamatester · 2024-11-14T03:20:40Z

The ether-fi adapter exports:

> [email protected] test
> ts-node --transpile-only cli/testAdapter.ts fees ether-fi

🦙 Running ETHER-FI adapter 🦙
---------------------------------------------------
Start Date:	Wed, 13 Nov 2024 00:50:06 GMT
End Date:	Thu, 14 Nov 2024 00:50:06 GMT
---------------------------------------------------

ETHEREUM 👇
Backfill start time: 12/3/2024
Daily fees: 720.09 k
└─ Methodology: Staking/Restaking rewards earned by all staked ETH + Fees on Liquid Vaults
Daily revenue: 93.58 k
└─ Methodology: Staking/Restaking rewards + Fees on Liquid Vaults
End timestamp: 1731545405 (2024-11-14T00:50:05.000Z)

g1nt0ki · 2024-11-14T11:53:19Z

fees/ether-fi/index.ts

+    toBlock: await options.getEndBlock(),
+    eventAbi: "event TokenRebased(uint256 indexed reportTimestamp,uint256 timeElapsed,uint256 preTotalShares,uint256 preTotalEther,uint256 postTotalShares,uint256 postTotalEther,uint256 sharesMintedAsFees)",
+  });
+  for (const log of stethRebaseLogs) {


why not take just the first log instead of looping?

Nice that would be cleaner it is equivalent to what is being done right now!

can you make that change because the loop is misleading

g1nt0ki · 2024-11-14T11:53:56Z

fees/ether-fi/index.ts

+  const stethRebaseLogs = await options.getLogs({
+    target: STETH,
+    fromBlock: await options.getStartBlock(),
+    toBlock: await options.getEndBlock(),


from & toBlock can be skipped, it is automatically pulled

*can you remove line 28 & 29?

g1nt0ki · 2024-11-14T11:57:50Z

fees/ether-fi/index.ts

+    target: SSV,
+    eventAbi: "event Transfer(address indexed from, address indexed to, uint256 value)",
+    topic: "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+    fromBlock: await options.getStartBlock() - 30 * 86400 / 12, //claimed every 31 days


hmm, if it is claimed every 31 days, it is better to leave a spike on the chart every 31st day instead of trying to average it.

So, I would remove from & toBlock here as well

Since we report daily revenue, averaging the claimed amount of SSV over 30 days accurately reflects how much SSV was earned each day. Claiming daily is not viable, so we claim monthly, but the SSV accrues daily for running the software. I believe it makes sense to keep it averaged, as this more accurately represents the daily earnings.

yes, but it is not really revenue till it is transferred, we apply the same logic for other adapters that we have listed.

vvalecha519 · 2024-11-20T14:09:24Z

@g1nt0ki any update on this pr?

g1nt0ki

.

llamatester · 2024-11-21T20:12:22Z

The ether-fi adapter exports:

> [email protected] test
> ts-node --transpile-only cli/testAdapter.ts fees ether-fi

🦙 Running ETHER-FI adapter 🦙
---------------------------------------------------
Start Date:	Wed, 20 Nov 2024 17:42:09 GMT
End Date:	Thu, 21 Nov 2024 17:42:09 GMT
---------------------------------------------------

ETHEREUM 👇
Backfill start time: 13/3/2024
Daily fees: 761.04 k
└─ Methodology: Staking/Restaking rewards earned by all staked ETH + Fees on Liquid Vaults
Daily revenue: 84.48 k
└─ Methodology: Staking/Restaking rewards + Fees on Liquid Vaults
End timestamp: 1732210928 (2024-11-21T17:42:08.000Z)

g1nt0ki · 2024-11-22T15:02:58Z

fees/ether-fi/index.ts

+
+  // add ssv revenue for running ssv validators
+  const ssvRevenue = await getSsvRevenue(options);
+  dailyFees.add(SSV, ssvRevenue / BigInt(30));


think the divide by 30 should go away?

fees/ether-fi/index.ts

llamatester · 2024-11-22T15:08:29Z

The ether-fi adapter exports:

> [email protected] test
> ts-node --transpile-only cli/testAdapter.ts fees ether-fi

🦙 Running ETHER-FI adapter 🦙
---------------------------------------------------
Start Date:	Thu, 21 Nov 2024 12:38:16 GMT
End Date:	Fri, 22 Nov 2024 12:38:16 GMT
---------------------------------------------------

ETHEREUM 👇
Backfill start time: 13/3/2024
Daily fees: 661.02 k
└─ Methodology: Staking/Restaking rewards earned by all staked ETH + Fees on Liquid Vaults
Daily revenue: 74.09 k
└─ Methodology: Staking/Restaking rewards + Fees on Liquid Vaults
End timestamp: 1732279095 (2024-11-22T12:38:15.000Z)

add restaking, ssv and steth rewards

c9aea6e

remove unneccesary prints

a6c1fcf

g1nt0ki reviewed Nov 14, 2024

View reviewed changes

vvalecha519 requested a review from g1nt0ki November 18, 2024 19:57

g1nt0ki self-assigned this Nov 21, 2024

This comment was marked as duplicate.

Sign in to view

g1nt0ki requested changes Nov 21, 2024

View reviewed changes

fix comments

4c7aebf

vvalecha519 requested a review from g1nt0ki November 22, 2024 14:04

g1nt0ki reviewed Nov 22, 2024

View reviewed changes

fix bug

10a7c0e

g1nt0ki reviewed Nov 22, 2024

View reviewed changes

fees/ether-fi/index.ts Show resolved Hide resolved

vvalecha519 requested a review from g1nt0ki November 22, 2024 15:07

g1nt0ki reviewed Nov 22, 2024

View reviewed changes

fees/ether-fi/index.ts Show resolved Hide resolved

g1nt0ki merged commit c9b074b into DefiLlama:master Nov 22, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add restaking, ssv and steth rewards #2093

add restaking, ssv and steth rewards #2093

vvalecha519 commented Nov 14, 2024

llamatester commented Nov 14, 2024

llamatester commented Nov 14, 2024

g1nt0ki Nov 14, 2024

vvalecha519 Nov 15, 2024 •

edited

Loading

g1nt0ki Nov 21, 2024

vvalecha519 Nov 21, 2024

g1nt0ki Nov 14, 2024

g1nt0ki Nov 21, 2024

vvalecha519 Nov 21, 2024

g1nt0ki Nov 14, 2024

vvalecha519 Nov 15, 2024 •

edited

Loading

g1nt0ki Nov 21, 2024

vvalecha519 Nov 21, 2024

vvalecha519 commented Nov 20, 2024

This comment was marked as duplicate.

g1nt0ki left a comment

llamatester commented Nov 21, 2024

g1nt0ki Nov 22, 2024

vvalecha519 Nov 22, 2024

llamatester commented Nov 22, 2024

add restaking, ssv and steth rewards #2093

add restaking, ssv and steth rewards #2093

Conversation

vvalecha519 commented Nov 14, 2024

llamatester commented Nov 14, 2024

llamatester commented Nov 14, 2024

Choose a reason for hiding this comment

vvalecha519 Nov 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vvalecha519 Nov 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vvalecha519 commented Nov 20, 2024

This comment was marked as duplicate.

g1nt0ki left a comment

Choose a reason for hiding this comment

llamatester commented Nov 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

llamatester commented Nov 22, 2024

vvalecha519 Nov 15, 2024 •

edited

Loading

vvalecha519 Nov 15, 2024 •

edited

Loading