rebase
This commit is contained in:
@ -408,13 +408,9 @@ impl JsonRpcRequestProcessor {
|
||||
self.get_filtered_program_accounts(&bank, program_id, filters)?
|
||||
}
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
let result = if program_id == &spl_token_id() && encoding == UiAccountEncoding::JsonParsed {
|
||||
=======
|
||||
let accounts = if is_known_spl_token_id(program_id)
|
||||
let result = if is_known_spl_token_id(program_id)
|
||||
&& encoding == UiAccountEncoding::JsonParsed
|
||||
{
|
||||
>>>>>>> 86d465c53 (Prepare RPC subsystem for multiple SPL Token program ids)
|
||||
get_parsed_token_accounts(bank.clone(), keyed_accounts.into_iter()).collect()
|
||||
} else {
|
||||
keyed_accounts
|
||||
|
@ -10,16 +10,8 @@ use {
|
||||
},
|
||||
inflector::Inflector,
|
||||
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_sdk::{
|
||||
instruction::CompiledInstruction, message::AccountKeys, pubkey::Pubkey, stake,
|
||||
system_program,
|
||||
},
|
||||
>>>>>>> 86d465c53 (Prepare RPC subsystem for multiple SPL Token program ids)
|
||||
solana_sdk::{instruction::CompiledInstruction, pubkey::Pubkey, stake, system_program},
|
||||
std::{
|
||||
collections::HashMap,
|
||||
str::{from_utf8, Utf8Error},
|
||||
|
@ -58,25 +58,15 @@ pub fn collect_token_balances(
|
||||
let mut collect_time = Measure::start("collect_token_balances");
|
||||
|
||||
for transaction in batch.sanitized_transactions() {
|
||||
<<<<<<< HEAD
|
||||
let has_token_program = transaction
|
||||
.message()
|
||||
.account_keys_iter()
|
||||
.any(is_token_program);
|
||||
.any(is_known_spl_token_id);
|
||||
|
||||
let mut transaction_balances: Vec<TransactionTokenBalance> = vec![];
|
||||
if has_token_program {
|
||||
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) {
|
||||
>>>>>>> 86d465c53 (Prepare RPC subsystem for multiple SPL Token program ids)
|
||||
continue;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user