Merge branch 'develop' into rc/v0.113.x

nervosnetwork · Dec 19, 2023 · 5150b88 · 5150b88
2 parents 3985919 + 3e17637
commit 5150b88
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/script/src/verify.rs b/script/src/verify.rs
@@ -1019,7 +1019,13 @@ impl<DL: CellDataProvider + HeaderProvider + ExtensionProvider + Send + Sync + C
         Ok(machine)
     }
 
-    fn run(&self, script_group: &ScriptGroup, max_cycles: Cycle) -> Result<Cycle, ScriptError> {
+    /// Runs a single program, then returns the exit code together with the entire
+    /// machine to the caller for more inspections.
+    pub fn detailed_run(
+        &self,
+        script_group: &ScriptGroup,
+        max_cycles: Cycle,
+    ) -> Result<(i8, Machine), ScriptError> {
         let program = self.extract_script(&script_group.script)?;
         let context = Default::default();
         let mut machine = self.build_machine(script_group, max_cycles, context)?;
@@ -1037,6 +1043,13 @@ impl<DL: CellDataProvider + HeaderProvider + ExtensionProvider + Send + Sync + C
             .add_cycles_no_checking(transferred_byte_cycles(bytes))
             .map_err(map_vm_internal_error)?;
         let code = machine.run().map_err(map_vm_internal_error)?;
+
+        Ok((code, machine))
+    }
+
+    fn run(&self, script_group: &ScriptGroup, max_cycles: Cycle) -> Result<Cycle, ScriptError> {
+        let (code, machine) = self.detailed_run(script_group, max_cycles)?;
+
         if code == 0 {
             Ok(machine.machine.cycles())
         } else {

diff --git a/sync/src/filter/get_block_filter_check_points_process.rs b/sync/src/filter/get_block_filter_check_points_process.rs
@@ -34,11 +34,11 @@ impl<'a> GetBlockFilterCheckPointsProcess<'a> {
     pub fn execute(self) -> Status {
         let active_chain = self.filter.shared.active_chain();
         let start_number: BlockNumber = self.message.to_entity().start_number().unpack();
-        let tip_number: BlockNumber = active_chain.tip_number();
+        let latest: BlockNumber = active_chain.get_latest_built_filter_block_number();
 
         let mut block_filter_hashes = Vec::new();
 
-        if tip_number >= start_number {
+        if latest >= start_number {
             for block_number in (start_number..start_number + BATCH_SIZE * CHECK_POINT_INTERVAL)
                 .step_by(CHECK_POINT_INTERVAL as usize)
             {
@@ -59,9 +59,9 @@ impl<'a> GetBlockFilterCheckPointsProcess<'a> {
             let message = packed::BlockFilterMessage::new_builder()
                 .set(content)
                 .build();
-            attempt!(send_message_to(self.nc.as_ref(), self.peer, &message));
+            attempt!(send_message_to(self.nc.as_ref(), self.peer, &message))
+        } else {
+            Status::ignored()
         }
-
-        Status::ok()
     }
 }
diff --git a/sync/src/filter/get_block_filter_hashes_process.rs b/sync/src/filter/get_block_filter_hashes_process.rs
@@ -32,11 +32,11 @@ impl<'a> GetBlockFilterHashesProcess<'a> {
     pub fn execute(self) -> Status {
         let active_chain = self.filter.shared.active_chain();
         let start_number: BlockNumber = self.message.to_entity().start_number().unpack();
-        let tip_number: BlockNumber = active_chain.tip_number();
+        let latest: BlockNumber = active_chain.get_latest_built_filter_block_number();
 
         let mut block_filter_hashes = Vec::new();
 
-        if tip_number >= start_number {
+        if latest >= start_number {
             let parent_block_filter_hash = if start_number > 0 {
                 match active_chain
                     .get_block_hash(start_number - 1)

diff --git a/sync/src/filter/get_block_filters_process.rs b/sync/src/filter/get_block_filters_process.rs
@@ -33,8 +33,9 @@ impl<'a> GetBlockFiltersProcess<'a> {
     pub fn execute(self) -> Status {
         let active_chain = self.filter.shared.active_chain();
         let start_number: BlockNumber = self.message.to_entity().start_number().unpack();
-        let tip_number: BlockNumber = active_chain.tip_number();
-        if tip_number >= start_number {
+        let latest: BlockNumber = active_chain.get_latest_built_filter_block_number();
+
+        if latest >= start_number {
             let mut block_hashes = Vec::new();
             let mut filters = Vec::new();
             for block_number in start_number..start_number + BATCH_SIZE {
@@ -58,9 +59,9 @@ impl<'a> GetBlockFiltersProcess<'a> {
             let message = packed::BlockFilterMessage::new_builder()
                 .set(content)
                 .build();
-            attempt!(send_message_to(self.nc.as_ref(), self.peer, &message));
+            attempt!(send_message_to(self.nc.as_ref(), self.peer, &message))
+        } else {
+            Status::ignored()
         }
-
-        Status::ok()
     }
 }
diff --git a/sync/src/types/mod.rs b/sync/src/types/mod.rs
@@ -2085,6 +2085,13 @@ impl ActiveChain {
         self.store().get_block_filter_hash(hash)
     }
 
+    pub fn get_latest_built_filter_block_number(&self) -> BlockNumber {
+        self.snapshot
+            .get_latest_built_filter_data_block_hash()
+            .and_then(|hash| self.snapshot.get_block_number(&hash))
+            .unwrap_or_default()
+    }
+
     pub fn shared(&self) -> &SyncShared {
         &self.shared
     }