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

clean feature: system_transfer_zero_check (#34076)

This commit is contained in:
Justin Starry 2023-11-16 10:14:28 +08:00 committed by GitHub
parent 0817cb048a
commit f9fba7e08b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
programs/system/src/system_processor.rs
View File

@ -9,7 +9,6 @@ use {
sysvar_cache::get_sysvar_with_account_check, sysvar_cache::get_sysvar_with_account_check,
}, },
solana_sdk::{ solana_sdk::{
feature_set,
instruction::InstructionError, instruction::InstructionError,
nonce, nonce,
program_utils::limited_deserialize, program_utils::limited_deserialize,
@ -220,14 +219,6 @@ fn transfer(
transaction_context: &TransactionContext, transaction_context: &TransactionContext,
instruction_context: &InstructionContext, instruction_context: &InstructionContext,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
if !invoke_context
.feature_set
.is_active(&feature_set::system_transfer_zero_check::id())
&& lamports == 0
{
return Ok(());
}
if !instruction_context.is_instruction_account_signer(from_account_index)? { if !instruction_context.is_instruction_account_signer(from_account_index)? {
ic_msg!( ic_msg!(
invoke_context, invoke_context,
@ -261,14 +252,6 @@ fn transfer_with_seed(
transaction_context: &TransactionContext, transaction_context: &TransactionContext,
instruction_context: &InstructionContext, instruction_context: &InstructionContext,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
if !invoke_context
.feature_set
.is_active(&feature_set::system_transfer_zero_check::id())
&& lamports == 0
{
return Ok(());
}
if !instruction_context.is_instruction_account_signer(from_base_account_index)? { if !instruction_context.is_instruction_account_signer(from_base_account_index)? {
ic_msg!( ic_msg!(
invoke_context, invoke_context,