connect a dag block

1. update MinedBlock and NewBranch message
2. add parent_hash function to block
3. update verifier

Author: simonjiao

block-relayer/src/block_relayer.rs

@@ -78,15 +78,14 @@ impl BlockRelayer {
         &self,
         network: NetworkServiceRef,
         executed_block: Arc<ExecutedBlock>,
-        tips_hash: Option<Vec<HashValue>>,
     ) {
         if !self.is_nearly_synced() {
             debug!("[block-relay] Ignore NewHeadBlock event because the node has not been synchronized yet.");
             return;
         }
         let compact_block = executed_block.block().clone().into();
         let compact_block_msg =
-            CompactBlockMessage::new(compact_block, executed_block.block_info.clone(), tips_hash);
+            CompactBlockMessage::new(compact_block, executed_block.block_info.clone());
         network.broadcast(NotificationMessage::CompactBlock(Box::new(
             compact_block_msg,
         )));
@@ -310,7 +309,7 @@ impl EventHandler<Self, NewBranch> for BlockRelayer {
                 return;
             }
         };
-        self.broadcast_compact_block(network, event.0, event.1);
+        self.broadcast_compact_block(network, event.0);
     }
 }
 

chain/src/chain.rs

@@ -465,13 +465,15 @@ impl BlockChain {
                 .storage
                 .get_block_by_hash(blue.id())?
                 .expect("block blue need exist");
-            transactions.extend(
-                blue_block
-                    .transactions()
-                    .iter()
-                    .cloned()
-                    .map(Transaction::UserTransaction),
-            );
+            // Todo: we already added txns of blue_blocks to target block when mining it.
+            // see create_block_template in MinerService
+            //transactions.extend(
+            //    blue_block
+            //        .transactions()
+            //        .iter()
+            //        .cloned()
+            //        .map(Transaction::UserTransaction),
+            //);
             total_difficulty += blue_block.header.difficulty();
         }
         transactions.extend(

chain/src/lib.rs

@@ -3,5 +3,5 @@
 #![deny(clippy::integer_arithmetic)]
 mod chain;
 pub mod verifier;
-pub use chain::{BlockChain, ChainStatusWithBlock};
+pub use chain::BlockChain;
 pub use starcoin_chain_api::{ChainReader, ChainWriter};

chain/src/verifier/mod.rs

@@ -93,6 +93,7 @@ pub trait BlockVerifier {
         R: ChainReader,
     {
         let epoch = current_chain.epoch();
+        let is_dag = header.is_dag();
 
         let switch_epoch = header.number() == epoch.end_block_number();
         // epoch first block's uncles should empty.
@@ -128,10 +129,18 @@ pub trait BlockVerifier {
 
             verify_block!(
                 VerifyBlockField::Uncle,
-                uncle.number() < header.number() ,
+                uncle.number() < header.number(),
                "uncle block number bigger than or equal to current block ,uncle block number is {} , current block number is {}", uncle.number(), header.number()
             );
 
+            if is_dag {
+                verify_block!(
+                VerifyBlockField::Uncle,
+                uncle.number() <= header.number(),
+               "For a Dag block, uncle block number bigger than current block ,uncle block number is {} , current block number is {}", uncle.number(), header.number()
+            );
+            }
+
             verify_block!(
                 VerifyBlockField::Uncle,
                 Self::can_be_uncle(current_chain, uncle)?,
@@ -182,15 +191,18 @@ impl BlockVerifier for BasicVerifier {
         let expect_number = current.number().saturating_add(1);
 
         // dag
+        // todo: For a dag block
+        // 1. It could be the first dag block, the chain is just a normal single chain
+        // 2. Or, both block and dag are created for flexidag
         if chain_status.tips_hash.is_some() {
+            // todo: make sure current block is a dag block
             let mut tips_hash = chain_status.tips_hash.clone().unwrap();
             tips_hash.sort();
 
             // if it is a dag block
             if HashValue::sha3_256_of(&tips_hash.encode().expect("hash encode must be successful"))
                 != new_block_parent
             {
-                // or a block of a single chain
                 verify_block!(
                     VerifyBlockField::Header,
                     expect_number == new_block_header.number(),
@@ -209,6 +221,7 @@ impl BlockVerifier for BasicVerifier {
                 );
             }
         } else {
+            // todo: handle the first dag block
             // or a block of a single chain
             verify_block!(
                 VerifyBlockField::Header,

miner/src/lib.rs

@@ -251,11 +251,10 @@ impl MinerService {
         }
 
         if let Some(task) = self.current_task.take() {
-            let tips_header = task.block_template.parents_hash.clone();
             let block = task.finish(nonce, extra);
             let block_hash: HashValue = block.id();
             info!(target: "miner", "Mint new block: {}", block);
-            ctx.broadcast(MinedBlock(Arc::new(block), tips_header));
+            ctx.broadcast(MinedBlock(Arc::new(block)));
             if let Some(metrics) = self.metrics.as_ref() {
                 metrics.block_mint_count.inc();
             }

network/api/src/messages.rs

@@ -48,26 +48,20 @@ impl Sample for TransactionsMessage {
 pub struct CompactBlockMessage {
     pub compact_block: CompactBlock,
     pub block_info: BlockInfo,
-    pub tips_hash: Option<Vec<HashValue>>,
 }
 
 impl CompactBlockMessage {
-    pub fn new(
-        compact_block: CompactBlock,
-        block_info: BlockInfo,
-        tips_hash: Option<Vec<HashValue>>,
-    ) -> Self {
+    pub fn new(compact_block: CompactBlock, block_info: BlockInfo) -> Self {
         Self {
             compact_block,
             block_info,
-            tips_hash,
         }
     }
 }
 
 impl Sample for CompactBlockMessage {
     fn sample() -> Self {
-        Self::new(CompactBlock::sample(), BlockInfo::sample(), None)
+        Self::new(CompactBlock::sample(), BlockInfo::sample())
     }
 }
 

network/src/service.rs

@@ -559,7 +559,10 @@ impl Inner {
                     peer_info.peer_info.update_chain_status(ChainStatus::new(
                         block_header.clone(),
                         compact_block_message.block_info.clone(),
-                        compact_block_message.tips_hash.clone(),
+                        compact_block_message
+                            .compact_block
+                            .dag_parent_and_tips()
+                            .map(|s| s.1.iter().map(|h| h.id()).collect::<Vec<_>>()),
                     ));
 
                     if self.self_peer.known_blocks.contains(&block_id) {
@@ -721,7 +724,9 @@ impl Inner {
                     ChainStatus::new(
                         msg.compact_block.header.clone(),
                         msg.block_info.clone(),
-                        msg.tips_hash.clone(),
+                        msg.compact_block
+                            .dag_parent_and_tips()
+                            .map(|s| s.1.iter().map(|h| h.id()).collect::<Vec<_>>()),
                     )
                     .encode()
                     .expect("Encoding the compact_block.header and block_info must be successful"),

sync/src/block_connector/block_connector_service.rs

@@ -261,7 +261,7 @@ where
     TransactionPoolServiceT: TxPoolSyncService + 'static,
 {
     fn handle_event(&mut self, msg: MinedBlock, _ctx: &mut ServiceContext<Self>) {
-        let MinedBlock(new_block, _tips_headers) = msg;
+        let MinedBlock(new_block) = msg;
         let id = new_block.header().id();
         debug!("try connect mined block: {}", id);