Make the snapshot header importable without parent

Author: remagpie

core/src/blockchain/blockchain.rs

@@ -98,6 +98,18 @@ impl BlockChain {
         }
     }
 
+    pub fn insert_bootstrap_header(&self, batch: &mut DBTransaction, header: &HeaderView) {
+        self.headerchain.insert_bootstrap_header(batch, header);
+
+        let hash = header.hash();
+
+        *self.pending_best_block_hash.write() = Some(hash);
+        batch.put(db::COL_EXTRA, BEST_BLOCK_KEY, &hash);
+
+        *self.pending_best_proposal_block_hash.write() = Some(hash);
+        batch.put(db::COL_EXTRA, BEST_PROPOSAL_BLOCK_KEY, &hash);
+    }
+
     pub fn insert_header(
         &self,
         batch: &mut DBTransaction,

core/src/blockchain/headerchain.rs

@@ -115,6 +115,48 @@ impl HeaderChain {
         }
     }
 
+    /// Inserts a bootstrap header into backing cache database.
+    /// Makes the imported header the best header.
+    /// Expects the header to be valid and already verified.
+    /// If the header is already known, does nothing.
+    // FIXME: Find better return type. Returning `None` at duplication is not natural
+    pub fn insert_bootstrap_header(&self, batch: &mut DBTransaction, header: &HeaderView) {
+        let hash = header.hash();
+
+        ctrace!(HEADERCHAIN, "Inserting bootstrap block header #{}({}) to the headerchain.", header.number(), hash);
+
+        if self.is_known_header(&hash) {
+            ctrace!(HEADERCHAIN, "Block header #{}({}) is already known.", header.number(), hash);
+            return
+        }
+
+        assert!(self.pending_best_header_hash.read().is_none());
+        assert!(self.pending_best_proposal_block_hash.read().is_none());
+
+        let compressed_header = compress(header.rlp().as_raw(), blocks_swapper());
+        batch.put(db::COL_HEADERS, &hash, &compressed_header);
+
+        let mut new_hashes = HashMap::new();
+        new_hashes.insert(header.number(), hash);
+        let mut new_details = HashMap::new();
+        new_details.insert(hash, BlockDetails {
+            number: header.number(),
+            total_score: 0.into(),
+            parent: header.parent_hash(),
+        });
+
+        batch.put(db::COL_EXTRA, BEST_HEADER_KEY, &hash);
+        *self.pending_best_header_hash.write() = Some(hash);
+        batch.put(db::COL_EXTRA, BEST_PROPOSAL_HEADER_KEY, &hash);
+        *self.pending_best_proposal_block_hash.write() = Some(hash);
+
+        let mut pending_hashes = self.pending_hashes.write();
+        let mut pending_details = self.pending_details.write();
+
+        batch.extend_with_cache(db::COL_EXTRA, &mut *pending_details, new_details, CacheUpdatePolicy::Overwrite);
+        batch.extend_with_cache(db::COL_EXTRA, &mut *pending_hashes, new_hashes, CacheUpdatePolicy::Overwrite);
+    }
+
     /// Inserts the header into backing cache database.
     /// Expects the header to be valid and already verified.
     /// If the header is already known, does nothing.

core/src/client/client.rs

@@ -28,7 +28,7 @@ use cstate::{
 };
 use ctimer::{TimeoutHandler, TimerApi, TimerScheduleError, TimerToken};
 use ctypes::transaction::{AssetTransferInput, PartialHashing, ShardTransaction};
-use ctypes::{BlockHash, BlockNumber, CommonParams, ShardId, Tracker, TxHash};
+use ctypes::{BlockHash, BlockNumber, CommonParams, Header, ShardId, Tracker, TxHash};
 use cvm::{decode, execute, ChainTimeInfo, ScriptResult, VMConfig};
 use kvdb::{DBTransaction, KeyValueDB};
 use parking_lot::{Mutex, RwLock, RwLockReadGuard};
@@ -634,6 +634,15 @@ impl ImportBlock for Client {
         Ok(self.importer.header_queue.import(unverified)?)
     }
 
