Merge pull request #1034 from jshufro/jms/integrated-updates

Add a rocketpool update command

Author: 0xfornax

Makefile

@@ -27,9 +27,9 @@ ${BIN_DIR}/rocketpool-cli-$1-$2: ${bin_deps}
 ifndef NO_DOCKER
 	docker run --rm -v ./:/src --user $(shell id -u):$(shell id -g) -e CGO_ENABLED=0 \
 		-e GOARCH=$2 -e GOOS=$1 --workdir /src -v ~/.cache:/.cache rocketpool/smartnode-builder:${VERSION} \
-		go build -o $$@ rocketpool-cli/rocketpool-cli.go
+		go build -o $$@ ./rocketpool-cli/
 else
-	CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build -o $$@ ./rocketpool-cli/rocketpool-cli.go
+	CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build -o $$@ ./rocketpool-cli/
 endif
 endef
 

rocketpool-cli/auction/bid-lot.go

@@ -109,7 +109,7 @@ func bidOnLot(c *cli.Context) error {
 		maxAmount.Quo(&tmp, eth.EthToWei(1))
 
 		// Prompt for maximum amount
-		if prompt.Confirm(fmt.Sprintf("Would you like to bid the maximum amount of ETH (%.6f ETH)?", math.RoundDown(eth.WeiToEth(&maxAmount), 6))) {
+		if prompt.Confirm("Would you like to bid the maximum amount of ETH (%.6f ETH)?", math.RoundDown(eth.WeiToEth(&maxAmount), 6)) {
 			amountWei = &maxAmount
 		} else {
 
@@ -145,7 +145,7 @@ func bidOnLot(c *cli.Context) error {
 	}
 
 	// Prompt for confirmation
-	if !(c.Bool("yes") || prompt.Confirm(fmt.Sprintf("Are you sure you want to bid %.6f ETH on lot %d? Bids are final and non-refundable.", math.RoundDown(eth.WeiToEth(amountWei), 6), selectedLot.Details.Index))) {
+	if !(c.Bool("yes") || prompt.Confirm("Are you sure you want to bid %.6f ETH on lot %d? Bids are final and non-refundable.", math.RoundDown(eth.WeiToEth(amountWei), 6), selectedLot.Details.Index)) {
 		fmt.Println("Cancelled.")
 		return nil
 	}

rocketpool-cli/auction/claim-lot.go

@@ -115,7 +115,7 @@ func claimFromLot(c *cli.Context) error {
 	}
 
 	// Prompt for confirmation
-	if !(c.Bool("yes") || prompt.Confirm(fmt.Sprintf("Are you sure you want to claim %d lots?", len(selectedLots)))) {
+	if !(c.Bool("yes") || prompt.Confirm("Are you sure you want to claim %d lots?", len(selectedLots))) {
 		fmt.Println("Cancelled.")
 		return nil
 	}

rocketpool-cli/auction/recover-lot.go

@@ -115,7 +115,7 @@ func recoverRplFromLot(c *cli.Context) error {
 	}
 
 	// Prompt for confirmation
-	if !(c.Bool("yes") || prompt.Confirm(fmt.Sprintf("Are you sure you want to recover %d lots?", len(selectedLots)))) {
+	if !(c.Bool("yes") || prompt.Confirm("Are you sure you want to recover %d lots?", len(selectedLots))) {
 		fmt.Println("Cancelled.")
 		return nil
 	}

rocketpool-cli/claims/claim-all.go

@@ -882,7 +882,7 @@ func claimAll(c *cli.Context, statusOnly bool) error {
 				if autoConfirm {
 					fmt.Printf("  %sContinuing with remaining %d claim(s)...%s\n", colorYellow, remaining, colorReset)
 				} else {
-					if !prompt.Confirm(fmt.Sprintf("  The above claim failed. Continue with the remaining %d claim(s)?", remaining)) {
+					if !prompt.Confirm("  The above claim failed. Continue with the remaining %d claim(s)?", remaining) {
 						skippedCount = remaining
 						fmt.Println("  Aborting remaining claims.")
 						break

rocketpool-cli/megapool/deposit.go

@@ -138,7 +138,7 @@ func nodeMegapoolDeposit(c *cli.Context) error {
 	fmt.Printf("The total bond requirement is %.2f ETH.\n", totalBondRequirementEth)
 	fmt.Println()
 
-	if !(c.Bool("yes") || prompt.Confirm(fmt.Sprintf("%sNOTE: You are about to create %d new megapool validator(s), requiring a total of: %.2f ETH).%s\nWould you like to continue?", colorYellow, count, totalBondRequirementEth, colorReset))) {
+	if !(c.Bool("yes") || prompt.Confirm("%sNOTE: You are about to create %d new megapool validator(s), requiring a total of: %.2f ETH).%s\nWould you like to continue?", colorYellow, count, totalBondRequirementEth, colorReset)) {
 		fmt.Println("Cancelled.")
 		return nil
 	}
@@ -272,13 +272,13 @@ func nodeMegapoolDeposit(c *cli.Context) error {
 
 	// Prompt for confirmation
 
-	if !(c.Bool("yes") || prompt.Confirm(fmt.Sprintf(
+	if !(c.Bool("yes") || prompt.Confirm(
 		"You are about to deposit %.6f ETH to create %d new megapool validator(s).\n"+
 			"%sARE YOU SURE YOU WANT TO DO THIS? %s\n",
 		math.RoundDown(eth.WeiToEth(totalBondRequirement), 6),
 		count,
 		colorYellow,
-		colorReset))) {
+		colorReset)) {
 		fmt.Println("Cancelled.")
 		return nil
 	}

rocketpool-cli/megapool/dissolve-validator.go

@@ -75,7 +75,7 @@ func dissolveValidator(c *cli.Context) error {
 	}
 
 	// Prompt for confirmation
-	if !(c.Bool("yes") || prompt.Confirm(fmt.Sprintf("Are you sure you want to DISSOLVE megapool validator ID: %d?", validatorId))) {
+	if !(c.Bool("yes") || prompt.Confirm("Are you sure you want to DISSOLVE megapool validator ID: %d?", validatorId)) {
 		fmt.Println("Cancelled.")
 		return nil
 	}

rocketpool-cli/megapool/exit-queue.go

@@ -169,7 +169,7 @@ func exitQueue(c *cli.Context) error {
 	}
 
 	// Ask for confirmation
-	if !(c.Bool("yes") || prompt.Confirm(fmt.Sprintf("Are you sure you want to exit %d validator(s) from the megapool queue?", len(canExitResponses)))) {
+	if !(c.Bool("yes") || prompt.Confirm("Are you sure you want to exit %d validator(s) from the megapool queue?", len(canExitResponses))) {
 		fmt.Println("Cancelled.")
 		return nil
 	}

rocketpool-cli/megapool/exit-validator.go

@@ -83,7 +83,7 @@ func exitValidator(c *cli.Context) error {
 	fmt.Printf("Once your funds have been withdrawn, you can run `rocketpool megapool notify-validator-exit` to distribute them to your withdrawal address.\n\n%s", colorReset)
 
 	// Prompt for confirmation
-	if !(c.Bool("yes") || prompt.Confirm(fmt.Sprintf("Are you sure you want to EXIT validator id %d?", validatorId))) {
+	if !(c.Bool("yes") || prompt.Confirm("Are you sure you want to EXIT validator id %d?", validatorId)) {
 		fmt.Println("Cancelled.")
 		return nil
 	}

rocketpool-cli/megapool/notify-final-balance.go

@@ -108,7 +108,7 @@ func notifyFinalBalance(c *cli.Context) error {
 	}
 
 	// Prompt for confirmation
-	if !(c.Bool("yes") || prompt.Confirm(fmt.Sprintf("Are you sure you want to notify the final balance for validator id %d exit?", validatorId))) {
+	if !(c.Bool("yes") || prompt.Confirm("Are you sure you want to notify the final balance for validator id %d exit?", validatorId)) {
 		fmt.Println("Cancelled.")
 		return nil
 	}