Skip to content
This repository has been archived by the owner on Dec 5, 2024. It is now read-only.

Commit

Permalink
refactored
Browse files Browse the repository at this point in the history
  • Loading branch information
@LetMut1
LetMut1 committed Feb 7, 2022
1 parent 5b6da54 commit 314a2f5
Showing 1 changed file with 72 additions and 32 deletions.
104 changes: 72 additions & 32 deletions stake-pool/cli/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use {
},
spl_associated_token_account::get_associated_token_address,
spl_stake_pool::state::ValidatorStakeInfo,
spl_stake_pool::state::StakeStatus,
spl_stake_pool::{
self, find_stake_program_address, find_transient_stake_program_address,
find_withdraw_authority_program_address,
Expand Down Expand Up @@ -686,6 +687,16 @@ fn command_increase_validator_stake(
amount: f64,
) -> CommandResult {
let lamports = native_token::sol_to_lamports(amount);

increase_validator_stake(config, stake_pool_address, vote_account, lamports)
}

fn increase_validator_stake(
config: &Config,
stake_pool_address: &Pubkey,
vote_account: &Pubkey,
amount: u64,
) -> CommandResult {
if !config.no_update {
command_update(config, stake_pool_address, false, false)?;
}
Expand Down Expand Up @@ -714,7 +725,7 @@ fn command_increase_validator_stake(
&stake_pool,
stake_pool_address,
vote_account,
lamports,
amount,
validator_stake_info.transient_seed_suffix_start,
),
],
Expand All @@ -731,6 +742,15 @@ fn command_decrease_validator_stake(
amount: f64,
) -> CommandResult {
let lamports = native_token::sol_to_lamports(amount);
decrease_validator_stake(config, stake_pool_address, vote_account, lamports)
}

fn decrease_validator_stake(
config: &Config,
stake_pool_address: &Pubkey,
vote_account: &Pubkey,
amount: u64,
) -> CommandResult {
if !config.no_update {
command_update(config, stake_pool_address, false, false)?;
}
Expand All @@ -751,7 +771,7 @@ fn command_decrease_validator_stake(
&stake_pool,
stake_pool_address,
vote_account,
lamports,
amount,
validator_stake_info.transient_seed_suffix_start,
),
],
Expand Down Expand Up @@ -2212,22 +2232,52 @@ fn command_distribute_stake(
stake_pool_address: &Pubkey,
only_from_reserve: bool,
) -> CommandResult {
if !config.no_update {
command_update(config, stake_pool_address, false, false)?;
}

let stake_pool = get_stake_pool(&config.rpc_client, stake_pool_address)?;
let validator_list = get_validator_list(&config.rpc_client, &stake_pool.validator_list)?;

// let stake_rent = config.rpc_client.get_minimum_balance_for_rent_exemption(std::mem::size_of::<stake::state::StakeState>())?;
// if let None = config.rpc_client
// .get_balance(&stake_pool.reserve_stake)?
// .saturating_sub(stake_rent)
// .checked_sub(stake_pool.total_lamports_liquidity) {
// return Err("The number of sol on the stake pool's reserve account is less than the number of liquidity sol".into());
// }
let epoch = config.rpc_client.get_epoch_info()?.epoch;

for v in validator_list.validators.into_iter() {
println!("{}", v.active_stake_lamports)
let validator_list = get_validator_list(&config.rpc_client, &stake_pool.validator_list)?;
let validators_quantity = validator_list.validators.len();
if validators_quantity == 0 {
return Ok(());
}

todo!();
let stake_rent = config.rpc_client.get_minimum_balance_for_rent_exemption(std::mem::size_of::<stake::state::StakeState>())?;
if let None = config.rpc_client
.get_balance(&stake_pool.reserve_stake)?
.saturating_sub(stake_rent)
.checked_sub(stake_pool.total_lamports_liquidity) {
return Err("The number of sol on the stake pool's reserve account is less than the number of liquidity sol".into());
}

// TODO DELEYE
println!("can distrivute: {}", config.rpc_client // TODO DELEYE
.get_balance(&stake_pool.reserve_stake)?
.saturating_sub(stake_rent));

// TODO Score по API

let validators_quantity = validator_list.validators.len() as u64;

let amount = config.rpc_client // TODO считать аккуратно // MINIMUM_ACTIVE_STAKE нельзя класть меньше этого значения // Сюда еще идет +RentExcempt!!
.get_balance(&stake_pool.reserve_stake)?
.saturating_sub(stake_rent)
.saturating_sub(stake_pool.total_lamports_liquidity)
.checked_div(validators_quantity).unwrap();

for validator_stake_info in validator_list.validators.into_iter() {
if validator_stake_info.last_update_epoch == epoch
&& validator_stake_info.status == StakeStatus::Active
&& validator_stake_info.transient_stake_lamports == 0 {
increase_validator_stake(
config, stake_pool_address, &validator_stake_info.vote_account_address, amount
)?;
}
}

Ok(())
}
Expand Down Expand Up @@ -2276,31 +2326,21 @@ fn command_withdraw_stake_for_subsequent_removing_validator(
stake_pool_address: &Pubkey,
vote_account: &Pubkey,
) -> CommandResult {
// Simulate result: Response { context: RpcResponseContext { slot: 118734932 }, value: RpcSimulateTransactionResult {
// err: Some(InstructionError(0, AccountNotRentExempt)), logs: Some([“Program EverSFw9uN5t1V8kS3ficHUcKffSjwpGzUSGd7mgmSks invoke [1]“,
// “Program log: Instruction: DecreaseValidatorStake”, “Program log: Need more than 2282880 lamports for transient stake to be rent-exempt,
// 4607 provided”, “Program log: Error: AccountNotRentExempt”, “Program EverSFw9uN5t1V8kS3ficHUcKffSjwpGzUSGd7mgmSks consumed 16077 of 200000
// compute units”, “Program EverSFw9uN5t1V8kS3ficHUcKffSjwpGzUSGd7mgmSks failed: An account does not have enough lamports to be rent-exempt”]),
// accounts: None, units_consumed: None } }

let stake_pool = get_stake_pool(&config.rpc_client, stake_pool_address)?;

let validator_list = get_validator_list(&config.rpc_client, &stake_pool.validator_list)?;
let validator_stake_info = validator_list
.find(vote_account)
.ok_or("Vote account not found in validator list")?;

let mut signers = vec![config.fee_payer.as_ref(), config.staker.as_ref()];
unique_signers!(signers);
let transaction = checked_transaction_with_signers(
config,
&[
spl_stake_pool::instruction::decrease_validator_stake_with_vote(
&spl_stake_pool::id(),
&stake_pool,
stake_pool_address,
vote_account,
validator_stake_info.active_stake_lamports,
validator_stake_info.transient_seed_suffix_start,
),
],
&signers,
)?;
send_transaction(config, transaction)?;
Ok(())
decrease_validator_stake(config, stake_pool_address, vote_account, validator_stake_info.active_stake_lamports)
}

fn command_check_accounts_for_rent_exempt(
Expand Down Expand Up @@ -3824,4 +3864,4 @@ fn main() {
eprintln!("{}", err);
exit(1);
});
}
}

0 comments on commit 314a2f5

Please sign in to comment.