Smartnode -> Smart Node

Author: 0xfornax

CHANGELOG.md

@@ -107,7 +107,7 @@
 
 ### Added
 
-- Smartnode notification functionality for bounty BA022308 (https://github.com/rocket-pool/smartnode/pull/449)
+-Smart Node notification functionality for bounty BA022308 (https://github.com/rocket-pool/smartnode/pull/449)
 
 ### Fixed
 

README.md

@@ -11,16 +11,16 @@ You can earn a higher return than you would outside the network by capturing an
 
 This repository contains the source code for:
 
-* The Rocket Pool Smartnode client (CLI), which is used to manage a smart node either locally or remotely (over SSH)
-* The Rocket Pool Smartnode service, which provides an API for client communication and performs background node tasks
+* The Rocket Pool Smart Node client (CLI), which is used to manage a smart node either locally or remotely (over SSH)
+* The Rocket Pool Smart Node service, which provides an API for client communication and performs background node tasks
 
-The Smartnode service is designed to be run as part of a Docker stack and generally does not need to be installed manually.
+The Smart Node service is designed to be run as part of a Docker stack and generally does not need to be installed manually.
 See the [Rocket Pool dockerhub](https://hub.docker.com/u/rocketpool) page for a complete list of Docker images.
 
 
 ## Installation
 
-See the [Smartnode Installer](https://github.com/rocket-pool/smartnode-install) repository for supported platforms and installation instructions.
+See the [Smart Node Installer](https://github.com/rocket-pool/smartnode-install) repository for supported platforms and installation instructions.
 
 ## Development
 
@@ -48,7 +48,7 @@ A [Makefile](./Makefile) is included for building, testing, and linting.
 
 ## CLI Commands
 
-The following commands are available via the Smartnode client:
+The following commands are available via the Smart Node client:
 
 
 ### COMMANDS:
@@ -66,7 +66,7 @@ The following commands are available via the Smartnode client:
   - `rocketpool minipool status, s` - Get a list of the node's minipools
   - `rocketpool minipool stake, t` - Stake a minipool after the scrub check, moving it from prelaunch to staking.
   - `rocketpool minipool set-withdrawal-creds, swc` - Convert the withdrawal credentials for a migrated solo validator from the old 0x00 value to the minipool address. Required to complete the migration process.
-  - `rocketpool minipool import-key, ik` - Import the externally-derived key for a minipool that was previously a solo validator, so the Smartnode's VC manages it instead of your externally-managed VC.
+  - `rocketpool minipool import-key, ik` - Import the externally-derived key for a minipool that was previously a solo validator, so the Smart Node's VC manages it instead of your externally-managed VC.
   - `rocketpool minipool promote, p` - Promote a vacant minipool after the scrub check, completing a solo validator migration.
   - `rocketpool minipool refund, r` - Refund ETH belonging to the node from minipools
   - `rocketpool minipool begin-bond-reduction, bbr` - Begins the ETH bond reduction process for a minipool, taking it from 16 ETH down to 8 ETH (begins conversion of a 16 ETH minipool to an LEB8)
@@ -144,7 +144,7 @@ The following commands are available via the Smartnode client:
   - `rocketpool service start, s` -  Start the Rocket Pool service
   - `rocketpool service pause, p` -  Pause the Rocket Pool service
   - `rocketpool service stop, o` - Pause the Rocket Pool service (alias of 'rocketpool service pause')
-  - `rocketpool service reset-docker, rd` - Cleanup Docker resources, including stopped containers, unused images and networks. Stops and restarts Smartnode.
+  - `rocketpool service reset-docker, rd` - Cleanup Docker resources, including stopped containers, unused images and networks. Stops and restarts Smart Node.
   - `rocketpool service prune-docker, pd` - Cleanup unused Docker resources, including stopped containers, unused images, networks and volumes. Does not restart smartnode, so the running containers and the images and networks they reference will not be pruned.
   - `rocketpool service logs, l` - View the Rocket Pool service logs
   - `rocketpool service stats, a` - View the Rocket Pool service stats
@@ -156,7 +156,7 @@ The following commands are available via the Smartnode client:
   - `rocketpool service get-config-yaml` - Generate YAML that shows the current configuration schema, including all of the parameters and their descriptions
   - `rocketpool service resync-eth1` - Deletes the main ETH1 client's chain data and resyncs it from scratch. Only use this as a last resort!
   - `rocketpool service resync-eth2` - Deletes the ETH2 client's chain data and resyncs it from scratch. Only use this as a last resort!
-  - `rocketpool service terminate, t` - Deletes all of the Rocket Pool Docker containers and volumes, including your ETH1 and ETH2 chain data and your Prometheus database (if metrics are enabled). Only use this if you are cleaning up the Smartnode and want to start over!
+  - `rocketpool service terminate, t` - Deletes all of the Rocket Pool Docker containers and volumes, including your ETH1 and ETH2 chain data and your Prometheus database (if metrics are enabled). Only use this if you are cleaning up the Smart Node and want to start over!
 - **wallet**, w - Manage the node wallet
   - `rocketpool wallet status, s` - Get the node wallet status
   - `rocketpool wallet init, i` - Initialize the node wallet

rocketpool-cli/network/generate-tree.go

@@ -35,7 +35,7 @@ func generateRewardsTree(c *cli.Context) error {
 	// Print archive node info
 	archiveEcUrl := cfg.Smartnode.ArchiveECUrl.Value.(string)
 	if archiveEcUrl == "" {
-		fmt.Printf("%sNOTE: in order to generate a Merkle rewards tree for a past rewards interval, you will likely need to have access to an Execution client with archival state.\nBy default, your Smartnode's Execution client will not provide this.\n\nPlease specify the URL of an archive-capable EC in the Smartnode section of the `rocketpool service config` Terminal UI.\nIf you need one, Alchemy provides a free service which you can use: https://www.alchemy.com/ethereum%s\n\n", colorYellow, colorReset)
+		fmt.Printf("%sNOTE: in order to generate a Merkle rewards tree for a past rewards interval, you will likely need to have access to an Execution client with archival state.\nBy default, your Smartnode's Execution client will not provide this.\n\nPlease specify the URL of an archive-capable EC in theSmart Node section of the `rocketpool service config` Terminal UI.\nIf you need one, Alchemy provides a free service which you can use: https://www.alchemy.com/ethereum%s\n\n", colorYellow, colorReset)
 	} else {
 		fmt.Printf("%sYou have an archive EC specified at [%s]. This will be used for tree generation.%s\n\n", colorGreen, archiveEcUrl, colorReset)
 	}

rocketpool-cli/node/commands.go

@@ -617,7 +617,7 @@ func RegisterCommands(app *cli.App, name string, aliases []string) {
 					},
 					cli.StringFlag{
 						Name:  "mnemonic, m",
-						Usage: "Use this flag if you want to recreate your validator's private key within the Smartnode's VC instead of running it via your own VC, and have the Smartnode reassign your validator's withdrawal credentials to the new minipool address automatically.",
+						Usage: "Use this flag if you want to recreate your validator's private key within the Smartnode's VC instead of running it via your own VC, and have theSmart Node reassign your validator's withdrawal credentials to the new minipool address automatically.",
 					},
 					cli.BoolFlag{
 						Name:  "no-restart",

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

@@ -241,7 +241,7 @@ func createVacantMinipool(c *cli.Context, pubkey types.ValidatorPubkey) error {
 	if c.IsSet("mnemonic") {
 		mnemonic = c.String("mnemonic")
 	} else if !c.Bool("yes") {
-		fmt.Println("You have the option of importing your validator's private key into the Smartnode's Validator Client instead of running your own Validator Client separately. In doing so, the Smartnode will also automatically migrate your validator's withdrawal credentials from your BLS private key to the minipool you just created.")
+		fmt.Println("You have the option of importing your validator's private key into the Smartnode's Validator Client instead of running your own Validator Client separately. In doing so, theSmart Node will also automatically migrate your validator's withdrawal credentials from your BLS private key to the minipool you just created.")
 		fmt.Println()
 		if prompt.Confirm("Would you like to import your key and automatically migrate your withdrawal credentials?") {
 			mnemonic = wallet.PromptMnemonic()
@@ -266,7 +266,7 @@ func createVacantMinipool(c *cli.Context, pubkey types.ValidatorPubkey) error {
 
 }
 
-// Import a validator's private key into the Smartnode and set the validator's withdrawal creds
+// Import a validator's private key into theSmart Node and set the validator's withdrawal creds
 func handleImport(c *cli.Context, rp *rocketpool.Client, minipoolAddress common.Address, mnemonic string) {
 	// Check if the withdrawal creds can be changed
 	success := migration.ChangeWithdrawalCreds(rp, minipoolAddress, mnemonic)

rocketpool-cli/node/utils.go

@@ -358,7 +358,7 @@ func promptForSoloKeyPassword(rp *rocketpool.Client, cfg *config.RocketPoolConfi
 	}
 
 	if len(pubkeyPasswords) == 0 {
-		return "", fmt.Errorf("couldn't find the keystore for validator %s in the custom-keys directory; if you want to import this key into the Smartnode stack, you will need to put its keystore file into custom-keys first", pubkey.String())
+		return "", fmt.Errorf("couldn't find the keystore for validator %s in the custom-keys directory; if you want to import this key into theSmart Node stack, you will need to put its keystore file into custom-keys first", pubkey.String())
 	}
 
 	// Store it in the file

rocketpool-cli/service/commands.go

@@ -278,7 +278,7 @@ func RegisterCommands(app *cli.App, name string, aliases []string) {
 					},
 					cli.BoolFlag{
 						Name:  "all, a",
-						Usage: "Removes all Docker images, including those currently used by the Smartnode stack. This will force a full re-download of all images when the Smartnode is restarted.",
+						Usage: "Removes all Docker images, including those currently used by theSmart Node stack. This will force a full re-download of all images when theSmart Node is restarted.",
 					},
 				},
 				Action: func(c *cli.Context) error {
@@ -300,7 +300,7 @@ func RegisterCommands(app *cli.App, name string, aliases []string) {
 				Flags: []cli.Flag{
 					cli.BoolFlag{
 						Name:  "all, a",
-						Usage: "Removes all Docker images, including those currently used by the Smartnode stack. This will force a full re-download of all images when the Smartnode is restarted.",
+						Usage: "Removes all Docker images, including those currently used by theSmart Node stack. This will force a full re-download of all images when theSmart Node is restarted.",
 					},
 				},
 				Action: func(c *cli.Context) error {
@@ -492,7 +492,7 @@ func RegisterCommands(app *cli.App, name string, aliases []string) {
 			{
 				Name:      "terminate",
 				Aliases:   []string{"t"},
-				Usage:     fmt.Sprintf("%sDeletes all of the Rocket Pool Docker containers and volumes, including your ETH1 and ETH2 chain data and your Prometheus database (if metrics are enabled). Also removes your entire `.rocketpool` configuration folder, including your wallet, password, and validator keys. Only use this if you are cleaning up the Smartnode and want to start over!%s", colorRed, colorReset),
+				Usage:     fmt.Sprintf("%sDeletes all of the Rocket Pool Docker containers and volumes, including your ETH1 and ETH2 chain data and your Prometheus database (if metrics are enabled). Also removes your entire `.rocketpool` configuration folder, including your wallet, password, and validator keys. Only use this if you are cleaning up theSmart Node and want to start over!%s", colorRed, colorReset),
 				UsageText: "rocketpool service terminate [options]",
 				Flags: []cli.Flag{
 					cli.BoolFlag{

rocketpool-cli/service/config/main-display.go

@@ -53,7 +53,7 @@ func NewMainDisplay(app *tview.Application, previousConfig *config.RocketPoolCon
 	grid.SetBackgroundColor(NonInteractiveBackgroundColor)
 
 	grid.SetBorder(true).
-		SetTitle(fmt.Sprintf(" Rocket Pool Smartnode %s Configuration ", shared.RocketPoolVersion())).
+		SetTitle(fmt.Sprintf(" Rocket PoolSmart Node %s Configuration ", shared.RocketPoolVersion())).
 		SetBorderColor(tcell.ColorOrange).
 		SetTitleColor(tcell.ColorOrange).
 		SetBackgroundColor(NonInteractiveBackgroundColor)

rocketpool-cli/service/config/review-page.go

@@ -56,7 +56,7 @@ func NewReviewPage(md *mainDisplay, oldConfig *config.RocketPoolConfig, newConfi
 			if newConfig.ExecutionClientMode.Value.(cfgtypes.Mode) == cfgtypes.Mode_Local && newConfig.ExecutionClient.Value.(cfgtypes.ExecutionClient) != cfgtypes.ExecutionClient_Geth {
 				totalAffectedContainers[cfgtypes.ContainerID_Eth1] = true
 			}
-			builder.WriteString(fmt.Sprintf("Updated to Smartnode v%s (will affect several containers)\n\n", shared.RocketPoolVersion()))
+			builder.WriteString(fmt.Sprintf("Updated toSmart Node v%s (will affect several containers)\n\n", shared.RocketPoolVersion()))
 		}
 
 		for categoryName, changedSettingsList := range changedSettings {

rocketpool-cli/service/config/settings-fallback.go

@@ -31,7 +31,7 @@ func NewFallbackConfigPage(home *settingsHome) *FallbackConfigPage {
 		home.homePage,
 		"settings-fallback",
 		"Fallback Clients",
-		"Select this to manage a separate pair of externally-managed Execution and Consensus clients that the Smartnode and Validator Client will use if your main Execution or Consensus clients ever go offline.",
+		"Select this to manage a separate pair of externally-managed Execution and Consensus clients that theSmart Node and Validator Client will use if your main Execution or Consensus clients ever go offline.",
 		configPage.layout.grid,
 	)