blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Both kinds of LamportsError are turned into InstructionError::ArithmeticOverflow anyway. (#26273)

This commit is contained in:
Alexander Meißner 2022-06-28 10:04:54 +02:00 committed by GitHub
parent de5b6a2989
commit e8fed88669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/src/nonce_keyed_account.rs
View File

@ -177,13 +177,11 @@ pub fn withdraw_nonce_account(
return Err(InstructionError::MissingRequiredSignature); return Err(InstructionError::MissingRequiredSignature);
} }
from.checked_sub_lamports(lamports) from.checked_sub_lamports(lamports)?;
.map_err(|_| InstructionError::ArithmeticOverflow)?;
drop(from); drop(from);
let mut to = instruction_context let mut to = instruction_context
.try_borrow_instruction_account(transaction_context, to_account_index)?; .try_borrow_instruction_account(transaction_context, to_account_index)?;
to.checked_add_lamports(lamports) to.checked_add_lamports(lamports)?;
.map_err(|_| InstructionError::ArithmeticOverflow)?;
Ok(()) Ok(())
} }

5
sdk/src/transaction_context.rs
View File

@ -4,7 +4,6 @@ use {
crate::{ crate::{
account::{AccountSharedData, ReadableAccount, WritableAccount}, account::{AccountSharedData, ReadableAccount, WritableAccount},
instruction::InstructionError, instruction::InstructionError,
lamports::LamportsError,
pubkey::Pubkey, pubkey::Pubkey,
}, },
std::{ std::{
@ -559,7 +558,7 @@ impl<'a> BorrowedAccount<'a> {
self.set_lamports( self.set_lamports(
self.get_lamports() self.get_lamports()
.checked_add(lamports) .checked_add(lamports)
.ok_or(LamportsError::ArithmeticOverflow)?, .ok_or(InstructionError::ArithmeticOverflow)?,
) )
} }
@ -568,7 +567,7 @@ impl<'a> BorrowedAccount<'a> {
self.set_lamports( self.set_lamports(
self.get_lamports() self.get_lamports()
.checked_sub(lamports) .checked_sub(lamports)
.ok_or(LamportsError::ArithmeticUnderflow)?, .ok_or(InstructionError::ArithmeticOverflow)?,
) )
} }