Change behavior for getting megapool details on finalized state or head (avoids errors when we check validators against head but finalized data is not ready for proofs)

0xfornax · 0xfornax · commit 06fb318499f7 · 2026-01-22T19:22:29.000-03:00
diff --git a/rocketpool-cli/megapool/claim.go b/rocketpool-cli/megapool/claim.go
@@ -32,7 +32,7 @@ func claim(c *cli.Context) error {
 		return nil
 	}
 
-	megapoolDetails, err := rp.MegapoolStatus()
+	megapoolDetails, err := rp.MegapoolStatus(false)
 	if err != nil {
 		return err
 	}
diff --git a/rocketpool-cli/megapool/delegate.go b/rocketpool-cli/megapool/delegate.go
@@ -30,7 +30,7 @@ func delegateUpgradeMegapool(c *cli.Context) error {
 	}
 
 	// Get megapool status
-	status, err := rp.MegapoolStatus()
+	status, err := rp.MegapoolStatus(false)
 	if err != nil {
 		return err
 	}
@@ -96,7 +96,7 @@ func setUseLatestDelegateMegapool(c *cli.Context, setting bool) error {
 	}
 
 	// Get megapool status
-	status, err := rp.MegapoolStatus()
+	status, err := rp.MegapoolStatus(false)
 	if err != nil {
 		return err
 	}
