From 9e0a26628b091732066f1016b71efb0cf0c5440a Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 13 Mar 2020 15:00:27 -0700 Subject: [PATCH] Drop :8899 port from http://devnet.solana.com references --- docs/src/implemented-proposals/installer.md | 2 +- docs/src/install-solana.md | 2 +- docs/src/paper-wallet/usage.md | 2 +- docs/src/remote-wallet/ledger.md | 2 +- docs/src/running-validator/validator-monitor.md | 8 ++++---- docs/src/running-validator/validator-start.md | 6 +++--- install/src/defaults.rs | 2 +- scripts/solana-install-deploy.sh | 7 ++----- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/docs/src/implemented-proposals/installer.md b/docs/src/implemented-proposals/installer.md index 0a28fc0fba..e889b2a560 100644 --- a/docs/src/implemented-proposals/installer.md +++ b/docs/src/implemented-proposals/installer.md @@ -154,7 +154,7 @@ FLAGS: OPTIONS: -d, --data_dir Directory to store install data [default: .../Library/Application Support/solana] - -u, --url JSON RPC URL for the solana cluster [default: http://devnet.solana.com:8899] + -u, --url JSON RPC URL for the solana cluster [default: http://devnet.solana.com] -p, --pubkey Public key of the update manifest [default: 9XX329sPuskWhH4DQh6k16c87dHKhXLBZTL3Gxmve8Gp] ``` diff --git a/docs/src/install-solana.md b/docs/src/install-solana.md index 9166810293..cd4ee4ad6d 100644 --- a/docs/src/install-solana.md +++ b/docs/src/install-solana.md @@ -110,7 +110,7 @@ Use the `solana config set` command to target a different cluster. For example, for Devnet, use: ```bash -solana config set --url http://devnet.solana.com:8899 +solana config set --url http://devnet.solana.com ``` ## Ensure Versions Match diff --git a/docs/src/paper-wallet/usage.md b/docs/src/paper-wallet/usage.md index 572710143d..603f7d0548 100644 --- a/docs/src/paper-wallet/usage.md +++ b/docs/src/paper-wallet/usage.md @@ -203,7 +203,7 @@ networked machine. Next, configure the `solana` CLI tool to connect to a particular cluster: ```bash -solana config set --url # (i.e. http://devnet.solana.com:8899) +solana config set --url # (i.e. http://devnet.solana.com) ``` Finally, to check the balance, run the following command: diff --git a/docs/src/remote-wallet/ledger.md b/docs/src/remote-wallet/ledger.md index 0b49e2d584..02d3a45968 100644 --- a/docs/src/remote-wallet/ledger.md +++ b/docs/src/remote-wallet/ledger.md @@ -127,7 +127,7 @@ usb://ledger/nano-s/BsNsvfXqQTtJnagwFWdBS7FBXgnsK8VZ5CmuznN85swK?key=0/0 Configure the `solana` CLI tool to connect to a particular cluster: ```bash -solana config set --url # (i.e. http://devnet.solana.com:8899) +solana config set --url # (i.e. http://devnet.solana.com) ``` If you want to set a Ledger key as the default signer for CLI commands, use the diff --git a/docs/src/running-validator/validator-monitor.md b/docs/src/running-validator/validator-monitor.md index 0da9667ad0..74b12f485f 100644 --- a/docs/src/running-validator/validator-monitor.md +++ b/docs/src/running-validator/validator-monitor.md @@ -35,13 +35,13 @@ cluster, as well as the health of the cluster: ```bash # Similar to solana-gossip, you should see your validator in the list of cluster nodes -curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getClusterNodes"}' http://devnet.solana.com:8899 +curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getClusterNodes"}' http://devnet.solana.com # If your validator is properly voting, it should appear in the list of `current` vote accounts. If staked, `stake` should be > 0 -curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getVoteAccounts"}' http://devnet.solana.com:8899 +curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getVoteAccounts"}' http://devnet.solana.com # Returns the current leader schedule -curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getLeaderSchedule"}' http://devnet.solana.com:8899 +curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getLeaderSchedule"}' http://devnet.solana.com # Returns info about the current epoch. slotIndex should progress on subsequent calls. -curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getEpochInfo"}' http://devnet.solana.com:8899 +curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getEpochInfo"}' http://devnet.solana.com ``` diff --git a/docs/src/running-validator/validator-start.md b/docs/src/running-validator/validator-start.md index 0139b6645f..e742e7d0bf 100644 --- a/docs/src/running-validator/validator-start.md +++ b/docs/src/running-validator/validator-start.md @@ -6,11 +6,11 @@ The solana cli includes `get` and `set` configuration commands to automatically set the `--url` argument for cli commands. For example: ```bash -solana config set --url http://devnet.solana.com:8899 +solana config set --url http://devnet.solana.com ``` \(You can always override the set configuration by explicitly passing the -`--url` argument with a command, eg: `solana --url http://beta.devnet.solana.com:8899 balance`\) +`--url` argument with a command, eg: `solana --url http://tds.solana.com balance`\) ## Confirm The Testnet Is Reachable @@ -107,7 +107,7 @@ You should see the following output: ```text Wallet Config Updated: /home/solana/.config/solana/wallet/config.yml -* url: http://devnet.solana.com:8899 +* url: http://devnet.solana.com * keypair: /home/solana/validator-keypair.json ``` diff --git a/install/src/defaults.rs b/install/src/defaults.rs index 48fd4c0bef..c6454e7eb5 100644 --- a/install/src/defaults.rs +++ b/install/src/defaults.rs @@ -1,4 +1,4 @@ -pub const JSON_RPC_URL: &str = "http://devnet.solana.com:8899"; +pub const JSON_RPC_URL: &str = "http://devnet.solana.com"; lazy_static! { pub static ref CONFIG_FILE: Option = { diff --git a/scripts/solana-install-deploy.sh b/scripts/solana-install-deploy.sh index 146fa7594e..40b88a95fb 100755 --- a/scripts/solana-install-deploy.sh +++ b/scripts/solana-install-deploy.sh @@ -21,7 +21,7 @@ TAG=$2 OS=${3:-linux} if [[ -z $URL || -z $TAG ]]; then - echo "Usage: $0 [edge|beta|stable|localhost|RPC URL] [edge|beta|release tag] [linux|osx|windows]" + echo "Usage: $0 [stable|localhost|RPC URL] [edge|beta|release tag] [linux|osx|windows]" exit 0 fi @@ -45,11 +45,8 @@ windows) esac case $URL in -edge|beta) - URL=http://$URL.devnet.solana.com:8899 - ;; stable) - URL=http://devnet.solana.com:8899 + URL=http://devnet.solana.com ;; localhost) URL=http://localhost:8899