Merge pull request zingolabs#498 from AloeareV/fix_reorg_buffer_offset

Fix reorg buffer offset
juanky201271 · Sep 20, 2023 · 823383c · 823383c
2 parents c439789 + 87e226a
commit 823383c
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/zingolib/src/wallet.rs b/zingolib/src/wallet.rs
@@ -57,7 +57,7 @@ use self::{
     message::Message,
     transactions::TransactionMetadataSet,
 };
-use zingoconfig::{ZingoConfig, REORG_BUFFER_OFFSET};
+use zingoconfig::ZingoConfig;
 
 pub mod data;
 pub mod keys;
@@ -476,7 +476,7 @@ impl LightWallet {
         >,
     ) -> Result<Anchor, String> {
         Ok(orchard::Anchor::from(
-            tree.root_at_checkpoint(REORG_BUFFER_OFFSET as usize)
+            tree.root_at_checkpoint(self.transaction_context.config.reorg_buffer_offset as usize)
                 .map_err(|e| format!("failed to get orchard anchor: {e}"))?,
         ))
     }
@@ -1104,7 +1104,10 @@ impl LightWallet {
                 selected.note.clone(),
                 witness_trees
                     .witness_tree_sapling
-                    .witness(selected.witnessed_position, REORG_BUFFER_OFFSET as usize)
+                    .witness(
+                        selected.witnessed_position,
+                        self.transaction_context.config.reorg_buffer_offset as usize,
+                    )
                     .map_err(|e| format!("failed to compute sapling witness: {e}"))?,
             ) {
                 let e = format!("Error adding note: {:?}", e);
@@ -1121,7 +1124,10 @@ impl LightWallet {
                 orchard::tree::MerklePath::from(
                     witness_trees
                         .witness_tree_orchard
-                        .witness(selected.witnessed_position, REORG_BUFFER_OFFSET as usize)
+                        .witness(
+                            selected.witnessed_position,
+                            self.transaction_context.config.reorg_buffer_offset as usize,
+                        )
                         .map_err(|e| format!("failed to compute orchard witness: {e}"))?,
                 ),
             ) {