stake-pool: Add reserve stake and decrease / increase validator stake instruction (#1617)

* Add reserve stake account

* Add decrease validator stake instruction

* Cargo fmt

* Add increase instruction

* Add more increase tests

* Fix set fee tests

* Fix clippy in tests

* Add test-bpf feature to increase / decrease tests

Author: joncinque

stake-pool/cli/src/main.rs

@@ -95,6 +95,9 @@ fn send_transaction(
 }
 
 fn command_create_pool(config: &Config, fee: Fee, max_validators: u32) -> CommandResult {
+    let reserve_stake = Keypair::new();
+    println!("Creating reserve stake {}", reserve_stake.pubkey());
+
     let mint_account = Keypair::new();
     println!("Creating mint {}", mint_account.pubkey());
 
@@ -109,6 +112,10 @@ fn command_create_pool(config: &Config, fee: Fee, max_validators: u32) -> Comman
 
     let validator_list = Keypair::new();
 
+    let reserve_stake_balance = config
+        .rpc_client
+        .get_minimum_balance_for_rent_exemption(STAKE_STATE_LEN)?
+        + 1;
     let mint_account_balance = config
         .rpc_client
         .get_minimum_balance_for_rent_exemption(spl_token::state::Mint::LEN)?;
@@ -123,7 +130,8 @@ fn command_create_pool(config: &Config, fee: Fee, max_validators: u32) -> Comman
     let validator_list_balance = config
         .rpc_client
         .get_minimum_balance_for_rent_exemption(validator_list_size)?;
-    let total_rent_free_balances = mint_account_balance
+    let total_rent_free_balances = reserve_stake_balance
+        + mint_account_balance
         + pool_fee_account_balance
         + stake_pool_account_lamports
         + validator_list_balance;
@@ -142,6 +150,22 @@ fn command_create_pool(config: &Config, fee: Fee, max_validators: u32) -> Comman
 
     let mut transaction = Transaction::new_with_payer(
         &[
+            // Account for the stake pool reserve
+            system_instruction::create_account(
+                &config.fee_payer.pubkey(),
+                &reserve_stake.pubkey(),
+                reserve_stake_balance,
+                STAKE_STATE_LEN as u64,
+                &stake_program::id(),
+            ),
+            stake_program::initialize(
+                &reserve_stake.pubkey(),
+                &stake_program::Authorized {
+                    staker: withdraw_authority,
+                    withdrawer: withdraw_authority,
+                },
+                &stake_program::Lockup::default(),
+            ),
             // Account for the stake pool mint
             system_instruction::create_account(
                 &config.fee_payer.pubkey(),
@@ -196,6 +220,7 @@ fn command_create_pool(config: &Config, fee: Fee, max_validators: u32) -> Comman
                 &config.manager.pubkey(),
                 &config.staker.pubkey(),
                 &validator_list.pubkey(),
+                &reserve_stake.pubkey(),
                 &mint_account.pubkey(),
                 &pool_fee_account.pubkey(),
                 &spl_token::id(),

stake-pool/program/src/instruction.rs

@@ -48,8 +48,10 @@ pub enum StakePoolInstruction {
     ///   3. `[w]` Stake account to be created
     ///   4. `[]` Validator this stake account will vote for
     ///   5. `[]` Rent sysvar
-    ///   6. `[]` System program
-    ///   7. `[]` Stake program
+    ///   6. `[]` Stake History sysvar
+    ///   7. `[]` Stake Config sysvar
+    ///   8. `[]` System program
+    ///   9. `[]` Stake program
     CreateValidatorStakeAccount,
 
     ///   (Staker only) Adds stake account delegated to validator to the pool's
@@ -98,29 +100,23 @@ pub enum StakePoolInstruction {
     /// In order to rebalance the pool without taking custody, the staker needs
     /// a way of reducing the stake on a stake account. This instruction splits
     /// some amount of stake, up to the total activated stake, from the canonical
-    /// validator stake account, into its "transient" stake account, defined by:
-    ///
-    /// ```ignore
-    /// Pubkey::find_program_address(
-    ///     &[&stake_account_address.to_bytes()[..32],], program_id,
-    /// )
-    /// ```
+    /// validator stake account, into its "transient" stake account.
     ///
     /// The instruction only succeeds if the transient stake account does not
     /// exist. The amount of lamports to move must be at least rent-exemption
     /// plus 1 lamport.
     ///
     ///  0. `[]` Stake pool
     ///  1. `[s]` Stake pool staker
-    ///  2. `[]` Validator list
-    ///  3. `[]` Stake pool withdraw authority
+    ///  2. `[]` Stake pool withdraw authority
+    ///  3. `[]` Validator list
     ///  5. `[w]` Canonical stake account to split from
     ///  5. `[w]` Transient stake account to receive split
     ///  6. `[]` Clock sysvar
     ///  7. `[]` Rent sysvar
     ///  8. `[]` System program
     ///  9. `[]` Stake program
-    ///  userdata: amount of lamports to split
+    ///  userdata: amount of lamports to split into the transient stake account
     DecreaseValidatorStake(u64),
 
     /// (Staker only) Increase stake on a validator from the reserve account
@@ -135,13 +131,18 @@ pub enum StakePoolInstruction {
     ///
     ///  0. `[]` Stake pool
     ///  1. `[s]` Stake pool staker
-    ///  2. `[]` Validator list
-    ///  3. `[]` Stake pool withdraw authority
+    ///  2. `[]` Stake pool withdraw authority
+    ///  3. `[]` Validator list
     ///  4. `[w]` Stake pool reserve stake
     ///  5. `[w]` Transient stake account
-    ///  6. `[]` Canonical stake account
+    ///  6. `[]` Validator vote account to delegate to
     ///  7. '[]' Clock sysvar
-    ///  8. `[]` Stake program
+    ///  8. '[]' Rent sysvar
+    ///  9. `[]` Stake History sysvar
+    /// 10. `[]` Stake Config sysvar
+    /// 11. `[]` System program
+    /// 12. `[]` Stake program
+    ///  userdata: amount of lamports to split into the transient stake account
     IncreaseValidatorStake(u64),
 
     ///  Updates balances of validator and transient stake accounts in the pool
@@ -249,6 +250,7 @@ pub fn initialize(
     manager: &Pubkey,
     staker: &Pubkey,
     validator_list: &Pubkey,
+    reserve_stake: &Pubkey,
     pool_mint: &Pubkey,
     manager_pool_account: &Pubkey,
     token_program_id: &Pubkey,
@@ -265,6 +267,7 @@ pub fn initialize(
         AccountMeta::new_readonly(*manager, true),
         AccountMeta::new_readonly(*staker, false),
         AccountMeta::new(*validator_list, false),
+        AccountMeta::new_readonly(*reserve_stake, false),
         AccountMeta::new_readonly(*pool_mint, false),
         AccountMeta::new_readonly(*manager_pool_account, false),
         AccountMeta::new_readonly(sysvar::clock::id(), false),
@@ -364,14 +367,68 @@ pub fn remove_validator_from_pool(
 
 /// Creates `DecreaseValidatorStake` instruction (rebalance from validator account to
 /// transient account)
-pub fn decrease_validator_stake() -> Result<Instruction, ProgramError> {
-    Err(ProgramError::IncorrectProgramId)
+pub fn decrease_validator_stake(
+    program_id: &Pubkey,
+    stake_pool: &Pubkey,
+    staker: &Pubkey,
+    stake_pool_withdraw_authority: &Pubkey,
+    validator_list: &Pubkey,
+    validator_stake: &Pubkey,
+    transient_stake: &Pubkey,
+    lamports: u64,
+) -> Result<Instruction, ProgramError> {
+    let accounts = vec![
+        AccountMeta::new_readonly(*stake_pool, false),
+        AccountMeta::new_readonly(*staker, true),
+        AccountMeta::new_readonly(*stake_pool_withdraw_authority, false),
+        AccountMeta::new_readonly(*validator_list, false),
+        AccountMeta::new(*validator_stake, false),
+        AccountMeta::new(*transient_stake, false),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(sysvar::rent::id(), false),
+        AccountMeta::new_readonly(system_program::id(), false),
+        AccountMeta::new_readonly(stake_program::id(), false),
+    ];
+    Ok(Instruction {
+        program_id: *program_id,
+        accounts,
+        data: StakePoolInstruction::DecreaseValidatorStake(lamports).try_to_vec()?,
+    })
 }
 
 /// Creates `IncreaseValidatorStake` instruction (rebalance from reserve account to
 /// transient account)
-pub fn increase_validator_stake() -> Result<Instruction, ProgramError> {
-    Err(ProgramError::IncorrectProgramId)
+pub fn increase_validator_stake(
+    program_id: &Pubkey,
+    stake_pool: &Pubkey,
+    staker: &Pubkey,
+    stake_pool_withdraw_authority: &Pubkey,
+    validator_list: &Pubkey,
+    reserve_stake: &Pubkey,
+    transient_stake: &Pubkey,
+    validator: &Pubkey,
+    lamports: u64,
+) -> Result<Instruction, ProgramError> {
+    let accounts = vec![
+        AccountMeta::new_readonly(*stake_pool, false),
+        AccountMeta::new_readonly(*staker, true),
+        AccountMeta::new_readonly(*stake_pool_withdraw_authority, false),
+        AccountMeta::new_readonly(*validator_list, false),
+        AccountMeta::new(*reserve_stake, false),
+        AccountMeta::new(*transient_stake, false),
+        AccountMeta::new_readonly(*validator, false),
+        AccountMeta::new_readonly(sysvar::clock::id(), false),
+        AccountMeta::new_readonly(sysvar::rent::id(), false),
+        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
+        AccountMeta::new_readonly(stake_program::config_id(), false),
+        AccountMeta::new_readonly(system_program::id(), false),
+        AccountMeta::new_readonly(stake_program::id(), false),
+    ];
+    Ok(Instruction {
+        program_id: *program_id,
+        accounts,
+        data: StakePoolInstruction::IncreaseValidatorStake(lamports).try_to_vec()?,
+    })
 }
 
 /// Creates `UpdateValidatorListBalance` instruction (update validator stake account balances)

stake-pool/program/src/lib.rs

@@ -25,6 +25,9 @@ const AUTHORITY_DEPOSIT: &[u8] = b"deposit";
 /// Seed for withdraw authority seed
 const AUTHORITY_WITHDRAW: &[u8] = b"withdraw";
 
+/// Seed for transient stake account
+const TRANSIENT_STAKE_SEED: &[u8] = b"transient";
+
 /// Minimum amount of staked SOL required in a validator stake account to allow
 /// for merges without a mismatch on credits observed
 pub const MINIMUM_ACTIVE_STAKE: u64 = LAMPORTS_PER_SOL;
@@ -73,4 +76,20 @@ pub fn find_stake_program_address(
     )
 }
 
+/// Generates the stake program address for a validator's vote account
+pub fn find_transient_stake_program_address(
+    program_id: &Pubkey,
+    vote_account_address: &Pubkey,
+    stake_pool_address: &Pubkey,
+) -> (Pubkey, u8) {
+    Pubkey::find_program_address(
+        &[
+            TRANSIENT_STAKE_SEED,
+            &vote_account_address.to_bytes()[..32],
+            &stake_pool_address.to_bytes()[..32],
+        ],
+        program_id,
+    )
+}
+
 solana_program::declare_id!("poo1B9L9nR3CrcaziKVYVpRX6A9Y1LAXYasjjfCbApj");