Skip loadedAddresses for jsonParsed tx meta (#27618)

Skip loaded_addresses for jsonParsed tx meta (cherry picked from commit 1df8830) # Conflicts: # transaction-status/src/lib.rs
solana-labs · Sep 7, 2022 · 8a8b036 · 8a8b036
1 parent 4b4b3bf
commit 8a8b036
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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))
         }
     }
 }