Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rocketpool-cli/minipool/rescue-dissolved.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func rescueDissolved(c *cli.Context) error {
}

fmt.Println("This command will allow you to manually deposit the remaining ETH for any dissolved minipools, activating them so you can exit them and retrieve your minipool's funds.")
fmt.Println("Please read our guide at https://docs.rocketpool.net/guides/node/rescue-dissolved.html to fully read about the process before continuing.")
fmt.Println("Please read our guide at https://docs.rocketpool.net/node-staking/rescue-dissolved to fully read about the process before continuing.")
fmt.Println()

// Validate the amount
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/network/generate-tree.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const (
colorGreen string = "\033[32m"
colorYellow string = "\033[33m"

signallingAddressLink string = "https://docs.rocketpool.net/guides/houston/participate#setting-your-snapshot-signalling-address"
signallingAddressLink string = "https://docs.rocketpool.net/pdao/participate#setting-your-snapshot-signalling-address"
)

func generateRewardsTree(c *cli.Context) error {
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/node/create-vacant-minipool.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func createVacantMinipool(c *cli.Context, pubkey types.ValidatorPubkey) error {
}

// 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 an 8 ETH deposit, and convert the remaining 24 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 Smart Node'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(), colorYellow, colorReset)
fmt.Printf("You are about to convert the solo staker %s into a Rocket Pool minipool. This will convert your 32 ETH deposit into an 8 ETH deposit, and convert the remaining 24 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/node-staking/solo-staker-migration 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 Smart Node'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(), colorYellow, colorReset)

// Get deposit amount
var amount float64
Expand Down
4 changes: 2 additions & 2 deletions rocketpool-cli/node/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const (
colorRed string = "\033[31m"
colorGreen string = "\033[32m"
colorYellow string = "\033[33m"
smoothingPoolLink string = "https://docs.rocketpool.net/guides/redstone/whats-new.html#smoothing-pool"
signallingAddressLink string = "https://docs.rocketpool.net/guides/houston/participate#setting-your-snapshot-signalling-address"
smoothingPoolLink string = "https://docs.rocketpool.net/upgrades/redstone/whats-new#smoothing-pool"
signallingAddressLink string = "https://docs.rocketpool.net/pdao/participate#setting-your-snapshot-signalling-address"
maxAlertItems int = 3
)

Expand Down
4 changes: 2 additions & 2 deletions rocketpool-cli/pdao/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const (
colorBlue string = "\033[36m"
colorReset string = "\033[0m"
colorGreen string = "\033[32m"
signallingAddressLink string = "https://docs.rocketpool.net/guides/houston/participate#setting-your-snapshot-signalling-address"
challengeLink string = "https://docs.rocketpool.net/guides/houston/pdao#challenge-process"
signallingAddressLink string = "https://docs.rocketpool.net/pdao/participate#setting-your-snapshot-signalling-address"
challengeLink string = "https://docs.rocketpool.net/pdao#challenge-process"
)

func getStatus(c *cli.Context) error {
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/service/config/step-checkpoint-sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func createCheckpointSyncStep(wiz *wizard, currentStep int, totalSteps int) *tex
// Create the labels and args
checkpointSyncLabel := wiz.md.Config.ConsensusCommon.CheckpointSyncProvider.Name

helperText := "Your client supports Checkpoint Sync. This powerful feature allows it to copy the most recent state from a separate Consensus client that you trust, so you don't have to wait for it to sync from scratch - you can start using it instantly!\n\nTake a look at our documentation for an example of how to use it:\nhttps://docs.rocketpool.net/guides/node/config-docker.html#beacon-chain-checkpoint-syncing\n\nIf you would like to use Checkpoint Sync, please provide the provider URL here. If you don't want to use it, leave it blank."
helperText := "Your client supports Checkpoint Sync. This powerful feature allows it to copy the most recent state from a separate Consensus client that you trust, so you don't have to wait for it to sync from scratch - you can start using it instantly!\n\nTake a look at our documentation for an example of how to use it:\nhttps://docs.rocketpool.net/node-staking/config-docker#beacon-chain-checkpoint-syncing\n\nIf you would like to use Checkpoint Sync, please provide the provider URL here. If you don't want to use it, leave it blank."

show := func(modal *textBoxModalLayout) {
wiz.md.setPage(modal.page)
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/service/config/step-local-cc.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func createLocalCcStep(wiz *wizard, currentStep int, totalSteps int) *choiceWiza
clients = append(clients, client)
}

helperText := "Please select the Consensus client you would like to use.\n\nHighlight each one to see a brief description of it, or go to https://docs.rocketpool.net/guides/node/eth-clients.html#eth2-clients to learn more about them."
helperText := "Please select the Consensus client you would like to use.\n\nHighlight each one to see a brief description of it, or go to https://docs.rocketpool.net/node-staking/eth-clients#eth2-clients to learn more about them."

show := func(modal *choiceModalLayout) {
wiz.md.setPage(modal.page)
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/service/config/step-local-ec.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func createLocalEcStep(wiz *wizard, currentStep int, totalSteps int) *choiceWiza
}
}

helperText := "Please select the Execution client you would like to use.\n\nHighlight each one to see a brief description of it, or go to https://docs.rocketpool.net/guides/node/eth-clients.html#eth1-clients to learn more about them."
helperText := "Please select the Execution client you would like to use.\n\nHighlight each one to see a brief description of it, or go to https://docs.rocketpool.net/node-staking/eth-clients#eth1-clients to learn more about them."

show := func(modal *choiceModalLayout) {
wiz.md.setPage(modal.page)
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/service/config/step-local-mev.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func createLocalMevStep(wiz *wizard, currentStep int, totalSteps int) *checkBoxW
regulatedAllLabel := strings.TrimPrefix(wiz.md.Config.MevBoost.EnableRegulatedAllMev.Name, "Enable ")
unregulatedAllLabel := strings.TrimPrefix(wiz.md.Config.MevBoost.EnableUnregulatedAllMev.Name, "Enable ")

helperText := "Select the profiles you would like to enable below. Read the descriptions carefully! Leave all options unchecked if you wish to opt out of MEV-Boost for now, [orange]but it will be required in the future.[white]\n\n[lime]Please read our guide to learn more about MEV:\nhttps://docs.rocketpool.net/guides/node/mev.html\n"
helperText := "Select the profiles you would like to enable below. Read the descriptions carefully! Leave all options unchecked if you wish to opt out of MEV-Boost for now, [orange]but it will be required in the future.[white]\n\n[lime]Please read our guide to learn more about MEV:\nhttps://docs.rocketpool.net/node-staking/mev\n"

show := func(modal *checkBoxModalLayout) {
labels, descriptions, selections := getMevChoices(wiz.md.Config.MevBoost)
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/service/config/step-metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "github.com/rocket-pool/smartnode/shared/types/config"

func createMetricsStep(wiz *wizard, currentStep int, totalSteps int) *choiceWizardStep {

helperText := "Would you like to enable the Smart Node's metrics monitoring system? This will monitor things such as hardware stats (CPU usage, RAM usage, free disk space), your minipool stats, stats about your node such as total RPL and ETH rewards, and much more. It also enables the Grafana dashboard to quickly and easily view these metrics (see https://docs.rocketpool.net/guides/node/grafana.html for an example).\n\nNone of this information will be sent to any remote servers for collection an analysis; this is purely for your own usage on your node."
helperText := "Would you like to enable the Smart Node's metrics monitoring system? This will monitor things such as hardware stats (CPU usage, RAM usage, free disk space), your minipool stats, stats about your node such as total RPL and ETH rewards, and much more. It also enables the Grafana dashboard to quickly and easily view these metrics (see https://docs.rocketpool.net/node-staking/grafana for an example).\n\nNone of this information will be sent to any remote servers for collection an analysis; this is purely for your own usage on your node."

show := func(modal *choiceModalLayout) {
wiz.md.setPage(modal.page)
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/service/config/step-mev-mode.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func createMevModeStep(wiz *wizard, currentStep int, totalSteps int) *choiceWiza
modeDescriptions = append(modeDescriptions, mode.Description)
}

helperText := "By default, yourSmart Node has MEV-Boost enabled. This allows you to capture extra profits from block proposals. Would you like Rocket Pool to manage MEV-Boost for you, or would you like to manage it yourself?\n\n[lime]Please read our guide to learn more about MEV:\nhttps://docs.rocketpool.net/guides/node/mev.html\n"
helperText := "By default, yourSmart Node has MEV-Boost enabled. This allows you to capture extra profits from block proposals. Would you like Rocket Pool to manage MEV-Boost for you, or would you like to manage it yourself?\n\n[lime]Please read our guide to learn more about MEV:\nhttps://docs.rocketpool.net/node-staking/mev\n"

show := func(modal *choiceModalLayout) {
wiz.md.setPage(modal.page)
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/service/config/step-native-cc.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func createNativeCcStep(wiz *wizard, currentStep int, totalSteps int) *choiceWiz
clientDescriptions = append(clientDescriptions, getAugmentedCcDescription(client.Value.(cfgtypes.ConsensusClient), client.Description))
}

helperText := "Please select the Consensus client you are / will be using.\n\nIf you're still deciding on one, highlight each one below to see a brief description of it, or go to https://docs.rocketpool.net/guides/node/eth-clients.html#eth2-clients to learn more about them."
helperText := "Please select the Consensus client you are / will be using.\n\nIf you're still deciding on one, highlight each one below to see a brief description of it, or go to https://docs.rocketpool.net/node-staking/eth-clients#eth2-clients to learn more about them."

show := func(modal *choiceModalLayout) {
wiz.md.setPage(modal.page)
Expand Down
2 changes: 1 addition & 1 deletion rocketpool-cli/service/config/step-native-mev.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package config

func createNativeMevStep(wiz *wizard, currentStep int, totalSteps int) *choiceWizardStep {

helperText := "NOTE: Rocket Pool expects our node operators to run MEV-Boost to prevent cheating and gain supplemental rewards from block proposals. In Native mode, you are responsible for setting up MEV-Boost yourself.\nMEV-Boost is currently opt-out, [orange]but will become required for all node operators in the future. [white]Please set MEV-Boost up when you are done configuring the Smart Node unless you explicitly intend to opt-out for now.\n\n[lime]Please read our guide to learn more about MEV:\nhttps://docs.rocketpool.net/guides/node/mev.html"
helperText := "NOTE: Rocket Pool expects our node operators to run MEV-Boost to prevent cheating and gain supplemental rewards from block proposals. In Native mode, you are responsible for setting up MEV-Boost yourself.\nMEV-Boost is currently opt-out, [orange]but will become required for all node operators in the future. [white]Please set MEV-Boost up when you are done configuring the Smart Node unless you explicitly intend to opt-out for now.\n\n[lime]Please read our guide to learn more about MEV:\nhttps://docs.rocketpool.net/node-staking/mev"

show := func(modal *choiceModalLayout) {
wiz.md.setPage(modal.page)
Expand Down
8 changes: 4 additions & 4 deletions rocketpool-cli/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func configureService(c *cli.Context) error {
}
_, err = os.Stat(path)
if os.IsNotExist(err) {
fmt.Printf("%sYour configured Rocket Pool directory of [%s] does not exist.\nPlease follow the instructions at https://docs.rocketpool.net/guides/node/docker.html to install the Smart Node.%s\n", colorYellow, path, colorReset)
fmt.Printf("%sYour configured Rocket Pool directory of [%s] does not exist.\nPlease follow the instructions at https://docs.rocketpool.net/node-staking/docker to install the Smart Node.%s\n", colorYellow, path, colorReset)
return nil
}

Expand Down Expand Up @@ -275,13 +275,13 @@ func configureService(c *cli.Context) error {
fmt.Printf("%sWARNING: You have requested to change networks.\n\nAll of your existing chain data, your node wallet, and your validator keys will be removed. If you had a Checkpoint Sync URL provided for your Consensus client, it will be removed and you will need to specify a different one that supports the new network.\n\nPlease confirm you have backed up everything you want to keep, because it will be deleted if you answer `y` to the prompt below.\n\n%s", colorYellow, colorReset)

if !prompt.Confirm("Would you like the Smart Node to automatically switch networks for you? This will destroy and rebuild your `data` folder and all of Rocket Pool's Docker containers.") {
fmt.Println("To change networks manually, please follow the steps laid out in the Node Operator's guide (https://docs.rocketpool.net/guides/node/mainnet.html).")
fmt.Println("To change networks manually, please follow the steps laid out in the Node Operator's guide (https://docs.rocketpool.net/node-staking/config-docker#choosing-a-network).")
return nil
}

err = changeNetworks(c, rp, fmt.Sprintf("%s%s", prefix, ApiContainerSuffix))
if err != nil {
fmt.Printf("%s%s%s\nThe Smart Node could not automatically change networks for you, so you will have to run the steps manually. Please follow the steps laid out in the Node Operator's guide (https://docs.rocketpool.net/guides/node/mainnet.html).\n", colorRed, err.Error(), colorReset)
fmt.Printf("%s%s%s\nThe Smart Node could not automatically change networks for you, so you will have to run the steps manually. Please follow the steps laid out in the Node Operator's guide (https://docs.rocketpool.net/node-staking/mainnet.html).\n", colorRed, err.Error(), colorReset)
}
return nil
}
Expand Down Expand Up @@ -663,7 +663,7 @@ func checkForValidatorChange(rp *rocketpool.Client, cfg *config.RocketPoolConfig
fmt.Printf("You have changed your validator client from %s to %s. Only %s has elapsed since you stopped %s.\n", currentValidatorName, pendingValidatorName, time.Since(validatorFinishTime), currentValidatorName)
fmt.Printf("If you were actively validating while using %s, starting %s without waiting will cause your validators to be slashed due to duplicate attestations!", currentValidatorName, pendingValidatorName)
fmt.Println("To prevent slashing, Rocket Pool will delay activating the new client for 15 minutes.")
fmt.Println("See the documentation for a more detailed explanation: https://docs.rocketpool.net/guides/node/maintenance/node-migration.html#slashing-and-the-slashing-database")
fmt.Println("See the documentation for a more detailed explanation: https://docs.rocketpool.net/node-staking/maintenance/node-migration.html#slashing-and-the-slashing-database")
fmt.Printf("If you have read the documentation, understand the risks, and want to bypass this cooldown, run `rocketpool service start --ignore-slash-timer`.%s\n\n", colorReset)

// Wait for 15 minutes
Expand Down
2 changes: 1 addition & 1 deletion shared/services/config/mev-boost-config.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
const (
mevBoostTagProd string = "flashbots/mev-boost:1.11.0"
mevBoostTagTest string = "flashbots/mev-boost:1.11.0"
mevDocsUrl string = "https://docs.rocketpool.net/guides/node/mev.html"
mevDocsUrl string = "https://docs.rocketpool.net/node-staking/mev"
RegulatedRelayDescription string = "Select this to enable the relays that comply with government regulations (e.g. OFAC sanctions), "
UnregulatedRelayDescription string = "Select this to enable the relays that do not follow any sanctions lists (do not censor transactions), "
NoSandwichRelayDescription string = "and do not allow front-running or sandwich attacks."
Expand Down
2 changes: 1 addition & 1 deletion shared/services/config/smartnode-config.go
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ func NewSmartnodeConfig(cfg *RocketPoolConfig) *SmartnodeConfig {
VerifyProposals: config.Parameter{
ID: "verifyProposals",
Name: "Enable PDAO Proposal Checker",
Description: "Check this box to opt into the responsibility for verifying Protocol DAO proposals once the Houston upgrade has been activated. Your node will regularly check for new proposals, verify their correctness, and submit challenges to any that do not match the on-chain data (e.g., if someone tampered with voting power and attempted to cheat).\n\nTo learn more about the PDAO proposal checking duty, including requirements and RPL bonding, please see the documentation at https://docs.rocketpool.net/guides/houston/pdao#challenge-process.",
Description: "Check this box to opt into the responsibility for verifying Protocol DAO proposals once the Houston upgrade has been activated. Your node will regularly check for new proposals, verify their correctness, and submit challenges to any that do not match the on-chain data (e.g., if someone tampered with voting power and attempted to cheat).\n\nTo learn more about the PDAO proposal checking duty, including requirements and RPL bonding, please see the documentation at https://docs.rocketpool.net/pdao#challenge-process.",
Type: config.ParameterType_Bool,
Default: map[config.Network]interface{}{config.Network_All: false},
AffectsContainers: []config.ContainerID{config.ContainerID_Node},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ groups:
summary: "Rocket Pool OS Updates Available"
description: |
There are updates available for your OS that haven't been applied yet. You should update your OS.
For more information on updating see the documentation at https://docs.rocketpool.net/guides/node/updates#updating-your-operating-system
For more information on updating see the documentation at https://docs.rocketpool.net/node-staking/updates#updating-your-operating-system
{{{- end }}}

{{{- if .AlertEnabled_RPUpdatesAvailable.Value }}}
Expand All @@ -127,7 +127,7 @@ groups:
summary: "Rocket PoolSmart Node Update Available"
description: |
There are updates available for the Rocket PoolSmart Node that haven't been applied yet. You should update the smartnode stack.
For more information on updating see the documentation at https://docs.rocketpool.net/guides/node/updates#updating-the-smartnode-stack
For more information on updating see the documentation at https://docs.rocketpool.net/node-staking/updates#updating-the-smartnode-stack
{{{- end }}}

{{{- if .AlertEnabled_LowETHBalance.Value }}}
Expand Down
Loading
Loading