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.

Sign up for GitHub

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

BEDS 1078/block proposal notifc #1228

Merged
merged 2 commits into from
Jan 15, 2025
Merged

BEDS 1078/block proposal notifc #1228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b58ca9
refactor: split api block proposal success & miss notification events
LuccaBitfly Jan 2, 2025
38da3ff
refactor: split frontend block proposal success & miss notification e…
LuccaBitfly Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions backend/pkg/api/data_access/notifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,8 +1681,10 @@ func (d *DataAccessService) GetNotificationSettingsDashboards(ctx context.Contex
settings.GroupEfficiencyBelowThreshold = event.Threshold
case types.ValidatorMissedAttestationEventName:
settings.IsAttestationsMissedSubscribed = true
case types.ValidatorMissedProposalEventName, types.ValidatorExecutedProposalEventName:
settings.IsBlockProposalSubscribed = true
case types.ValidatorExecutedProposalEventName:
settings.IsBlockProposalSuccessSubscribed = true
case types.ValidatorMissedProposalEventName:
settings.IsBlockProposalMissedSubscribed = true
case types.ValidatorUpcomingProposalEventName:
settings.IsUpcomingBlockProposalSubscribed = true
case types.SyncCommitteeSoonEventName:
Expand Down Expand Up @@ -1922,9 +1924,8 @@ func (d *DataAccessService) UpdateNotificationSettingsValidatorDashboard(ctx con
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsSlashedSubscribed, userId, types.ValidatorGotSlashedEventName, networkName, eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsMaxCollateralSubscribed, userId, types.RocketpoolCollateralMaxReachedEventName, networkName, eventFilter, epoch, settings.MaxCollateralThreshold)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsMinCollateralSubscribed, userId, types.RocketpoolCollateralMinReachedEventName, networkName, eventFilter, epoch, settings.MinCollateralThreshold)
// Set two events for IsBlockProposalSubscribed
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsBlockProposalSubscribed, userId, types.ValidatorMissedProposalEventName, networkName, eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsBlockProposalSubscribed, userId, types.ValidatorExecutedProposalEventName, networkName, eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsBlockProposalSuccessSubscribed, userId, types.ValidatorMissedProposalEventName, networkName, eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsBlockProposalMissedSubscribed, userId, types.ValidatorExecutedProposalEventName, networkName, eventFilter, epoch, 0)

