Revert "rpc: rework binary encoding. BREAKING CHANGE (bp #11646) (#11673)"

This reverts commit d6ca879d39.

client/src/rpc_client.rs

@@ -15,7 +15,12 @@ use bincode::serialize;
 use indicatif::{ProgressBar, ProgressStyle};
 use log::*;
 use serde_json::{json, Value};
-use solana_account_decoder::{parse_token::UiTokenAmount, UiAccount, UiAccountEncoding};
+use solana_account_decoder::{
+    parse_token::UiTokenAmount,
+    UiAccount,
+    UiAccountData::{Binary, Binary64},
+    UiAccountEncoding,
+};
 use solana_sdk::{
     account::Account,
     clock::{
@@ -472,7 +477,7 @@ impl RpcClient {
         commitment_config: CommitmentConfig,
     ) -> RpcResult<Option<Account>> {
         let config = RpcAccountInfoConfig {
-            encoding: Some(UiAccountEncoding::Base64),
+            encoding: Some(UiAccountEncoding::Binary64),
             commitment: Some(commitment_config),
             data_slice: None,
         };
@@ -490,8 +495,17 @@ impl RpcClient {
                 }
                 let Response {
                     context,
-                    value: rpc_account,
+                    value: mut rpc_account,
                 } = serde_json::from_value::<Response<Option<UiAccount>>>(result_json)?;
+                if let Some(ref mut account) = rpc_account {
+                    if let Binary(_) = &account.data {
+                        let tmp = Binary64(String::new());
+                        match std::mem::replace(&mut account.data, tmp) {
+                            Binary(new_data) => account.data = Binary64(new_data),
+                            _ => panic!("should have gotten binary here."),
+                        }
+                    }
+                }
                 trace!("Response account {:?} {:?}", pubkey, rpc_account);
                 let account = rpc_account.and_then(|rpc_account| rpc_account.decode());
                 Ok(Response {