From 1fae3d24de820069417414b900a7efee9e82ecf7 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Wed, 1 Dec 2021 00:30:43 -0700 Subject: [PATCH] bank: reuse last hash/fees helper to instatiate `InvokeContext` --- runtime/src/bank.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index f0dd4bbb37..b9d8b31d11 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -3877,16 +3877,8 @@ impl Bank { let compute_meter = ComputeMeter::new_ref(compute_budget.max_units); - let (blockhash, lamports_per_signature) = { - let blockhash_queue = self.blockhash_queue.read().unwrap(); - let blockhash = blockhash_queue.last_hash(); - ( - blockhash, - blockhash_queue - .get_lamports_per_signature(&blockhash) - .unwrap_or(self.fee_rate_governor.lamports_per_signature), - ) - }; + let (blockhash, lamports_per_signature) = + self.last_blockhash_and_lamports_per_signature(); if let Some(legacy_message) = tx.message().legacy_message() { process_result = MessageProcessor::process_message(