From d3ef061044cb76f43de0d12682f77732613a1eb8 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 21:56:18 +0000
Subject: [PATCH] RpcClient: Encode TXs as base64 by default (#12817)

(cherry picked from commit efbe37ba209a7ec800b92546e3eedca0ebd5322a)

Co-authored-by: Trent Nelson <trent@solana.com>
---
 client/src/mock_sender.rs |  2 +-
 client/src/rpc_client.rs  | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/client/src/mock_sender.rs b/client/src/mock_sender.rs
index c67ecc9d1d..2461b99f80 100644
--- a/client/src/mock_sender.rs
+++ b/client/src/mock_sender.rs
@@ -112,7 +112,7 @@ impl RpcSender for MockSender {
                     Signature::new(&[8; 64]).to_string()
                 } else {
                     let tx_str = params.as_array().unwrap()[0].as_str().unwrap().to_string();
-                    let data = bs58::decode(tx_str).into_vec().unwrap();
+                    let data = base64::decode(tx_str).unwrap();
                     let tx: Transaction = bincode::deserialize(&data).unwrap();
                     tx.signatures[0].to_string()
                 };
diff --git a/client/src/rpc_client.rs b/client/src/rpc_client.rs
index 59d2c6b9be..c9f36ff7c2 100644
--- a/client/src/rpc_client.rs
+++ b/client/src/rpc_client.rs
@@ -133,7 +133,11 @@ impl RpcClient {
         transaction: &Transaction,
         config: RpcSendTransactionConfig,
     ) -> ClientResult<Signature> {
-        let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Base58);
+        let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Base64);
+        let config = RpcSendTransactionConfig {
+            encoding: Some(encoding),
+            ..config
+        };
         let serialized_encoded = serialize_encode_transaction(transaction, encoding)?;
         let signature_base58_str: String = self.send(
             RpcRequest::SendTransaction,
@@ -170,7 +174,11 @@ impl RpcClient {
         transaction: &Transaction,
         config: RpcSimulateTransactionConfig,
     ) -> RpcResult<RpcSimulateTransactionResult> {
-        let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Base58);
+        let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Base64);
+        let config = RpcSimulateTransactionConfig {
+            encoding: Some(encoding),
+            ..config
+        };
         let serialized_encoded = serialize_encode_transaction(transaction, encoding)?;
         self.send(
             RpcRequest::SimulateTransaction,