chore: integration active mmr by default

chain/src/tests/block_assembler.rs

@@ -173,7 +173,7 @@ fn test_block_template_message() {
         .unwrap()
         .unwrap();
 
-    let _cellbase_witness = CellbaseWitness::from_slice(
+    let cellbase_witness = CellbaseWitness::from_slice(
         block_template
             .cellbase
             .data
@@ -183,8 +183,15 @@ fn test_block_template_message() {
             .as_bytes(),
     )
     .expect("should be valid CellbaseWitness slice");
-
-    // assert_eq!("TEST".as_bytes(), cellbase_witness.message().raw_data());
+    let snapshot = shared.snapshot();
+    let version = snapshot
+        .compute_versionbits(snapshot.tip_header())
+        .unwrap()
+        .to_le_bytes();
+    assert_eq!(
+        [version.as_slice(), b" ", "TEST".as_bytes()].concat(),
+        cellbase_witness.message().raw_data()
+    );
 }
 
 #[test]

rpc/README.md

@@ -2197,7 +2197,7 @@ Response
         ],
         "version": "0x0",
         "witnesses": [
-          "0x650000000c00000055000000490000001000000030000000310000001892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df20114000000b2e61ff569acf041b3c2c17724e2379c581eeac30c00000000000020206d657373616765"
+          "0x6a0000000c00000055000000490000001000000030000000310000001892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df20114000000b2e61ff569acf041b3c2c17724e2379c581eeac311000000000000202054455354206d657373616765"
         ]
       },
       "hash": "0xbaf7e4db2fd002f19a597ca1a31dfe8cfe26ed8cebc91f52b75b16a7a5ec8bab"

rpc/src/module/miner.rs

@@ -90,7 +90,7 @@ pub trait MinerRpc {
     ///         ],
     ///         "version": "0x0",
     ///         "witnesses": [
-    ///           "0x650000000c00000055000000490000001000000030000000310000001892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df20114000000b2e61ff569acf041b3c2c17724e2379c581eeac30c00000000000020206d657373616765"
+    ///           "0x6a0000000c00000055000000490000001000000030000000310000001892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df20114000000b2e61ff569acf041b3c2c17724e2379c581eeac311000000000000202054455354206d657373616765"
     ///         ]
     ///       },
     ///       "hash": "0xbaf7e4db2fd002f19a597ca1a31dfe8cfe26ed8cebc91f52b75b16a7a5ec8bab"

test/src/main.rs

@@ -525,7 +525,6 @@ fn all_specs() -> Vec<Box<dyn Spec>> {
         Box::new(CheckCellDeps),
         Box::new(CheckAbsoluteEpochSince),
         Box::new(CheckRelativeEpochSince),
-        Box::new(CheckBlockExtension),
         Box::new(CheckVmVersion),
         Box::new(CheckVmBExtension),
     ];

test/src/specs/hardfork/v2021/mod.rs

@@ -1,11 +1,9 @@
 mod cell_deps;
-mod extension;
 mod since;
 mod vm_b_extension;
 mod vm_version;
 
 pub use cell_deps::CheckCellDeps;
-pub use extension::CheckBlockExtension;
 pub use since::{CheckAbsoluteEpochSince, CheckRelativeEpochSince};
 pub use vm_b_extension::CheckVmBExtension;
 pub use vm_version::CheckVmVersion;

test/src/specs/sync/block_sync.rs

@@ -391,7 +391,7 @@ impl Spec for RequestUnverifiedBlocks {
 
         let mut received = Vec::new();
         while let Ok((_, _, data)) = net.receive_timeout(target_node, Duration::from_secs(10)) {
-            let message = SyncMessage::from_slice(&data).unwrap();
+            let message = SyncMessage::from_compatible_slice(&data).unwrap();
             if let packed::SyncMessageUnionReader::SendBlock(reader) = message.as_reader().to_enum()
             {
                 received.push(reader.block().calc_header_hash());

test/src/utils.rs

@@ -330,9 +330,9 @@ pub fn find_available_port() -> u16 {
 }
 
 pub fn message_name(data: &Bytes) -> String {
-    if let Ok(message) = SyncMessage::from_slice(data) {
+    if let Ok(message) = SyncMessage::from_compatible_slice(data) {
         message.to_enum().item_name().to_string()
-    } else if let Ok(message) = RelayMessage::from_slice(data) {
+    } else if let Ok(message) = RelayMessage::from_compatible_slice(data) {
         message.to_enum().item_name().to_string()
     } else {
         panic!("unknown message item");

tx-pool/src/block_assembler/mod.rs

@@ -144,7 +144,6 @@ impl BlockAssembler {
         let current_template = &current.template;
         let uncles = &current_template.uncles;
 
-        let extension = Self::build_extension(&current.snapshot)?;
         let (proposals, txs, txs_size, basic_size) = {
             let tx_pool_reader = tx_pool.read().await;
             if current.snapshot.tip_hash() != tx_pool_reader.snapshot().tip_hash() {
@@ -157,7 +156,7 @@ impl BlockAssembler {
                 current_template.cellbase.data(),
                 uncles,
                 proposals.iter(),
-                extension.clone(),
+                current_template.extension.clone(),
             );
 
             let txs_size_limit = max_block_bytes
@@ -190,9 +189,6 @@ impl BlockAssembler {
                 current.template.current_time,
             ))
             .dao(dao);
-        if let Some(data) = extension {
-            builder.extension(data);
-        }
 
         current.template = builder.build();
         current.size.txs = txs_size;
@@ -438,21 +434,22 @@ impl BlockAssembler {
             .build();
         let tip = snapshot.tip_header();
 
-        let message = if let Some(version) = snapshot.compute_versionbits(tip) {
-            [
-                version.to_le_bytes().as_slice(),
-                b" ",
-                config.message.as_bytes(),
-            ]
-            .concat()
-            .pack()
-        } else {
-            config.message.as_bytes().pack()
-        };
+        let mut message = vec![];
+        if let Some(version) = snapshot.compute_versionbits(tip) {
+            message.extend_from_slice(&version.to_le_bytes());
+            message.extend_from_slice(b" ");
+        }
+        if config.use_binary_version_as_message_prefix {
+            message.extend_from_slice(config.binary_version.as_bytes());
+        }
+        if !config.message.is_empty() {
+            message.extend_from_slice(b" ");
+            message.extend_from_slice(config.message.as_bytes());
+        }
 
         CellbaseWitness::new_builder()
             .lock(cellbase_lock)
-            .message(message)
+            .message(message.pack())
             .build()
     }
 
@@ -771,6 +768,7 @@ impl BlockTemplateBuilder {
             cycles_limit: template.cycles_limit,
             bytes_limit: template.bytes_limit,
             uncles_count_limit: template.uncles_count_limit,
+            extension: template.extension.clone(),
             // option
             uncles: template.uncles.clone(),
             transactions: template.transactions.clone(),
@@ -779,7 +777,6 @@ impl BlockTemplateBuilder {
             work_id: None,
             dao: Some(template.dao.clone()),
             current_time: None,
-            extension: None,
         }
     }