set_lamports() (#16921)

This commit is contained in:
Jeff Washington (jwash) 2021-04-28 16:30:06 -05:00 committed by GitHub
parent 8dc15f727c
commit a7070a5ca7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -4,7 +4,7 @@ use bincode::{deserialize, serialized_size};
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
use solana_config_program::{create_config_account, get_config_data, ConfigState}; use solana_config_program::{create_config_account, get_config_data, ConfigState};
use solana_sdk::{ use solana_sdk::{
account::{AccountSharedData, ReadableAccount}, account::{AccountSharedData, ReadableAccount, WritableAccount},
genesis_config::GenesisConfig, genesis_config::GenesisConfig,
instruction::InstructionError, instruction::InstructionError,
keyed_account::KeyedAccount, keyed_account::KeyedAccount,
@ -53,7 +53,7 @@ pub fn add_genesis_account(genesis_config: &mut GenesisConfig) -> u64 {
let mut account = create_config_account(vec![], &Config::default(), 0); let mut account = create_config_account(vec![], &Config::default(), 0);
let lamports = genesis_config.rent.minimum_balance(account.data().len()); let lamports = genesis_config.rent.minimum_balance(account.data().len());
account.lamports = lamports.max(1); account.set_lamports(lamports.max(1));
genesis_config.add_account(id(), account); genesis_config.add_account(id(), account);

View File

@ -915,7 +915,9 @@ impl MessageProcessor {
); );
return Err(InstructionError::InvalidRealloc); return Err(InstructionError::InvalidRealloc);
} }
dst_keyed_account.try_account_ref_mut()?.lamports = src_keyed_account.lamports; dst_keyed_account
.try_account_ref_mut()?
.set_lamports(src_keyed_account.lamports());
dst_keyed_account dst_keyed_account
.try_account_ref_mut()? .try_account_ref_mut()?
.set_owner(*src_keyed_account.owner()); .set_owner(*src_keyed_account.owner());