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

Log more info on runtime account verification errors (#17861) (#17879)

Browse Source 
(cherry picked from commit a1fab0c5ca)

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2021-06-17 01:55:37 +00:00
committed by GitHub
parent 5c495ad1b0
commit 962a2126b5
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
runtime/src/message_processor.rs
View File

@ -9,7 +9,7 @@ use solana_sdk::{
account_utils::StateMut, account_utils::StateMut,
bpf_loader_upgradeable::{self, UpgradeableLoaderState}, bpf_loader_upgradeable::{self, UpgradeableLoaderState},
feature_set::{demote_sysvar_write_locks, instructions_sysvar_enabled, FeatureSet}, feature_set::{demote_sysvar_write_locks, instructions_sysvar_enabled, FeatureSet},
ic_msg, ic_logger_msg, ic_msg,
instruction::{CompiledInstruction, Instruction, InstructionError}, instruction::{CompiledInstruction, Instruction, InstructionError},
keyed_account::{create_keyed_accounts_unified, keyed_account_at_index, KeyedAccount}, keyed_account::{create_keyed_accounts_unified, keyed_account_at_index, KeyedAccount},
message::Message, message::Message,
@ -396,6 +396,7 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
.invoke_stack .invoke_stack
.last() .last()
.ok_or(InstructionError::CallDepth)?; .ok_or(InstructionError::CallDepth)?;
let logger = self.get_logger();
MessageProcessor::verify_and_update( MessageProcessor::verify_and_update(
message, message,
instruction, instruction,
@ -406,6 +407,7 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
caller_write_privileges, caller_write_privileges,
&mut self.timings, &mut self.timings,
self.feature_set.is_active(&demote_sysvar_write_locks::id()), self.feature_set.is_active(&demote_sysvar_write_locks::id()),
logger,
) )
} }
fn get_caller(&self) -> Result<&Pubkey, InstructionError> { fn get_caller(&self) -> Result<&Pubkey, InstructionError> {
@ -1008,6 +1010,7 @@ impl MessageProcessor {
rent: &Rent, rent: &Rent,
timings: &mut ExecuteDetailsTimings, timings: &mut ExecuteDetailsTimings,
demote_sysvar_write_locks: bool, demote_sysvar_write_locks: bool,
logger: Rc<RefCell<dyn Logger>>,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
// Verify all executable accounts have zero outstanding refs // Verify all executable accounts have zero outstanding refs
Self::verify_account_references(executable_accounts)?; Self::verify_account_references(executable_accounts)?;
@ -1024,14 +1027,24 @@ impl MessageProcessor {
.map_err(|_| InstructionError::AccountBorrowOutstanding)?; .map_err(|_| InstructionError::AccountBorrowOutstanding)?;
} }
let account = accounts[account_index].borrow(); let account = accounts[account_index].borrow();
pre_accounts[unique_index].verify( pre_accounts[unique_index]
.verify(
&program_id, &program_id,
message.is_writable(account_index, demote_sysvar_write_locks), message.is_writable(account_index, demote_sysvar_write_locks),
rent, rent,
&account, &account,
timings, timings,
true, true,
)?; )
.map_err(|err| {
ic_logger_msg!(
logger,
"failed to verify account {}: {}",
pre_accounts[unique_index].key,
err
);
err
})?;
pre_sum += u128::from(pre_accounts[unique_index].lamports()); pre_sum += u128::from(pre_accounts[unique_index].lamports());
post_sum += u128::from(account.lamports()); post_sum += u128::from(account.lamports());
Ok(()) Ok(())
@ -1047,6 +1060,7 @@ impl MessageProcessor {
} }
/// Verify the results of a cross-program instruction /// Verify the results of a cross-program instruction
#[allow(clippy::too_many_arguments)]
fn verify_and_update( fn verify_and_update(
message: &Message, message: &Message,
instruction: &CompiledInstruction, instruction: &CompiledInstruction,
@ -1057,6 +1071,7 @@ impl MessageProcessor {
caller_write_privileges: Option<&[bool]>, caller_write_privileges: Option<&[bool]>,
timings: &mut ExecuteDetailsTimings, timings: &mut ExecuteDetailsTimings,
demote_sysvar_write_locks: bool, demote_sysvar_write_locks: bool,
logger: Rc<RefCell<dyn Logger>>,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
// Verify the per-account instruction results // Verify the per-account instruction results
let (mut pre_sum, mut post_sum) = (0_u128, 0_u128); let (mut pre_sum, mut post_sum) = (0_u128, 0_u128);
@ -1079,14 +1094,12 @@ impl MessageProcessor {
.map_err(|_| InstructionError::AccountBorrowOutstanding)?; .map_err(|_| InstructionError::AccountBorrowOutstanding)?;
} }
let account = account.borrow(); let account = account.borrow();
pre_account.verify( pre_account
&program_id, .verify(&program_id, is_writable, &rent, &account, timings, false)
is_writable, .map_err(|err| {
&rent, ic_logger_msg!(logger, "failed to verify account {}: {}", key, err);
&account, err
timings, })?;
false,
)?;
pre_sum += u128::from(pre_account.lamports()); pre_sum += u128::from(pre_account.lamports());
post_sum += u128::from(account.lamports()); post_sum += u128::from(account.lamports());
if is_writable && !account.executable() { if is_writable && !account.executable() {
@ -1175,6 +1188,7 @@ impl MessageProcessor {
&rent_collector.rent, &rent_collector.rent,
timings, timings,
demote_sysvar_write_locks, demote_sysvar_write_locks,
invoke_context.get_logger(),
)?; )?;
timings.accumulate(&invoke_context.timings); timings.accumulate(&invoke_context.timings);