From d925902b3ff47d0cb094d1dfb003a57fdacf0236 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 16 Aug 2019 10:22:22 -0700
Subject: [PATCH] Set default wallet/validator-info url to localhost (#5537)

automerge
---
 book/src/validator-start.md          | 8 +++++---
 validator-info/src/validator_info.rs | 2 +-
 wallet/src/wallet.rs                 | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/book/src/validator-start.md b/book/src/validator-start.md
index 6137ac1718..a25ad36860 100644
--- a/book/src/validator-start.md
+++ b/book/src/validator-start.md
@@ -22,6 +22,8 @@ for more detail on cluster activity.
 Sanity check that you are able to interact with the cluster by receiving a small
 airdrop of lamports from the testnet drone:
 ```bash
+$ solana-wallet set --url http://testnet.solana.com:8899
+$ solana-wallet get
 $ solana-wallet airdrop 123
 $ solana-wallet balance
 ```
@@ -73,18 +75,18 @@ choice, to start the node:
 
 If this is a `solana-install`-installation:
 ```bash
-$ validator.sh --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --ledger ~/validator-config --rpc-port 8899 --poll-for-new-genesis-block testnet.solana.com
+$ validator.sh --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --ledger ~/validator-config --rpc-port 8899 --poll-for-new-genesis-block --entrypoint testnet.solana.com
 ```
 
 Alternatively, the `solana-install run` command can be used to run the validator
 node while periodically checking for and applying software updates:
 ```bash
-$ solana-install run validator.sh -- --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --ledger ~/validator-config --rpc-port 8899 --poll-for-new-genesis-block testnet.solana.com
+$ solana-install run validator.sh -- --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --ledger ~/validator-config --rpc-port 8899 --poll-for-new-genesis-block --entrypoint testnet.solana.com
 ```
 
 If you built from source:
 ```bash
-$ NDEBUG=1 USE_INSTALL=1 ./multinode-demo/validator.sh --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --rpc-port 8899 --poll-for-new-genesis-block testnet.solana.com
+$ NDEBUG=1 USE_INSTALL=1 ./multinode-demo/validator.sh --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --rpc-port 8899 --poll-for-new-genesis-block --entrypoint testnet.solana.com
 ```
 
 ### Enabling CUDA
diff --git a/validator-info/src/validator_info.rs b/validator-info/src/validator_info.rs
index 90c803b7dd..f1dab1c0ae 100644
--- a/validator-info/src/validator_info.rs
+++ b/validator-info/src/validator_info.rs
@@ -18,7 +18,7 @@ use std::process::exit;
 pub const MAX_SHORT_FIELD_LENGTH: usize = 70;
 pub const MAX_LONG_FIELD_LENGTH: usize = 300;
 pub const MAX_VALIDATOR_INFO: u64 = 576;
-pub const JSON_RPC_URL: &str = "http://testnet.solana.com:8899";
+pub const JSON_RPC_URL: &str = "http://127.0.0.1:8899";
 
 // Config account key: Va1idator1nfo111111111111111111111111111111
 pub const REGISTER_CONFIG_KEY: [u8; 32] = [
diff --git a/wallet/src/wallet.rs b/wallet/src/wallet.rs
index e04ef7e643..15e87d7f4b 100644
--- a/wallet/src/wallet.rs
+++ b/wallet/src/wallet.rs
@@ -133,7 +133,7 @@ impl Default for WalletConfig {
             command: WalletCommand::Balance(Pubkey::default()),
             drone_host: None,
             drone_port: DRONE_PORT,
-            json_rpc_url: "http://testnet.solana.com:8899".to_string(),
+            json_rpc_url: "http://127.0.0.1:8899".to_string(),
             keypair: Keypair::new(),
             rpc_client: None,
         }