From 8a8b036902c22db311a878169978ea289b68318e Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <tyera@solana.com>
Date: Wed, 7 Sep 2022 08:41:08 -0700
Subject: [PATCH] Skip loadedAddresses for jsonParsed tx meta (#27618)

Skip loaded_addresses for jsonParsed tx meta

(cherry picked from commit 1df88307905e1b372bfb8d7cd9c0a5f59fdfe173)

# Conflicts:
#	transaction-status/src/lib.rs
---
 transaction-status/src/lib.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/transaction-status/src/lib.rs b/transaction-status/src/lib.rs
index 813c833934ac01..9b9fe66a2c1c9f 100644
--- a/transaction-status/src/lib.rs
+++ b/transaction-status/src/lib.rs
@@ -370,7 +370,13 @@ impl UiTransactionStatusMeta {
                 .post_token_balances
                 .map(|balance| balance.into_iter().map(Into::into).collect()),
             rewards: meta.rewards,
+<<<<<<< HEAD
             loaded_addresses: Some(UiLoadedAddresses::from(&meta.loaded_addresses)),
+=======
+            loaded_addresses: None,
+            return_data: meta.return_data,
+            compute_units_consumed: meta.compute_units_consumed,
+>>>>>>> 1df883079 (Skip loadedAddresses for jsonParsed tx meta (#27618))
         }
     }
 }