reorg fix

Author: Numi2

src/config.rs

@@ -41,6 +41,9 @@ pub struct Net {
     /// Optional static ban list of libp2p PeerIds. Connections and dials to these peers are blocked.
     #[serde(default)]
     pub banned_peer_ids: Vec<String>,
+    /// Suppress routine network gossip logs by default (overridden by CLI --quiet-net)
+    #[serde(default)]
+    pub quiet_by_default: bool,
 }
 
 #[derive(Debug, Deserialize, Clone)]

src/epoch.rs

@@ -377,8 +377,8 @@ impl Manager {
                             match window {
                                 Some(w) if w.len() as u64 == RETARGET_INTERVAL => calculate_retarget_consensus(&w),
                                 _ => {
-                                    eprintln!("🔥 Retarget window incomplete starting at {}", start);
-                                    prev_anchor.as_ref().map_or((TARGET_LEADING_ZEROS, DEFAULT_MEM_KIB), |p| (p.difficulty, p.mem_kib))
+                                    eprintln!("⏳ Retarget window incomplete starting at {} — waiting before emitting retarget epoch {}", start, current_epoch);
+                                    continue;
                                 }
                             }
                         } else {

src/main.rs

@@ -264,7 +264,6 @@ async fn main() -> anyhow::Result<()> {
     println!("--- unchained Node ---");
 
     let cli = Cli::parse();
-    if cli.quiet_net { network::set_quiet_logging(true); }
 
     // Try reading config from CLI path, then from the executable directory, else fallback to embedded default
     let mut cfg = match config::load(&cli.config) {
@@ -298,7 +297,10 @@ async fn main() -> anyhow::Result<()> {
         }
     };
 
-    // Resolve storage path: if relative, place under user's home at ~/.unchained/unchained_data
+    // Apply quiet logging preference: CLI flag overrides config
+    if cli.quiet_net {
+        network::set_quiet_logging(true);
+    }
     if std::path::Path::new(&cfg.storage.path).is_relative() {
         let home = std::env::var("HOME")
             .or_else(|_| std::env::var("USERPROFILE"))
@@ -309,6 +311,11 @@ async fn main() -> anyhow::Result<()> {
         cfg.storage.path = abs.to_string_lossy().into_owned();
     }
 
+    // If no CLI quiet flag, honor config default
+    if !cli.quiet_net && cfg.net.quiet_by_default {
+        network::set_quiet_logging(true);
+    }
+
     let db = match std::panic::catch_unwind(|| storage::open(&cfg.storage)) {
         Ok(db) => db,
         Err(_) => return Err(anyhow::anyhow!("failed to open database")),

src/miner.rs

@@ -374,6 +374,28 @@ impl Miner {
         let creator_address = self.wallet.address();
         let mem_kib = anchor.mem_kib;
         let difficulty = anchor.difficulty;
+        // Safety: at retarget boundaries, only mine when our local retarget window is complete.
+        // This avoids producing anchors with params that will be rejected once history arrives.
+        if anchor.num > 0 && anchor.num % crate::consensus::RETARGET_INTERVAL == 0 {
+            if let Ok(window_opt) = self.db.get_or_build_retarget_window(anchor.num) {
+                let ready = window_opt.as_ref().map(|w| w.len() as u64 == crate::consensus::RETARGET_INTERVAL).unwrap_or(false);
+                if !ready {
+                    println!(
+                        "⏳ Retarget guard: delaying mining for epoch #{} until historical window [{}..{}] is complete",
+                        anchor.num,
+                        anchor.num.saturating_sub(crate::consensus::RETARGET_INTERVAL),
+                        anchor.num.saturating_sub(1)
+                    );
+                    return Ok(());
+                }
+            } else {
+                println!(
+                    "⏳ Retarget guard: delaying mining for epoch #{} (window fetch error)",
+                    anchor.num
+                );
+                return Ok(());
+            }
+        }
         let mut attempts = 0u64;
         let max_attempts = self.cfg.max_attempts;