From 11f6c04990d57b4580817fb33fa85a1961fecd95 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 18 May 2021 21:19:19 +0000
Subject: [PATCH] get_program_accounts_with_config() now correctly defaults to
 RpcClient's commitment level (backport #17312) (#17315)

* get_program_accounts_with_config() now correctly defaults to RpcClient's commitment level

(cherry picked from commit 63b97729e6856be4f3955942ac8087c005ed202e)

# Conflicts:
#	client/src/rpc_client.rs

* Update rpc_client.rs

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 client/src/rpc_client.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/src/rpc_client.rs b/client/src/rpc_client.rs
index 9a94d31b2a..5a73e397d0 100644
--- a/client/src/rpc_client.rs
+++ b/client/src/rpc_client.rs
@@ -1016,8 +1016,7 @@ impl RpcClient {
             RpcProgramAccountsConfig {
                 filters: None,
                 account_config: RpcAccountInfoConfig {
-                    encoding: Some(UiAccountEncoding::Base64),
-                    commitment: Some(self.commitment_config),
+                    encoding: Some(UiAccountEncoding::Base64Zstd),
                     ..RpcAccountInfoConfig::default()
                 },
             },
@@ -1029,7 +1028,10 @@ impl RpcClient {
         pubkey: &Pubkey,
         config: RpcProgramAccountsConfig,
     ) -> ClientResult<Vec<(Pubkey, Account)>> {
-        let commitment = config.account_config.commitment.unwrap_or_default();
+        let commitment = config
+            .account_config
+            .commitment
+            .unwrap_or_else(|| self.commitment());
         let commitment = self.maybe_map_commitment(commitment)?;
         let account_config = RpcAccountInfoConfig {
             commitment: Some(commitment),