Remove blacklisted tx from message_hash_to_transaction (Backport #374) (

#376)
jito-foundation · Sep 22, 2023 · 8928640 · 8928640
1 parent 9ccd81f
commit 8928640
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -216,7 +216,7 @@ indicatif = "0.17.4"
 Inflector = "0.11.4"
 itertools = "0.10.5"
 jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"] }
-jito-protos = { path = "jito-protos", version = "=1.16.13" }
+jito-protos = { path = "jito-protos", version = "=1.16.15" }
 tip-distribution = { path = "jito-programs/mev-programs/programs/tip-distribution", features = ["no-entrypoint"] }
 tip-payment = { path = "jito-programs/mev-programs/programs/tip-payment", features = ["no-entrypoint"] }
 js-sys = "0.3.63"

diff --git a/core/src/unprocessed_transaction_storage.rs b/core/src/unprocessed_transaction_storage.rs
@@ -190,17 +190,15 @@ fn consume_scan_should_process_packet(
             bank.get_transaction_account_lock_limit(),
         )
         .is_err()
+            || message
+                .account_keys()
+                .iter()
+                .any(|key| blacklisted_accounts.contains(key))
         {
             payload
                 .message_hash_to_transaction
                 .remove(packet.message_hash());
             ProcessingDecision::Never
-        } else if message
-            .account_keys()
-            .iter()
-            .any(|key| blacklisted_accounts.contains(key))
-        {
-            ProcessingDecision::Never
         } else if payload.account_locks.try_locking(message) {
             payload.sanitized_transactions.push(sanitized_transaction);
             ProcessingDecision::Now

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock