From 3c7b9c29387df4a7c90aec5377836ef9d169d608 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Tue, 29 Sep 2020 22:15:11 -0600
Subject: [PATCH] Move remaining nonce utils from runtime to SDK

---
 core/src/transaction_status_service.rs               | 4 ++--
 runtime/src/accounts.rs                              | 3 +--
 runtime/src/bank.rs                                  | 5 ++---
 runtime/src/lib.rs                                   | 1 -
 sdk/src/nonce/mod.rs                                 | 1 +
 runtime/src/nonce_utils.rs => sdk/src/nonce/utils.rs | 0
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename runtime/src/nonce_utils.rs => sdk/src/nonce/utils.rs (100%)

diff --git a/core/src/transaction_status_service.rs b/core/src/transaction_status_service.rs
index b1ce0b38b8..39f7b94180 100644
--- a/core/src/transaction_status_service.rs
+++ b/core/src/transaction_status_service.rs
@@ -3,9 +3,9 @@ use itertools::izip;
 use solana_ledger::{blockstore::Blockstore, blockstore_processor::TransactionStatusBatch};
 use solana_runtime::{
     bank::{Bank, HashAgeKind},
-    nonce_utils,
     transaction_utils::OrderedIterator,
 };
+use solana_sdk::nonce;
 use solana_transaction_status::{InnerInstructions, TransactionStatusMeta};
 use std::{
     sync::{
@@ -75,7 +75,7 @@ impl TransactionStatusService {
             if Bank::can_commit(&status) && !transaction.signatures.is_empty() {
                 let fee_calculator = match hash_age_kind {
                     Some(HashAgeKind::DurableNonce(_, account)) => {
-                        nonce_utils::fee_calculator_of(&account)
+                        nonce::utils::fee_calculator_of(&account)
                     }
                     _ => bank.get_fee_calculator(&transaction.message().recent_blockhash),
                 }
diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs
index ff2b35c4f8..2f6b5c4fd8 100644
--- a/runtime/src/accounts.rs
+++ b/runtime/src/accounts.rs
@@ -7,7 +7,6 @@ use crate::{
     bank::{HashAgeKind, TransactionProcessResult},
     blockhash_queue::BlockhashQueue,
     feature_set::{self, FeatureSet},
-    nonce_utils,
     rent_collector::RentCollector,
     system_instruction_processor::{get_system_account_kind, SystemAccountKind},
     transaction_utils::OrderedIterator,
@@ -316,7 +315,7 @@ impl Accounts {
                 ((_, tx), (Ok(()), hash_age_kind)) => {
                     let fee_calculator = match hash_age_kind.as_ref() {
                         Some(HashAgeKind::DurableNonce(_, account)) => {
-                            nonce_utils::fee_calculator_of(account)
+                            nonce::utils::fee_calculator_of(account)
                         }
                         _ => hash_queue
                             .get_fee_calculator(&tx.message().recent_blockhash)
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 61261f0490..15167253bd 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -17,7 +17,6 @@ use crate::{
     instruction_recorder::InstructionRecorder,
     log_collector::LogCollector,
     message_processor::{Executors, MessageProcessor},
-    nonce_utils,
     process_instruction::{Executor, ProcessInstruction, ProcessInstructionWithContext},
     rent_collector::RentCollector,
     stakes::Stakes,
@@ -1828,7 +1827,7 @@ impl Bank {
                     .map(|acc| (*nonce_pubkey, acc))
             })
             .filter(|(_pubkey, nonce_account)| {
-                nonce_utils::verify_nonce_account(nonce_account, &tx.message().recent_blockhash)
+                nonce::utils::verify_nonce_account(nonce_account, &tx.message().recent_blockhash)
             })
     }
 
@@ -2244,7 +2243,7 @@ impl Bank {
             .map(|((_, tx), (res, hash_age_kind))| {
                 let (fee_calculator, is_durable_nonce) = match hash_age_kind {
                     Some(HashAgeKind::DurableNonce(_, account)) => {
-                        (nonce_utils::fee_calculator_of(account), true)
+                        (nonce::utils::fee_calculator_of(account), true)
                     }
                     _ => (
                         hash_queue
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index b3a6a3ef20..5b8eea61a1 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -22,7 +22,6 @@ pub mod loader_utils;
 pub mod log_collector;
 pub mod message_processor;
 mod native_loader;
-pub mod nonce_utils;
 pub mod process_instruction;
 pub mod rent_collector;
 pub mod serde_snapshot;
diff --git a/sdk/src/nonce/mod.rs b/sdk/src/nonce/mod.rs
index c38595384a..f9a34f27cd 100644
--- a/sdk/src/nonce/mod.rs
+++ b/sdk/src/nonce/mod.rs
@@ -2,3 +2,4 @@ pub mod account;
 pub use account::{create_account, Account};
 pub mod state;
 pub use state::State;
+pub mod utils;
diff --git a/runtime/src/nonce_utils.rs b/sdk/src/nonce/utils.rs
similarity index 100%
rename from runtime/src/nonce_utils.rs
rename to sdk/src/nonce/utils.rs