[fix] blockchain: reset current blockstamp when abort rollback

lib/modules/blockchain/blockchain/src/fork/rollback.rs

@@ -88,15 +88,16 @@ pub fn apply_rollback(bc: &mut BlockchainModule, new_bc_branch: Vec<Blockstamp>)
                 durs_bc_db_reader::blocks::get_fork_block(&db, w.as_ref(), *blockstamp)
             {
                 new_branch_blocks.push(dal_block.clone());
-                if let Ok(CheckAndApplyBlockReturn::ValidMainBlock(ValidBlockApplyReqs(
+                match check_and_apply_block(bc, &db, &mut w, dal_block.block) {
+                    Ok(check_and_apply_block_return) => match check_and_apply_block_return {
+                        CheckAndApplyBlockReturn::ValidMainBlock(ValidBlockApplyReqs(
                             bc_db_query,
                             wot_dbs_queries,
                             tx_dbs_queries,
-                ))) = check_and_apply_block(bc, &db, &mut w, dal_block.block)
-                {
+                        )) => {
                             bc.current_blockstamp = *blockstamp;
-                    // Apply db requests
 
+                            // Apply db requests
                             bc_db_query
                                 .apply(
                                     &db,
@@ -112,11 +113,27 @@ pub fn apply_rollback(bc: &mut BlockchainModule, new_bc_branch: Vec<Blockstamp>)
                                     .expect("Fatal error : Fail to apply WotsDBsWriteRequest !");
                             }
                             exec_currency_queries(&db, &mut w, blockstamp.id, tx_dbs_queries)?;
-                } else {
+                        }
+                        CheckAndApplyBlockReturn::ForkBlock
+                        | CheckAndApplyBlockReturn::OrphanBlock => {
+                            fatal_error!(
+                                "apply_rollback(): a block in new branch is not chainable: \
+                                 {{ block_not_chainable: {}, current_blockstamp: {} }}",
+                                blockstamp,
+                                bc.current_blockstamp,
+                            );
+                        }
+                    },
+                    Err(e) => {
                         new_branch_is_valid = false;
                         bc.invalid_forks.insert(*blockstamp);
+                        info!(
+                            "Blockchain: abort rollback: block {} is invalid: {:?}",
+                            blockstamp, e
+                        );
                         break;
                     }
+                }
             } else {
                 fatal_error!(
                     "apply_rollback(): Fail to get block {} on new branch in forks blocks DB !",
@@ -162,7 +179,9 @@ pub fn apply_rollback(bc: &mut BlockchainModule, new_bc_branch: Vec<Blockstamp>)
             }
         }
         Err(DbError::WriteAbort { .. }) => {
-            // reload dbs
+            // Reset current blockstamp
+            bc.current_blockstamp = old_current_blockstamp;
+            // Reload wot file
             let dbs_path = durs_conf::get_blockchain_db_path(bc.profile_path.clone());
             bc.wot_databases = WotsV10DBs::open(Some(&dbs_path));
         }