Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v1.18: relax stake split destination check (backport of #162) #368

Merged
merged 1 commit into from
Mar 21, 2024
Merged

v1.18: relax stake split destination check (backport of #162) #368

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions cli/src/stake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ use {
},
stake_history::{Epoch, StakeHistory},
system_instruction::{self, SystemError},
system_program,
sysvar::{clock, stake_history},
transaction::Transaction,
},
Expand Down Expand Up @@ -1980,15 +1981,26 @@ pub fn process_split_stake(

let rent_exempt_reserve = if !sign_only {
if let Ok(stake_account) = rpc_client.get_account(&split_stake_account_address) {
let err_msg = if stake_account.owner == stake::program::id() {
format!("Stake account {split_stake_account_address} already exists")
if stake_account.owner == stake::program::id() {
return Err(CliError::BadParameter(format!(
"Stake account {split_stake_account_address} already exists"
))
.into());
} else if stake_account.owner == system_program::id() {
if !stake_account.data.is_empty() {
return Err(CliError::BadParameter(format!(
"Account {split_stake_account_address} has data and cannot be used to split stake"
))
.into());
}
// if `stake_account`'s owner is the system_program and its data is
// empty, `stake_account` is allowed to receive the stake split
} else {
format!(
"Account {split_stake_account_address} already exists and is not a stake \
account"
)
};
return Err(CliError::BadParameter(err_msg).into());
return Err(CliError::BadParameter(format!(
"Account {split_stake_account_address} already exists and cannot be used to split stake"
))
.into());
}
}

let minimum_balance =
Expand Down
Loading