gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Michael Vines
2022-02-09 08:32:43 -08:00
parent 320fbd63c5
commit 71211e0d90
3 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/src/rpc.rs
View File

@ -408,13 +408,9 @@ impl JsonRpcRequestProcessor {
self.get_filtered_program_accounts(&bank, program_id, filters)? self.get_filtered_program_accounts(&bank, program_id, filters)?
} }
}; };
<<<<<<< HEAD let result = if is_known_spl_token_id(program_id)
let result = if program_id == &spl_token_id() && encoding == UiAccountEncoding::JsonParsed {
=======
let accounts = if is_known_spl_token_id(program_id)
&& encoding == UiAccountEncoding::JsonParsed && encoding == UiAccountEncoding::JsonParsed
{ {
>>>>>>> 86d465c53 (Prepare RPC subsystem for multiple SPL Token program ids)
get_parsed_token_accounts(bank.clone(), keyed_accounts.into_iter()).collect() get_parsed_token_accounts(bank.clone(), keyed_accounts.into_iter()).collect()
} else { } else {
keyed_accounts keyed_accounts

10
transaction-status/src/parse_instruction.rs
View File

@ -10,16 +10,8 @@ use {
}, },
inflector::Inflector, inflector::Inflector,
serde_json::Value, serde_json::Value,
<<<<<<< HEAD
solana_account_decoder::parse_token::spl_token_id,
solana_sdk::{instruction::CompiledInstruction, pubkey::Pubkey, stake, system_program},
=======
solana_account_decoder::parse_token::spl_token_ids, solana_account_decoder::parse_token::spl_token_ids,
solana_sdk::{ solana_sdk::{instruction::CompiledInstruction, pubkey::Pubkey, stake, system_program},
instruction::CompiledInstruction, message::AccountKeys, pubkey::Pubkey, stake,
system_program,
},
>>>>>>> 86d465c53 (Prepare RPC subsystem for multiple SPL Token program ids)
std::{ std::{
collections::HashMap, collections::HashMap,
str::{from_utf8, Utf8Error}, str::{from_utf8, Utf8Error},

12
transaction-status/src/token_balances.rs
View File

@ -58,25 +58,15 @@ pub fn collect_token_balances(
let mut collect_time = Measure::start("collect_token_balances"); let mut collect_time = Measure::start("collect_token_balances");
for transaction in batch.sanitized_transactions() { for transaction in batch.sanitized_transactions() {
<<<<<<< HEAD
let has_token_program = transaction let has_token_program = transaction
.message() .message()
.account_keys_iter() .account_keys_iter()
.any(is_token_program); .any(is_known_spl_token_id);
let mut transaction_balances: Vec<TransactionTokenBalance> = vec![]; let mut transaction_balances: Vec<TransactionTokenBalance> = vec![];
if has_token_program { if has_token_program {
for (index, account_id) in transaction.message().account_keys_iter().enumerate() { for (index, account_id) in transaction.message().account_keys_iter().enumerate() {
if transaction.message().is_invoked(index) || is_token_program(account_id) {
=======
let account_keys = transaction.message().account_keys();
let has_token_program = account_keys.iter().any(is_known_spl_token_id);
let mut transaction_balances: Vec<TransactionTokenBalance> = vec![];
if has_token_program {
for (index, account_id) in account_keys.iter().enumerate() {
if transaction.message().is_invoked(index) || is_known_spl_token_id(account_id) { if transaction.message().is_invoked(index) || is_known_spl_token_id(account_id) {
>>>>>>> 86d465c53 (Prepare RPC subsystem for multiple SPL Token program ids)
continue; continue;
} }