stake-pool: Combine create stake and add validator (#2371)

Author: joncinque

stake-pool/cli/scripts/setup-stake-pool.sh

@@ -37,15 +37,6 @@ setup_pool () {
     --mint-keypair $mint_keyfile
 }
 
-create_validator_stakes() {
-  pool=$1
-  validator_list=$2
-  for validator in $(cat $validator_list)
-  do
-    $spl_stake_pool create-validator-stake $pool $validator
-  done
-}
-
 add_validator_stakes () {
   pool=$1
   validator_list=$2
@@ -65,7 +56,5 @@ setup_pool $max_validators $stake_pool_keyfile $mint_keyfile
 
 stake_pool_pubkey=$(solana-keygen pubkey $stake_pool_keyfile)
 
-echo "Creating validator stake accounts"
-create_validator_stakes $stake_pool_pubkey $validator_list
 echo "Adding validator stake accounts to the pool"
 add_validator_stakes $stake_pool_pubkey $validator_list

stake-pool/cli/src/main.rs

@@ -357,36 +357,6 @@ fn command_create_pool(
     Ok(())
 }
 
-fn command_vsa_create(
-    config: &Config,
-    stake_pool_address: &Pubkey,
-    vote_account: &Pubkey,
-) -> CommandResult {
-    let (stake_account, _) =
-        find_stake_program_address(&spl_stake_pool::id(), vote_account, stake_pool_address);
-    println!(
-        "Creating stake account {}, delegated to {}",
-        stake_account, vote_account
-    );
-    let transaction = checked_transaction_with_signers(
-        config,
-        &[
-            // Create new validator stake account address
-            spl_stake_pool::instruction::create_validator_stake_account(
-                &spl_stake_pool::id(),
-                stake_pool_address,
-                &config.staker.pubkey(),
-                &config.fee_payer.pubkey(),
-                &stake_account,
-                vote_account,
-            ),
-        ],
-        &[config.fee_payer.as_ref(), config.staker.as_ref()],
-    )?;
-    send_transaction(config, transaction)?;
-    Ok(())
-}
-
 fn command_vsa_add(
     config: &Config,
     stake_pool_address: &Pubkey,
@@ -408,20 +378,6 @@ fn command_vsa_add(
         return Ok(());
     }
 
-    let stake_state = get_stake_state(&config.rpc_client, &stake_account_address)?;
-    if let stake_program::StakeState::Stake(meta, _stake) = stake_state {
-        if meta.authorized.withdrawer != config.staker.pubkey() {
-            let error = format!(
-                "Stake account withdraw authority must be the staker {}, actual {}",
-                config.staker.pubkey(),
-                meta.authorized.withdrawer
-            );
-            return Err(error.into());
-        }
-    } else {
-        return Err("Stake account is not active.".into());
-    }
-
     if !config.no_update {
         command_update(config, stake_pool_address, false, false)?;
     }
@@ -435,6 +391,7 @@ fn command_vsa_add(
                 &spl_stake_pool::id(),
                 &stake_pool,
                 stake_pool_address,
+                &config.fee_payer.pubkey(),
                 vote_account,
             ),
         ],
@@ -1714,27 +1671,6 @@ fn main() {
                     .help("Stake pool reserve keypair [default: new keypair]"),
             )
         )
-        .subcommand(SubCommand::with_name("create-validator-stake")
-            .about("Create a new stake account to use with the pool. Must be signed by the pool staker.")
-            .arg(
-                Arg::with_name("pool")
-                    .index(1)
-                    .validator(is_pubkey)
-                    .value_name("POOL_ADDRESS")
-                    .takes_value(true)
-                    .required(true)
-                    .help("Stake pool address"),
-            )
-            .arg(
-                Arg::with_name("vote_account")
-                    .index(2)
-                    .validator(is_pubkey)
-                    .value_name("VOTE_ACCOUNT_ADDRESS")
-                    .takes_value(true)
-                    .required(true)
-                    .help("The validator vote account that this stake will be delegated to"),
-            )
-        )
         .subcommand(SubCommand::with_name("add-validator")
             .about("Add validator account to the stake pool. Must be signed by the pool staker.")
             .arg(
@@ -2345,11 +2281,6 @@ fn main() {
                 reserve_keypair,
             )
         }
-        ("create-validator-stake", Some(arg_matches)) => {
-            let stake_pool_address = pubkey_of(arg_matches, "pool").unwrap();
-            let vote_account_address = pubkey_of(arg_matches, "vote_account").unwrap();
-            command_vsa_create(&config, &stake_pool_address, &vote_account_address)
-        }
         ("add-validator", Some(arg_matches)) => {
             let stake_pool_address = pubkey_of(arg_matches, "pool").unwrap();
             let vote_account_address = pubkey_of(arg_matches, "vote_account").unwrap();

stake-pool/program/src/instruction.rs

@@ -77,42 +77,24 @@ pub enum StakePoolInstruction {
         max_validators: u32,
     },
 
-    ///   (Staker only) Creates new program account for accumulating stakes for
-    ///   a particular validator
-    ///
-    ///   0. `[]` Stake pool account this stake will belong to
-    ///   1. `[s]` Staker
-    ///   2. `[ws]` Funding account (must be a system account)
-    ///   3. `[w]` Stake account to be created
-    ///   4. `[]` Validator this stake account will vote for
-    ///   5. `[]` Rent sysvar
-    ///   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
     ///   list of managed validators.
     ///
-    ///   The stake account must have the rent-exempt amount plus at least 1 SOL,
-    ///   and at most 1.001 SOL.
-    ///
-    ///   Once we delegate even 1 SOL, it will accrue rewards one epoch later,
-    ///   so we'll have more than 1 active SOL at this point.
-    ///   At 10% annualized rewards, 1 epoch of 2 days will accrue
-    ///   0.000547945 SOL, so we check that it is at least 1 SOL, and at most
-    ///   1.001 SOL.
+    ///   The stake account will have the rent-exempt amount plus 1 SOL.
     ///
     ///   0. `[w]` Stake pool
     ///   1. `[s]` Staker
-    ///   2. `[]` Stake pool withdraw authority
-    ///   3. `[w]` Validator stake list storage account
-    ///   4. `[w]` Stake account to add to the pool, its withdraw authority must
-    ///      be set to the staker
-    ///   5. `[]` Clock sysvar
-    ///   6. '[]' Sysvar stake history account
-    ///   7. `[]` Stake program
+    ///   2. `[ws]` Funding account (must be a system account)
+    ///   3. `[]` Stake pool withdraw authority
+    ///   4. `[w]` Validator stake list storage account
+    ///   5. `[w]` Stake account to add to the pool
+    ///   6. `[]` Validator this stake account will be delegated to
+    ///   7. `[]` Rent sysvar
+    ///   8. `[]` Clock sysvar
+    ///   9. '[]' Stake history sysvar
+    ///  10. '[]' Stake config sysvar
+    ///  11. `[]` System program
+    ///  12. `[]` Stake program
     AddValidatorToPool,
 
     ///   (Staker only) Removes validator from the pool
@@ -415,54 +397,30 @@ pub fn initialize(
     }
 }
 
-/// Creates `CreateValidatorStakeAccount` instruction (create new stake account for the validator)
-pub fn create_validator_stake_account(
-    program_id: &Pubkey,
-    stake_pool: &Pubkey,
-    staker: &Pubkey,
-    funder: &Pubkey,
-    stake_account: &Pubkey,
-    validator: &Pubkey,
-) -> Instruction {
-    let accounts = vec![
-        AccountMeta::new_readonly(*stake_pool, false),
-        AccountMeta::new_readonly(*staker, true),
-        AccountMeta::new(*funder, true),
-        AccountMeta::new(*stake_account, false),
-        AccountMeta::new_readonly(*validator, false),
-        AccountMeta::new_readonly(sysvar::rent::id(), false),
-        AccountMeta::new_readonly(sysvar::clock::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),
-    ];
-    Instruction {
-        program_id: *program_id,
-        accounts,
-        data: StakePoolInstruction::CreateValidatorStakeAccount
-            .try_to_vec()
-            .unwrap(),
-    }
-}
-
 /// Creates `AddValidatorToPool` instruction (add new validator stake account to the pool)
 pub fn add_validator_to_pool(
     program_id: &Pubkey,
     stake_pool: &Pubkey,
     staker: &Pubkey,
+    funder: &Pubkey,
     stake_pool_withdraw: &Pubkey,
     validator_list: &Pubkey,
-    stake_account: &Pubkey,
+    stake: &Pubkey,
+    validator: &Pubkey,
 ) -> Instruction {
     let accounts = vec![
         AccountMeta::new(*stake_pool, false),
         AccountMeta::new_readonly(*staker, true),
+        AccountMeta::new(*funder, true),
         AccountMeta::new_readonly(*stake_pool_withdraw, false),
         AccountMeta::new(*validator_list, false),
-        AccountMeta::new(*stake_account, false),
+        AccountMeta::new(*stake, false),
+        AccountMeta::new_readonly(*validator, false),
+        AccountMeta::new_readonly(sysvar::rent::id(), false),
         AccountMeta::new_readonly(sysvar::clock::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),
     ];
     Instruction {
@@ -610,32 +568,13 @@ pub fn set_preferred_validator(
     }
 }
 
-/// Creates `CreateValidatorStakeAccount` instruction with a vote account
-pub fn create_validator_stake_account_with_vote(
-    program_id: &Pubkey,
-    stake_pool_address: &Pubkey,
-    staker: &Pubkey,
-    funder: &Pubkey,
-    vote_account_address: &Pubkey,
-) -> Instruction {
-    let (stake_account, _) =
-        find_stake_program_address(program_id, vote_account_address, stake_pool_address);
-    create_validator_stake_account(
-        program_id,
-        stake_pool_address,
-        staker,
-        funder,
-        &stake_account,
-        vote_account_address,
-    )
-}
-
 /// Create an `AddValidatorToPool` instruction given an existing stake pool and
 /// vote account
 pub fn add_validator_to_pool_with_vote(
     program_id: &Pubkey,
     stake_pool: &StakePool,
     stake_pool_address: &Pubkey,
+    funder: &Pubkey,
     vote_account_address: &Pubkey,
 ) -> Instruction {
     let pool_withdraw_authority =
@@ -646,9 +585,11 @@ pub fn add_validator_to_pool_with_vote(
         program_id,
         stake_pool_address,
         &stake_pool.staker,
+        funder,
         &pool_withdraw_authority,
         &stake_pool.validator_list,
         &stake_account_address,
+        vote_account_address,
     )
 }