+    fn import_bootstrap_header(&self, header: &Header) -> Result<BlockHash, BlockImportError> {
+        if self.block_chain().is_known_header(&header.hash()) {
+            return Err(BlockImportError::Import(ImportError::AlreadyInChain))
+        }
+        let import_lock = self.importer.import_lock.lock();
+        self.importer.import_bootstrap_header(header, self, &import_lock);
+        Ok(header.hash())
+    }
+
     fn import_sealed_block(&self, block: &SealedBlock) -> ImportResult {
         let h = block.header().hash();
         let route = {

core/src/client/importer.rs

@@ -100,7 +100,7 @@ impl Importer {
             }
 
             {
-                let headers: Vec<&Header> = blocks.iter().map(|block| &block.header).collect();
+                let headers: Vec<_> = blocks.iter().map(|block| &block.header).collect();
                 self.import_headers(headers, client, &import_lock);
             }
 
@@ -362,6 +362,23 @@ impl Importer {
         imported.len()
     }
 
+    pub fn import_bootstrap_header<'a>(&'a self, header: &'a Header, client: &Client, _importer_lock: &MutexGuard<()>) {
+        let hash = header.hash();
+        ctrace!(CLIENT, "Importing bootstrap header {}-{:?}", header.number(), hash);
+
+        {
+            let chain = client.block_chain();
+            let mut batch = DBTransaction::new();
+            chain.insert_bootstrap_header(&mut batch, &HeaderView::new(&header.rlp_bytes()));
+            client.db().write_buffered(batch);
+            chain.commit();
+        }
+
+        client.new_headers(&[hash], &[], &[hash], &[], &[], Some(hash));
+
+        client.db().flush().expect("DB flush failed.");
+    }
+
     fn check_header(&self, header: &Header, parent: &Header) -> bool {
         // FIXME: self.verifier.verify_block_family
         if let Err(e) = self.engine.verify_block_family(&header, &parent) {

core/src/client/mod.rs

@@ -38,7 +38,7 @@ use cmerkle::Result as TrieResult;
 use cnetwork::NodeId;
 use cstate::{AssetScheme, FindActionHandler, OwnedAsset, StateResult, Text, TopLevelState, TopStateView};
 use ctypes::transaction::{AssetTransferInput, PartialHashing, ShardTransaction};
-use ctypes::{BlockHash, BlockNumber, CommonParams, ShardId, Tracker, TxHash};
+use ctypes::{BlockHash, BlockNumber, CommonParams, Header, ShardId, Tracker, TxHash};
 use cvm::ChainTimeInfo;
 use kvdb::KeyValueDB;
 use primitives::{Bytes, H160, H256, U256};
@@ -196,6 +196,10 @@ pub trait ImportBlock {
     /// Import a header into the blockchain
     fn import_header(&self, bytes: Bytes) -> Result<BlockHash, BlockImportError>;
 
+    /// Import a trusted bootstrap header into the blockchain
+    /// Bootstrap headers don't execute any verifications
+    fn import_bootstrap_header(&self, bytes: &Header) -> Result<BlockHash, BlockImportError>;
+
     /// Import sealed block. Skips all verifications.
     fn import_sealed_block(&self, block: &SealedBlock) -> ImportResult;
 

core/src/client/test_client.rs

@@ -509,6 +509,10 @@ impl ImportBlock for TestBlockChainClient {
         unimplemented!()
     }
 
+    fn import_bootstrap_header(&self, _header: &BlockHeader) -> Result<BlockHash, BlockImportError> {
+        unimplemented!()
+    }
+
     fn import_sealed_block(&self, _block: &SealedBlock) -> ImportResult {
         Ok(H256::default().into())
     }

core/src/consensus/tendermint/worker.rs

@@ -52,6 +52,7 @@ use crate::encoded;
 use crate::error::{BlockError, Error};
 use crate::snapshot_notify::NotifySender as SnapshotNotifySender;
 use crate::transaction::{SignedTransaction, UnverifiedTransaction};
+use crate::types::BlockStatus;
 use crate::views::BlockView;
 use crate::BlockId;
 use std::cell::Cell;
@@ -965,7 +966,8 @@ impl Worker {
     }
 
     fn on_imported_proposal(&mut self, proposal: &Header) {
-        if proposal.number() < 1 {
+        // NOTE: Only the genesis block and the snapshot target don't have the parent in the blockchain
+        if self.client().block_status(&BlockId::Hash(*proposal.parent_hash())) == BlockStatus::Unknown {
             return
         }
 

foundry/run_node.rs

@@ -264,7 +264,7 @@ pub fn run_node(matches: &ArgMatches<'_>) -> Result<(), String> {
             let network_config = config.network_config()?;
             // XXX: What should we do if the network id has been changed.
             let c = client.client();
-            let network_id = c.common_params(BlockId::Latest).unwrap().network_id();
+            let network_id = c.common_params(BlockId::Number(0)).unwrap().network_id();
             let routing_table = RoutingTable::new();
             let service = network_start(network_id, timer_loop, &network_config, Arc::clone(&routing_table))?;
 

sync/src/block/extension.rs

@@ -89,10 +89,12 @@ impl Extension {
         let mut header = client.best_header();
         let mut hollow_headers = vec![header.decode()];
         while client.block_body(&BlockId::Hash(header.hash())).is_none() {
-            header = client
-                .block_header(&BlockId::Hash(header.parent_hash()))
-                .expect("Every imported header must have parent");
-            hollow_headers.push(header.decode());
+            if let Some(h) = client.block_header(&BlockId::Hash(header.parent_hash())) {
+                header = h;
+                hollow_headers.push(header.decode());
+            } else {
+                break
+            }
         }
         let mut body_downloader = BodyDownloader::default();
         for neighbors in hollow_headers.windows(2).rev() {
@@ -765,7 +767,7 @@ impl Extension {
         match self.state {
             State::SnapshotHeader(hash, _) => match headers {
                 [header] if header.hash() == hash => {
-                    match self.client.import_header(header.rlp_bytes().to_vec()) {
+                    match self.client.import_bootstrap_header(&header) {
                         Err(BlockImportError::Import(ImportError::AlreadyInChain)) => {}
                         Err(BlockImportError::Import(ImportError::AlreadyQueued)) => {}
                         // FIXME: handle import errors