// Insert all the events or update the threshold if they already exist
if len(eventsToInsert) > 0 {
Expand Down
3 changes: 2 additions & 1 deletion backend/pkg/api/types/notifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ type NotificationSettingsValidatorDashboard struct {
IsGroupEfficiencyBelowSubscribed bool `json:"is_group_efficiency_below_subscribed"`
GroupEfficiencyBelowThreshold float64 `json:"group_efficiency_below_threshold" faker:"boundary_start=0, boundary_end=1"`
IsAttestationsMissedSubscribed bool `json:"is_attestations_missed_subscribed"`
IsBlockProposalSubscribed bool `json:"is_block_proposal_subscribed"`
IsBlockProposalSuccessSubscribed bool `json:"is_block_proposal_success_subscribed"`
IsBlockProposalMissedSubscribed bool `json:"is_block_proposal_missed_subscribed"`
IsUpcomingBlockProposalSubscribed bool `json:"is_upcoming_block_proposal_subscribed"`
IsSyncSubscribed bool `json:"is_sync_subscribed"`
IsWithdrawalProcessedSubscribed bool `json:"is_withdrawal_processed_subscribed"`
Expand Down
7 changes: 5 additions & 2 deletions frontend/components/notifications/management/NotificationsManagementDashboards.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,11 @@ const wrappedDashboards: ComputedRef<
if (settingsValidatorDashboard.is_attestations_missed_subscribed) {
result.push($t('notifications.subscriptions.validators.attestation_missed.label'))
}
if (settingsValidatorDashboard.is_block_proposal_subscribed) {
result.push($t('notifications.subscriptions.validators.block_proposal.label'))
if (settingsValidatorDashboard.is_block_proposal_missed_subscribed) {
result.push($t('notifications.subscriptions.validators.block_proposal_missed.label'))
}
if (settingsValidatorDashboard.is_block_proposal_success_subscribed) {
result.push($t('notifications.subscriptions.validators.block_proposal_success.label'))
}
if (settingsValidatorDashboard.is_upcoming_block_proposal_subscribed) {
result.push($t('notifications.subscriptions.validators.upcoming_block_proposal.label'))
Expand Down
11 changes: 8 additions & 3 deletions frontend/components/notifications/management/NotificationsManagementSubscriptionDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ function closeDialog(): void {

const checkboxes = ref({
is_attestations_missed_subscribed: props.value?.is_attestations_missed_subscribed ?? false,
is_block_proposal_subscribed: props.value?.is_block_proposal_subscribed ?? false,
is_block_proposal_missed_subscribed: props.value?.is_block_proposal_missed_subscribed ?? false,
is_block_proposal_success_subscribed: props.value?.is_block_proposal_success_subscribed ?? false,
is_group_efficiency_below_subscribed: props.value?.is_group_efficiency_below_subscribed ?? false,
is_max_collateral_subscribed: props.value?.is_max_collateral_subscribed ?? false,
is_min_collateral_subscribed: props.value?.is_min_collateral_subscribed ?? false,
Expand Down Expand Up @@ -113,8 +114,12 @@ const { minutes: minutesUntilNetworkFinality } = formatSecondsTo(secondsUntilNet
:info="$t('notifications.subscriptions.validators.attestation_missed.info', { count: Number(formatSecondsTo(secondsPerEpoch, { minimumFractionDigits: 1 }).minutes) })"
/>
<BcSettingsRow
v-model:checkbox="checkboxes.is_block_proposal_subscribed"
:label="$t('notifications.subscriptions.validators.block_proposal.label')"
v-model:checkbox="checkboxes.is_block_proposal_success_subscribed"
:label="$t('notifications.subscriptions.validators.block_proposal_success.label')"
/>
<BcSettingsRow
v-model:checkbox="checkboxes.is_block_proposal_missed_subscribed"
:label="$t('notifications.subscriptions.validators.block_proposal_missed.label')"
/>
<BcSettingsRow
v-model:checkbox="checkboxes.is_upcoming_block_proposal_subscribed"
Expand Down
3 changes: 2 additions & 1 deletion frontend/components/playground/PlaygroundDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ const openQuestion = (yesLabel?: string, noLabel?: string) => {
const validatorSub: NotificationSettingsValidatorDashboard = {
group_efficiency_below_threshold: 0,
is_attestations_missed_subscribed: true,
is_block_proposal_subscribed: true,
is_block_proposal_missed_subscribed: true,
is_block_proposal_success_subscribed: true,
is_group_efficiency_below_subscribed: true,
is_max_collateral_subscribed: false,
is_min_collateral_subscribed: false,
Expand Down
3 changes: 2 additions & 1 deletion frontend/composables/notifications/useNotificationsManagementDashboards.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ export function useNotificationsManagementDashboards() {
const accountDashboardSettings = settings as NotificationSettingsValidatorDashboard
accountDashboardSettings.group_efficiency_below_threshold = 0
accountDashboardSettings.is_attestations_missed_subscribed = false
accountDashboardSettings.is_block_proposal_subscribed = false
accountDashboardSettings.is_block_proposal_missed_subscribed = false
accountDashboardSettings.is_block_proposal_success_subscribed = false
accountDashboardSettings.is_group_efficiency_below_subscribed = false
accountDashboardSettings.is_max_collateral_subscribed = false
accountDashboardSettings.is_min_collateral_subscribed = false
Expand Down
7 changes: 6 additions & 1 deletion frontend/i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,12 @@
"text": "Indicates the percentage of rewards in relation to the theoretical maximum value",
"title": "Attestation Efficiency: "
},
"block_proposal": "Block Proposal",
"block_proposal_missed": {
"label": "Block proposal missed"
},
"block_proposal_success": {
"label": "Block proposal success"
},
"sync": {
"text": "If isPartOfSyncCommittee then sync_efficiency = executed_Sync / (scheduled_Sync - missed_Blocks) else 1",
"title": "Sync Committee Efficiency: "
Expand Down
3 changes: 2 additions & 1 deletion frontend/types/api/notifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ export interface NotificationSettingsValidatorDashboard {
is_group_efficiency_below_subscribed: boolean;
group_efficiency_below_threshold: number /* float64 */;
is_attestations_missed_subscribed: boolean;
is_block_proposal_subscribed: boolean;
is_block_proposal_success_subscribed: boolean;
is_block_proposal_missed_subscribed: boolean;
is_upcoming_block_proposal_subscribed: boolean;
is_sync_subscribed: boolean;
is_withdrawal_processed_subscribed: boolean;
Expand Down
Loading