ethpandaops · pk910 · Feb 9, 2025
diff --git a/clients/consensus/chainspec.go b/clients/consensus/chainspec.go
@@ -58,6 +58,7 @@ type ChainSpec struct {
 	MaxWithdrawalRequestsPerPayload    uint64            `yaml:"MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD"    check-if-fork:"ElectraForkEpoch"`
 	DepositChainId                     uint64            `yaml:"DEPOSIT_CHAIN_ID"`
 	MinActivationBalance               uint64            `yaml:"MIN_ACTIVATION_BALANCE"`
+	ShardCommitteePeriod               uint64            `yaml:"SHARD_COMMITTEE_PERIOD"`
 
 	// EIP7594: PeerDAS
 	NumberOfColumns              *uint64 `yaml:"NUMBER_OF_COLUMNS"                check-if-fork:"Eip7594ForkEpoch"`

diff --git a/handlers/submit_consolidation.go b/handlers/submit_consolidation.go
@@ -10,9 +10,11 @@ import (
 	"time"
 
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
+	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/sirupsen/logrus"
 
+	"github.com/ethpandaops/dora/indexer/beacon"
 	"github.com/ethpandaops/dora/indexer/execution"
 	"github.com/ethpandaops/dora/services"
 	"github.com/ethpandaops/dora/templates"
@@ -108,6 +110,8 @@ func handleSubmitConsolidationPageDataAjax(w http.ResponseWriter, r *http.Reques
 		address := query.Get("address")
 		addressBytes := common.HexToAddress(address)
 
+		chainState := services.GlobalBeaconService.GetChainState()
+		chainSpecs := chainState.GetSpecs()
 		validators := services.GlobalBeaconService.GetCachedValidatorSet(true)
 		result := []models.SubmitConsolidationPageDataValidator{}
 		for _, validator := range validators {
@@ -136,12 +140,18 @@ func handleSubmitConsolidationPageDataAjax(w http.ResponseWriter, r *http.Reques
 				status = validator.Status.String()
 			}
 
+			consolidable := false
+			if validator.Validator.ActivationEpoch < beacon.FarFutureEpoch && validator.Validator.ActivationEpoch+phase0.Epoch(chainSpecs.ShardCommitteePeriod) > chainState.CurrentEpoch() {
+				consolidable = true
+			}
+
 			result = append(result, models.SubmitConsolidationPageDataValidator{
-				Index:    uint64(validator.Index),
-				Pubkey:   validator.Validator.PublicKey.String(),
-				Balance:  uint64(validator.Balance),
-				CredType: fmt.Sprintf("%02x", validator.Validator.WithdrawalCredentials[0]),
-				Status:   status,
+				Index:          uint64(validator.Index),
+				Pubkey:         validator.Validator.PublicKey.String(),
+				Balance:        uint64(validator.Balance),
+				CredType:       fmt.Sprintf("%02x", validator.Validator.WithdrawalCredentials[0]),
+				Status:         status,
+				IsConsolidable: consolidable,
 			})
 		}
 

diff --git a/handlers/submit_withdrawal.go b/handlers/submit_withdrawal.go
@@ -10,9 +10,11 @@ import (
 	"time"
 
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
+	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/sirupsen/logrus"
 
+	"github.com/ethpandaops/dora/indexer/beacon"
 	"github.com/ethpandaops/dora/indexer/execution"
 	"github.com/ethpandaops/dora/services"
 	"github.com/ethpandaops/dora/templates"
@@ -109,6 +111,9 @@ func handleSubmitWithdrawalPageDataAjax(w http.ResponseWriter, r *http.Request)
 		address := query.Get("address")
 		addressBytes := common.HexToAddress(address)
 
+		chainState := services.GlobalBeaconService.GetChainState()
+		chainSpecs := chainState.GetSpecs()
+
 		validators := services.GlobalBeaconService.GetCachedValidatorSet(true)
 		result := []models.SubmitWithdrawalPageDataValidator{}
 		for _, validator := range validators {
@@ -137,12 +142,18 @@ func handleSubmitWithdrawalPageDataAjax(w http.ResponseWriter, r *http.Request)
 				status = validator.Status.String()
 			}
 
+			withdrawable := false
+			if validator.Validator.ActivationEpoch < beacon.FarFutureEpoch && validator.Validator.ActivationEpoch+phase0.Epoch(chainSpecs.ShardCommitteePeriod) > chainState.CurrentEpoch() {
+				withdrawable = true
+			}
+
 			result = append(result, models.SubmitWithdrawalPageDataValidator{
-				Index:    uint64(validator.Index),
-				Pubkey:   validator.Validator.PublicKey.String(),
-				Balance:  uint64(validator.Balance),
-				CredType: fmt.Sprintf("%02x", validator.Validator.WithdrawalCredentials[0]),
-				Status:   status,
+				Index:          uint64(validator.Index),
+				Pubkey:         validator.Validator.PublicKey.String(),
+				Balance:        uint64(validator.Balance),
+				CredType:       fmt.Sprintf("%02x", validator.Validator.WithdrawalCredentials[0]),
+				Status:         status,
+				IsWithdrawable: withdrawable,
 			})
 		}
 

diff --git a/types/models/submit_consolidation.go b/types/models/submit_consolidation.go
@@ -10,9 +10,10 @@ type SubmitConsolidationPageData struct {
 }
 
 type SubmitConsolidationPageDataValidator struct {
-	Index    uint64 `json:"index"`
-	Pubkey   string `json:"pubkey"`
-	Balance  uint64 `json:"balance"`
-	CredType string `json:"credtype"`
-	Status   string `json:"status"`
+	Index          uint64 `json:"index"`
+	Pubkey         string `json:"pubkey"`
+	Balance        uint64 `json:"balance"`
+	CredType       string `json:"credtype"`
+	Status         string `json:"status"`
+	IsConsolidable bool   `json:"isconsolidable"`
 }
diff --git a/types/models/submit_withdrawal.go b/types/models/submit_withdrawal.go
@@ -11,9 +11,10 @@ type SubmitWithdrawalPageData struct {
 }
 
 type SubmitWithdrawalPageDataValidator struct {
-	Index    uint64 `json:"index"`
-	Pubkey   string `json:"pubkey"`
-	Balance  uint64 `json:"balance"`
-	CredType string `json:"credtype"`
-	Status   string `json:"status"`
+	Index          uint64 `json:"index"`
+	Pubkey         string `json:"pubkey"`
+	Balance        uint64 `json:"balance"`
+	CredType       string `json:"credtype"`
+	Status         string `json:"status"`
+	IsWithdrawable bool   `json:"iswithdrawable"`
 }
diff --git a/ui-package/src/components/SubmitConsolidationsForm/ConsolidationReview.tsx b/ui-package/src/components/SubmitConsolidationsForm/ConsolidationReview.tsx
@@ -168,6 +168,18 @@ const ConsolidationReview = (props: IConsolidationReviewProps) => {
           The network is not on Electra yet, so consolidation requests can not be submitted.
         </div>
       : <div>
+          {!props.sourceValidator.isconsolidable && (
+            <div className="alert alert-warning" role="alert">
+              <i className="fa-solid fa-triangle-exclamation me-2"></i>
+              This consolidation will fail because the source validator is not withdrawable yet. The validator must be withdrawable before it can be consolidated.
+            </div>
+          )}
+          {props.targetValidator.credtype !== "0x02" && props.targetValidator.index != props.sourceValidator.index && (
+            <div className="alert alert-warning" role="alert">
+              <i className="fa-solid fa-triangle-exclamation me-2"></i>
+              This consolidation will fail because the target validator does not have 0x02 withdrawal credentials. The target validator must first perform a self-consolidation to update its withdrawal credentials to 0x02.
+            </div>
+          )}
           <div className="row">
             <div className="col-3 col-lg-2">
               Consolidation Contract:
@@ -231,7 +243,11 @@ const ConsolidationReview = (props: IConsolidationReviewProps) => {
           </div>
           <div className="row mt-3">
             <div className="col-12">
-              <button className="btn btn-primary" disabled={submitRequest.isPending || submitRequest.isSuccess} onClick={() => submitConsolidation()}>
+              <button 
+                className="btn btn-primary" 
+                disabled={submitRequest.isPending || submitRequest.isSuccess} 
+                onClick={() => submitConsolidation()}
+              >
                 {submitRequest.isSuccess ?
                   <span>Submitted</span> :
                   submitRequest.isPending ? (

diff --git a/ui-package/src/components/SubmitConsolidationsForm/SubmitConsolidationsFormProps.ts b/ui-package/src/components/SubmitConsolidationsForm/SubmitConsolidationsFormProps.ts
@@ -1,4 +1,3 @@
-
 export interface ISubmitConsolidationsFormProps {
   consolidationContract: string;
   explorerUrl: string;
@@ -11,4 +10,5 @@ export interface IValidator {
   credtype: string;
   balance: number;
   status: string;
+  isconsolidable: boolean;
 }
diff --git a/ui-package/src/components/SubmitWithdrawalsForm/SubmitWithdrawalsFormProps.ts b/ui-package/src/components/SubmitWithdrawalsForm/SubmitWithdrawalsFormProps.ts
@@ -1,4 +1,3 @@
-
 export interface ISubmitWithdrawalsFormProps {
   withdrawalContract: string;
   explorerUrl: string;
@@ -12,4 +11,5 @@ export interface IValidator {
   credtype: string;
   balance: number;
   status: string;
+  iswithdrawable: boolean;
 }
diff --git a/ui-package/src/components/SubmitWithdrawalsForm/WithdrawalReview.tsx b/ui-package/src/components/SubmitWithdrawalsForm/WithdrawalReview.tsx
@@ -168,6 +168,13 @@ const WithdrawalReview = (props: IWithdrawalReviewProps) => {
           The network is not on Electra yet, so withdrawal requests can not be submitted.
         </div>
       : <div>
+          {!props.validator.iswithdrawable && (
+            <div className="alert alert-warning" role="alert">
+              <i className="fa-solid fa-triangle-exclamation me-2"></i>
+              This withdrawal will fail because the validator is not withdrawable yet. The validator must be withdrawable before funds can be withdrawn.
+            </div>
+          )}
+
           <div className="row">
             <div className="col-3 col-lg-2">
               Withdrawal Contract:
@@ -231,7 +238,11 @@ const WithdrawalReview = (props: IWithdrawalReviewProps) => {
           </div>
           <div className="row mt-3">
             <div className="col-12">
-              <button className="btn btn-primary" disabled={submitRequest.isPending || submitRequest.isSuccess} onClick={() => submitWithdrawal()}>
+              <button 
+                className="btn btn-primary" 
+                disabled={submitRequest.isPending || submitRequest.isSuccess} 
+                onClick={() => submitWithdrawal()}
+              >
                 {submitRequest.isSuccess ?
                   <span>Submitted</span> :
                   submitRequest.isPending ? (