Show latest block withdrawls processed

Author: 0xfornax

rocketpool-cli/megapool/exit-validator.go

@@ -3,6 +3,7 @@ package megapool
 import (
 	"fmt"
 	"sort"
+	"strings"
 
 	"github.com/rocket-pool/smartnode/shared/services/beacon"
 	"github.com/rocket-pool/smartnode/shared/services/rocketpool"
@@ -26,7 +27,26 @@ func getExitableValidator() (uint64, bool, error) {
 	defer rp.Close()
 
 	// Get the latest block and identify the withdrawals present in it
-		
+	withdrawalsResp, err := rp.GetLatestBlockWithdrawals()
+	if err != nil {
+		fmt.Printf("Warning: could not fetch latest beacon block withdrawals: %s\n\n", err.Error())
+	} else if len(withdrawalsResp.Withdrawals) == 0 {
+		fmt.Printf("Latest beacon block (slot %d, exec block %d) has no validator withdrawals.\n\n",
+			withdrawalsResp.Slot, withdrawalsResp.BlockNumber)
+	} else {
+		indexes := make([]string, 0, len(withdrawalsResp.Withdrawals))
+		seen := make(map[string]struct{}, len(withdrawalsResp.Withdrawals))
+		for _, wd := range withdrawalsResp.Withdrawals {
+			if _, ok := seen[wd.ValidatorIndex]; ok {
+				continue
+			}
+			seen[wd.ValidatorIndex] = struct{}{}
+			indexes = append(indexes, wd.ValidatorIndex)
+		}
+		fmt.Printf("Latest beacon block (slot %d, exec block %d) processed withdrawals for %d validator(s):\n",
+			withdrawalsResp.Slot, withdrawalsResp.BlockNumber, len(indexes))
+		fmt.Printf("  %s\n\n", strings.Join(indexes, ", "))
+	}
 
 	// Get Megapool status
 	status, err := rp.MegapoolStatus(false)
@@ -50,7 +70,9 @@ func getExitableValidator() (uint64, bool, error) {
 		}
 	}
 	if len(exitingValidators) > 0 {
-		sort.Sort(ByIndex(exitingValidators))
+		// Make sure that exitingValidators is sorted by validator index ascending from the last withdrawal index
+
+		//sort.Sort(ByIndex(exitingValidators))
 		fmt.Println("The following validators are still active and have already received their exit request on the Beacon Chain:")
 		for _, v := range exitingValidators {
 			fmt.Printf("ID %d: - Index %d Pubkey: 0x%s\n", v.ValidatorId, v.ValidatorIndex, v.PubKey.String())

rocketpool/api/megapool/latest-block-withdrawals.go

@@ -0,0 +1,60 @@
+package megapool
+
+import (
+	"fmt"
+
+	"github.com/urfave/cli/v3"
+
+	"github.com/rocket-pool/smartnode/shared/services"
+	"github.com/rocket-pool/smartnode/shared/services/beacon"
+	"github.com/rocket-pool/smartnode/shared/types/api"
+)
+
+// getLatestBlockWithdrawals returns the validator withdrawals processed in the
+// latest beacon block that contains an execution payload. If the head slot has
+// no execution payload (e.g. it was a missed slot), it walks backwards a few
+// slots until it finds one.
+func getLatestBlockWithdrawals(c *cli.Command) (*api.LatestBlockWithdrawalsResponse, error) {
+	if err := services.RequireBeaconClientSynced(c); err != nil {
+		return nil, err
+	}
+	bc, err := services.GetBeaconClient(c)
+	if err != nil {
+		return nil, err
+	}
+
+	blockToRequest := "head"
+	const maxAttempts = 8
+	var (
+		block  beacon.BeaconBlock
+		exists bool
+	)
+	for attempts := 0; attempts < maxAttempts; attempts++ {
+		block, exists, err = bc.GetBeaconBlock(blockToRequest)
+		if err != nil {
+			return nil, fmt.Errorf("error getting beacon block %s: %w", blockToRequest, err)
+		}
+		if exists && block.HasExecutionPayload {
+			break
+		}
+		// Walk backwards by slot number; if we don't yet have one, fall back.
+		var nextSlot uint64
+		if block.Slot > 0 {
+			nextSlot = block.Slot - 1
+		} else if attempts == 0 {
+			// We never resolved the head, give up
+			return nil, fmt.Errorf("could not resolve the head beacon block")
+		}
+		if attempts == maxAttempts-1 {
+			return nil, fmt.Errorf("could not find a beacon block with an execution payload after %d attempts", maxAttempts)
+		}
+		blockToRequest = fmt.Sprintf("%d", nextSlot)
+	}
+
+	response := &api.LatestBlockWithdrawalsResponse{
+		Slot:        block.Slot,
+		BlockNumber: block.ExecutionBlockNumber,
+		Withdrawals: block.Withdrawals,
+	}
+	return response, nil
+}

rocketpool/api/megapool/routes.go

@@ -362,6 +362,11 @@ func RegisterRoutes(mux *http.ServeMux, c *cli.Command) {
 		resp, err := getEffectiveDelegate(c)
 		apiutils.WriteResponse(w, resp, err)
 	})
+
+	mux.HandleFunc("/api/megapool/latest-block-withdrawals", func(w http.ResponseWriter, r *http.Request) {
+		resp, err := getLatestBlockWithdrawals(c)
+		apiutils.WriteResponse(w, resp, err)
+	})
 }
 
 func parseUint64(r *http.Request, name string) (uint64, error) {

shared/services/rocketpool/megapool.go

@@ -557,6 +557,22 @@ func (c *Client) DistributeMegapool() (api.DistributeMegapoolResponse, error) {
 	return response, nil
 }
 
+// Get the validator withdrawals processed in the latest beacon block (with execution payload)
+func (c *Client) GetLatestBlockWithdrawals() (api.LatestBlockWithdrawalsResponse, error) {
+	responseBytes, err := c.callHTTPAPI("GET", "/api/megapool/latest-block-withdrawals", nil)
+	if err != nil {
+		return api.LatestBlockWithdrawalsResponse{}, fmt.Errorf("Could not get latest block withdrawals: %w", err)
+	}
+	var response api.LatestBlockWithdrawalsResponse
+	if err := json.Unmarshal(responseBytes, &response); err != nil {
+		return api.LatestBlockWithdrawalsResponse{}, fmt.Errorf("Could not decode latest block withdrawals response: %w", err)
+	}
+	if response.Error != "" {
+		return api.LatestBlockWithdrawalsResponse{}, fmt.Errorf("Could not get latest block withdrawals: %s", response.Error)
+	}
+	return response, nil
+}
+
 // Get the bond amount required for the megapool's next validator
 func (c *Client) GetNewValidatorBondRequirement() (api.GetNewValidatorBondRequirementResponse, error) {
 	responseBytes, err := c.callHTTPAPI("GET", "/api/megapool/get-new-validator-bond-requirement", nil)

shared/types/api/megapool.go

@@ -178,3 +178,11 @@ type GetNodeMegapoolEthBondedResponse struct {
 	Error     string   `json:"error"`
 	EthBonded *big.Int `json:"ethBonded"`
 }
+
+type LatestBlockWithdrawalsResponse struct {
+	Status      string                  `json:"status"`
+	Error       string                  `json:"error"`
+	Slot        uint64                  `json:"slot"`
+	BlockNumber uint64                  `json:"blockNumber"`
+	Withdrawals []beacon.WithdrawalInfo `json:"withdrawals"`
+}