Merge branch 'master' into migrate-version-check

Author: 0xfornax

bindings/utils/state/network.go

@@ -265,7 +265,7 @@ func GetTotalEffectiveRplStake(rp *rocketpool.RocketPool, contracts *NetworkCont
 			}
 			for j := i; j < m; j++ {
 				address := addresses[j]
-				err = mc.AddCall(contracts.RocketNodeStaking, &minimumStakes[j], "getNodeMinimumRPLStake", address)
+				err = mc.AddCall(contracts.RocketNodeStaking, &minimumStakes[j], "getNodeMinimumLegacyRPLStake", address)
 				if err != nil {
 					return fmt.Errorf("error adding node minimum RPL stake call for address %s: %w", address.Hex(), err)
 				}

rocketpool/node/node.go

@@ -139,7 +139,7 @@ func run(c *cli.Command) error {
 	}
 
 	// Wait until the node wallet stored on disk is registered
-	if err := services.WaitNodeRegistered(c, true); err != nil {
+	if err := services.WaitNodeRegistered(ctx, c, true); err != nil {
 		return err
 	}
 

rocketpool/watchtower/watchtower.go

@@ -107,7 +107,7 @@ func run(c *cli.Command) error {
 	}
 
 	// Wait until the node wallet stored on disk is registered
-	if err := services.WaitNodeRegistered(c, true); err != nil {
+	if err := services.WaitNodeRegistered(ctx, c, true); err != nil {
 		return err
 	}
 

shared/services/config/nethermind-params.go

@@ -10,8 +10,8 @@ import (
 
 // Constants
 const (
-	nethermindTagProd          string = "nethermind/nethermind:1.37.1"
-	nethermindTagTest          string = "nethermind/nethermind:1.37.1"
+	nethermindTagProd          string = "nethermind/nethermind:1.37.2"
+	nethermindTagTest          string = "nethermind/nethermind:1.37.2"
 	nethermindEventLogInterval int    = 1000
 	nethermindStopSignal       string = "SIGTERM"
 )

shared/services/proposals/checksum-manager.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"sort"
 	"strings"
 
@@ -138,9 +139,7 @@ func LoadFromFile[ContextType any, DataType IDataType](m *ChecksumManager[Contex
 
 	// Iterate over each file, counting backwards from the bottom
 	dataFolder := filepath.Dir(m.checksumFilename)
-	for i := len(lines) - 1; i >= 0; i-- {
-		line := lines[i]
-
+	for _, line := range slices.Backward(lines) {
 		// Get the checksum from the line
 		checksumString, filename, found := strings.Cut(line, "  ")
 		if !found {

shared/services/requirements.go

@@ -137,7 +137,7 @@ func RequireNodeSecurityMember(c *cli.Command) error {
 // Service synchronization
 //
 
-func WaitNodeHdPassword(c *cli.Command, verbose bool) error {
+func WaitNodeHdPassword(ctx context.Context, c *cli.Command, verbose bool) error {
 	for {
 		nodePasswordSet, err := getNodeHdPasswordSet(c)
 		if err != nil {
@@ -149,12 +149,14 @@ func WaitNodeHdPassword(c *cli.Command, verbose bool) error {
 		if verbose {
 			log.Printf("The node password has not been set, retrying in %s...\n", checkNodePasswordInterval.String())
 		}
-		time.Sleep(checkNodePasswordInterval)
+		if err := sleepCtx(ctx, checkNodePasswordInterval); err != nil {
+			return err
+		}
 	}
 }
 
-func WaitNodeHdWallet(c *cli.Command, verbose bool) error {
-	if err := WaitNodeHdPassword(c, verbose); err != nil {
+func WaitNodeHdWallet(ctx context.Context, c *cli.Command, verbose bool) error {
+	if err := WaitNodeHdPassword(ctx, c, verbose); err != nil {
 		return err
 	}
 	for {
@@ -168,7 +170,9 @@ func WaitNodeHdWallet(c *cli.Command, verbose bool) error {
 		if verbose {
 			log.Printf("The node wallet has not been initialized, retrying in %s...\n", checkNodeWalletInterval.String())
 		}
-		time.Sleep(checkNodeWalletInterval)
+		if err := sleepCtx(ctx, checkNodeWalletInterval); err != nil {
+			return err
+		}
 	}
 }
 
@@ -182,7 +186,7 @@ func WaitBeaconClientSynced(c *cli.Command, verbose bool) error {
 	return err
 }
 
-func WaitRocketStorage(c *cli.Command, verbose bool) error {
+func WaitRocketStorage(ctx context.Context, c *cli.Command, verbose bool) error {
 	if err := WaitEthClientSynced(c, verbose); err != nil {
 		return err
 	}
@@ -197,16 +201,18 @@ func WaitRocketStorage(c *cli.Command, verbose bool) error {
 		if verbose {
 			log.Printf("The Rocket Pool storage contract was not found, retrying in %s...\n", checkRocketStorageInterval.String())
 		}
-		time.Sleep(checkRocketStorageInterval)
+		if err := sleepCtx(ctx, checkRocketStorageInterval); err != nil {
+			return err
+		}
 	}
 }
 
 // This check makes calls to GetHdWallet instead of GetWallet as it's used in node and watchtower
-func WaitNodeRegistered(c *cli.Command, verbose bool) error {
-	if err := WaitNodeHdWallet(c, verbose); err != nil {
+func WaitNodeRegistered(ctx context.Context, c *cli.Command, verbose bool) error {
+	if err := WaitNodeHdWallet(ctx, c, verbose); err != nil {
 		return err
 	}
-	if err := WaitRocketStorage(c, verbose); err != nil {
+	if err := WaitRocketStorage(ctx, c, verbose); err != nil {
 		return err
 	}
 	for {
@@ -220,7 +226,21 @@ func WaitNodeRegistered(c *cli.Command, verbose bool) error {
 		if verbose {
 			log.Printf("The node is not registered with Rocket Pool, retrying in %s...\n", checkNodeRegisteredInterval.String())
 		}
-		time.Sleep(checkNodeRegisteredInterval)
+		if err := sleepCtx(ctx, checkNodeRegisteredInterval); err != nil {
+			return err
+		}
+	}
+}
+
+// sleepCtx sleeps for d, returning ctx.Err() if the context is cancelled first.
+func sleepCtx(ctx context.Context, d time.Duration) error {
+	timer := time.NewTimer(d)
+	defer timer.Stop()
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-timer.C:
+		return nil
 	}
 }
 

shared/services/state/network-state.go

@@ -534,7 +534,10 @@ func (s *NetworkState) GetMegapoolEligibleBorrowedEth(node *rpstate.NativeNodeDe
 		return big.NewInt(0)
 	}
 
-	megapool := s.MegapoolDetails[node.MegapoolAddress]
+	megapool, exists := s.MegapoolDetails[node.MegapoolAddress]
+	if !exists {
+		return big.NewInt(0)
+	}
 	eligibleBorrowedEth := big.NewInt(0).Set(megapool.UserCapital)
 
 	// Iterate over the validators