remove solana-program and solana-sdk from solana-stake-program (anza-xyz#4719)

* remove solana-sdk from solana-stake-program

* remove solana-program from solana-stake-program

* remove solana_program after rebase

* remove redundant import

* missing feature activation in compute-budget-instruction

* missing feature activation in solana-entry

* missing feature in stake program dev deps

* missing feature activations in runtime-transaction

* missing feature activation in compute-budget-instruction

* missing feature activation in cost-model

* missing feature activations in stake program deps

* trigger ci

Author: kevinheavey

Cargo.lock

@@ -14,7 +14,7 @@ log = { workspace = true }
 solana-borsh = { workspace = true }
 solana-builtins-default-costs = { workspace = true, features = ["svm-internal"] }
 solana-compute-budget = { workspace = true }
-solana-compute-budget-interface = { workspace = true }
+solana-compute-budget-interface = { workspace = true, features = ["borsh"] }
 solana-feature-set = { workspace = true }
 solana-instruction = { workspace = true }
 solana-packet = { workspace = true }
@@ -39,7 +39,7 @@ solana-message = { workspace = true }
 solana-program = { workspace = true }
 solana-signer = { workspace = true }
 solana-system-interface = { workspace = true }
-solana-transaction = { workspace = true }
+solana-transaction = { workspace = true, features = ["blake3"] }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

compute-budget-instruction/Cargo.toml

@@ -59,6 +59,7 @@ solana-cost-model = { path = ".", features = ["dev-context-only-utils"] }
 solana-instruction = { workspace = true }
 solana-keypair = { workspace = true }
 solana-logger = { workspace = true }
+solana-pubkey = { workspace = true, features = ["rand"] }
 solana-reserved-account-keys = { workspace = true }
 solana-runtime-transaction = { workspace = true, features = [
     "dev-context-only-utils",

cost-model/Cargo.toml

@@ -41,6 +41,7 @@ solana-reserved-account-keys = { workspace = true }
 solana-signature = { workspace = true }
 solana-signer = { workspace = true }
 solana-system-transaction = { workspace = true }
+solana-transaction = { workspace = true, features = ["verify"] }
 
 [lib]
 crate-type = ["lib"]

entry/Cargo.toml

@@ -17,20 +17,20 @@ solana-bincode = { workspace = true }
 solana-clock = { workspace = true }
 solana-config-program = { workspace = true }
 solana-feature-set = { workspace = true }
+solana-genesis-config = { workspace = true }
 solana-instruction = { workspace = true }
 solana-log-collector = { workspace = true }
 solana-native-token = { workspace = true }
 solana-packet = { workspace = true }
-solana-program = { workspace = true }
 solana-program-runtime = { workspace = true }
-solana-pubkey = { workspace = true }
+solana-pubkey = { workspace = true, features = ["sha2"] }
 solana-rent = { workspace = true }
-solana-sdk = { workspace = true }
 solana-sdk-ids = { workspace = true }
+solana-stake-interface = { workspace = true }
 solana-sysvar = { workspace = true }
-solana-transaction-context = { workspace = true }
+solana-transaction-context = { workspace = true, features = ["bincode"] }
 solana-type-overrides = { workspace = true }
-solana-vote-interface = { workspace = true }
+solana-vote-interface = { workspace = true, features = ["bincode"] }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
@@ -40,6 +40,7 @@ solana-compute-budget = { workspace = true }
 solana-epoch-rewards = { workspace = true }
 solana-epoch-schedule = { workspace = true }
 solana-logger = { workspace = true }
+solana-pubkey = { workspace = true, features = ["rand"] }
 solana-sysvar-id = { workspace = true }
 solana-vote-program = { workspace = true, default-features = false }
 test-case = { workspace = true }

programs/sbf/Cargo.lock

@@ -5,26 +5,24 @@ use {
     solana_clock::{Clock, Epoch},
     solana_feature_set::FeatureSet,
     solana_instruction::AccountMeta,
-    solana_program::{
-        stake::{
-            instruction::{
-                self, AuthorizeCheckedWithSeedArgs, AuthorizeWithSeedArgs, LockupArgs,
-                LockupCheckedArgs, StakeInstruction,
-            },
-            stake_flags::StakeFlags,
-            state::{Authorized, Lockup, StakeAuthorize, StakeStateV2},
-        },
-        vote::state::{VoteState, VoteStateVersions},
-    },
     solana_program_runtime::invoke_context::mock_process_instruction,
     solana_pubkey::Pubkey,
     solana_rent::Rent,
     solana_sdk_ids::sysvar::{clock, rent, stake_history},
+    solana_stake_interface::{
+        instruction::{
+            self, AuthorizeCheckedWithSeedArgs, AuthorizeWithSeedArgs, LockupArgs,
+            LockupCheckedArgs, StakeInstruction,
+        },
+        stake_flags::StakeFlags,
+        state::{Authorized, Lockup, StakeAuthorize, StakeStateV2},
+    },
     solana_stake_program::{
         stake_instruction,
         stake_state::{Delegation, Meta, Stake},
     },
     solana_sysvar::stake_history::StakeHistory,
+    solana_vote_interface::state::{VoteState, VoteStateVersions},
     solana_vote_program::vote_state,
     std::sync::Arc,
 };
@@ -624,7 +622,7 @@ fn bench_deactivate_delinquent(c: &mut Criterion) {
 
     // reference vote account has been consistently voting
     let mut vote_state = VoteState::default();
-    for epoch in 0..=solana_program::stake::MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION {
+    for epoch in 0..=solana_stake_interface::MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION {
         vote_state.increment_credits(epoch as Epoch, 1);
     }
     let reference_vote_address = Pubkey::new_unique();
@@ -660,7 +658,7 @@ fn bench_deactivate_delinquent(c: &mut Criterion) {
     test_setup.add_account(
         clock::id(),
         create_account_shared_data_for_test(&Clock {
-            epoch: solana_program::stake::MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION as u64,
+            epoch: solana_stake_interface::MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION as u64,
             ..Clock::default()
         }),
     );

programs/stake/Cargo.toml

@@ -2,14 +2,14 @@
 //!  carries variables that the stake program cares about
 #[deprecated(
     since = "1.8.0",
-    note = "Please use `solana_sdk::stake::config` or `solana_program::stake::config` instead"
+    note = "Please use `solana_stake_interface::config` instead"
 )]
-pub use solana_program::stake::config::*;
+pub use solana_stake_interface::config::*;
 use {
     bincode::deserialize,
     solana_account::{AccountSharedData, ReadableAccount, WritableAccount},
     solana_config_program::{create_config_account, get_config_data},
-    solana_sdk::genesis_config::GenesisConfig,
+    solana_genesis_config::GenesisConfig,
     solana_transaction_context::BorrowedAccount,
 };
 

programs/stake/benches/stake.rs

@@ -2,13 +2,13 @@
 #![allow(clippy::arithmetic_side_effects)]
 #[deprecated(
     since = "1.8.0",
-    note = "Please use `solana_sdk::stake::program::id` or `solana_program::stake::program::id` instead"
+    note = "Please use `solana_sdk_ids::sysvar::stake::id` instead"
 )]
 pub use solana_sdk_ids::stake::{check_id, id};
 use {
     solana_feature_set::{self as feature_set, FeatureSet},
+    solana_genesis_config::GenesisConfig,
     solana_native_token::LAMPORTS_PER_SOL,
-    solana_sdk::genesis_config::GenesisConfig,
 };
 
 pub mod config;

programs/stake/src/config.rs

@@ -4,8 +4,8 @@
 use {
     solana_clock::Epoch,
     solana_instruction::error::InstructionError,
-    solana_program::stake::state::{Delegation, Stake, StakeStateV2},
     solana_pubkey::Pubkey,
+    solana_stake_interface::state::{Delegation, Stake, StakeStateV2},
     solana_sysvar::stake_history::StakeHistory,
     solana_vote_interface::state::VoteState,
     std::cmp::Ordering,

programs/stake/src/lib.rs

@@ -9,8 +9,8 @@ use {
     solana_account::{state_traits::StateMut, AccountSharedData, WritableAccount},
     solana_clock::Epoch,
     solana_instruction::error::InstructionError,
-    solana_program::stake::{
-        instruction::StakeError,
+    solana_stake_interface::{
+        error::StakeError,
         state::{Stake, StakeStateV2},
     },
     solana_sysvar::stake_history::StakeHistory,

programs/stake/src/points.rs

@@ -7,15 +7,16 @@ use {
     log::*,
     solana_bincode::limited_deserialize,
     solana_instruction::error::InstructionError,
-    solana_program::stake::{
-        instruction::{LockupArgs, StakeError, StakeInstruction},
-        program::id,
-        state::{Authorized, Lockup},
-    },
     solana_program_runtime::{
         declare_process_instruction, sysvar_cache::get_sysvar_with_account_check,
     },
     solana_pubkey::Pubkey,
+    solana_stake_interface::{
+        error::StakeError,
+        instruction::{LockupArgs, StakeInstruction},
+        program::id,
+        state::{Authorized, Lockup},
+    },
     solana_transaction_context::{IndexOfAccount, InstructionContext, TransactionContext},
 };
 
@@ -398,31 +399,30 @@ mod tests {
         solana_epoch_schedule::EpochSchedule,
         solana_feature_set::FeatureSet,
         solana_instruction::{AccountMeta, Instruction},
-        solana_program::{
-            stake::{
-                config as stake_config,
-                instruction::{
-                    self, authorize_checked, authorize_checked_with_seed, initialize_checked,
-                    set_lockup_checked, AuthorizeCheckedWithSeedArgs, AuthorizeWithSeedArgs,
-                    LockupArgs, StakeError,
-                },
-                stake_flags::StakeFlags,
-                state::{warmup_cooldown_rate, Authorized, Lockup, StakeAuthorize},
-                MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION,
-            },
-            vote::state::{VoteState, VoteStateVersions},
-        },
         solana_program_runtime::invoke_context::mock_process_instruction,
         solana_pubkey::Pubkey,
         solana_rent::Rent,
         solana_sdk_ids::{
             system_program,
             sysvar::{clock, epoch_rewards, epoch_schedule, rent, rewards, stake_history},
         },
+        solana_stake_interface::{
+            config as stake_config,
+            error::StakeError,
+            instruction::{
+                self, authorize_checked, authorize_checked_with_seed, initialize_checked,
+                set_lockup_checked, AuthorizeCheckedWithSeedArgs, AuthorizeWithSeedArgs,
+                LockupArgs,
+            },
+            stake_flags::StakeFlags,
+            state::{warmup_cooldown_rate, Authorized, Lockup, StakeAuthorize},
+            MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION,
+        },
         solana_sysvar::{
             rewards::Rewards,
             stake_history::{StakeHistory, StakeHistoryEntry},
         },
+        solana_vote_interface::state::{VoteState, VoteStateVersions},
         solana_vote_program::vote_state,
         std::{collections::HashSet, str::FromStr, sync::Arc},
         test_case::test_case,

programs/stake/src/rewards.rs

@@ -5,31 +5,30 @@
 
 #[deprecated(
     since = "1.8.0",
-    note = "Please use `solana_sdk::stake::state` or `solana_program::stake::state` instead"
+    note = "Please use `solana_sdk::stake::state` or `solana_stake_interface::state` instead"
 )]
-pub use solana_program::stake::state::*;
+pub use solana_stake_interface::state::*;
 use {
     solana_account::{state_traits::StateMut, AccountSharedData, ReadableAccount},
     solana_clock::{Clock, Epoch},
     solana_feature_set::FeatureSet,
     solana_instruction::error::InstructionError,
     solana_log_collector::ic_msg,
-    solana_program::{
-        stake::{
-            instruction::{LockupArgs, StakeError},
-            program::id,
-            stake_flags::StakeFlags,
-            tools::{acceptable_reference_epoch_credits, eligible_for_deactivate_delinquent},
-        },
-        vote::state::{VoteState, VoteStateVersions},
-    },
     solana_program_runtime::invoke_context::InvokeContext,
     solana_pubkey::Pubkey,
     solana_rent::Rent,
+    solana_sdk_ids::stake::id,
+    solana_stake_interface::{
+        error::StakeError,
+        instruction::LockupArgs,
+        stake_flags::StakeFlags,
+        tools::{acceptable_reference_epoch_credits, eligible_for_deactivate_delinquent},
+    },
     solana_sysvar::stake_history::{StakeHistory, StakeHistoryEntry},
     solana_transaction_context::{
         BorrowedAccount, IndexOfAccount, InstructionContext, TransactionContext,
     },
+    solana_vote_interface::state::{VoteState, VoteStateVersions},
     std::{collections::HashSet, convert::TryFrom},
 };
 
@@ -1452,10 +1451,10 @@ mod tests {
         proptest::prelude::*,
         solana_account::{create_account_shared_data_for_test, AccountSharedData},
         solana_epoch_schedule::EpochSchedule,
-        solana_program::stake::state::warmup_cooldown_rate,
         solana_program_runtime::with_mock_invoke_context,
         solana_pubkey::Pubkey,
         solana_sdk_ids::sysvar::epoch_schedule,
+        solana_stake_interface::state::warmup_cooldown_rate,
         solana_sysvar_id::SysvarId,
         test_case::test_case,
     };

programs/stake/src/stake_instruction.rs

@@ -38,10 +38,12 @@ solana-feature-set = { workspace = true }
 solana-instruction = { workspace = true }
 solana-keypair = { workspace = true }
 solana-program = { workspace = true }
+solana-pubkey = { workspace = true, features = ["rand"] }
 solana-reserved-account-keys = { workspace = true }
 solana-signer = { workspace = true }
 solana-system-interface = { workspace = true, features = ["bincode"] }
 solana-system-transaction = { workspace = true }
+solana-transaction = { workspace = true, features = ["blake3"] }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]