add withdrawal & consolidation request details to validator details page

ethpandaops · Nov 29, 2024 · 2d524c2 · 2d524c2
1 parent 0f74f94
commit 2d524c2
Show file tree

Hide file tree

Showing 17 changed files with 773 additions and 59 deletions.
diff --git a/db/consolidation_request_txs.go b/db/consolidation_request_txs.go
@@ -140,6 +140,11 @@ func GetConsolidationRequestTxsFiltered(offset uint64, limit uint32, canonicalFo
 		fmt.Fprintf(&sql, " %v dequeue_block <= $%v", filterOp, len(args))
 		filterOp = "AND"
 	}
+	if len(filter.PublicKey) > 0 {
+		args = append(args, filter.PublicKey)
+		fmt.Fprintf(&sql, " %v (source_pubkey = $%v OR target_pubkey = $%v) ", filterOp, len(args), len(args))
+		filterOp = "AND"
+	}
 	if len(filter.SourceAddress) > 0 {
 		args = append(args, filter.SourceAddress)
 		fmt.Fprintf(&sql, " %v source_address = $%v", filterOp, len(args))

diff --git a/db/consolidation_requests.go b/db/consolidation_requests.go
@@ -92,6 +92,11 @@ func GetConsolidationRequestsFiltered(offset uint64, limit uint32, finalizedBloc
 		fmt.Fprintf(&sql, " %v slot_number <= $%v", filterOp, len(args))
 		filterOp = "AND"
 	}
+	if len(filter.PublicKey) > 0 {
+		args = append(args, filter.PublicKey)
+		fmt.Fprintf(&sql, " %v (source_pubkey = $%v OR target_pubkey = $%v) ", filterOp, len(args), len(args))
+		filterOp = "AND"
+	}
 	if len(filter.SourceAddress) > 0 {
 		args = append(args, filter.SourceAddress)
 		fmt.Fprintf(&sql, " %v source_address = $%v", filterOp, len(args))

diff --git a/db/withdrawal_request_txs.go b/db/withdrawal_request_txs.go
@@ -134,6 +134,11 @@ func GetWithdrawalRequestTxsFiltered(offset uint64, limit uint32, canonicalForkI
 		fmt.Fprintf(&sql, " %v dequeue_block <= $%v", filterOp, len(args))
 		filterOp = "AND"
 	}
+	if len(filter.PublicKey) > 0 {
+		args = append(args, filter.PublicKey)
+		fmt.Fprintf(&sql, " %v validator_pubkey = $%v ", filterOp, len(args))
+		filterOp = "AND"
+	}
 	if len(filter.SourceAddress) > 0 {
 		args = append(args, filter.SourceAddress)
 		fmt.Fprintf(&sql, " %v source_address = $%v", filterOp, len(args))

diff --git a/db/withdrawal_requests.go b/db/withdrawal_requests.go
@@ -88,6 +88,11 @@ func GetWithdrawalRequestsFiltered(offset uint64, limit uint32, finalizedBlock u
 		fmt.Fprintf(&sql, " %v slot_number <= $%v", filterOp, len(args))
 		filterOp = "AND"
 	}
+	if len(filter.PublicKey) > 0 {
+		args = append(args, filter.PublicKey)
+		fmt.Fprintf(&sql, " %v validator_pubkey = $%v ", filterOp, len(args))
+		filterOp = "AND"
+	}
 	if len(filter.SourceAddress) > 0 {
 		args = append(args, filter.SourceAddress)
 		fmt.Fprintf(&sql, " %v source_address = $%v", filterOp, len(args))

diff --git a/dbtypes/other.go b/dbtypes/other.go
@@ -98,6 +98,7 @@ type SlashingFilter struct {
 type WithdrawalRequestFilter struct {
 	MinSlot       uint64
 	MaxSlot       uint64
+	PublicKey     []byte
 	SourceAddress []byte
 	MinIndex      uint64
 	MaxIndex      uint64
@@ -110,6 +111,7 @@ type WithdrawalRequestFilter struct {
 type WithdrawalRequestTxFilter struct {
 	MinDequeue    uint64
 	MaxDequeue    uint64
+	PublicKey     []byte
 	SourceAddress []byte
 	MinIndex      uint64
 	MaxIndex      uint64
@@ -122,6 +124,7 @@ type WithdrawalRequestTxFilter struct {
 type ConsolidationRequestFilter struct {
 	MinSlot          uint64
 	MaxSlot          uint64
+	PublicKey        []byte
 	SourceAddress    []byte
 	MinSrcIndex      uint64
 	MaxSrcIndex      uint64
@@ -135,6 +138,7 @@ type ConsolidationRequestFilter struct {
 type ConsolidationRequestTxFilter struct {
 	MinDequeue       uint64
 	MaxDequeue       uint64
+	PublicKey        []byte
 	SourceAddress    []byte
 	MinSrcIndex      uint64
 	MaxSrcIndex      uint64

diff --git a/handlers/pageData.go b/handlers/pageData.go
@@ -192,20 +192,25 @@ func createMenuItems(active string) []types.MainMenuItem {
 			},
 		},
 	})
-	validatorMenu = append(validatorMenu, types.NavigationGroup{
-		Links: []types.NavigationLink{
-			{
-				Label: "Withdrawal Requests",
-				Path:  "/validators/el_withdrawals",
-				Icon:  "fa-money-bill-transfer",
-			},
-			{
-				Label: "Consolidation Requests",
-				Path:  "/validators/el_consolidations",
-				Icon:  "fa-square-plus",
+
+	chainState := services.GlobalBeaconService.GetChainState()
+	specs := chainState.GetSpecs()
+	if specs != nil && specs.ElectraForkEpoch != nil && uint64(chainState.CurrentEpoch()) >= *specs.ElectraForkEpoch {
+		validatorMenu = append(validatorMenu, types.NavigationGroup{
+			Links: []types.NavigationLink{
+				{
+					Label: "Withdrawal Requests",
+					Path:  "/validators/el_withdrawals",
+					Icon:  "fa-money-bill-transfer",
+				},
+				{
+					Label: "Consolidation Requests",
+					Path:  "/validators/el_consolidations",
+					Icon:  "fa-square-plus",
+				},
 			},
-		},
-	})
+		})
+	}
 
 	submitLinks := []types.NavigationLink{}
 	if utils.Config.Frontend.ShowSubmitDeposit {