revert chain history change

Author: Boog900

Cargo.lock

@@ -3,7 +3,6 @@ resolver = "3"
 members = [
 	# Binaries
 	"binaries/cuprated",
-	"binaries/p2p_connect",
 
 	# Consensus
 	"consensus",
@@ -63,7 +62,6 @@ members = [
 default-members = [
 	# Binaries
 	"binaries/cuprated",
-	"binaries/p2p_connect",
 
 	# Consensus
 	"consensus",

Cargo.toml

@@ -128,12 +128,10 @@ async fn get_blocks(
         removed_pool_txids: Default::default(),
     };
 
-    /*
     if !get_blocks {
         return Ok(resp);
     }
 
-     */
 
     if let Some(block_id) = block_hashes.first() {
         let (height, hash) = helper::top_height(&mut state).await?;

binaries/cuprated/src/rpc/handlers/bin.rs

@@ -93,11 +93,7 @@ pub fn open(config: Config) -> Result<Blockchain, heed::Error> {
         // <https://docs.rs/heed/0.20.0/heed/struct.EnvOpenOptions.html#method.open>
         unsafe { env_open_options.open(&config.data_dir)? }
     };
-/*
-Hello,
 
-I wouldn't class
- */
     let (block_heights, key_images, pre_rct_outputs, tx_ids, tx_outputs, alt_chain_infos, alt_block_heights, alt_blocks_info, alt_block_blobs, alt_transaction_blobs, alt_transaction_infos) = {
         let mut rw_tx = env.write_txn()?;
 

storage/blockchain/src/free.rs

@@ -29,21 +29,36 @@ pub fn update_alt_chain_info(
         Err(e) => Err(e)?,
     };
 
-    let current_chain_id = alt_block_height.chain_id;
-
-    let mut info = db.alt_chain_infos
-        .get(tx_rw, &current_chain_id)?
-        .unwrap_or(AltChainInfo {
-            parent_chain: parent_chain.into(),
-            common_ancestor_height: 0,
-            chain_height: 0,
-        });
+    let Some(mut info) = db.alt_chain_infos
+        .get(tx_rw, &alt_block_height.chain_id)?
+    else {
+        db.alt_chain_infos.put(
+            tx_rw,
+            &alt_block_height.chain_id,
+            &AltChainInfo {
+                parent_chain: parent_chain.into(),
+                common_ancestor_height: alt_block_height.height.checked_sub(1).unwrap(),
+                chain_height: alt_block_height.height + 1,
+            },
+        )?;
+
+        return Ok(());
+    };
 
     if info.chain_height < alt_block_height.height + 1 {
+        // If the chain height is increasing we only need to update the chain height.
         info.chain_height = alt_block_height.height + 1;
+    } else {
+        // If the chain height is not increasing we are popping blocks and need to update the
+        // split point.
+        info.common_ancestor_height = alt_block_height.height.checked_sub(1).unwrap();
+        info.parent_chain = parent_chain.into();
     }
 
-    db.alt_chain_infos.put(tx_rw, &current_chain_id, &info)?;
+    db.alt_chain_infos
+        .put(tx_rw, &alt_block_height.chain_id, &info)?;
+
+    db.alt_chain_infos.put(tx_rw, &alt_block_height.chain_id, &info)?;
 
     Ok(())
 }