Handle base fees and include failed transactions in transaction history

Cargo.toml

@@ -17,12 +17,14 @@ solana-loader-v4-program = "~1.18"
 bincode = "1.3"
 indexmap = "2.2.6"
 solana-address-lookup-table-program = "1.18.8"
+log = "0.4.21"
 
 [dev-dependencies]
 spl-token = "3.5.0"
 solana-program-test = "~1.18"
 criterion = "0.5"
 tokio = "1.35"
+test-log = "0.2.15"
 
 [features]
 internal-test = []

src/accounts_db.rs

@@ -21,10 +21,13 @@ use solana_program_runtime::{
     sysvar_cache::SysvarCache,
 };
 use solana_sdk::{
-    account::{AccountSharedData, ReadableAccount},
+    account::{AccountSharedData, ReadableAccount, WritableAccount},
     account_utils::StateMut,
+    nonce,
     pubkey::Pubkey,
+    transaction::TransactionError,
 };
+use solana_system_program::{get_system_account_kind, SystemAccountKind};
 use std::{collections::HashMap, sync::Arc};
 
 use crate::types::InvalidSysvarDataError;
@@ -289,6 +292,36 @@ impl AccountsDb {
             Err(AddressLookupError::InvalidAccountOwner)
         }
     }
+
+    pub(crate) fn withdraw(
+        &mut self,
+        pubkey: &Pubkey,
+        lamports: u64,
+    ) -> solana_sdk::transaction::Result<()> {
+        match self.inner.get_mut(pubkey) {
+            Some(account) => {
+                let min_balance = match get_system_account_kind(account) {
+                    Some(SystemAccountKind::Nonce) => self
+                        .sysvar_cache
+                        .get_rent()
+                        .unwrap()
+                        .minimum_balance(nonce::State::size()),
+                    _ => 0,
+                };
+
+                lamports
+                    .checked_add(min_balance)
+                    .filter(|required_balance| *required_balance <= account.lamports())
+                    .ok_or(TransactionError::InsufficientFundsForFee)?;
+                account
+                    .checked_sub_lamports(lamports)
+                    .map_err(|_| TransactionError::InsufficientFundsForFee)?;
+
+                Ok(())
+            }
+            None => Err(TransactionError::AccountNotFound),
+        }
+    }
 }
 
 fn into_address_loader_error(err: AddressLookupError) -> AddressLoaderError {

src/history.rs

@@ -1,8 +1,8 @@
-use crate::types::TransactionMetadata;
+use crate::types::TransactionResult;
 use indexmap::IndexMap;
 use solana_sdk::signature::Signature;
 
-pub struct TransactionHistory(IndexMap<Signature, TransactionMetadata>);
+pub struct TransactionHistory(IndexMap<Signature, TransactionResult>);
 
 impl TransactionHistory {
     pub fn new() -> Self {
@@ -17,17 +17,17 @@ impl TransactionHistory {
         }
     }
 
-    pub fn get_transaction(&self, signature: &Signature) -> Option<&TransactionMetadata> {
+    pub fn get_transaction(&self, signature: &Signature) -> Option<&TransactionResult> {
         self.0.get(signature)
     }
 
-    pub fn add_new_transaction(&mut self, signature: Signature, meta: TransactionMetadata) {
+    pub fn add_new_transaction(&mut self, signature: Signature, result: TransactionResult) {
         let capacity = self.0.capacity();
         if capacity != 0 {
             if self.0.len() == capacity {
                 self.0.shift_remove_index(0);
             }
-            self.0.insert(signature, meta);
+            self.0.insert(signature, result);
         }
     }