SVM: Move nonce_info from accounts-db to Solana SDK (solana-labs#35138)

pgarg66 · Feb 8, 2024 · eeb0cf1 · eeb0cf1
1 parent 9b63ac8
commit eeb0cf1
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/accounts-db/src/accounts.rs b/accounts-db/src/accounts.rs
@@ -6,7 +6,6 @@ use {
         },
         accounts_index::{IndexKey, ScanConfig, ScanError, ScanResult, ZeroLamport},
         ancestors::Ancestors,
-        nonce_info::{NonceFull, NonceInfo},
         storable_accounts::StorableAccounts,
         transaction_results::TransactionExecutionResult,
     },
@@ -22,6 +21,7 @@ use {
             state::{DurableNonce, Versions as NonceVersions},
             State as NonceState,
         },
+        nonce_info::{NonceFull, NonceInfo},
         pubkey::Pubkey,
         rent_debits::RentDebits,
         slot_hashes::SlotHashes,

diff --git a/accounts-db/src/lib.rs b/accounts-db/src/lib.rs
@@ -30,7 +30,6 @@ pub mod hardened_unpack;
 pub mod in_mem_accounts_index;
 pub mod inline_spl_token;
 pub mod inline_spl_token_2022;
-pub mod nonce_info;
 pub mod partitioned_rewards;
 mod pubkey_bins;
 mod read_only_accounts_cache;

diff --git a/accounts-db/src/transaction_results.rs b/accounts-db/src/transaction_results.rs
@@ -5,9 +5,9 @@
 )]
 pub use solana_sdk::inner_instruction::{InnerInstruction, InnerInstructionsList};
 use {
-    crate::nonce_info::{NonceFull, NonceInfo, NoncePartial},
     solana_program_runtime::loaded_programs::LoadedProgramsForTxBatch,
     solana_sdk::{
+        nonce_info::{NonceFull, NonceInfo, NoncePartial},
         rent_debits::RentDebits,
         transaction::{self, TransactionError},
         transaction_context::TransactionReturnData,

diff --git a/rpc/src/transaction_status_service.rs b/rpc/src/transaction_status_service.rs
@@ -212,7 +212,6 @@ pub(crate) mod tests {
         crossbeam_channel::unbounded,
         dashmap::DashMap,
         solana_account_decoder::parse_token::token_amount_to_ui_amount,
-        solana_accounts_db::nonce_info::{NonceFull, NoncePartial},
         solana_ledger::{genesis_utils::create_genesis_config, get_tmp_ledger_path_auto_delete},
         solana_runtime::bank::{Bank, TransactionBalancesSet},
         solana_sdk::{
@@ -223,6 +222,7 @@ pub(crate) mod tests {
             message::{LegacyMessage, Message, MessageHeader, SanitizedMessage},
             nonce::{self, state::DurableNonce},
             nonce_account,
+            nonce_info::{NonceFull, NoncePartial},
             pubkey::Pubkey,
             rent_debits::RentDebits,
             signature::{Keypair, Signature, Signer},

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -85,7 +85,6 @@ use {
         ancestors::{Ancestors, AncestorsForSerialization},
         blockhash_queue::BlockhashQueue,
         epoch_accounts_hash::EpochAccountsHash,
-        nonce_info::{NonceInfo, NoncePartial},
         partitioned_rewards::PartitionedEpochRewardsConfig,
         sorted_storages::SortedStorages,
         stake_rewards::StakeReward,
@@ -136,6 +135,7 @@ use {
         native_token::LAMPORTS_PER_SOL,
         nonce::{self, state::DurableNonce, NONCED_TX_MARKER_IX_INDEX},
         nonce_account,
+        nonce_info::{NonceInfo, NoncePartial},
         packet::PACKET_DATA_SIZE,
         precompiles::get_precompiles,
         pubkey::Pubkey,

diff --git a/runtime/src/bank/tests.rs b/runtime/src/bank/tests.rs
@@ -34,7 +34,6 @@ use {
         accounts_partition::{self, PartitionIndex, RentPayingAccountsByPartition},
         ancestors::Ancestors,
         inline_spl_token,
-        nonce_info::NonceFull,
         partitioned_rewards::TestPartitionedEpochRewards,
         transaction_results::DurableNonceFee,
     },
@@ -82,6 +81,7 @@ use {
         native_loader,
         native_token::{sol_to_lamports, LAMPORTS_PER_SOL},
         nonce::{self, state::DurableNonce},
+        nonce_info::NonceFull,
         packet::PACKET_DATA_SIZE,
         poh_config::PohConfig,
         program::MAX_RETURN_DATA,

diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
@@ -84,6 +84,7 @@ pub mod log;
 pub mod native_loader;
 pub mod net;
 pub mod nonce_account;
+pub mod nonce_info;
 pub mod offchain_message;
 pub mod packet;
 pub mod poh_config;

diff --git a/accounts-db/src/nonce_info.rs → sdk/src/nonce_info.rs b/accounts-db/src/nonce_info.rs → sdk/src/nonce_info.rs
@@ -1,4 +1,5 @@
-use solana_sdk::{
+#![cfg(feature = "full")]
+use crate::{
     account::{AccountSharedData, ReadableAccount, WritableAccount},
     message::SanitizedMessage,
     nonce_account,
@@ -118,7 +119,7 @@ impl NonceInfo for NonceFull {
 mod tests {
     use {
         super::*,
-        solana_sdk::{
+        crate::{
             hash::Hash,
             instruction::Instruction,
             message::Message,

diff --git a/svm/src/account_loader.rs b/svm/src/account_loader.rs
@@ -8,7 +8,6 @@ use {
     log::warn,
     solana_accounts_db::{
         accounts::{LoadedTransaction, TransactionLoadResult, TransactionRent},
-        nonce_info::NonceFull,
         transaction_results::TransactionCheckResult,
     },
     solana_program_runtime::{
@@ -25,6 +24,7 @@ use {
         message::SanitizedMessage,
         native_loader,
         nonce::State as NonceState,
+        nonce_info::NonceFull,
         pubkey::Pubkey,
         rent::RentDue,
         rent_collector::{RentCollector, RENT_EXEMPT_RENT_EPOCH},