From ed98acd95a5903218880c2a736297e090981f4e2 Mon Sep 17 00:00:00 2001 From: Vladimir Motylenko Date: Tue, 14 Sep 2021 11:30:45 +0300 Subject: [PATCH] chore(rpc): Fix default rpc, to use api domain --- clap-utils/src/input_validators.rs | 6 +++--- cli-config/src/config.rs | 10 +++++----- install/src/defaults.rs | 2 +- stake-accounts/src/arg_parser.rs | 2 +- stake-o-matic/src/main.rs | 6 +++--- tokens/src/arg_parser.rs | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/clap-utils/src/input_validators.rs b/clap-utils/src/input_validators.rs index b74990afb0..69a2aef631 100644 --- a/clap-utils/src/input_validators.rs +++ b/clap-utils/src/input_validators.rs @@ -214,9 +214,9 @@ where pub fn normalize_to_url_if_moniker>(url_or_moniker: T) -> String { match url_or_moniker.as_ref() { - "m" | "mainnet-beta" => "https://mainnet.velas.com/rpc", - "t" | "testnet" => "https://testnet.velas.com/rpc", - "d" | "devnet" => "https://devnet.velas.com/rpc", + "m" | "mainnet" => "https://api.mainnet.velas.com", + "t" | "testnet" => "https://api.testnet.velas.com", + "d" | "devnet" => "https://api.devnet.velas.com", "l" | "localhost" => "http://localhost:8899", url => url, } diff --git a/cli-config/src/config.rs b/cli-config/src/config.rs index 2ce98b6fc3..b3896631c0 100644 --- a/cli-config/src/config.rs +++ b/cli-config/src/config.rs @@ -30,7 +30,7 @@ impl Default for Config { keypair_path.extend(&[".config", "velas", "id.json"]); keypair_path.to_str().unwrap().to_string() }; - let json_rpc_url = "https://mainnet.velas.com/rpc".to_string(); + let json_rpc_url = "https://api.mainnet.velas.com".to_string(); // Empty websocket_url string indicates the client should // `Config::compute_websocket_url(&json_rpc_url)` @@ -107,13 +107,13 @@ mod test { #[test] fn compute_websocket_url() { assert_eq!( - Config::compute_websocket_url("http://devnet.velas.com/rpc"), - "ws://devnet.velas.com/rpc".to_string() + Config::compute_websocket_url("http://api.devnet.velas.com"), + "ws://api.devnet.velas.com/".to_string() ); assert_eq!( - Config::compute_websocket_url("https://devnet.velas.com"), - "wss://devnet.velas.com/".to_string() + Config::compute_websocket_url("https://api.devnet.velas.com"), + "wss://api.devnet.velas.com/".to_string() ); assert_eq!( diff --git a/install/src/defaults.rs b/install/src/defaults.rs index d5cae6f094..d087dfcdd7 100644 --- a/install/src/defaults.rs +++ b/install/src/defaults.rs @@ -1,4 +1,4 @@ -pub const JSON_RPC_URL: &str = "http://devnet.velas.com/rpc"; +pub const JSON_RPC_URL: &str = "http://api.devnet.velas.com"; /// Returns last 30 releases from GitHub Release REST API, could be /// increased up to 100 (?per_page=100). If we need a list with more diff --git a/stake-accounts/src/arg_parser.rs b/stake-accounts/src/arg_parser.rs index 50f9217c1c..f755df7d5c 100644 --- a/stake-accounts/src/arg_parser.rs +++ b/stake-accounts/src/arg_parser.rs @@ -149,7 +149,7 @@ where .global(true) .takes_value(true) .value_name("URL") - .help("RPC entrypoint address. i.e. https://devnet.velas.com/rpc"), + .help("RPC entrypoint address. i.e. https://api.devnet.velas.com"), ) .subcommand( SubCommand::with_name("new") diff --git a/stake-o-matic/src/main.rs b/stake-o-matic/src/main.rs index a131afdf1c..74c00abb6b 100644 --- a/stake-o-matic/src/main.rs +++ b/stake-o-matic/src/main.rs @@ -473,14 +473,14 @@ fn get_config() -> Config { let min_release_version = release_version_of(&matches, "min_release_version"); let (json_rpc_url, validator_list) = match cluster.as_str() { - "mainnet-beta" => ( + "mainnet" => ( value_t!(matches, "json_rpc_url", String) - .unwrap_or_else(|_| "https://mainnet.velas.com/rpc".into()), + .unwrap_or_else(|_| "https://api.mainnet.velas.com".into()), validator_list::mainnet_beta_validators(), ), "testnet" => ( value_t!(matches, "json_rpc_url", String) - .unwrap_or_else(|_| "https://testnet.velas.com/rpc".into()), + .unwrap_or_else(|_| "https://api.testnet.velas.com".into()), validator_list::testnet_validators(), ), "unknown" => { diff --git a/tokens/src/arg_parser.rs b/tokens/src/arg_parser.rs index 2d71cb1847..dc6c4023c3 100644 --- a/tokens/src/arg_parser.rs +++ b/tokens/src/arg_parser.rs @@ -37,7 +37,7 @@ where .global(true) .takes_value(true) .value_name("URL") - .help("RPC entrypoint address. i.e. https://devnet.velas.com/rpc"), + .help("RPC entrypoint address. i.e. https://api.devnet.velas.com"), ) .subcommand( SubCommand::with_name("distribute-tokens")