Add agave-reserved-account-keys crate

Cargo.toml

@@ -108,6 +108,7 @@ members = [
     "rayon-threadlimit",
     "rbpf-cli",
     "remote-wallet",
+    "reserved-account-keys",
     "rpc",
     "rpc-client",
     "rpc-client-api",
@@ -181,6 +182,7 @@ Inflector = "0.11.4"
 axum = "0.7.9"
 agave-banking-stage-ingress-types = { path = "banking-stage-ingress-types", version = "=2.3.0" }
 agave-feature-set = { path = "feature-set", version = "=2.3.0" }
+agave-reserved-account-keys = { path = "reserved-account-keys", version = "=2.3.0" }
 agave-transaction-view = { path = "transaction-view", version = "=2.3.0" }
 aquamarine = "0.6.0"
 aes-gcm-siv = "0.11.1"
@@ -493,7 +495,6 @@ solana-remote-wallet = { path = "remote-wallet", version = "=2.3.0", default-fea
 solana-rent = "=2.2.1"
 solana-rent-collector = "=2.2.1"
 solana-rent-debits = "=2.2.1"
-solana-reserved-account-keys = "=2.2.1"
 solana-reward-info = "=2.2.1"
 solana-sanitize = "=2.2.1"
 solana-secp256r1-program = "=2.2.1"

cli-output/Cargo.toml

@@ -11,6 +11,7 @@ edition = { workspace = true }
 
 [dependencies]
 Inflector = { workspace = true }
+agave-reserved-account-keys = { workspace = true }
 base64 = { workspace = true }
 chrono = { workspace = true, features = ["default", "serde"] }
 clap = "2.33.0"
@@ -34,7 +35,6 @@ solana-native-token = { workspace = true }
 solana-packet = { workspace = true }
 solana-program = { workspace = true }
 solana-pubkey = { workspace = true }
-solana-reserved-account-keys = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-signature = { workspace = true }

cli-output/src/display.rs

@@ -1,5 +1,6 @@
 use {
     crate::cli_output::CliSignatureVerificationStatus,
+    agave_reserved_account_keys::ReservedAccountKeys,
     base64::{prelude::BASE64_STANDARD, Engine},
     chrono::{DateTime, Local, SecondsFormat, TimeZone, Utc},
     console::style,
@@ -12,7 +13,6 @@ use {
     solana_native_token::lamports_to_sol,
     solana_program::stake,
     solana_pubkey::Pubkey,
-    solana_reserved_account_keys::ReservedAccountKeys,
     solana_signature::Signature,
     solana_transaction::versioned::{TransactionVersion, VersionedTransaction},
     solana_transaction_error::TransactionError,

core/Cargo.toml

@@ -108,6 +108,7 @@ tokio = { workspace = true, features = ["full"] }
 trees = { workspace = true }
 
 [dev-dependencies]
+agave-reserved-account-keys = { workspace = true }
 criterion = { workspace = true }
 fs_extra = { workspace = true }
 serde_json = { workspace = true }

core/src/banking_stage/consumer.rs

@@ -858,6 +858,7 @@ mod tests {
         crate::banking_stage::tests::{
             create_slow_genesis_config, sanitize_transactions, simulate_poh,
         },
+        agave_reserved_account_keys::ReservedAccountKeys,
         crossbeam_channel::{unbounded, Receiver},
         solana_cost_model::{cost_model::CostModel, transaction_cost::TransactionCost},
         solana_entry::entry::{next_entry, next_versioned_entry},
@@ -890,7 +891,6 @@ mod tests {
             nonce_account::verify_nonce_account,
             poh_config::PohConfig,
             pubkey::Pubkey,
-            reserved_account_keys::ReservedAccountKeys,
             signature::Keypair,
             signer::Signer,
             system_program, system_transaction,

core/src/banking_stage/unprocessed_packet_batches.rs

@@ -50,11 +50,11 @@ impl Ord for DeserializedPacket {
 mod tests {
     use {
         super::*,
+        agave_reserved_account_keys::ReservedAccountKeys,
         solana_perf::packet::PacketFlags,
         solana_runtime::bank::Bank,
         solana_sdk::{
             hash::Hash,
-            reserved_account_keys::ReservedAccountKeys,
             signature::{Keypair, Signer},
             system_transaction,
             transaction::Transaction,

cost-model/Cargo.toml

@@ -48,6 +48,7 @@ crate-type = ["lib"]
 name = "solana_cost_model"
 
 [dev-dependencies]
+agave-reserved-account-keys = { workspace = true }
 itertools = { workspace = true }
 rand = "0.8.5"
 # See order-crates-for-publishing.py for using this unusual `path = "."`
@@ -61,7 +62,6 @@ 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/src/transaction_cost.rs

@@ -295,11 +295,11 @@ mod tests {
     use {
         super::*,
         crate::cost_model::CostModel,
+        agave_reserved_account_keys::ReservedAccountKeys,
         solana_feature_set::FeatureSet,
         solana_hash::Hash,
         solana_keypair::Keypair,
         solana_message::SimpleAddressLoader,
-        solana_reserved_account_keys::ReservedAccountKeys,
         solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
         solana_transaction::{sanitized::MessageHash, versioned::VersionedTransaction},
         solana_vote::vote_transaction,

entry/Cargo.toml

@@ -31,13 +31,13 @@ solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
 
 [dev-dependencies]
+agave-reserved-account-keys = { workspace = true }
 assert_matches = { workspace = true }
 solana-keypair = { workspace = true }
 solana-logger = { workspace = true }
 solana-message = { workspace = true }
 solana-perf = { workspace = true, features = ["dev-context-only-utils"] }
 solana-pubkey = { workspace = true }
-solana-reserved-account-keys = { workspace = true }
 solana-signature = { workspace = true }
 solana-signer = { workspace = true }
 solana-system-transaction = { workspace = true }

entry/benches/entry_sigverify.rs

@@ -1,11 +1,11 @@
 #![feature(test)]
 extern crate test;
 use {
+    agave_reserved_account_keys::ReservedAccountKeys,
     solana_entry::entry::{self, VerifyRecyclers},
     solana_hash::Hash,
     solana_message::SimpleAddressLoader,
     solana_perf::test_tx::test_tx,
-    solana_reserved_account_keys::ReservedAccountKeys,
     solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
     solana_transaction::{
         sanitized::{MessageHash, SanitizedTransaction},

entry/src/entry.rs

@@ -974,12 +974,12 @@ pub fn thread_pool_for_benches() -> ThreadPool {
 mod tests {
     use {
         super::*,
+        agave_reserved_account_keys::ReservedAccountKeys,
         solana_hash::Hash,
         solana_keypair::Keypair,
         solana_message::SimpleAddressLoader,
         solana_perf::test_tx::{test_invalid_tx, test_tx},
         solana_pubkey::Pubkey,
-        solana_reserved_account_keys::ReservedAccountKeys,
         solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
         solana_sha256_hasher::hash,
         solana_signer::Signer,

ledger-tool/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-reserved-account-keys = { workspace = true }
 bs58 = { workspace = true }
 chrono = { workspace = true, features = ["default"] }
 clap = { workspace = true }

ledger-tool/src/main.rs

@@ -12,6 +12,7 @@ use {
         },
         program::*,
     },
+    agave_reserved_account_keys::ReservedAccountKeys,
     clap::{
         crate_description, crate_name, value_t, value_t_or_exit, values_t_or_exit, App,
         AppSettings, Arg, ArgMatches, SubCommand,
@@ -74,7 +75,6 @@ use {
         native_token::{lamports_to_sol, sol_to_lamports, Sol},
         pubkey::Pubkey,
         rent::Rent,
-        reserved_account_keys::ReservedAccountKeys,
         shred_version::compute_shred_version,
         stake::{self, state::StakeStateV2},
         system_program,

ledger/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-reserved-account-keys = { workspace = true }
 anyhow = { workspace = true }
 assert_matches = { workspace = true }
 bincode = { workspace = true }

ledger/src/transaction_address_lookup_table_scanner.rs

@@ -1,10 +1,10 @@
 use {
+    agave_reserved_account_keys::ReservedAccountKeys,
     bincode::deserialize,
     lazy_static::lazy_static,
     solana_sdk::{
         address_lookup_table::{self, instruction::ProgramInstruction},
         pubkey::Pubkey,
-        reserved_account_keys::ReservedAccountKeys,
         transaction::SanitizedVersionedTransaction,
     },
     std::collections::HashSet,