lookup address to keys

Author: JamesMDunn

crates/plugin/src/selectors.rs

@@ -1,5 +1,6 @@
 use hashbrown::HashMap;
 use itertools::Itertools;
+use solana_sdk::message::AccountKeys;
 use solana_transaction::versioned::VersionedTransaction;
 use solana_transaction_status::TransactionStatusMeta;
 
@@ -82,9 +83,12 @@ impl TransactionSelector {
         }
         let instructions = &tx.message.instructions();
 
-        let keys = &tx.message.static_account_keys();
+        let account_keys = AccountKeys::new(
+            tx.message.static_account_keys(),
+            Some(&meta.loaded_addresses),
+        );
 
-        let pubkey_routes = keys
+        let pubkey_routes = account_keys
             .iter()
             .filter_map(|a| self.pubkeys.get(a))
             .unique()
@@ -104,7 +108,7 @@ impl TransactionSelector {
             )
             .map(|a| a.program_id_index)
             .unique()
-            .filter_map(|a| Some(keys[a as usize]))
+            .filter_map(|a| Some(account_keys[a as usize]))
             .filter_map(|a| self.programs.get(&a))
             .chain(self.allows_all_programs.iter())
             .unique()

crates/plugin/src/stats.rs

@@ -5,6 +5,7 @@ use std::time::Duration;
 use crate::prelude::*;
 use indexer_rabbitmq::geyser::{Message, SlotStatistics};
 use solana_sdk::message::compiled_instruction::CompiledInstruction;
+use solana_sdk::message::AccountKeys;
 use solana_transaction::versioned::VersionedTransaction;
 use solana_transaction_status::TransactionStatusMeta;
 
@@ -254,7 +255,7 @@ fn process_slot(
     }
 
     let msg = &vtx.message;
-    let keys = msg.static_account_keys();
+    let account_keys = AccountKeys::new(msg.static_account_keys(), Some(&meta.loaded_addresses));
 
     let inner_ixs: Vec<(&Pubkey, &CompiledInstruction)> = meta
         .inner_instructions
@@ -263,7 +264,7 @@ fn process_slot(
             ixss.iter().flat_map(|ixs| {
                 ixs.instructions.iter().map(|ix| {
                     (
-                        &keys[ix.instruction.program_id_index as usize],
+                        &account_keys[ix.instruction.program_id_index as usize],
                         &ix.instruction,
                     )
                 })
@@ -274,7 +275,7 @@ fn process_slot(
     let top_level_ixs = msg
         .instructions()
         .iter()
-        .map(|ix| (&keys[ix.program_id_index as usize], ix));
+        .map(|ix| (&account_keys[ix.program_id_index as usize], ix));
 
     let all_ixs = top_level_ixs.chain(inner_ixs);
     for (pgm_ref, ix_ref) in all_ixs {
@@ -306,7 +307,7 @@ fn process_slot(
                     //initialize account
                     1 | 16 | 18 => {
                         if ix_ref.accounts.len() > 1 {
-                            let mint = keys[ix_ref.accounts[1] as usize].to_string();
+                            let mint = account_keys[ix_ref.accounts[1] as usize].to_string();
                             let val = stats.new_token_accounts.entry(mint).or_default();
                             *val += 1;
                         }
@@ -317,5 +318,5 @@ fn process_slot(
         }
     }
 
-    stats.payers.insert(keys[0].to_string());
+    stats.payers.insert(account_keys[0].to_string());
 }