Merge pull request #113 from xcshuan/master

[BUG Fix] Deadlock issue of InputIterator
nervosnetwork · May 13, 2024 · 0c08eaa · 0c08eaa
2 parents 10e691a + 54aecec
commit 0c08eaa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/transaction/handler/mod.rs b/src/transaction/handler/mod.rs
@@ -71,7 +71,7 @@ impl HandlerContexts {
         }
     }
 
-    pub fn add_context(mut self, context: Box<dyn HandlerContext>) {
+    pub fn add_context(&mut self, context: Box<dyn HandlerContext>) {
         self.contexts.push(context);
     }
 }
diff --git a/src/transaction/input/mod.rs b/src/transaction/input/mod.rs
@@ -1,4 +1,5 @@
 pub mod transaction_input;
+use anyhow::{anyhow, Error};
 use ckb_types::packed::Script;
 pub use transaction_input::TransactionInput;
 
@@ -74,6 +75,10 @@ impl InputIterator {
 
     fn collect_live_cells(&mut self) -> Result<(), CellCollectorError> {
         loop {
+            if self.lock_scripts.len() == 0 {
+                return Ok(());
+            }
+
             if let Some(lock_script) = self.lock_scripts.last() {
                 let mut query = CellQueryOptions::new_lock(lock_script.clone());
                 query.script_search_mode = Some(SearchMode::Exact);