@lidofinance/lsv-cli 1.5.1 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/abi/AccessControlConfirmable.js.map +1 -1
- package/dist/abi/Dashboard.js.map +1 -1
- package/dist/abi/LazyOracle.js.map +1 -1
- package/dist/abi/LidoLocator.js.map +1 -1
- package/dist/abi/OperatorGrid.js.map +1 -1
- package/dist/abi/PredepositGuarantee.js.map +1 -1
- package/dist/abi/StEth.js.map +1 -1
- package/dist/abi/StakingVault.js.map +1 -1
- package/dist/abi/ValidatorConsolidationRequests.js.map +1 -1
- package/dist/abi/VaultFactory.js.map +1 -1
- package/dist/abi/VaultHub.js.map +1 -1
- package/dist/abi/VaultViewer.js.map +1 -1
- package/dist/abi/WstEth.js.map +1 -1
- package/dist/abi/defi-wrapper/Distributor.js.map +1 -1
- package/dist/abi/defi-wrapper/Factory.js.map +1 -1
- package/dist/abi/defi-wrapper/OssifiableProxy.js.map +1 -1
- package/dist/abi/defi-wrapper/StrategyFactory.d.ts +59 -0
- package/dist/abi/defi-wrapper/StrategyFactory.js +37 -0
- package/dist/abi/defi-wrapper/StrategyFactory.js.map +1 -0
- package/dist/abi/defi-wrapper/StvPool.js.map +1 -1
- package/dist/abi/defi-wrapper/StvStETHPool.js.map +1 -1
- package/dist/abi/defi-wrapper/TimeLock.js.map +1 -1
- package/dist/abi/defi-wrapper/WithdrawalQueue.js.map +1 -1
- package/dist/abi/defi-wrapper/index.d.ts +1 -0
- package/dist/abi/defi-wrapper/index.js +1 -0
- package/dist/abi/defi-wrapper/index.js.map +1 -1
- package/dist/command/index.js +11 -0
- package/dist/command/index.js.map +1 -1
- package/dist/configs/constants.d.ts +4 -4
- package/dist/contracts/dashboard-impl.d.ts +4 -3
- package/dist/contracts/dashboard-impl.js +5 -8
- package/dist/contracts/dashboard-impl.js.map +1 -1
- package/dist/contracts/dashboard.d.ts +4 -3
- package/dist/contracts/dashboard.js +1 -1
- package/dist/contracts/dashboard.js.map +1 -1
- package/dist/contracts/defi-wrapper/distributor.d.ts +5 -4
- package/dist/contracts/defi-wrapper/distributor.js +2 -2
- package/dist/contracts/defi-wrapper/distributor.js.map +1 -1
- package/dist/contracts/defi-wrapper/factory.d.ts +5 -4
- package/dist/contracts/defi-wrapper/factory.js +2 -2
- package/dist/contracts/defi-wrapper/factory.js.map +1 -1
- package/dist/contracts/defi-wrapper/index.d.ts +1 -0
- package/dist/contracts/defi-wrapper/index.js +1 -0
- package/dist/contracts/defi-wrapper/index.js.map +1 -1
- package/dist/contracts/defi-wrapper/ossifiable-proxy.d.ts +5 -4
- package/dist/contracts/defi-wrapper/ossifiable-proxy.js +2 -2
- package/dist/contracts/defi-wrapper/ossifiable-proxy.js.map +1 -1
- package/dist/contracts/defi-wrapper/strategy-factory.d.ts +5 -0
- package/dist/contracts/defi-wrapper/strategy-factory.js +12 -0
- package/dist/contracts/defi-wrapper/strategy-factory.js.map +1 -0
- package/dist/contracts/defi-wrapper/stv-pool.d.ts +5 -4
- package/dist/contracts/defi-wrapper/stv-pool.js +2 -2
- package/dist/contracts/defi-wrapper/stv-pool.js.map +1 -1
- package/dist/contracts/defi-wrapper/stv-steth-pool.d.ts +5 -4
- package/dist/contracts/defi-wrapper/stv-steth-pool.js +2 -2
- package/dist/contracts/defi-wrapper/stv-steth-pool.js.map +1 -1
- package/dist/contracts/defi-wrapper/timelock.d.ts +5 -4
- package/dist/contracts/defi-wrapper/timelock.js +2 -2
- package/dist/contracts/defi-wrapper/timelock.js.map +1 -1
- package/dist/contracts/defi-wrapper/withdrawal-queue.d.ts +5 -4
- package/dist/contracts/defi-wrapper/withdrawal-queue.js +2 -2
- package/dist/contracts/defi-wrapper/withdrawal-queue.js.map +1 -1
- package/dist/contracts/lazy-oracle.d.ts +5 -3
- package/dist/contracts/lazy-oracle.js +5 -9
- package/dist/contracts/lazy-oracle.js.map +1 -1
- package/dist/contracts/locator.d.ts +4 -2
- package/dist/contracts/locator.js +5 -8
- package/dist/contracts/locator.js.map +1 -1
- package/dist/contracts/operator-grid.d.ts +5 -4
- package/dist/contracts/operator-grid.js +5 -8
- package/dist/contracts/operator-grid.js.map +1 -1
- package/dist/contracts/pdg.d.ts +5 -4
- package/dist/contracts/pdg.js +5 -8
- package/dist/contracts/pdg.js.map +1 -1
- package/dist/contracts/steth.d.ts +5 -4
- package/dist/contracts/steth.js +5 -9
- package/dist/contracts/steth.js.map +1 -1
- package/dist/contracts/validator-consolidation-requests.d.ts +3 -3
- package/dist/contracts/validator-consolidation-requests.js.map +1 -1
- package/dist/contracts/vault-factory.d.ts +5 -3
- package/dist/contracts/vault-factory.js +6 -8
- package/dist/contracts/vault-factory.js.map +1 -1
- package/dist/contracts/vault-hub.d.ts +5 -3
- package/dist/contracts/vault-hub.js +5 -9
- package/dist/contracts/vault-hub.js.map +1 -1
- package/dist/contracts/vault-viewer.d.ts +4 -2
- package/dist/contracts/vault-viewer.js +6 -9
- package/dist/contracts/vault-viewer.js.map +1 -1
- package/dist/contracts/vault.d.ts +5 -4
- package/dist/contracts/vault.js +2 -2
- package/dist/contracts/vault.js.map +1 -1
- package/dist/contracts/wsteth.d.ts +5 -3
- package/dist/contracts/wsteth.js +5 -9
- package/dist/contracts/wsteth.js.map +1 -1
- package/dist/features/consolidation.d.ts +1 -1
- package/dist/features/defi-wrapper/create-vault.js +3 -3
- package/dist/features/defi-wrapper/create-vault.js.map +1 -1
- package/dist/features/defi-wrapper/defi-wrapper-factory.d.ts +14 -4
- package/dist/features/defi-wrapper/defi-wrapper-factory.js +21 -4
- package/dist/features/defi-wrapper/defi-wrapper-factory.js.map +1 -1
- package/dist/features/defi-wrapper/distributor.js +3 -3
- package/dist/features/defi-wrapper/pool-info.js +2 -2
- package/dist/features/defi-wrapper/timelock.d.ts +3 -3
- package/dist/features/defi-wrapper/timelock.js +1 -1
- package/dist/features/defi-wrapper/timelock.js.map +1 -1
- package/dist/features/deposits/make-pdg-proof.js +4 -4
- package/dist/features/deposits/make-pdg-proof.js.map +1 -1
- package/dist/features/deposits/validators.js +1 -1
- package/dist/features/deposits/validators.js.map +1 -1
- package/dist/features/metrics.d.ts +3 -0
- package/dist/features/metrics.js +25 -0
- package/dist/features/metrics.js.map +1 -1
- package/dist/features/mint-burn/mint-limit.js +1 -1
- package/dist/features/utils/minting-capacity.js +1 -1
- package/dist/features/vault-factory.js +1 -1
- package/dist/features/vault-operations/index.d.ts +1 -0
- package/dist/features/vault-operations/index.js +1 -0
- package/dist/features/vault-operations/index.js.map +1 -1
- package/dist/features/vault-operations/share-limit.d.ts +8 -0
- package/dist/features/vault-operations/share-limit.js +20 -0
- package/dist/features/vault-operations/share-limit.js.map +1 -0
- package/dist/features/with-report.d.ts +1 -1
- package/dist/index.js +30 -10
- package/dist/index.js.map +1 -1
- package/dist/programs/account/main.d.ts +1 -1
- package/dist/programs/account/write.js +29 -2
- package/dist/programs/account/write.js.map +1 -1
- package/dist/programs/contracts/dashboard/main.d.ts +1 -1
- package/dist/programs/contracts/dashboard/write.js +21 -14
- package/dist/programs/contracts/dashboard/write.js.map +1 -1
- package/dist/programs/contracts/hub/main.d.ts +1 -1
- package/dist/programs/contracts/hub/write.js +2 -1
- package/dist/programs/contracts/hub/write.js.map +1 -1
- package/dist/programs/contracts/lazy-oracle/main.d.ts +1 -1
- package/dist/programs/contracts/main.d.ts +1 -1
- package/dist/programs/contracts/operator-grid/main.d.ts +1 -1
- package/dist/programs/contracts/operator-grid/write.js +13 -9
- package/dist/programs/contracts/operator-grid/write.js.map +1 -1
- package/dist/programs/contracts/pdg/main.d.ts +1 -1
- package/dist/programs/contracts/pdg/write.js +1 -1
- package/dist/programs/contracts/vault/main.d.ts +1 -1
- package/dist/programs/contracts/vault-factory/main.d.ts +1 -1
- package/dist/programs/contracts/vault-viewer/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/distributor/config.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/distributor/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/distributor/read.js +2 -2
- package/dist/programs/defi-wrapper/contracts/distributor/write.js +1 -1
- package/dist/programs/defi-wrapper/contracts/factory/config.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/factory/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/factory/read.js +2 -2
- package/dist/programs/defi-wrapper/contracts/factory/write.js +124 -36
- package/dist/programs/defi-wrapper/contracts/factory/write.js.map +1 -1
- package/dist/programs/defi-wrapper/contracts/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/stv-pool/config.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/stv-pool/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/stv-pool/read.js +2 -2
- package/dist/programs/defi-wrapper/contracts/stv-pool/write.js +1 -1
- package/dist/programs/defi-wrapper/contracts/stv-steth-pool/config.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/stv-steth-pool/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/stv-steth-pool/read.js +2 -2
- package/dist/programs/defi-wrapper/contracts/stv-steth-pool/write.js +1 -1
- package/dist/programs/defi-wrapper/contracts/withdrawal-queue/config.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/withdrawal-queue/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/contracts/withdrawal-queue/read.js +2 -2
- package/dist/programs/defi-wrapper/contracts/withdrawal-queue/write.js +1 -1
- package/dist/programs/defi-wrapper/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/distributor/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/distributor/read.js +2 -2
- package/dist/programs/defi-wrapper/use-cases/distributor/write.js +3 -3
- package/dist/programs/defi-wrapper/use-cases/health/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/health/read.js +2 -2
- package/dist/programs/defi-wrapper/use-cases/health/utils.js +1 -1
- package/dist/programs/defi-wrapper/use-cases/health/write.js +3 -3
- package/dist/programs/defi-wrapper/use-cases/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/common/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/common/read.js +8 -8
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/common/write.js +1 -1
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/dashboard/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/dashboard/write.js +3 -3
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/pool/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/pool/write.js +3 -3
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/proxy/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/proxy/read.js +1 -1
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/proxy/write.js +3 -3
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/withdrawal-queue/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/timelock-governance/withdrawal-queue/write.js +3 -3
- package/dist/programs/defi-wrapper/use-cases/wrapper-operations/main.d.ts +1 -1
- package/dist/programs/defi-wrapper/use-cases/wrapper-operations/read.js +3 -3
- package/dist/programs/defi-wrapper/use-cases/wrapper-operations/write.js +35 -49
- package/dist/programs/defi-wrapper/use-cases/wrapper-operations/write.js.map +1 -1
- package/dist/programs/dev-tools/anvil/main.d.ts +1 -1
- package/dist/programs/dev-tools/defi-wrapper/main.d.ts +1 -1
- package/dist/programs/dev-tools/defi-wrapper/write.js +1 -1
- package/dist/programs/dev-tools/main.d.ts +1 -1
- package/dist/programs/pdg-helpers.js +4 -0
- package/dist/programs/pdg-helpers.js.map +1 -1
- package/dist/programs/use-cases/consolidation/main.d.ts +1 -1
- package/dist/programs/use-cases/consolidation/write.d.ts +1 -1
- package/dist/programs/use-cases/consolidation/write.js +1 -1
- package/dist/programs/use-cases/deposits/main.d.ts +1 -1
- package/dist/programs/use-cases/metrics/main.d.ts +1 -1
- package/dist/programs/use-cases/metrics/read.js +7 -7
- package/dist/programs/use-cases/metrics/read.js.map +1 -1
- package/dist/programs/use-cases/report/main.d.ts +1 -1
- package/dist/programs/use-cases/vault-operations/main.d.ts +1 -1
- package/dist/programs/use-cases/vault-operations/write.js +29 -15
- package/dist/programs/use-cases/vault-operations/write.js.map +1 -1
- package/dist/providers/wallet.d.ts +302 -300
- package/dist/providers/wallet.js +10 -2
- package/dist/providers/wallet.js.map +1 -1
- package/dist/tests/integration/deposits.test.js +1 -1
- package/dist/tests/integration/deposits.test.js.map +1 -1
- package/dist/tests/integration/helpers/test-client.d.ts +150 -150
- package/dist/tests/integration/metrics.test.js.map +1 -1
- package/dist/tests/integration/mint-burn.test.js.map +1 -1
- package/dist/tests/utils/calculate-overview-v2.test.js +1 -1
- package/dist/tests/utils/csv-file.test.js +1 -1
- package/dist/tests/utils/error-handler.test.js +5 -8
- package/dist/tests/utils/error-handler.test.js.map +1 -1
- package/dist/tests/utils/lido-apr.test.js +1 -1
- package/dist/tests/utils/logging.test.js +30 -14
- package/dist/tests/utils/logging.test.js.map +1 -1
- package/dist/tests/utils/rebase-rewards.test.js +44 -43
- package/dist/tests/utils/rebase-rewards.test.js.map +1 -1
- package/dist/tests/utils/report-statistic.test.d.ts +1 -0
- package/dist/tests/utils/report-statistic.test.js +501 -0
- package/dist/tests/utils/report-statistic.test.js.map +1 -0
- package/dist/tests/utils/snake-to-camel.test.js +1 -1
- package/dist/tests/utils/spinner.test.d.ts +1 -0
- package/dist/tests/utils/spinner.test.js +113 -0
- package/dist/tests/utils/spinner.test.js.map +1 -0
- package/dist/tests/utils/timestamp.test.js +1 -1
- package/dist/utils/arguments.d.ts +1 -1
- package/dist/utils/cache.d.ts +0 -1
- package/dist/utils/cache.js +1 -2
- package/dist/utils/cache.js.map +1 -1
- package/dist/utils/charts/blessed/charts-apr.js +5 -5
- package/dist/utils/charts/blessed/charts-apr.js.map +1 -1
- package/dist/utils/charts/blessed/charts-rewards.js +4 -4
- package/dist/utils/charts/blessed/charts-rewards.js.map +1 -1
- package/dist/utils/charts/blessed/datasets/prepare-metrics.d.ts +6 -6
- package/dist/utils/charts/blessed/datasets/prepare-metrics.js +12 -13
- package/dist/utils/charts/blessed/datasets/prepare-metrics.js.map +1 -1
- package/dist/utils/charts/blessed/utils.js +5 -2
- package/dist/utils/charts/blessed/utils.js.map +1 -1
- package/dist/utils/charts/simple/simple-charts.js +15 -7
- package/dist/utils/charts/simple/simple-charts.js.map +1 -1
- package/dist/utils/error-handler.js +3 -0
- package/dist/utils/error-handler.js.map +1 -1
- package/dist/utils/fetchCL.js +26 -35
- package/dist/utils/fetchCL.js.map +1 -1
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/interrupt-handler.js +14 -6
- package/dist/utils/interrupt-handler.js.map +1 -1
- package/dist/utils/logging/console.d.ts +5 -1
- package/dist/utils/logging/console.js +36 -25
- package/dist/utils/logging/console.js.map +1 -1
- package/dist/utils/prompts/confirmations.d.ts +1 -1
- package/dist/utils/prompts/operations.d.ts +1 -1
- package/dist/utils/prompts/predeposit-guarantee.d.ts +1 -1
- package/dist/utils/prompts/predeposit-guarantee.js +1 -1
- package/dist/utils/proof/create-proof.js +18 -3
- package/dist/utils/proof/create-proof.js.map +1 -1
- package/dist/utils/rebase-rewards.d.ts +0 -1
- package/dist/utils/rebase-rewards.js +12 -3
- package/dist/utils/rebase-rewards.js.map +1 -1
- package/dist/utils/report/statistic-data.js +31 -16
- package/dist/utils/report/statistic-data.js.map +1 -1
- package/dist/utils/spinner/spinners.js +5 -3
- package/dist/utils/spinner/spinners.js.map +1 -1
- package/dist/utils/statistic/report-statistic.d.ts +21 -6
- package/dist/utils/statistic/report-statistic.js +65 -25
- package/dist/utils/statistic/report-statistic.js.map +1 -1
- package/dist/utils/transactions/tx-private-key.d.ts +2 -2
- package/dist/utils/transactions/tx-private-key.js +43 -11
- package/dist/utils/transactions/tx-private-key.js.map +1 -1
- package/dist/utils/transactions/tx-wc.d.ts +12 -11
- package/dist/utils/transactions/tx-wc.js +108 -11
- package/dist/utils/transactions/tx-wc.js.map +1 -1
- package/dist/utils/transactions/utils.d.ts +1 -0
- package/dist/utils/transactions/utils.js +11 -0
- package/dist/utils/transactions/utils.js.map +1 -1
- package/dist/utils/wallet-connect.d.ts +4 -1
- package/dist/utils/wallet-connect.js +52 -4
- package/dist/utils/wallet-connect.js.map +1 -1
- package/dist/utils/with-error.d.ts +7 -0
- package/dist/utils/with-error.js +6 -0
- package/dist/utils/with-error.js.map +1 -0
- package/dist/version/index.js +1 -1
- package/package.json +3 -3
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { describe, it, expect } from 'vitest';
|
|
2
|
-
import { formatTimestamp } from '
|
|
2
|
+
import { formatTimestamp } from 'utils/timestamp.js';
|
|
3
3
|
describe('formatTimestamp', () => {
|
|
4
4
|
it('should format timestamp with default format and UTC timezone', () => {
|
|
5
5
|
// 2024-01-15 12:30:00 UTC
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Permit, RoleAssignment, Tier, Deposit, ValidatorTopUp } from '../types/index.js';
|
|
2
2
|
import { Address, Hex } from 'viem';
|
|
3
|
-
import { PubkeyMap } from '
|
|
3
|
+
import { PubkeyMap } from 'utils/consolidation/types.js';
|
|
4
4
|
export declare const stringToBigIntArray: (value: string) => bigint[];
|
|
5
5
|
export declare const stringToBigIntArrayWei: (value: string) => bigint[];
|
|
6
6
|
export declare const stringTo2dArray: (value: string) => string[][];
|
package/dist/utils/cache.d.ts
CHANGED
|
@@ -36,7 +36,6 @@ type GetRebaseRewardFromCacheArgs = {
|
|
|
36
36
|
blockNumberPrev: number;
|
|
37
37
|
blockNumberCurr: number;
|
|
38
38
|
liabilitySharesPrev: bigint;
|
|
39
|
-
liabilitySharesCurr: bigint;
|
|
40
39
|
};
|
|
41
40
|
export declare const getRebaseRewardFromCache: (args: GetRebaseRewardFromCacheArgs) => Promise<bigint>;
|
|
42
41
|
type GetIndexedEventsFromCacheArgs = {
|
package/dist/utils/cache.js
CHANGED
|
@@ -183,7 +183,7 @@ export const getShareRateFromCache = async (blockNumber) => {
|
|
|
183
183
|
return shareRate;
|
|
184
184
|
};
|
|
185
185
|
export const getRebaseRewardFromCache = async (args) => {
|
|
186
|
-
const { vaultAddress, blockNumberPrev, blockNumberCurr, liabilitySharesPrev,
|
|
186
|
+
const { vaultAddress, blockNumberPrev, blockNumberCurr, liabilitySharesPrev, } = args;
|
|
187
187
|
const cacheKey = `${blockNumberPrev}_${blockNumberCurr}`;
|
|
188
188
|
const cached = await cache.getRebaseReward(vaultAddress, cacheKey);
|
|
189
189
|
if (cached !== null)
|
|
@@ -194,7 +194,6 @@ export const getRebaseRewardFromCache = async (args) => {
|
|
|
194
194
|
shareRatePrev,
|
|
195
195
|
shareRateCurr,
|
|
196
196
|
sharesPrev: liabilitySharesPrev,
|
|
197
|
-
sharesCurr: liabilitySharesCurr,
|
|
198
197
|
});
|
|
199
198
|
await cache.setRebaseReward(vaultAddress, cacheKey, reward);
|
|
200
199
|
return reward;
|
package/dist/utils/cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../utils/cache.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../utils/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import blessed from 'blessed';
|
|
|
2
2
|
import contrib from 'blessed-contrib';
|
|
3
3
|
import { callReadMethodSilent, getVaultReportHistory } from '../../index.js';
|
|
4
4
|
import { getDashboardContract } from '../../../contracts/index.js';
|
|
5
|
-
import {
|
|
5
|
+
import { getNOFeeSnapshotsByBlockNumbers } from '../../../features/index.js';
|
|
6
6
|
import { lineOpts, getMinMax } from './utils.js';
|
|
7
7
|
import { LIMIT } from './constants.js';
|
|
8
8
|
import { prepareCarrySpread, prepareBottomLine, prepareGrossStakingAPR, prepareLidoAPR, prepareNetStakingAPR, buildLidoAPRChart, buildNetStakingAPRChart, buildCarrySpreadChart, buildBottomLineChart, buildGrossStakingAPRChart, } from './datasets/index.js';
|
|
@@ -25,11 +25,11 @@ export const fetchAprChartsData = async ({ cid, dashboard, limit = LIMIT, cacheU
|
|
|
25
25
|
if (!history || history.length < 2)
|
|
26
26
|
throw new Error('Not enough data');
|
|
27
27
|
const blockNumbers = history.map((r) => r.blockNumber);
|
|
28
|
-
const
|
|
28
|
+
const noFeeSnapshots = await getNOFeeSnapshotsByBlockNumbers(vault, blockNumbers, dashboardContract, history);
|
|
29
29
|
const grossStakingAPR = prepareGrossStakingAPR(history);
|
|
30
|
-
const netStakingAPR = prepareNetStakingAPR(history,
|
|
31
|
-
const carrySpread = await prepareCarrySpread(history,
|
|
32
|
-
const bottomLine = await prepareBottomLine(history,
|
|
30
|
+
const netStakingAPR = prepareNetStakingAPR(history, noFeeSnapshots);
|
|
31
|
+
const carrySpread = await prepareCarrySpread(history, noFeeSnapshots, vault);
|
|
32
|
+
const bottomLine = await prepareBottomLine(history, noFeeSnapshots, vault);
|
|
33
33
|
const lidoAPR = await prepareLidoAPR(history);
|
|
34
34
|
const grossStakingAPRChart = buildGrossStakingAPRChart(grossStakingAPR);
|
|
35
35
|
const netStakingAPRChart = buildNetStakingAPRChart(netStakingAPR);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"charts-apr.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-apr.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,OAAO,MAAM,iBAAiB,CAAC;AAGtC,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"charts-apr.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-apr.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import blessed from 'blessed';
|
|
|
2
2
|
import contrib from 'blessed-contrib';
|
|
3
3
|
import { callReadMethodSilent, getVaultReportHistory } from '../../index.js';
|
|
4
4
|
import { getDashboardContract } from '../../../contracts/index.js';
|
|
5
|
-
import {
|
|
5
|
+
import { getNOFeeSnapshotsByBlockNumbers } from '../../../features/index.js';
|
|
6
6
|
import { lineOpts } from './utils.js';
|
|
7
7
|
import { LIMIT } from './constants.js';
|
|
8
8
|
import { prepareNetStakingRewards, prepareNodeOperatorRewards, prepareGrossStakingRewards, buildNetStakingRewardsChart, buildNodeOperatorRewardsChart, buildGrossStakingRewardsChart, } from './datasets/index.js';
|
|
@@ -22,10 +22,10 @@ export const fetchRewardsChartsData = async ({ cid, dashboard, limit = LIMIT, ca
|
|
|
22
22
|
if (!history || history.length < 2)
|
|
23
23
|
throw new Error('Not enough data');
|
|
24
24
|
const blockNumbers = history.map((r) => r.blockNumber);
|
|
25
|
-
const
|
|
25
|
+
const noFeeSnapshots = await getNOFeeSnapshotsByBlockNumbers(vault, blockNumbers, dashboardContract, history);
|
|
26
26
|
const grossStakingRewards = prepareGrossStakingRewards(history);
|
|
27
|
-
const nodeOperatorRewards = prepareNodeOperatorRewards(history,
|
|
28
|
-
const netStakingRewards = prepareNetStakingRewards(history,
|
|
27
|
+
const nodeOperatorRewards = prepareNodeOperatorRewards(history, noFeeSnapshots);
|
|
28
|
+
const netStakingRewards = prepareNetStakingRewards(history, noFeeSnapshots);
|
|
29
29
|
const grossStakingRewardsChart = buildGrossStakingRewardsChart(grossStakingRewards);
|
|
30
30
|
const nodeOperatorRewardsChart = buildNodeOperatorRewardsChart(nodeOperatorRewards);
|
|
31
31
|
const netStakingRewardsChart = buildNetStakingRewardsChart(netStakingRewards);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"charts-rewards.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-rewards.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,OAAO,MAAM,iBAAiB,CAAC;AAGtC,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"charts-rewards.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-rewards.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { VaultReport } from '../../../index.js';
|
|
2
|
-
export declare const prepareBottomLine: (history: VaultReport[],
|
|
1
|
+
import { VaultReport, NOFeeSnapshot } from '../../../index.js';
|
|
2
|
+
export declare const prepareBottomLine: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[], vaultAddress: string) => Promise<{
|
|
3
3
|
values: string[];
|
|
4
4
|
timestamp: number[];
|
|
5
5
|
}>;
|
|
@@ -7,11 +7,11 @@ export declare const prepareGrossStakingAPR: (history: VaultReport[]) => {
|
|
|
7
7
|
values: number[];
|
|
8
8
|
timestamp: number[];
|
|
9
9
|
};
|
|
10
|
-
export declare const prepareNetStakingAPR: (history: VaultReport[],
|
|
10
|
+
export declare const prepareNetStakingAPR: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[]) => {
|
|
11
11
|
values: number[];
|
|
12
12
|
timestamp: number[];
|
|
13
13
|
};
|
|
14
|
-
export declare const prepareCarrySpread: (history: VaultReport[],
|
|
14
|
+
export declare const prepareCarrySpread: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[], vaultAddress: string) => Promise<{
|
|
15
15
|
values: number[];
|
|
16
16
|
timestamp: number[];
|
|
17
17
|
}>;
|
|
@@ -23,11 +23,11 @@ export declare const prepareGrossStakingRewards: (history: VaultReport[]) => {
|
|
|
23
23
|
values: string[];
|
|
24
24
|
timestamp: number[];
|
|
25
25
|
};
|
|
26
|
-
export declare const prepareNodeOperatorRewards: (history: VaultReport[],
|
|
26
|
+
export declare const prepareNodeOperatorRewards: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[]) => {
|
|
27
27
|
values: string[];
|
|
28
28
|
timestamp: number[];
|
|
29
29
|
};
|
|
30
|
-
export declare const prepareNetStakingRewards: (history: VaultReport[],
|
|
30
|
+
export declare const prepareNetStakingRewards: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[]) => {
|
|
31
31
|
values: string[];
|
|
32
32
|
timestamp: number[];
|
|
33
33
|
};
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { formatEther } from 'viem';
|
|
2
|
-
import { getBottomLine, getGrossStakingAPR, getNetStakingAPR, getCarrySpread, calculateLidoAPR, getGrossStakingRewards, getNetStakingRewards, getDailyLidoFees, } from '../../../index.js';
|
|
2
|
+
import { getBottomLine, getGrossStakingAPR, getNetStakingAPR, getCarrySpread, calculateLidoAPR, getGrossStakingRewards, getNetStakingRewards, getDailyLidoFees, getNodeOperatorFeeForPeriod, EMPTY_NO_FEE_SNAPSHOT, } from '../../../index.js';
|
|
3
3
|
import { getRebaseRewardFromCache, getShareRateFromCache } from '../../../index.js';
|
|
4
|
-
|
|
4
|
+
const snapshotAt = (noFeeSnapshots, i) => noFeeSnapshots[i] ?? EMPTY_NO_FEE_SNAPSHOT;
|
|
5
|
+
export const prepareBottomLine = async (history, noFeeSnapshots, vaultAddress) => {
|
|
5
6
|
const bottomLine = [];
|
|
6
7
|
const timestamp = [];
|
|
7
8
|
for (let i = 1; i < history.length; i++) {
|
|
@@ -13,10 +14,9 @@ export const prepareBottomLine = async (history, nodeOperatorAccruedFees, vaultA
|
|
|
13
14
|
vaultAddress,
|
|
14
15
|
blockNumberCurr: current.blockNumber,
|
|
15
16
|
blockNumberPrev: previous.blockNumber,
|
|
16
|
-
liabilitySharesCurr: BigInt(current.data.liabilityShares),
|
|
17
17
|
liabilitySharesPrev: BigInt(previous.data.liabilityShares),
|
|
18
18
|
});
|
|
19
|
-
const bottomLineValue = getBottomLine(current, previous,
|
|
19
|
+
const bottomLineValue = getBottomLine(current, previous, snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1), stEthLiabilityRebaseRewards);
|
|
20
20
|
bottomLine.push(String(bottomLineValue));
|
|
21
21
|
timestamp.push(current.timestamp);
|
|
22
22
|
}
|
|
@@ -36,7 +36,7 @@ export const prepareGrossStakingAPR = (history) => {
|
|
|
36
36
|
}
|
|
37
37
|
return { values: grossStakingAPRPercent, timestamp };
|
|
38
38
|
};
|
|
39
|
-
export const prepareNetStakingAPR = (history,
|
|
39
|
+
export const prepareNetStakingAPR = (history, noFeeSnapshots) => {
|
|
40
40
|
const netStakingAPRPercent = [];
|
|
41
41
|
const timestamp = [];
|
|
42
42
|
for (let i = 1; i < history.length; i++) {
|
|
@@ -44,13 +44,13 @@ export const prepareNetStakingAPR = (history, nodeOperatorAccruedFees) => {
|
|
|
44
44
|
const previous = history[i - 1];
|
|
45
45
|
if (!current || !previous)
|
|
46
46
|
continue;
|
|
47
|
-
const value = getNetStakingAPR(current, previous,
|
|
47
|
+
const value = getNetStakingAPR(current, previous, snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1));
|
|
48
48
|
netStakingAPRPercent.push(value.apr_percent);
|
|
49
49
|
timestamp.push(current.timestamp);
|
|
50
50
|
}
|
|
51
51
|
return { values: netStakingAPRPercent, timestamp };
|
|
52
52
|
};
|
|
53
|
-
export const prepareCarrySpread = async (history,
|
|
53
|
+
export const prepareCarrySpread = async (history, noFeeSnapshots, vaultAddress) => {
|
|
54
54
|
const carrySpreadPercent = [];
|
|
55
55
|
const timestamp = [];
|
|
56
56
|
for (let i = 1; i < history.length; i++) {
|
|
@@ -62,10 +62,9 @@ export const prepareCarrySpread = async (history, nodeOperatorAccruedFees, vault
|
|
|
62
62
|
vaultAddress,
|
|
63
63
|
blockNumberCurr: current.blockNumber,
|
|
64
64
|
blockNumberPrev: previous.blockNumber,
|
|
65
|
-
liabilitySharesCurr: BigInt(current.data.liabilityShares),
|
|
66
65
|
liabilitySharesPrev: BigInt(previous.data.liabilityShares),
|
|
67
66
|
});
|
|
68
|
-
const value = getCarrySpread(current, previous,
|
|
67
|
+
const value = getCarrySpread(current, previous, snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1), stEthLiabilityRebaseRewards);
|
|
69
68
|
carrySpreadPercent.push(value.apr_percent);
|
|
70
69
|
timestamp.push(current.timestamp);
|
|
71
70
|
}
|
|
@@ -102,7 +101,7 @@ export const prepareGrossStakingRewards = (history) => {
|
|
|
102
101
|
}
|
|
103
102
|
return { values: grossStakingRewards, timestamp };
|
|
104
103
|
};
|
|
105
|
-
export const prepareNodeOperatorRewards = (history,
|
|
104
|
+
export const prepareNodeOperatorRewards = (history, noFeeSnapshots) => {
|
|
106
105
|
const nodeOperatorRewards = [];
|
|
107
106
|
const timestamp = [];
|
|
108
107
|
for (let i = 1; i < history.length; i++) {
|
|
@@ -110,13 +109,13 @@ export const prepareNodeOperatorRewards = (history, nodeOperatorAccruedFees) =>
|
|
|
110
109
|
const previous = history[i - 1];
|
|
111
110
|
if (!current || !previous)
|
|
112
111
|
continue;
|
|
113
|
-
const value =
|
|
112
|
+
const value = getNodeOperatorFeeForPeriod(snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1));
|
|
114
113
|
nodeOperatorRewards.push(String(formatEther(value)));
|
|
115
114
|
timestamp.push(current.timestamp);
|
|
116
115
|
}
|
|
117
116
|
return { values: nodeOperatorRewards, timestamp };
|
|
118
117
|
};
|
|
119
|
-
export const prepareNetStakingRewards = (history,
|
|
118
|
+
export const prepareNetStakingRewards = (history, noFeeSnapshots) => {
|
|
120
119
|
const netStakingRewards = [];
|
|
121
120
|
const timestamp = [];
|
|
122
121
|
for (let i = 1; i < history.length; i++) {
|
|
@@ -124,7 +123,7 @@ export const prepareNetStakingRewards = (history, nodeOperatorAccruedFees) => {
|
|
|
124
123
|
const previous = history[i - 1];
|
|
125
124
|
if (!current || !previous)
|
|
126
125
|
continue;
|
|
127
|
-
const value = getNetStakingRewards(current, previous,
|
|
126
|
+
const value = getNetStakingRewards(current, previous, snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1));
|
|
128
127
|
netStakingRewards.push(String(formatEther(value)));
|
|
129
128
|
timestamp.push(current.timestamp);
|
|
130
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-metrics.js","sourceRoot":"","sources":["../../../../../utils/charts/blessed/datasets/prepare-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,EAEL,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"prepare-metrics.js","sourceRoot":"","sources":["../../../../../utils/charts/blessed/datasets/prepare-metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,11 @@ export const getMinMax = (arr) => {
|
|
|
9
9
|
const hasFloat = arr.some((v) => !Number.isInteger(v));
|
|
10
10
|
let minY, maxY;
|
|
11
11
|
if (hasFloat) {
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
// Scale based on magnitude of max value so tiny floats (e.g. 0.002) don't
|
|
13
|
+
// get collapsed to 0 by fixed *10/10 rounding
|
|
14
|
+
const scale = Math.pow(10, -Math.floor(Math.log10(Math.abs(max) || 1)) + 1);
|
|
15
|
+
minY = Math.floor((min - range * 0.15) * scale) / scale;
|
|
16
|
+
maxY = Math.ceil((max + range * 0.15) * scale) / scale;
|
|
14
17
|
}
|
|
15
18
|
else {
|
|
16
19
|
minY = Math.floor(min - range * 0.15);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,UAAU,EACV,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,QAAQ,GACT,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAa,EAAE,EAAE;IACzC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;IAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAG,GAAG,GAAG,GAAG,CAAC;IACxB,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,IAAI,IAAI,EAAE,IAAI,CAAC;IACf,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,UAAU,EACV,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,QAAQ,GACT,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAa,EAAE,EAAE;IACzC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;IAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAG,GAAG,GAAG,GAAG,CAAC;IACxB,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,IAAI,IAAI,EAAE,IAAI,CAAC;IACf,IAAI,QAAQ,EAAE,CAAC;QACb,0EAA0E;QAC1E,8CAA8C;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5E,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC;QACxD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC;IACzD,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC;QACtC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAClC,CAAC,CAAC;AAEF,iGAAiG;AACjG,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAgB,EAAE,UAAU,GAAG,CAAC,EAAE,EAAE;IACpE,2DAA2D;IAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CACxB,CAAC,EACD,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,QAAQ,GAAG,UAAU,CAAC,CAAC,CAChD,CAAC;IACF,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IACxB,IAAI,CAAC,IAAI,SAAS;QAAE,OAAO,MAAM,CAAC;IAClC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;IACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,EACE,KAAK,EACL,KAAK,EACL,MAAM,EACN,KAAK,GAMN,EACD,IAA0D,EAC1D,EAAE;IACF,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,GAAG,KAAK,UAAU,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG;QAC9E,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE;QAC/B,KAAK,EAAE;YACL,IAAI,EAAE,WAAW,CAAC,KAAiC,CAAC,IAAI,QAAQ;YAChE,GAAG,UAAU;SACd;QACD,aAAa,EAAE,cAAc;QAC7B,QAAQ,EAAE,QAAQ;QAClB,gBAAgB,EAAE,kBAAkB;QACpC,YAAY,EAAE,cAAc;QAC5B,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,2BAA2B;QAC3B,UAAU,EAAE,YAAY;KACzB,CAAC;IACF,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QAClD,OAAO;YACL,GAAG,IAAI;YACP,MAAM,EAAE;gBACN,KAAK,EAAE,YAAY;gBACnB,KAAK,EACH,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,WAAW;oBACnC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CACtB,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;wBAChB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW;4BAC3B,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;4BACrB,CAAC,CAAC,SAAS,CAAC;wBACd,IAAI,IAAI;4BAAE,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;wBAC5B,OAAO,GAAG,CAAC;oBACb,CAAC,EACD,EAA4B,CAC7B;oBACH,CAAC,CAAC,EAAE;aACT;SACF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { formatEther } from 'viem';
|
|
2
2
|
import { getDashboardContract } from '../../../contracts/index.js';
|
|
3
3
|
import { logError, logInfo, callReadMethodSilent, getVaultReportHistory, getGrossStakingAPR, getGrossStakingRewards, getNetStakingAPR, getCarrySpread, getBottomLine, getRebaseRewardFromCache, formatTimestamp, } from '../../index.js';
|
|
4
|
-
import {
|
|
4
|
+
import { getNOFeeSnapshotsByBlockNumbers } from '../../../features/index.js';
|
|
5
5
|
import { logGrossStakingAPRChart, logNetStakingAPRChart, logCarrySpreadChart, logBottomLineChart, } from '../metrics.js';
|
|
6
6
|
// TODO: Refactor this file
|
|
7
7
|
// Render simple charts for APR metrics
|
|
@@ -40,25 +40,33 @@ export const renderSimpleCharts = async ({ dashboard, cid, limit = 20, cacheUse
|
|
|
40
40
|
const grossStakingRewards = [];
|
|
41
41
|
const timeLabels = [];
|
|
42
42
|
const blockNumbers = history.map((r) => r.blockNumber);
|
|
43
|
-
const
|
|
43
|
+
const noFeeSnapshots = await getNOFeeSnapshotsByBlockNumbers(vault, blockNumbers, dashboardContract, history);
|
|
44
44
|
for (let i = 1; i < history.length; i++) {
|
|
45
45
|
const current = history[i];
|
|
46
46
|
const previous = history[i - 1];
|
|
47
47
|
if (!current || !previous)
|
|
48
48
|
continue;
|
|
49
|
+
const noFeeCurr = noFeeSnapshots[i] ?? {
|
|
50
|
+
accruedFee: 0n,
|
|
51
|
+
settledGrowth: 0n,
|
|
52
|
+
feeRate: 0n,
|
|
53
|
+
};
|
|
54
|
+
const noFeePrev = noFeeSnapshots[i - 1] ?? {
|
|
55
|
+
accruedFee: 0n,
|
|
56
|
+
settledGrowth: 0n,
|
|
57
|
+
feeRate: 0n,
|
|
58
|
+
};
|
|
49
59
|
const stEthLiabilityRebaseRewards = await getRebaseRewardFromCache({
|
|
50
60
|
vaultAddress: vault,
|
|
51
61
|
blockNumberCurr: current.blockNumber,
|
|
52
62
|
blockNumberPrev: previous.blockNumber,
|
|
53
|
-
liabilitySharesCurr: BigInt(current.data.liabilityShares),
|
|
54
63
|
liabilitySharesPrev: BigInt(previous.data.liabilityShares),
|
|
55
64
|
});
|
|
56
65
|
grossStakingRewards.push(Number(formatEther(getGrossStakingRewards(current, previous), 'gwei')));
|
|
57
66
|
grossStakingAPRPercent.push(getGrossStakingAPR(current, previous).apr_percent);
|
|
58
|
-
netStakingAPRPercent.push(getNetStakingAPR(current, previous,
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
bottomLine.push(Number(getBottomLine(current, previous, nodeOperatorAccruedFees[i] ?? 0n, stEthLiabilityRebaseRewards)));
|
|
67
|
+
netStakingAPRPercent.push(getNetStakingAPR(current, previous, noFeeCurr, noFeePrev).apr_percent);
|
|
68
|
+
carrySpreadPercent.push(getCarrySpread(current, previous, noFeeCurr, noFeePrev, stEthLiabilityRebaseRewards).apr_percent);
|
|
69
|
+
bottomLine.push(Number(getBottomLine(current, previous, noFeeCurr, noFeePrev, stEthLiabilityRebaseRewards)));
|
|
62
70
|
timeLabels.push(formatTimestamp(current.timestamp, 'dd.mm hh:mm'));
|
|
63
71
|
}
|
|
64
72
|
logGrossStakingAPRChart(grossStakingAPRPercent, timeLabels);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple-charts.js","sourceRoot":"","sources":["../../../../utils/charts/simple/simple-charts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EACL,QAAQ,EACR,OAAO,EACP,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,wBAAwB,EACxB,eAAe,GAChB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"simple-charts.js","sourceRoot":"","sources":["../../../../utils/charts/simple/simple-charts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../utils/error-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAY,EAAE,OAAe,EAAE,EAAE;IAC1D,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClB,MAAM,GAAG,CAAC;AACZ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../utils/error-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAY,EAAE,OAAe,EAAE,EAAE;IAC1D,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClB,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QACxC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IACD,MAAM,GAAG,CAAC;AACZ,CAAC,CAAC"}
|
package/dist/utils/fetchCL.js
CHANGED
|
@@ -45,6 +45,18 @@ const isValidatorsInfoArray = (obj) => {
|
|
|
45
45
|
Array.isArray(obj.data) &&
|
|
46
46
|
obj.data.every(isValidator));
|
|
47
47
|
};
|
|
48
|
+
const validateResponse = (response) => {
|
|
49
|
+
if (!response.ok) {
|
|
50
|
+
throw new Error(`HTTP error ${response.status}-${response.statusText}, URL(${response.url})`);
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
const getCLApiUrl = (clURL) => {
|
|
54
|
+
const url = clURL || getConfig().CL_URL;
|
|
55
|
+
if (!url) {
|
|
56
|
+
throw new Error('CL_URL is not set. CL_URL is required for fetching beacon header by parent root');
|
|
57
|
+
}
|
|
58
|
+
return url;
|
|
59
|
+
};
|
|
48
60
|
const endpoints = {
|
|
49
61
|
finalityCheckpoints: 'eth/v1/beacon/states/head/finality_checkpoints',
|
|
50
62
|
genesis: 'eth/v1/beacon/genesis',
|
|
@@ -55,15 +67,10 @@ const endpoints = {
|
|
|
55
67
|
nodeSyncing: 'eth/v1/node/syncing',
|
|
56
68
|
};
|
|
57
69
|
export const finalityCheckpoints = async (clURL) => {
|
|
58
|
-
const url = clURL
|
|
59
|
-
if (!url) {
|
|
60
|
-
throw new Error('CL_URL is not set. CL_URL is required for fetching epoch');
|
|
61
|
-
}
|
|
70
|
+
const url = getCLApiUrl(clURL);
|
|
62
71
|
try {
|
|
63
72
|
const epochResp = await fetch(`${url.endsWith('/') ? url : url + '/'}${endpoints.finalityCheckpoints}`);
|
|
64
|
-
|
|
65
|
-
throw new Error(`HTTP ${epochResp.status} ${epochResp.statusText}. URL: ${url}\n`);
|
|
66
|
-
}
|
|
73
|
+
validateResponse(epochResp);
|
|
67
74
|
const body = await epochResp.json();
|
|
68
75
|
if (!isFinalityCheckpoints(body)) {
|
|
69
76
|
throw new Error(`Response JSON is not of type FinalityCheckpoints.\nSnippet: ${JSON.stringify(body)}`);
|
|
@@ -76,13 +83,11 @@ export const finalityCheckpoints = async (clURL) => {
|
|
|
76
83
|
}
|
|
77
84
|
};
|
|
78
85
|
export const fetchBeaconHeader = async (stateId, clURL) => {
|
|
79
|
-
const url = clURL
|
|
80
|
-
if (!url) {
|
|
81
|
-
throw new Error('CL_URL is not set. CL_URL is required for fetching beacon header');
|
|
82
|
-
}
|
|
86
|
+
const url = getCLApiUrl(clURL);
|
|
83
87
|
try {
|
|
84
88
|
const beaconHeaderResp = await fetch(`${url.endsWith('/') ? url : url + '/'}${endpoints.beaconHeader(stateId)}`);
|
|
85
|
-
|
|
89
|
+
validateResponse(beaconHeaderResp);
|
|
90
|
+
return await beaconHeaderResp.json();
|
|
86
91
|
}
|
|
87
92
|
catch (error) {
|
|
88
93
|
printError(error, `Error fetching beacon header. Used URL: ${url}, stateId: ${stateId}. Please check if the CL_URL environment variable is correct or try to use another CL.`);
|
|
@@ -90,14 +95,12 @@ export const fetchBeaconHeader = async (stateId, clURL) => {
|
|
|
90
95
|
}
|
|
91
96
|
};
|
|
92
97
|
export const fetchBeaconState = async (stateId, clURL) => {
|
|
93
|
-
const url = clURL
|
|
94
|
-
if (!url) {
|
|
95
|
-
throw new Error('CL_URL is not set. CL_URL is required for fetching beacon state');
|
|
96
|
-
}
|
|
98
|
+
const url = getCLApiUrl(clURL);
|
|
97
99
|
try {
|
|
98
100
|
const beaconStateResp = await fetch(`${url.endsWith('/') ? url : url + '/'}${endpoints.state(stateId)}`, {
|
|
99
101
|
headers: { accept: 'application/octet-stream' },
|
|
100
102
|
});
|
|
103
|
+
validateResponse(beaconStateResp);
|
|
101
104
|
const { headers } = beaconStateResp;
|
|
102
105
|
const forkName = headers.get('eth-consensus-version');
|
|
103
106
|
// Checks
|
|
@@ -116,13 +119,11 @@ export const fetchBeaconState = async (stateId, clURL) => {
|
|
|
116
119
|
}
|
|
117
120
|
};
|
|
118
121
|
export const fetchBeaconHeaderByParentRoot = async (parentRoot, clURL) => {
|
|
119
|
-
const url = clURL
|
|
120
|
-
if (!url) {
|
|
121
|
-
throw new Error('CL_URL is not set. CL_URL is required for fetching beacon header by parent root');
|
|
122
|
-
}
|
|
122
|
+
const url = getCLApiUrl(clURL);
|
|
123
123
|
try {
|
|
124
124
|
const beaconHeaderResp = await fetch(`${url.endsWith('/') ? url : url + '/'}${endpoints.beaconHeadersByParentRoot(parentRoot)}`);
|
|
125
|
-
|
|
125
|
+
validateResponse(beaconHeaderResp);
|
|
126
|
+
return await beaconHeaderResp.json();
|
|
126
127
|
}
|
|
127
128
|
catch (error) {
|
|
128
129
|
printError(error, `Error fetching beacon header by parent root. Used URL: ${url}, parentRoot: ${parentRoot}. Please check if the CL_URL environment variable is correct or try to use another CL.`);
|
|
@@ -130,15 +131,10 @@ export const fetchBeaconHeaderByParentRoot = async (parentRoot, clURL) => {
|
|
|
130
131
|
}
|
|
131
132
|
};
|
|
132
133
|
export const fetchValidatorsInfo = async (validatorPubkeys, clURL) => {
|
|
133
|
-
const url = clURL
|
|
134
|
-
if (!url) {
|
|
135
|
-
throw new Error('CL_URL is not set. CL_URL is required for fetching validator info');
|
|
136
|
-
}
|
|
134
|
+
const url = getCLApiUrl(clURL);
|
|
137
135
|
try {
|
|
138
136
|
const validatorsInfoResp = await fetch(`${url.endsWith('/') ? url : url + '/'}${endpoints.validatorsInfo('?id=' + validatorPubkeys.join(','))}`);
|
|
139
|
-
|
|
140
|
-
throw new Error(`HTTP ${validatorsInfoResp.status} ${validatorsInfoResp.statusText}. URL: ${url}\n`);
|
|
141
|
-
}
|
|
137
|
+
validateResponse(validatorsInfoResp);
|
|
142
138
|
const body = await validatorsInfoResp.json();
|
|
143
139
|
if (!isValidatorsInfoArray(body)) {
|
|
144
140
|
throw new Error(`Response JSON is not of type ValidatorsInfo.\nSnippet: ${JSON.stringify(body)}`);
|
|
@@ -151,15 +147,10 @@ export const fetchValidatorsInfo = async (validatorPubkeys, clURL) => {
|
|
|
151
147
|
}
|
|
152
148
|
};
|
|
153
149
|
export const fetchNodeSyncingStatus = async (clURL) => {
|
|
154
|
-
const url = clURL
|
|
155
|
-
if (!url) {
|
|
156
|
-
throw new Error('CL_URL is not set. CL_URL is required for checking node syncing status');
|
|
157
|
-
}
|
|
150
|
+
const url = getCLApiUrl(clURL);
|
|
158
151
|
try {
|
|
159
152
|
const syncingResp = await fetch(`${url.endsWith('/') ? url : url + '/'}${endpoints.nodeSyncing}`);
|
|
160
|
-
|
|
161
|
-
throw new Error(`HTTP ${syncingResp.status} ${syncingResp.statusText}. URL: ${url}\n`);
|
|
162
|
-
}
|
|
153
|
+
validateResponse(syncingResp);
|
|
163
154
|
const body = await syncingResp.json();
|
|
164
155
|
return body;
|
|
165
156
|
}
|