Skip to content

Commit

Permalink
Merge pull request #972 from gobitfly/BEDS-639/Split_proposal_event
Browse files Browse the repository at this point in the history 
RP_rewards
  • Loading branch information
@peterbitfly
peterbitfly authored Oct 17, 2024
2 parents 5b4d1f9 + 7b7a4bb commit 3b89a37
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 26 deletions.
18 changes: 10 additions & 8 deletions backend/pkg/api/data_access/notifications.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1053,9 +1053,9 @@ func (d *DataAccessService) GetRocketPoolNotifications(ctx context.Context, user
// switch notification.EventType {
// case types.RocketpoolNewClaimRoundStartedEventName:
// resultEntry.EventType = "reward_round"
// case types.RocketpoolCollateralMinReached:
// case types.RocketpoolCollateralMinReachedEventName:
// resultEntry.EventType = "collateral_min"
// case types.RocketpoolCollateralMaxReached:
// case types.RocketpoolCollateralMaxReachedEventName:
// resultEntry.EventType = "collateral_max"
// default:
// return nil, nil, fmt.Errorf("invalid event name for rocketpool notification: %v", notification.EventType)
Expand Down Expand Up @@ -1868,7 +1868,7 @@ func (d *DataAccessService) GetNotificationSettingsDashboards(ctx context.Contex
settings.GroupOfflineThreshold = event.Threshold
case types.ValidatorMissedAttestationEventName:
settings.IsAttestationsMissedSubscribed = true
case types.ValidatorProposalEventName:
case types.ValidatorMissedProposalEventName, types.ValidatorExecutedProposalEventName:
settings.IsBlockProposalSubscribed = true
case types.ValidatorUpcomingProposalEventName:
settings.IsUpcomingBlockProposalSubscribed = true
Expand All @@ -1878,10 +1878,10 @@ func (d *DataAccessService) GetNotificationSettingsDashboards(ctx context.Contex
settings.IsWithdrawalProcessedSubscribed = true
case types.ValidatorGotSlashedEventName:
settings.IsSlashedSubscribed = true
case types.RocketpoolCollateralMinReached:
case types.RocketpoolCollateralMinReachedEventName:
settings.IsMinCollateralSubscribed = true
settings.MinCollateralThreshold = event.Threshold
case types.RocketpoolCollateralMaxReached:
case types.RocketpoolCollateralMaxReachedEventName:
settings.IsMaxCollateralSubscribed = true
settings.MaxCollateralThreshold = event.Threshold
}
Expand Down Expand Up @@ -2085,13 +2085,15 @@ func (d *DataAccessService) UpdateNotificationSettingsValidatorDashboard(ctx con
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsValidatorOfflineSubscribed, userId, string(types.ValidatorIsOfflineEventName), eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsGroupOfflineSubscribed, userId, string(types.GroupIsOfflineEventName), eventFilter, epoch, settings.GroupOfflineThreshold)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsAttestationsMissedSubscribed, userId, string(types.ValidatorMissedAttestationEventName), eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsBlockProposalSubscribed, userId, string(types.ValidatorProposalEventName), eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsUpcomingBlockProposalSubscribed, userId, string(types.ValidatorUpcomingProposalEventName), eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsSyncSubscribed, userId, string(types.SyncCommitteeSoon), eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsWithdrawalProcessedSubscribed, userId, string(types.ValidatorReceivedWithdrawalEventName), eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsSlashedSubscribed, userId, string(types.ValidatorGotSlashedEventName), eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsMaxCollateralSubscribed, userId, string(types.RocketpoolCollateralMaxReached), eventFilter, epoch, settings.MaxCollateralThreshold)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsMinCollateralSubscribed, userId, string(types.RocketpoolCollateralMinReached), eventFilter, epoch, settings.MinCollateralThreshold)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsMaxCollateralSubscribed, userId, string(types.RocketpoolCollateralMaxReachedEventName), eventFilter, epoch, settings.MaxCollateralThreshold)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsMinCollateralSubscribed, userId, string(types.RocketpoolCollateralMinReachedEventName), eventFilter, epoch, settings.MinCollateralThreshold)
// Set two events for IsBlockProposalSubscribed
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsBlockProposalSubscribed, userId, string(types.ValidatorMissedProposalEventName), eventFilter, epoch, 0)
d.AddOrRemoveEvent(&eventsToInsert, &eventsToDelete, settings.IsBlockProposalSubscribed, userId, string(types.ValidatorExecutedProposalEventName), eventFilter, epoch, 0)

