Merge pull request #596 from jshufro/jms/v2/cpd

Remove pseudomodal.go (unused), deduplicate other parts

Author: 0xfornax

rocketpool-cli/client/client.go

@@ -16,11 +16,6 @@ import (
 
 // Config
 const (
-	InstallerName              string = "install.sh"
-	UpdateTrackerInstallerName string = "install-update-tracker.sh"
-	InstallerURL               string = "https://github.com/rocket-pool/smartnode/releases/download/%s/" + InstallerName
-	UpdateTrackerURL           string = "https://github.com/rocket-pool/smartnode/releases/download/%s/" + UpdateTrackerInstallerName
-
 	SettingsFile       string = "user-settings.yml"
 	BackupSettingsFile string = "user-settings-backup.yml"
 

rocketpool-cli/client/service.go

@@ -19,51 +19,57 @@ import (
 )
 
 const (
+	installerName              string = "install.sh"
+	updateTrackerInstallerName string = "install-update-tracker.sh"
+	installerURL               string = "https://github.com/rocket-pool/smartnode/releases/download/%s/" + installerName
+	updateTrackerURL           string = "https://github.com/rocket-pool/smartnode/releases/download/%s/" + updateTrackerInstallerName
+
 	debugColor         color.Attribute = color.FgYellow
 	nethermindAdminUrl string          = "http://127.0.0.1:7434"
 )
 
-// Install the Rocket Pool service
-func (c *Client) InstallService(verbose bool, noDeps bool, version string, path string, useLocalInstaller bool) error {
-	// Get installation script flags
+func (c *Client) downloadAndRun(
+	name string,
+	url string,
+	verbose bool,
+	version string,
+	useLocalInstaller bool,
+	extraFlags []string,
+) error {
+	var script []byte
+
 	flags := []string{
 		"-v", shellescape.Quote(version),
 	}
-	if path != "" {
-		flags = append(flags, fmt.Sprintf("-p %s", shellescape.Quote(path)))
-	}
-	if noDeps {
-		flags = append(flags, "-d")
-	}
+	flags = append(flags, extraFlags...)
 
-	var script []byte
 	if useLocalInstaller {
 		// Make sure it exists
-		_, err := os.Stat(InstallerName)
+		_, err := os.Stat(name)
 		if errors.Is(err, os.ErrNotExist) {
-			return fmt.Errorf("local install script [%s] does not exist", InstallerName)
+			return fmt.Errorf("local script [%s] does not exist", name)
 		}
 		if err != nil {
-			return fmt.Errorf("error checking install script [%s]: %w", InstallerName, err)
+			return fmt.Errorf("error checking script [%s]: %w", name, err)
 		}
 
 		// Read it
-		script, err = os.ReadFile(InstallerName)
+		script, err = os.ReadFile(name)
 		if err != nil {
-			return fmt.Errorf("error reading local install script [%s]: %w", InstallerName, err)
+			return fmt.Errorf("error reading local script [%s]: %w", name, err)
 		}
 
 		// Set the "local mode" flag
 		flags = append(flags, "-l")
 	} else {
 		// Download the installation script
-		resp, err := http.Get(fmt.Sprintf(InstallerURL, version))
+		resp, err := http.Get(fmt.Sprintf(url, version))
 		if err != nil {
 			return err
 		}
 		defer resp.Body.Close()
 		if resp.StatusCode != http.StatusOK {
-			return fmt.Errorf("unexpected http status downloading installation script: %d", resp.StatusCode)
+			return fmt.Errorf("unexpected http status downloading %s script: %d", name, resp.StatusCode)
 		}
 
 		// Sanity check that the script octet length matches content-length
@@ -128,103 +134,23 @@ func (c *Client) InstallService(verbose bool, noDeps bool, version string, path
 	return nil
 }
 
-// Install the update tracker
-func (c *Client) InstallUpdateTracker(verbose bool, version string, useLocalInstaller bool) error {
+// Install the Rocket Pool service
+func (c *Client) InstallService(verbose bool, noDeps bool, version string, path string, useLocalInstaller bool) error {
 	// Get installation script flags
-	flags := []string{
-		"-v", shellescape.Quote(version),
-	}
-
-	var script []byte
-	if useLocalInstaller {
-		// Make sure it exists
-		_, err := os.Stat(UpdateTrackerInstallerName)
-		if errors.Is(err, os.ErrNotExist) {
-			return fmt.Errorf("local update tracker install script [%s] does not exist", UpdateTrackerInstallerName)
-		}
-		if err != nil {
-			return fmt.Errorf("error checking update tracker install script [%s]: %w", UpdateTrackerInstallerName, err)
-		}
-
-		// Read it
-		script, err = os.ReadFile(UpdateTrackerInstallerName)
-		if err != nil {
-			return fmt.Errorf("error reading local update tracker install script [%s]: %w", UpdateTrackerInstallerName, err)
-		}
-
-		// Set the "local mode" flag
-		flags = append(flags, "-l")
-	} else {
-		// Download the update tracker script
-		resp, err := http.Get(fmt.Sprintf(UpdateTrackerURL, version))
-		if err != nil {
-			return err
-		}
-		defer resp.Body.Close()
-		if resp.StatusCode != http.StatusOK {
-			return fmt.Errorf("unexpected http status downloading update tracker installer script: %d", resp.StatusCode)
-		}
-
-		// Sanity check that the script octet length matches content-length
-		script, err = io.ReadAll(resp.Body)
-		if err != nil {
-			return err
-		}
-
-		if fmt.Sprint(len(script)) != resp.Header.Get("content-length") {
-			return fmt.Errorf("downloaded script length %d did not match content-length header %s", len(script), resp.Header.Get("content-length"))
-		}
-	}
-
-	// Get the escalation command
-	escalationCmd, err := c.getEscalationCommand()
-	if err != nil {
-		return fmt.Errorf("error getting escalation command: %w", err)
-	}
-
-	// Initialize installation command
-	cmd := c.newCommand(fmt.Sprintf("%s sh -s -- %s", escalationCmd, strings.Join(flags, " ")))
-
-	// Pass the script to sh via its stdin fd
-	cmd.SetStdin(bytes.NewReader(script))
-
-	// Get command output pipes
-	cmdOut, err := cmd.StdoutPipe()
-	if err != nil {
-		return err
+	flags := []string{}
+	if path != "" {
+		flags = append(flags, fmt.Sprintf("-p %s", shellescape.Quote(path)))
 	}
-	cmdErr, err := cmd.StderrPipe()
-	if err != nil {
-		return err
+	if noDeps {
+		flags = append(flags, "-d")
 	}
 
-	// Print progress from stdout
-	go (func() {
-		scanner := bufio.NewScanner(cmdOut)
-		for scanner.Scan() {
-			fmt.Println(scanner.Text())
-		}
-	})()
-
-	// Read command & error output from stderr; render in verbose mode
-	var errMessage string
-	go (func() {
-		c := color.New(debugColor)
-		scanner := bufio.NewScanner(cmdErr)
-		for scanner.Scan() {
-			errMessage = scanner.Text()
-			if verbose {
-				_, _ = c.Println(scanner.Text())
-			}
-		}
-	})()
+	return c.downloadAndRun(installerName, installerURL, verbose, version, useLocalInstaller, flags)
+}
 
-	// Run command and return error output
-	err = cmd.Run()
-	if err != nil {
-		return fmt.Errorf("could not install Rocket Pool update tracker: %s", errMessage)
-	}
-	return nil
+// Install the update tracker
+func (c *Client) InstallUpdateTracker(verbose bool, version string, useLocalInstaller bool) error {
+	return c.downloadAndRun(updateTrackerInstallerName, updateTrackerURL, verbose, version, useLocalInstaller, nil)
 }
 
 // Start the Rocket Pool service

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

@@ -1,10 +1,7 @@
 package node
 
 import (
-	"crypto/rand"
 	"fmt"
-	"math/big"
-	"strconv"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/rocket-pool/node-manager-core/beacon"
@@ -29,126 +26,20 @@ func createVacantMinipool(c *cli.Context, pubkey beacon.ValidatorPubkey) error {
 		return err
 	}
 
-	// Make sure Beacon is on the correct chain
-	depositContractInfo, err := rp.Api.Network.GetDepositContractInfo(true)
+	d, err := newDepositPrompts(c, rp, &pubkey)
 	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 d == nil {
 		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 {
-		return err
-	}
-	if !feeDistributorResponse.Data.IsInitialized {
-		fmt.Println("Your fee distributor has not been initialized yet so you cannot create a new minipool.\nPlease run `rocketpool node initialize-fee-distributor` to initialize it first.")
-		return nil
-	}
-
-	// Post a warning about fee distribution
-	if !(c.Bool("yes") || utils.Confirm(fmt.Sprintf("%sNOTE: by creating a new minipool, your node will automatically claim and distribute any balance you have in your fee distributor contract. If you don't want to claim your balance at this time, you should not create a new minipool.%s\nWould you like to continue?", terminal.ColorYellow, terminal.ColorReset))) {
-		fmt.Println("Cancelled.")
-		return nil
-	}
-
-	// Print a notification about the pubkey
-	fmt.Printf("You are about to convert the solo staker %s into a Rocket Pool minipool. This will convert your 32 ETH deposit into either an 8 ETH or 16 ETH deposit (your choice), and convert the remaining 24 or 16 ETH into a deposit from the Rocket Pool staking pool. The staking pool portion will be credited to your node's account, allowing you to create more validators without depositing additional ETH onto the Beacon Chain. Your excess balance (your existing Beacon rewards) will be preserved and not shared with the pool stakers.\n\nPlease thoroughly read our documentation at https://docs.rocketpool.net/guides/atlas/solo-staker-migration.html to learn about the process and its implications.\n\n1. First, we'll create the new minipool.\n2. Next, we'll ask whether you want to import the validator's private key into your Smartnode's Validator Client, or keep running your own externally-managed validator.\n3. Finally, we'll help you migrate your validator's withdrawal credentials to the minipool address.\n\n%sNOTE: If you intend to use the credit balance to create additional validators, you will need to have enough RPL staked to support them.%s\n\n", pubkey.Hex(), terminal.ColorYellow, terminal.ColorReset)
-
-	// Get deposit amount
-	var amount float64
-	if c.String(amountFlag) != "" {
-		// Parse amount
-		depositAmount, err := strconv.ParseFloat(c.String(amountFlag), 64)
-		if err != nil {
-			return fmt.Errorf("invalid deposit amount '%s': %w", c.String(amountFlag), err)
-		}
-		amount = depositAmount
-	} else {
-		// Get deposit amount options
-		amountOptions := []string{
-			"8 ETH",
-			"16 ETH",
-		}
-
-		// Prompt for amount
-		selected, _ := utils.Select("Please choose an amount of ETH you want to use as your deposit for the new minipool (this will become your share of the balance, and the remainder will become the pool stakers' share):", amountOptions)
-		switch selected {
-		case 0:
-			amount = 8
-		case 1:
-			amount = 16
-		}
-	}
-	amountWei := eth.EthToWei(amount)
-
-	// Get network node fees
-	nodeFeeResponse, err := rp.Api.Network.NodeFee()
-	if err != nil {
-		return err
-	}
-
-	// Get minimum node fee
-	var minNodeFee float64
-	if c.String("max-slippage") == "auto" {
-		// Use default max slippage
-		minNodeFee = eth.WeiToEth(nodeFeeResponse.Data.NodeFee) - DefaultMaxNodeFeeSlippage
-		if minNodeFee < eth.WeiToEth(nodeFeeResponse.Data.MinNodeFee) {
-			minNodeFee = eth.WeiToEth(nodeFeeResponse.Data.MinNodeFee)
-		}
-	} else if c.String("max-slippage") != "" {
-		// Parse max slippage
-		maxNodeFeeSlippagePerc, err := strconv.ParseFloat(c.String("max-slippage"), 64)
-		if err != nil {
-			return fmt.Errorf("invalid maximum commission rate slippage '%s': %w", c.String("max-slippage"), err)
-		}
-		maxNodeFeeSlippage := maxNodeFeeSlippagePerc / 100
-
-		// Calculate min node fee
-		minNodeFee = eth.WeiToEth(nodeFeeResponse.Data.NodeFee) - maxNodeFeeSlippage
-		if minNodeFee < eth.WeiToEth(nodeFeeResponse.Data.MinNodeFee) {
-			minNodeFee = eth.WeiToEth(nodeFeeResponse.Data.MinNodeFee)
-		}
-	} else {
-		// Prompt for min node fee
-		if nodeFeeResponse.Data.MinNodeFee == nodeFeeResponse.Data.MaxNodeFee {
-			fmt.Printf("Your minipool will use the current fixed commission rate of %.2f%%.\n", eth.WeiToEth(nodeFeeResponse.Data.MinNodeFee)*100)
-			minNodeFee = eth.WeiToEth(nodeFeeResponse.Data.MinNodeFee)
-		} else {
-			minNodeFee = promptMinNodeFee(eth.WeiToEth(nodeFeeResponse.Data.NodeFee), eth.WeiToEth(nodeFeeResponse.Data.MinNodeFee))
-		}
-	}
-
-	// Get minipool salt
-	var salt *big.Int
-	if c.String(saltFlag) != "" {
-		var success bool
-		salt, success = big.NewInt(0).SetString(c.String(saltFlag), 0)
-		if !success {
-			return fmt.Errorf("invalid minipool salt: %s", c.String(saltFlag))
-		}
-	} else {
-		buffer := make([]byte, 32)
-		_, err = rand.Read(buffer)
-		if err != nil {
-			return fmt.Errorf("error generating random salt: %w", err)
-		}
-		salt = big.NewInt(0).SetBytes(buffer)
-	}
+	minNodeFee := d.minNodeFee
+	amountWei := d.amountWei
+	amount := eth.WeiToEth(amountWei)
 
 	// Build the TX
-	response, err := rp.Api.Node.CreateVacantMinipool(amountWei, minNodeFee, salt, pubkey)
+	response, err := rp.Api.Node.CreateVacantMinipool(amountWei, minNodeFee, d.salt, pubkey)
 	if err != nil {
 		return err
 	}
@@ -177,20 +68,25 @@ func createVacantMinipool(c *cli.Context, pubkey beacon.ValidatorPubkey) error {
 	syncResponse, err := rp.Api.Service.ClientStatus()
 	if err != nil {
 		return fmt.Errorf("error checking if your clients are in sync: %w", err)
-	} else {
-		if syncResponse.Data.BcManagerStatus.PrimaryClientStatus.IsSynced {
-			fmt.Printf("Your consensus client is synced, you may safely create a minipool.\n")
-		} else if syncResponse.Data.BcManagerStatus.FallbackEnabled {
-			if syncResponse.Data.BcManagerStatus.FallbackClientStatus.IsSynced {
-				fmt.Printf("Your fallback consensus client is synced, you may safely create a minipool.\n")
-			} else {
-				fmt.Printf("%s**WARNING**: neither your primary nor fallback consensus clients are fully synced.\nYou cannot migrate until they've finished syncing.\n%s", terminal.ColorRed, terminal.ColorReset)
-				return nil
-			}
+	}
+	if syncResponse.Data.BcManagerStatus.PrimaryClientStatus.IsSynced {
+		fmt.Println("Your consensus client is synced, you may safely create a minipool.")
+	} else if syncResponse.Data.BcManagerStatus.FallbackEnabled {
+		if syncResponse.Data.BcManagerStatus.FallbackClientStatus.IsSynced {
+			fmt.Println("Your fallback consensus client is synced, you may safely create a minipool.")
 		} else {
-			fmt.Printf("%s**WARNING**: your primary consensus client is either not fully synced or offline and you do not have a fallback client configured.\nYou cannot migrate until you have a synced consensus client.\n%s", terminal.ColorRed, terminal.ColorReset)
+			fmt.Print(terminal.ColorRed)
+			fmt.Println("**WARNING**: neither your primary nor fallback consensus clients are fully synced.")
+			fmt.Println("You cannot migrate until they've finished syncing.")
+			fmt.Print(terminal.ColorReset)
 			return nil
 		}
+	} else {
+		fmt.Print(terminal.ColorRed)
+		fmt.Println("**WARNING**: your primary consensus client is either not fully synced or offline and you do not have a fallback client configured.")
+		fmt.Println("You cannot migrate until you have a synced consensus client.")
+		fmt.Print(terminal.ColorReset)
+		return nil
 	}
 
 	// Run the TX