diff --git a/backend/pkg/api/router.go b/backend/pkg/api/router.go index 92ce5f381..1a5b57e47 100644 --- a/backend/pkg/api/router.go +++ b/backend/pkg/api/router.go @@ -98,7 +98,7 @@ func addRoutes(hs *handlers.HandlerService, publicRouter, internalRouter *mux.Ro {"GET", "/validator-dashboards/{dashboard_id}/groups/{group_id}/summary", hs.PublicGetValidatorDashboardGroupSummary, hs.InternalGetValidatorDashboardGroupSummary}, {"GET", "/validator-dashboards/{dashboard_id}/summary-chart", hs.PublicGetValidatorDashboardSummaryChart, hs.InternalGetValidatorDashboardSummaryChart}, {"GET", "/validator-dashboards/{dashboard_id}/rewards", hs.PublicGetValidatorDashboardRewards, hs.InternalGetValidatorDashboardRewards}, - {"GET", "/validator-dashboards/{dashboard_id}/groups/{group_id}/rewards", hs.PublicGetValidatorDashboardGroupRewards, hs.InternalGetValidatorDashboardGroupRewards}, + {"GET", "/validator-dashboards/{dashboard_id}/groups/{group_id}/rewards/{epoch}", hs.PublicGetValidatorDashboardGroupRewards, hs.InternalGetValidatorDashboardGroupRewards}, {"GET", "/validator-dashboards/{dashboard_id}/rewards-chart", hs.PublicGetValidatorDashboardRewardsChart, hs.InternalGetValidatorDashboardRewardsChart}, {"GET", "/validator-dashboards/{dashboard_id}/duties/{epoch}", hs.PublicGetValidatorDashboardDuties, hs.InternalGetValidatorDashboardDuties}, {"GET", "/validator-dashboards/{dashboard_id}/blocks", hs.PublicGetValidatorDashboardBlocks, hs.InternalGetValidatorDashboardBlocks}, diff --git a/backend/pkg/api/types/validator_dashboard.go b/backend/pkg/api/types/validator_dashboard.go index fd732ffdd..4eb88c3a5 100644 --- a/backend/pkg/api/types/validator_dashboard.go +++ b/backend/pkg/api/types/validator_dashboard.go @@ -102,8 +102,13 @@ type VDBGroupRewardsData struct { AttestationsHead VDBGroupRewardsDetails `json:"attestations_head"` Sync VDBGroupRewardsDetails `json:"sync"` Slashing VDBGroupRewardsDetails `json:"slashing"` + Inactivity VDBGroupRewardsDetails `json:"inactivity"` Proposal VDBGroupRewardsDetails `json:"proposal"` - ProposalElReward decimal.Decimal `json:"proposal_el_reward"` + + ProposalElReward decimal.Decimal `json:"proposal_el_reward"` + ProposalClAttIncReward decimal.Decimal `json:"proposal_cl_att_inc_reward"` + ProposalClSyncIncReward decimal.Decimal `json:"proposal_cl_sync_inc_reward"` + ProposalClSlashingIncReward decimal.Decimal `json:"proposal_cl_slashing_inc_reward"` } type InternalGetValidatorDashboardGroupRewardsResponse ApiDataResponse[VDBGroupRewardsData] diff --git a/frontend/types/api/validator_dashboard.ts b/frontend/types/api/validator_dashboard.ts index 8f4b17364..3a6c542b0 100644 --- a/frontend/types/api/validator_dashboard.ts +++ b/frontend/types/api/validator_dashboard.ts @@ -93,8 +93,12 @@ export interface VDBGroupRewardsData { attestations_head: VDBGroupRewardsDetails; sync: VDBGroupRewardsDetails; slashing: VDBGroupRewardsDetails; + inactivity: VDBGroupRewardsDetails; proposal: VDBGroupRewardsDetails; proposal_el_reward: string /* decimal.Decimal */; + proposal_cl_att_inc_reward: string /* decimal.Decimal */; + proposal_cl_sync_inc_reward: string /* decimal.Decimal */; + proposal_cl_slashing_inc_reward: string /* decimal.Decimal */; } export type InternalGetValidatorDashboardGroupRewardsResponse = ApiDataResponse; export type InternalGetValidatorDashboardRewardsChartResponse = ApiDataResponse>; // bar chart, series id is group id, stack is 'execution' or 'consensus'