Dedup deposit contract and network checks

Author: jshufro

rocketpool-cli/commands/node/create-vacant-minipool.go

@@ -34,19 +34,10 @@ func createVacantMinipool(c *cli.Context, pubkey beacon.ValidatorPubkey) error {
 	if err != nil {
 		return err
 	}
-	if depositContractInfo.Data.RPNetwork != depositContractInfo.Data.BeaconNetwork ||
-		depositContractInfo.Data.RPDepositContract != depositContractInfo.Data.BeaconDepositContract {
-		utils.PrintDepositMismatchError(
-			depositContractInfo.Data.RPNetwork,
-			depositContractInfo.Data.BeaconNetwork,
-			depositContractInfo.Data.RPDepositContract,
-			depositContractInfo.Data.BeaconDepositContract)
+	if depositContractInfo.Data.PrintMismatch() {
 		return nil
 	}
 
-	fmt.Println("Your Beacon Node is on the correct network.")
-	fmt.Println()
-
 	// Check if the fee distributor has been initialized
 	feeDistributorResponse, err := rp.Api.Node.InitializeFeeDistributor()
 	if err != nil {

rocketpool-cli/commands/node/deposit.go

@@ -33,19 +33,10 @@ func nodeDeposit(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	if depositContractInfo.Data.RPNetwork != depositContractInfo.Data.BeaconNetwork ||
-		depositContractInfo.Data.RPDepositContract != depositContractInfo.Data.BeaconDepositContract {
-		utils.PrintDepositMismatchError(
-			depositContractInfo.Data.RPNetwork,
-			depositContractInfo.Data.BeaconNetwork,
-			depositContractInfo.Data.RPDepositContract,
-			depositContractInfo.Data.BeaconDepositContract)
+	if depositContractInfo.Data.PrintMismatch() {
 		return nil
 	}
 
-	fmt.Println("Your Beacon Node is on the correct network.")
-	fmt.Println()
-
 	// Check if the fee distributor has been initialized
 	feeDistributorResponse, err := rp.Api.Node.InitializeFeeDistributor()
 	if err != nil {

rocketpool-cli/commands/service/sync.go

@@ -99,19 +99,9 @@ func getSyncProgress(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	if depositContractInfo.Data.RPNetwork != depositContractInfo.Data.BeaconNetwork ||
-		depositContractInfo.Data.RPDepositContract != depositContractInfo.Data.BeaconDepositContract {
-		utils.PrintDepositMismatchError(
-			depositContractInfo.Data.RPNetwork,
-			depositContractInfo.Data.BeaconNetwork,
-			depositContractInfo.Data.RPDepositContract,
-			depositContractInfo.Data.BeaconDepositContract)
-		return nil
-	} else {
-		fmt.Println("Your Beacon Node is on the correct network.")
-		fmt.Println()
-	}
 
-	// Return
+	// Print any mismatch between client networks
+	depositContractInfo.Data.PrintMismatch()
+
 	return nil
 }

rocketpool-cli/utils/utils.go

@@ -153,23 +153,6 @@ func PrettyPrintError(err error) {
 	fmt.Println(prettyErr)
 }
 
-// Prints an error message when the Beacon client is not using the deposit contract address that Rocket Pool expects
-func PrintDepositMismatchError(rpNetwork, beaconNetwork uint64, rpDepositAddress, beaconDepositAddress common.Address) {
-	fmt.Printf("%s***ALERT***\n", terminal.ColorRed)
-	fmt.Println("YOUR ETH2 CLIENT IS NOT CONNECTED TO THE SAME NETWORK THAT ROCKET POOL IS USING!")
-	fmt.Println("This is likely because your ETH2 client is using the wrong configuration.")
-	fmt.Println("For the safety of your funds, Rocket Pool will not let you deposit your ETH until this is resolved.")
-	fmt.Println()
-	fmt.Println("To fix it if you are in Docker mode:")
-	fmt.Println("\t1. Run 'rocketpool service install -d' to get the latest configuration")
-	fmt.Println("\t2. Run 'rocketpool service stop' and 'rocketpool service start' to apply the configuration.")
-	fmt.Println("If you are using Hybrid or Native mode, please correct the network flags in your ETH2 launch script.")
-	fmt.Println()
-	fmt.Println("Details:")
-	fmt.Printf("\tRocket Pool expects deposit contract %s on chain %d.\n", rpDepositAddress.Hex(), rpNetwork)
-	fmt.Printf("\tYour Beacon client is using deposit contract %s on chain %d.%s\n", beaconDepositAddress.Hex(), beaconNetwork, terminal.ColorReset)
-}
-
 // Prints what network you're currently on
 func PrintNetwork(currentNetwork config.Network, isNew bool) error {
 	if isNew {

shared/types/api/network.go

@@ -1,9 +1,11 @@
 package api
 
 import (
+	"fmt"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/rocket-pool/smartnode/v2/rocketpool-cli/utils/terminal"
 	sharedtypes "github.com/rocket-pool/smartnode/v2/shared/types"
 )
 
@@ -73,3 +75,30 @@ type NetworkDepositContractInfoData struct {
 	BeaconNetwork         uint64         `json:"beaconNetwork"`
 	SufficientSync        bool           `json:"sufficientSync"`
 }
+
+func (ndcid *NetworkDepositContractInfoData) Mismatched() bool {
+	return ndcid.RPNetwork != ndcid.BeaconNetwork ||
+		ndcid.RPDepositContract != ndcid.BeaconDepositContract
+}
+
+func (ndcid *NetworkDepositContractInfoData) PrintMismatch() bool {
+	if !ndcid.Mismatched() {
+		fmt.Println("Your Beacon Node is on the correct network.")
+		fmt.Println()
+		return false
+	}
+	fmt.Printf("%s***ALERT***\n", terminal.ColorRed)
+	fmt.Println("YOUR ETH2 CLIENT IS NOT CONNECTED TO THE SAME NETWORK THAT ROCKET POOL IS USING!")
+	fmt.Println("This is likely because your ETH2 client is using the wrong configuration.")
+	fmt.Println("For the safety of your funds, Rocket Pool will not let you deposit your ETH until this is resolved.")
+	fmt.Println()
+	fmt.Println("To fix it if you are in Docker mode:")
+	fmt.Println("\t1. Run 'rocketpool service install -d' to get the latest configuration")
+	fmt.Println("\t2. Run 'rocketpool service stop' and 'rocketpool service start' to apply the configuration.")
+	fmt.Println("If you are using Hybrid or Native mode, please correct the network flags in your ETH2 launch script.")
+	fmt.Println()
+	fmt.Println("Details:")
+	fmt.Printf("\tRocket Pool expects deposit contract %s on chain %d.\n", ndcid.RPDepositContract.Hex(), ndcid.RPNetwork)
+	fmt.Printf("\tYour Beacon client is using deposit contract %s on chain %d.%s\n", ndcid.BeaconDepositContract.Hex(), ndcid.BeaconNetwork, terminal.ColorReset)
+	return true
+}