// Insert all the events or update the threshold if they already exist
if len(eventsToInsert) > 0 {
Expand Down
30 changes: 12 additions & 18 deletions backend/pkg/commons/types/frontend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ func (npui NotificationsPerUserId) AddNotification(n Notification) {
}

const (
ValidatorMissedProposalEventName EventName = "validator_proposal_missed"
ValidatorExecutedProposalEventName EventName = "validator_proposal_submitted"

ValidatorDidSlashEventName EventName = "validator_did_slash"
ValidatorGroupIsOfflineEventName EventName = "validator_group_is_offline"
ValidatorBalanceDecreasedEventName EventName = "validator_balance_decreased"
Expand All @@ -80,25 +77,22 @@ const (
NetworkValidatorExitQueueNotFullEventName EventName = "network_validator_exit_queue_not_full"
NetworkLivenessIncreasedEventName EventName = "network_liveness_increased"
TaxReportEventName EventName = "user_tax_report"
//nolint:misspell
RocketpoolCollateralMinReachedEventName EventName = "rocketpool_colleteral_min"
//nolint:misspell
RocketpoolCollateralMaxReachedEventName EventName = "rocketpool_colleteral_max"
SyncCommitteeSoonEventName EventName = "validator_synccommittee_soon"
SyncCommitteeSoonEventName EventName = "validator_synccommittee_soon"
//nolint:misspell
RocketpoolCommissionThresholdEventName EventName = "rocketpool_commision_threshold"

// Validator dashboard events
ValidatorIsOfflineEventName EventName = "validator_is_offline"
GroupIsOfflineEventName EventName = "group_is_offline"
ValidatorMissedAttestationEventName EventName = "validator_attestation_missed"
ValidatorProposalEventName EventName = "validator_proposal"
ValidatorUpcomingProposalEventName EventName = "validator_proposal_upcoming"
SyncCommitteeSoon EventName = "validator_synccommittee_soon"
ValidatorReceivedWithdrawalEventName EventName = "validator_withdrawal"
ValidatorGotSlashedEventName EventName = "validator_got_slashed"
RocketpoolCollateralMinReached EventName = "rocketpool_colleteral_min" //nolint:misspell
RocketpoolCollateralMaxReached EventName = "rocketpool_colleteral_max" //nolint:misspell
ValidatorIsOfflineEventName EventName = "validator_is_offline"
GroupIsOfflineEventName EventName = "group_is_offline"
ValidatorMissedAttestationEventName EventName = "validator_attestation_missed"
ValidatorMissedProposalEventName EventName = "validator_proposal_missed"
ValidatorExecutedProposalEventName EventName = "validator_proposal_submitted"
ValidatorUpcomingProposalEventName EventName = "validator_proposal_upcoming"
SyncCommitteeSoon EventName = "validator_synccommittee_soon"
ValidatorReceivedWithdrawalEventName EventName = "validator_withdrawal"
ValidatorGotSlashedEventName EventName = "validator_got_slashed"
RocketpoolCollateralMinReachedEventName EventName = "rocketpool_colleteral_min" //nolint:misspell
RocketpoolCollateralMaxReachedEventName EventName = "rocketpool_colleteral_max" //nolint:misspell

// Account dashboard events
IncomingTransactionEventName EventName = "incoming_transaction"
Expand Down

0 comments on commit 3b89a37

Please sign in to comment.