feat: fail transaction if account commit failed (#796)

Author: bmuddha

Cargo.lock

@@ -39,7 +39,7 @@ resolver = "2"
 
 [workspace.package]
 # Solana Version (2.2.x)
-version = "0.5.1"
+version = "0.5.2"
 authors = ["MagicBlock Maintainers <[email protected]>"]
 repository = "https://github.com/magicblock-labs/ephemeral-validator"
 homepage = "https://www.magicblock.xyz"
@@ -144,7 +144,7 @@ serde_json = "1.0"
 serde_with = "3.16"
 serial_test = "3.2"
 sha3 = "0.10.8"
-solana-account = { git = "https://github.com/magicblock-labs/solana-account.git", rev = "57158728" }
+solana-account = { git = "https://github.com/magicblock-labs/solana-account.git", rev = "2246929" }
 solana-account-decoder = { version = "2.2" }
 solana-account-decoder-client-types = { version = "2.2" }
 solana-account-info = { version = "2.2" }
@@ -235,7 +235,7 @@ features = ["lz4"]
 # some solana dependencies have solana-storage-proto as dependency
 # we need to patch them with our version, because they use protobuf-src v1.1.0
 # and we use protobuf-src v2.1.1. Otherwise compilation fails
-solana-account = { git = "https://github.com/magicblock-labs/solana-account.git", rev = "57158728" }
+solana-account = { git = "https://github.com/magicblock-labs/solana-account.git", rev = "2246929" }
 solana-storage-proto = { path = "./storage-proto" }
 solana-svm = { git = "https://github.com/magicblock-labs/magicblock-svm.git", rev = "3e9456ec4" }
 # Fork is used to enable `disable_manual_compaction` usage

Cargo.toml

@@ -26,9 +26,9 @@ impl From<lmdb::Error> for AccountsDbError {
 #[macro_export]
 macro_rules! log_err {
     ($msg: expr) => {
-        |err| ::log::warn!("{} error: {err}", $msg)
+        |err| ::log::error!("{} error: {err}", $msg)
     };
     ($msg: expr, $($ctx:expr),* $(,)?) => {
-        |err| ::log::warn!("{} error: {err}", format!($msg, $($ctx),*))
+        |err| ::log::error!("{} error: {err}", format!($msg, $($ctx),*))
     };
 }

magicblock-accounts-db/src/error.rs

@@ -168,10 +168,10 @@ impl AccountsDbIndex {
         pubkey: &Pubkey,
         owner: &Pubkey,
         allocation: Allocation,
+        txn: &mut RwTransaction,
     ) -> AccountsDbResult<Option<ExistingAllocation>> {
         let Allocation { offset, blocks, .. } = allocation;
 
-        let mut txn = self.env.begin_rw_txn()?;
         let mut dealloc = None;
 
         // merge offset and block count into one single u64 and cast it to [u8; 8]
@@ -181,23 +181,21 @@ impl AccountsDbIndex {
 
         // optimisitically try to insert account to index, assuming that it doesn't exist
         let inserted =
-            self.accounts
-                .put_if_not_exists(&mut txn, pubkey, index_value)?;
+            self.accounts.put_if_not_exists(txn, pubkey, index_value)?;
         // if the account does exist, then it already occupies space in main storage
         if !inserted {
             // in which case we just move the account to a new allocation
             // adjusting all of the offsets and cleaning up the older ones
             let previous =
-                self.reallocate_account(pubkey, &mut txn, &index_value)?;
+                self.reallocate_account(pubkey, txn, &index_value)?;
             dealloc.replace(previous);
         };
 
         // track the account via programs' index as well
-        self.programs.put(&mut txn, owner, offset_and_pubkey)?;
+        self.programs.put(txn, owner, offset_and_pubkey)?;
         // track the reverse relation between account and its owner
-        self.owners.put(&mut txn, pubkey, owner)?;
+        self.owners.put(txn, pubkey, owner)?;
 
-        txn.commit()?;
         Ok(dealloc)
     }
 
@@ -267,9 +265,9 @@ impl AccountsDbIndex {
         &self,
         pubkey: &Pubkey,
         owner: &Pubkey,
+        txn: &mut RwTransaction,
     ) -> AccountsDbResult<()> {
-        let txn = self.env.begin_ro_txn()?;
-        let old_owner = match self.owners.get(&txn, pubkey)? {
+        let old_owner = match self.owners.get(txn, pubkey)? {
             // if current owner matches with that stored in index, then we are all set
             Some(val) if owner.as_ref() == val => {
                 return Ok(());
@@ -278,23 +276,21 @@ impl AccountsDbIndex {
             // if they don't match, then we have to remove old entries and create new ones
             Some(val) => Pubkey::try_from(val).ok(),
         };
-        let allocation = self.get_allocation(&txn, pubkey)?;
-        let mut txn = self.env.begin_rw_txn()?;
+        let allocation = self.get_allocation(txn, pubkey)?;
         // cleanup `programs` and `owners` index
         self.remove_programs_index_entry(
             pubkey,
             old_owner,
-            &mut txn,
+            txn,
             allocation.offset,
         )?;
         // track new owner of the account via programs' index
         let offset_and_pubkey =
             bytes!(#pack, allocation.offset, Offset, *pubkey, Pubkey);
-        self.programs.put(&mut txn, owner, offset_and_pubkey)?;
+        self.programs.put(txn, owner, offset_and_pubkey)?;
         // track the reverse relation between account and its owner
-        self.owners.put(&mut txn, pubkey, owner)?;
-
-        txn.commit().map_err(Into::into)
+        self.owners.put(txn, pubkey, owner)?;
+        Ok(())
     }
 
     fn remove_programs_index_entry(
@@ -379,9 +375,9 @@ impl AccountsDbIndex {
     pub(crate) fn try_recycle_allocation(
         &self,
         space: Blocks,
+        txn: &mut RwTransaction,
     ) -> AccountsDbResult<ExistingAllocation> {
-        let mut txn = self.env.begin_rw_txn()?;
-        let mut cursor = self.deallocations.cursor_rw(&mut txn)?;
+        let mut cursor = self.deallocations.cursor_rw(txn)?;
         // this is a neat lmdb trick where we can search for entry with matching
         // or greater key since we are interested in any allocation of at least
         // `blocks` size or greater, this works perfectly well for this case
@@ -402,9 +398,6 @@ impl AccountsDbIndex {
             cursor.put(&remainder.to_le_bytes(), &index_value, WEMPTY)?;
         }
 
-        drop(cursor);
-        txn.commit()?;
-
         Ok(ExistingAllocation { offset, blocks })
     }
 
@@ -438,6 +431,11 @@ impl AccountsDbIndex {
         };
         self.deallocations.entries(&txn)
     }
+
+    /// Initiate RW Transaction
+    pub(crate) fn rwtxn(&self) -> lmdb::Result<RwTransaction<'_>> {
+        self.env.begin_rw_txn()
+    }
 }
 
 pub(crate) mod iterator;