diff --git a/rocketpool-cli/megapool/dissolve-validator.go b/rocketpool-cli/megapool/dissolve-validator.go
@@ -36,9 +36,9 @@ func dissolveValidator(c *cli.Context) error {
 		validatorId = c.Uint64("validator-id")
 	} else {
 		// Get Megapool status
-		status, err := rp.MegapoolStatus()
+		status, err := rp.MegapoolStatus(false)
 		if err != nil {
-			return err
+			return err	
 		}
 
 		validatorsInPrestake := []api.MegapoolValidatorDetails{}
diff --git a/rocketpool-cli/megapool/exit-queue.go b/rocketpool-cli/megapool/exit-queue.go
@@ -43,7 +43,7 @@ func exitQueue(c *cli.Context) error {
 		}
 	} else {
 		// Get Megapool status
-		status, err := rp.MegapoolStatus()
+		status, err := rp.MegapoolStatus(false)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool-cli/megapool/exit-validator.go b/rocketpool-cli/megapool/exit-validator.go
@@ -42,7 +42,7 @@ func exitValidator(c *cli.Context) error {
 		validatorId = c.Uint64("validator-id")
 	} else {
 		// Get Megapool status
-		status, err := rp.MegapoolStatus()
+		status, err := rp.MegapoolStatus(false)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool-cli/megapool/notify-final-balance.go b/rocketpool-cli/megapool/notify-final-balance.go
@@ -48,7 +48,7 @@ func notifyFinalBalance(c *cli.Context) error {
 		validatorId = c.Uint64("validator-id")
 	} else {
 		// Get Megapool status
-		status, err := rp.MegapoolStatus()
+		status, err := rp.MegapoolStatus(true)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool-cli/megapool/notify-validator-exit.go b/rocketpool-cli/megapool/notify-validator-exit.go
@@ -40,7 +40,7 @@ func notifyValidatorExit(c *cli.Context) error {
 		validatorId = c.Uint64("validator-id")
 	} else {
 		// Get Megapool status
-		status, err := rp.MegapoolStatus()
+		status, err := rp.MegapoolStatus(true)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool-cli/megapool/reduce-bond.go b/rocketpool-cli/megapool/reduce-bond.go
@@ -32,7 +32,7 @@ func reduceBond(c *cli.Context) error {
 		return nil
 	}
 
-	megapoolDetails, err := rp.MegapoolStatus()
+	megapoolDetails, err := rp.MegapoolStatus(false)
 	if err != nil {
 		return err
 	}
diff --git a/rocketpool-cli/megapool/repay-debt.go b/rocketpool-cli/megapool/repay-debt.go
@@ -33,7 +33,7 @@ func repayDebt(c *cli.Context) error {
 		return nil
 	}
 
-	megapoolDetails, err := rp.MegapoolStatus()
+	megapoolDetails, err := rp.MegapoolStatus(false)
 	if err != nil {
 		return err
 	}
diff --git a/rocketpool-cli/megapool/stake.go b/rocketpool-cli/megapool/stake.go
@@ -37,7 +37,7 @@ func stake(c *cli.Context) error {
 		validatorId = c.Uint64("validator-id")
 	} else {
 		// Get Megapool status
-		status, err := rp.MegapoolStatus()
+		status, err := rp.MegapoolStatus(false)
 		if err != nil {
 			return err
 		}
diff --git a/rocketpool-cli/megapool/status.go b/rocketpool-cli/megapool/status.go
@@ -51,7 +51,7 @@ func getStatus(c *cli.Context) error {
 	}
 
 	// Get Megapool status
-	status, err := rp.MegapoolStatus()
+	status, err := rp.MegapoolStatus(false)
 	if err != nil {
 		return err
 	}
@@ -179,7 +179,7 @@ func getValidatorStatus(c *cli.Context) error {
 	}
 
 	// Get Megapool status
-	status, err := rp.MegapoolStatus()
+	status, err := rp.MegapoolStatus(false)
 	if err != nil {
 		return err
 	}
diff --git a/rocketpool/api/megapool/commands.go b/rocketpool/api/megapool/commands.go
@@ -88,16 +88,22 @@ func RegisterSubcommands(command *cli.Command, name string, aliases []string) {
 				Name:      "status",
 				Aliases:   []string{"s"},
 				Usage:     "Get the node's megapool status",
-				UsageText: "rocketpool api megapool status",
+				UsageText: "rocketpool api megapool status finalized-state",
 				Action: func(c *cli.Context) error {
 
 					// Validate args
-					if err := cliutils.ValidateArgCount(c, 0); err != nil {
+					if err := cliutils.ValidateArgCount(c, 1); err != nil {
+						return err
+					}
+
+					// Get finalized state
+					finalizedState, err := cliutils.ValidateBool("finalized-state", c.Args().Get(0))
+					if err != nil {
 						return err
 					}
 
 					// Run
-					api.PrintResponse(getStatus(c))
+					api.PrintResponse(getStatus(c, finalizedState))
 					return nil
 
 				},
diff --git a/rocketpool/api/megapool/distribute.go b/rocketpool/api/megapool/distribute.go
@@ -44,7 +44,7 @@ func canDistributeMegapool(c *cli.Context) (*api.CanDistributeMegapoolResponse,
 	}
 
 	// Load the megapool details
-	details, err := services.GetNodeMegapoolDetails(rp, bc, nodeAccount.Address)
+	details, err := services.GetNodeMegapoolDetails(rp, bc, nodeAccount.Address, nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/rocketpool/api/megapool/reduce-bond.go b/rocketpool/api/megapool/reduce-bond.go
@@ -57,7 +57,7 @@ func canReduceBond(c *cli.Context, amount *big.Int) (*api.CanReduceBondResponse,
 	}
 
 	// Load the megapool details
-	details, err := services.GetNodeMegapoolDetails(rp, bc, nodeAccount.Address)
+	details, err := services.GetNodeMegapoolDetails(rp, bc, nodeAccount.Address, nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/rocketpool/api/megapool/status.go b/rocketpool/api/megapool/status.go
@@ -1,17 +1,19 @@
 package megapool
 
 import (
+	"context"
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/rocket-pool/smartnode/bindings/megapool"
 	"github.com/rocket-pool/smartnode/bindings/utils/eth"
 	"github.com/rocket-pool/smartnode/shared/services"
 	"github.com/rocket-pool/smartnode/shared/types/api"
 	"github.com/urfave/cli"
 )
 
-func getStatus(c *cli.Context) (*api.MegapoolStatusResponse, error) {
+func getStatus(c *cli.Context, finalizedState bool) (*api.MegapoolStatusResponse, error) {
 
 	// Get services
 	if err := services.RequireNodeRegistered(c); err != nil {
@@ -41,26 +43,33 @@ func getStatus(c *cli.Context) (*api.MegapoolStatusResponse, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts *bind.CallOpts
+	// Get beacon head info
 
-	details, err := services.GetNodeMegapoolDetails(rp, bc, nodeAccount.Address)
+	if err != nil {
+		return nil, fmt.Errorf("Error getting the beacon head info: %w", err)
+	}
+
+	if finalizedState {
+		// We just need a non-nil opts for the next calls to use the finalized state
+		opts = &bind.CallOpts{
+			Context: context.Background(),
+		}
+	}
+
+	details, err := services.GetNodeMegapoolDetails(rp, bc, nodeAccount.Address, opts)
 	if err != nil {
 		return nil, err
 	}
 	response.Megapool = details
 
 	// Get latest delegate address
-	delegate, err := rp.GetContract("rocketMegapoolDelegate", nil)
+	delegate, err := rp.GetContract("rocketMegapoolDelegate", opts)
 	if err != nil {
 		return nil, fmt.Errorf("Error getting latest minipool delegate contract: %w", err)
 	}
 	response.LatestDelegate = *delegate.Address
 
-	// Get beacon head info
-	response.BeaconHead, err = bc.GetBeaconHead()
-	if err != nil {
-		return nil, fmt.Errorf("Error getting the beacon head info: %w", err)
-	}
-
 	// Return response
 	return &response, nil
 }
@@ -171,7 +180,7 @@ func getValidatorMapAndBalances(c *cli.Context) (*api.MegapoolValidatorMapAndRew
 		return nil, err
 	}
 
-	status, err := getStatus(c)
+	status, err := getStatus(c, false)
 	if err != nil {
 		return nil, fmt.Errorf("Error getting the megapool status")
 	}
diff --git a/rocketpool/node/defend-challenge-exit.go b/rocketpool/node/defend-challenge-exit.go
@@ -146,7 +146,7 @@ func (t *defendChallengeExit) run(state *state.NetworkState) error {
 	if err != nil {
 		return err
 	}
-	validatorInfo, err := services.GetMegapoolValidatorDetails(t.rp, t.bc, mp, megapoolAddress, uint32(validatorCount))
+	validatorInfo, err := services.GetMegapoolValidatorDetails(t.rp, t.bc, mp, megapoolAddress, uint32(validatorCount), opts)
 	if err != nil {
 		return err
 	}
diff --git a/rocketpool/node/notify-final-balance.go b/rocketpool/node/notify-final-balance.go
@@ -149,7 +149,7 @@ func (t *notifyFinalBalance) run(state *state.NetworkState) error {
 	if err != nil {
 		return err
 	}
-	validatorInfo, err := services.GetMegapoolValidatorDetails(t.rp, t.bc, mp, megapoolAddress, uint32(validatorCount))
+	validatorInfo, err := services.GetMegapoolValidatorDetails(t.rp, t.bc, mp, megapoolAddress, uint32(validatorCount), opts)
 	if err != nil {
 		return err
 	}
diff --git a/rocketpool/node/notify-validator-exit.go b/rocketpool/node/notify-validator-exit.go
@@ -144,11 +144,11 @@ func (t *notifyValidatorExit) run(state *state.NetworkState) error {
 	}
 
 	// Iterate over megapool validators checking whether they're ready to notify exit
-	validatorCount, err := mp.GetValidatorCount(nil)
+	validatorCount, err := mp.GetValidatorCount(opts)
 	if err != nil {
 		return err
 	}
-	validatorInfo, err := services.GetMegapoolValidatorDetails(t.rp, t.bc, mp, megapoolAddress, uint32(validatorCount))
+	validatorInfo, err := services.GetMegapoolValidatorDetails(t.rp, t.bc, mp, megapoolAddress, uint32(validatorCount), opts)
 	if err != nil {
 		return err
 	}
diff --git a/rocketpool/node/stake-megapool-validator.go b/rocketpool/node/stake-megapool-validator.go
@@ -147,7 +147,7 @@ func (t *stakeMegapoolValidator) run(state *state.NetworkState) error {
 	if err != nil {
 		return err
 	}
-	validatorInfo, err := services.GetMegapoolValidatorDetails(t.rp, t.bc, mp, megapoolAddress, uint32(validatorCount))
+	validatorInfo, err := services.GetMegapoolValidatorDetails(t.rp, t.bc, mp, megapoolAddress, uint32(validatorCount), opts)
 	if err != nil {
 		return err
 	}
diff --git a/shared/services/megapools.go b/shared/services/megapools.go
diff --git a/shared/services/rocketpool/megapool.go b/shared/services/rocketpool/megapool.go

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func claim(c *cli.Context) error {`
`32`	`32`	`return nil`
`33`	`33`	`}`
`34`	`34`
`35`		`- megapoolDetails, err := rp.MegapoolStatus()`
	`35`	`+ megapoolDetails, err := rp.MegapoolStatus(false)`
`36`	`36`	`if err != nil {`
`37`	`37`	`return err`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func delegateUpgradeMegapool(c *cli.Context) error {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// Get megapool status`
`33`		`- status, err := rp.MegapoolStatus()`
	`33`	`+ status, err := rp.MegapoolStatus(false)`
`34`	`34`	`if err != nil {`
`35`	`35`	`return err`
`36`	`36`	`}`
`@@ -96,7 +96,7 @@ func setUseLatestDelegateMegapool(c *cli.Context, setting bool) error {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`// Get megapool status`
`99`		`- status, err := rp.MegapoolStatus()`
	`99`	`+ status, err := rp.MegapoolStatus(false)`
`100`	`100`	`if err != nil {`
`101`	`101`	`return err`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func exitQueue(c *cli.Context) error {`
`43`	`43`	`}`
`44`	`44`	`} else {`
`45`	`45`	`// Get Megapool status`
`46`		`- status, err := rp.MegapoolStatus()`
	`46`	`+ status, err := rp.MegapoolStatus(false)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return err`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func exitValidator(c *cli.Context) error {`
`42`	`42`	`validatorId = c.Uint64("validator-id")`
`43`	`43`	`} else {`
`44`	`44`	`// Get Megapool status`
`45`		`- status, err := rp.MegapoolStatus()`
	`45`	`+ status, err := rp.MegapoolStatus(false)`
`46`	`46`	`if err != nil {`
`47`	`47`	`return err`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func notifyFinalBalance(c *cli.Context) error {`
`48`	`48`	`validatorId = c.Uint64("validator-id")`
`49`	`49`	`} else {`
`50`	`50`	`// Get Megapool status`
`51`		`- status, err := rp.MegapoolStatus()`
	`51`	`+ status, err := rp.MegapoolStatus(true)`
`52`	`52`	`if err != nil {`
`53`	`53`	`return err`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func notifyValidatorExit(c *cli.Context) error {`
`40`	`40`	`validatorId = c.Uint64("validator-id")`
`41`	`41`	`} else {`
`42`	`42`	`// Get Megapool status`
`43`		`- status, err := rp.MegapoolStatus()`
	`43`	`+ status, err := rp.MegapoolStatus(true)`
`44`	`44`	`if err != nil {`
`45`	`45`	`return err`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func reduceBond(c *cli.Context) error {`
`32`	`32`	`return nil`
`33`	`33`	`}`
`34`	`34`
`35`		`- megapoolDetails, err := rp.MegapoolStatus()`
	`35`	`+ megapoolDetails, err := rp.MegapoolStatus(false)`
`36`	`36`	`if err != nil {`
`37`	`37`	`return err`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func repayDebt(c *cli.Context) error {`
`33`	`33`	`return nil`
`34`	`34`	`}`
`35`	`35`
`36`		`- megapoolDetails, err := rp.MegapoolStatus()`
	`36`	`+ megapoolDetails, err := rp.MegapoolStatus(false)`
`37`	`37`	`if err != nil {`
`38`	`38`	`return err`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func stake(c *cli.Context) error {`
`37`	`37`	`validatorId = c.Uint64("validator-id")`
`38`	`38`	`} else {`
`39`	`39`	`// Get Megapool status`
`40`		`- status, err := rp.MegapoolStatus()`
	`40`	`+ status, err := rp.MegapoolStatus(false)`
`41`	`41`	`if err != nil {`
`42`	`42`	`return err`
`43`	`43`	`}`