From 5e97bd3d8a6250f830ee70eabe37ba73c48e1838 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 05:58:30 +0000
Subject: [PATCH] simulate_transaction_with_config() now passes full config to
 server (#12803)

(cherry picked from commit b3c2752bb01dda03209f967df3a66afd483c5428)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 client/src/rpc_client.rs  | 10 ++--------
 stake-o-matic/src/main.rs | 12 +++++++++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/src/rpc_client.rs b/client/src/rpc_client.rs
index 9a1cf45ca1..59d2c6b9be 100644
--- a/client/src/rpc_client.rs
+++ b/client/src/rpc_client.rs
@@ -161,26 +161,20 @@ impl RpcClient {
     pub fn simulate_transaction(
         &self,
         transaction: &Transaction,
-        sig_verify: bool,
     ) -> RpcResult<RpcSimulateTransactionResult> {
-        self.simulate_transaction_with_config(
-            transaction,
-            sig_verify,
-            RpcSimulateTransactionConfig::default(),
-        )
+        self.simulate_transaction_with_config(transaction, RpcSimulateTransactionConfig::default())
     }
 
     pub fn simulate_transaction_with_config(
         &self,
         transaction: &Transaction,
-        sig_verify: bool,
         config: RpcSimulateTransactionConfig,
     ) -> RpcResult<RpcSimulateTransactionResult> {
         let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Base58);
         let serialized_encoded = serialize_encode_transaction(transaction, encoding)?;
         self.send(
             RpcRequest::SimulateTransaction,
-            json!([serialized_encoded, { "sigVerify": sig_verify }]),
+            json!([serialized_encoded, config]),
         )
     }
 
diff --git a/stake-o-matic/src/main.rs b/stake-o-matic/src/main.rs
index 19316da707..af59f64271 100644
--- a/stake-o-matic/src/main.rs
+++ b/stake-o-matic/src/main.rs
@@ -6,8 +6,8 @@ use solana_clap_utils::{
 };
 use solana_cli_output::display::format_labeled_address;
 use solana_client::{
-    client_error, rpc_client::RpcClient, rpc_request::MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS,
-    rpc_response::RpcVoteAccountInfo,
+    client_error, rpc_client::RpcClient, rpc_config::RpcSimulateTransactionConfig,
+    rpc_request::MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS, rpc_response::RpcVoteAccountInfo,
 };
 use solana_metrics::datapoint_info;
 use solana_notifier::Notifier;
@@ -394,7 +394,13 @@ fn simulate_transactions(
     for (mut transaction, memo) in candidate_transactions {
         transaction.message.recent_blockhash = blockhash;
 
-        let sim_result = rpc_client.simulate_transaction(&transaction, false)?;
+        let sim_result = rpc_client.simulate_transaction_with_config(
+            &transaction,
+            RpcSimulateTransactionConfig {
+                sig_verify: false,
+                ..RpcSimulateTransactionConfig::default()
+            },
+        )?;
         if sim_result.value.err.is_some() {
             trace!(
                 "filtering out transaction due to simulation failure: {:?}: {}",