From baf51e4b37b5f5236baae0bc461d7a952a73c165 Mon Sep 17 00:00:00 2001 From: Lucas B Date: Wed, 13 Sep 2023 00:34:11 -0500 Subject: [PATCH 1/2] remove blacklisted tx from message_hash_to_transaction --- core/src/banking_stage/unprocessed_transaction_storage.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/banking_stage/unprocessed_transaction_storage.rs b/core/src/banking_stage/unprocessed_transaction_storage.rs index a8fd9fe6bd..f807f0ecea 100644 --- a/core/src/banking_stage/unprocessed_transaction_storage.rs +++ b/core/src/banking_stage/unprocessed_transaction_storage.rs @@ -203,6 +203,9 @@ fn consume_scan_should_process_packet( .iter() .any(|key| blacklisted_accounts.contains(key)) { + payload + .message_hash_to_transaction + .remove(packet.message_hash()); ProcessingDecision::Never } else if payload.account_locks.try_locking(message) { payload.sanitized_transactions.push(sanitized_transaction); From 3ccba94b453d3442bb39d0d5709ce6f270ec7c9f Mon Sep 17 00:00:00 2001 From: Lucas B Date: Wed, 13 Sep 2023 00:53:56 -0500 Subject: [PATCH 2/2] fix ci --- .../unprocessed_transaction_storage.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/core/src/banking_stage/unprocessed_transaction_storage.rs b/core/src/banking_stage/unprocessed_transaction_storage.rs index f807f0ecea..531bdba483 100644 --- a/core/src/banking_stage/unprocessed_transaction_storage.rs +++ b/core/src/banking_stage/unprocessed_transaction_storage.rs @@ -193,15 +193,10 @@ fn consume_scan_should_process_packet( bank.get_transaction_account_lock_limit(), ) .is_err() - { - payload - .message_hash_to_transaction - .remove(packet.message_hash()); - ProcessingDecision::Never - } else if message - .account_keys() - .iter() - .any(|key| blacklisted_accounts.contains(key)) + || message + .account_keys() + .iter() + .any(|key| blacklisted_accounts.contains(key)) { payload .message_hash_to_transaction