Withdraw authority no longer implies a custodian (solana-labs#11302)

* Withdraw authority no longer implies a custodian

Before this change, if the withdraw authority and custodian had
the same public key, then a withdraw authority signature would
imply a custodian signature and lockup would be not be enforced.

After this change, the client's withdraw instruction must
explictly reference a custodian account in its optional sixth
account argument.

Likewise, the fee-payer no longer implies either a withdraw
authority or custodian.

* Fix test

The test was configuring the stake account with the fee-payer as
the withdraw authority, but then passing in a different key to
the withdraw instruction's withdraw authority parameter. It only
worked because the second transaction was signed by the fee-payer.

Author: garious

cli/src/stake.rs

@@ -32,7 +32,7 @@ use solana_stake_program::{
     stake_state::{Authorized, Lockup, Meta, StakeAuthorize, StakeState},
 };
 use solana_vote_program::vote_state::VoteState;
-use std::{collections::HashSet, ops::Deref, sync::Arc};
+use std::{ops::Deref, sync::Arc};
 
 pub const STAKE_AUTHORITY_ARG: ArgConstant<'static> = ArgConstant {
     name: "stake_authority",
@@ -1485,7 +1485,7 @@ pub fn build_stake_state(
             let (active_stake, activating_stake, deactivating_stake) = stake
                 .delegation
                 .stake_activating_and_deactivating(current_epoch, Some(stake_history));
-            let lockup = if lockup.is_in_force(clock, &HashSet::new()) {
+            let lockup = if lockup.is_in_force(clock, None) {
                 Some(lockup.into())
             } else {
                 None
@@ -1535,7 +1535,7 @@ pub fn build_stake_state(
             authorized,
             lockup,
         }) => {
-            let lockup = if lockup.is_in_force(clock, &HashSet::new()) {
+            let lockup = if lockup.is_in_force(clock, None) {
                 Some(lockup.into())
             } else {
                 None

core/src/non_circulating_supply.rs

@@ -23,14 +23,14 @@ pub fn calculate_non_circulating_supply(bank: &Arc<Bank>) -> NonCirculatingSuppl
         let stake_account = StakeState::from(&account).unwrap_or_default();
         match stake_account {
             StakeState::Initialized(meta) => {
-                if meta.lockup.is_in_force(&clock, &HashSet::default())
+                if meta.lockup.is_in_force(&clock, None)
                     || withdraw_authority_list.contains(&meta.authorized.withdrawer)
                 {
                     non_circulating_accounts_set.insert(*pubkey);
                 }
             }
             StakeState::Stake(meta, _stake) => {
-                if meta.lockup.is_in_force(&clock, &HashSet::default())
+                if meta.lockup.is_in_force(&clock, None)
                     || withdraw_authority_list.contains(&meta.authorized.withdrawer)
                 {
                     non_circulating_accounts_set.insert(*pubkey);

programs/stake/src/stake_instruction.rs

@@ -454,7 +454,8 @@ pub fn process_instruction(
                 to,
                 &Clock::from_keyed_account(next_keyed_account(keyed_accounts)?)?,
                 &StakeHistory::from_keyed_account(next_keyed_account(keyed_accounts)?)?,
-                &signers,
+                next_keyed_account(keyed_accounts)?,
+                keyed_accounts.next(),
             )
         }
         StakeInstruction::Deactivate => me.deactivate(