Use rooted bank by default in rpc bank selection (#6759)

* Name anonymous parameters for clarity

* Add CommitmentConfig to select bank for rpc

* Add commitment information to jsonrpc docs

* Update send_and_confirm retries as per commitment defaults

* Pass CommitmentConfig into client requests; also various 'use' cleanup

* Use _with_commitment methods to speed local_cluster tests

* Pass CommitmentConfig into Archiver in order to enable quick confirmations in local_cluster tests

* Restore solana ping speed

* Increase wallet-sanity timeout to account for longer confirmation time

client/src/rpc_request.rs

@@ -1,5 +1,8 @@
 use serde_json::{json, Value};
-use solana_sdk::clock::{Epoch, Slot};
+use solana_sdk::{
+    clock::{Epoch, Slot},
+    commitment_config::CommitmentConfig,
+};
 use std::{error, fmt};
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
@@ -83,7 +86,12 @@ pub enum RpcRequest {
 }
 
 impl RpcRequest {
-    pub(crate) fn build_request_json(&self, id: u64, params: Option<Value>) -> Value {
+    pub(crate) fn build_request_json(
+        &self,
+        id: u64,
+        params: Option<Value>,
+        commitment_config: Option<CommitmentConfig>,
+    ) -> Value {
         let jsonrpc = "2.0";
         let method = match self {
             RpcRequest::ConfirmTransaction => "confirmTransaction",
@@ -123,7 +131,13 @@ impl RpcRequest {
            "method": method,
         });
         if let Some(param_string) = params {
-            request["params"] = param_string;
+            if let Some(config) = commitment_config {
+                request["params"] = json!([param_string, config]);
+            } else {
+                request["params"] = json!([param_string]);
+            }
+        } else if let Some(config) = commitment_config {
+            request["params"] = json!([config]);
         }
         request
     }
@@ -154,45 +168,65 @@ impl error::Error for RpcError {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use solana_sdk::commitment_config::CommitmentLevel;
 
     #[test]
     fn test_build_request_json() {
         let test_request = RpcRequest::GetAccountInfo;
-        let addr = json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"]);
-        let request = test_request.build_request_json(1, Some(addr.clone()));
+        let addr = json!("deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx");
+        let request = test_request.build_request_json(1, Some(addr.clone()), None);
         assert_eq!(request["method"], "getAccountInfo");
-        assert_eq!(request["params"], addr,);
+        assert_eq!(request["params"], json!([addr]));
 
         let test_request = RpcRequest::GetBalance;
-        let request = test_request.build_request_json(1, Some(addr));
+        let request = test_request.build_request_json(1, Some(addr), None);
         assert_eq!(request["method"], "getBalance");
 
         let test_request = RpcRequest::GetEpochInfo;
-        let request = test_request.build_request_json(1, None);
+        let request = test_request.build_request_json(1, None, None);
         assert_eq!(request["method"], "getEpochInfo");
 
         let test_request = RpcRequest::GetInflation;
-        let request = test_request.build_request_json(1, None);
+        let request = test_request.build_request_json(1, None, None);
         assert_eq!(request["method"], "getInflation");
 
         let test_request = RpcRequest::GetRecentBlockhash;
-        let request = test_request.build_request_json(1, None);
+        let request = test_request.build_request_json(1, None, None);
         assert_eq!(request["method"], "getRecentBlockhash");
 
         let test_request = RpcRequest::GetSlot;
-        let request = test_request.build_request_json(1, None);
+        let request = test_request.build_request_json(1, None, None);
         assert_eq!(request["method"], "getSlot");
 
         let test_request = RpcRequest::GetTransactionCount;
-        let request = test_request.build_request_json(1, None);
+        let request = test_request.build_request_json(1, None, None);
         assert_eq!(request["method"], "getTransactionCount");
 
         let test_request = RpcRequest::RequestAirdrop;
-        let request = test_request.build_request_json(1, None);
+        let request = test_request.build_request_json(1, None, None);
         assert_eq!(request["method"], "requestAirdrop");
 
         let test_request = RpcRequest::SendTransaction;
-        let request = test_request.build_request_json(1, None);
+        let request = test_request.build_request_json(1, None, None);
         assert_eq!(request["method"], "sendTransaction");
     }
+
+    #[test]
+    fn test_build_request_json_config_options() {
+        let commitment_config = CommitmentConfig {
+            commitment: CommitmentLevel::Max,
+        };
+        let addr = json!("deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx");
+
+        // Test request with CommitmentConfig and no params
+        let test_request = RpcRequest::GetRecentBlockhash;
+        let request = test_request.build_request_json(1, None, Some(commitment_config.clone()));
+        assert_eq!(request["params"], json!([commitment_config.clone()]));
+
+        // Test request with CommitmentConfig and params
+        let test_request = RpcRequest::GetBalance;
+        let request =
+            test_request.build_request_json(1, Some(addr.clone()), Some(commitment_config.clone()));
+        assert_eq!(request["params"], json!([addr, commitment_config]));
+    }
 }