chore: bump rustreexo

Author: Davidson-Souza

Cargo.lock

@@ -56,7 +56,7 @@ kv = "0.24"
 miniscript = { version = "12.3", default-features = false }
 rand = "0.8"
 rcgen = { version = "0.14", default-features = false, features = ["aws_lc_rs", "pem"] }
-rustreexo = "0.4"
+rustreexo = { git = "https://github.com/mit-dci/rustreexo", rev = "b1080e0cca54e99213cd92e4bcb7743840802a1a" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha2 = { version = "0.10", default-features = false }

Cargo.toml

@@ -21,7 +21,7 @@ use floresta_chain::AssumeValidArg;
 use floresta_chain::ChainState;
 use floresta_chain::FlatChainStore;
 use floresta_chain::FlatChainStoreConfig;
-use rustreexo::accumulator::proof::Proof;
+use rustreexo::proof::Proof;
 
 /// Reads the first 151 blocks (or 150 blocks on top of genesis) from blocks.txt, which are regtest
 fn read_blocks_txt() -> Vec<Block> {

crates/floresta-chain/benches/chain_state_bench.rs

@@ -284,8 +284,8 @@ mod tests {
     use bitcoin::OutPoint;
     use bitcoin::Transaction;
     use bitcoin::Txid;
-    use rustreexo::accumulator::proof::Proof;
-    use rustreexo::accumulator::stump::Stump;
+    use rustreexo::proof::Proof;
+    use rustreexo::stump::Stump;
 
     use super::*;
     use crate::BlockConsumer;

crates/floresta-chain/src/extensions.rs

@@ -26,6 +26,7 @@ use core::cell::UnsafeCell;
 use bitcoin::block::Header as BlockHeader;
 use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::hashes::sha256;
+use bitcoin::hashes::Hash;
 use bitcoin::Block;
 use bitcoin::BlockHash;
 use bitcoin::Network;
@@ -37,9 +38,9 @@ use bitcoin::Work;
 use floresta_common::Channel;
 #[cfg(feature = "metrics")]
 use metrics;
-use rustreexo::accumulator::node_hash::BitcoinNodeHash;
-use rustreexo::accumulator::proof::Proof;
-use rustreexo::accumulator::stump::Stump;
+use rustreexo::node_hash::BitcoinNodeHash;
+use rustreexo::proof::Proof;
+use rustreexo::stump::Stump;
 use spin::RwLock;
 use tracing::debug;
 use tracing::info;
@@ -576,7 +577,7 @@ impl<PersistedState: ChainStore> ChainState<PersistedState> {
         };
 
         let mut acc = acc.as_slice();
-        let acc = Stump::deserialize(&mut acc).map_err(BlockchainError::UtreexoError)?;
+        let acc = Stump::deserialize(&mut acc)?;
         Ok(Some(acc))
     }
 
@@ -1000,7 +1001,10 @@ impl<PersistedState: ChainStore> BlockchainInterface for ChainState<PersistedSta
         acc: Stump,
     ) -> Result<(), Self::Error> {
         // Convert to BitcoinNodeHashes, from rustreexo
-        let del_hashes: Vec<_> = del_hashes.into_iter().map(Into::into).collect();
+        let del_hashes: Vec<_> = del_hashes
+            .into_iter()
+            .map(|hash| BitcoinNodeHash::Some(hash.to_byte_array()))
+            .collect();
 
         if !acc.verify(&proof, &del_hashes)? {
             return Err(BlockValidationErrors::InvalidProof)?;
@@ -1452,8 +1456,8 @@ mod test {
     use floresta_common::assert_ok;
     use floresta_common::bhash;
     use rand::Rng;
-    use rustreexo::accumulator::proof::Proof;
-    use rustreexo::accumulator::stump::Stump;
+    use rustreexo::proof::Proof;
+    use rustreexo::stump::Stump;
 
     use super::BlockchainInterface;
     use super::ChainParams;

crates/floresta-chain/src/pruned_utreexo/chain_state.rs

@@ -11,7 +11,7 @@
 use bitcoin::block::Header as BlockHeader;
 use bitcoin::BlockHash;
 use bitcoin::Network;
-use rustreexo::accumulator::stump::Stump;
+use rustreexo::stump::Stump;
 
 use super::chain_state::ChainState;
 use super::chainparams::ChainParams;

crates/floresta-chain/src/pruned_utreexo/chain_state_builder.rs

@@ -23,7 +23,7 @@ use bitcoin::Network;
 use floresta_common::acchashes;
 use floresta_common::bhash;
 use floresta_common::service_flags;
-use rustreexo::accumulator::node_hash::BitcoinNodeHash;
+use rustreexo::node_hash::BitcoinNodeHash;
 
 use crate::prelude::*;
 use crate::AssumeValidArg;

crates/floresta-chain/src/pruned_utreexo/chainparams.rs

@@ -11,6 +11,7 @@ use bitcoin::blockdata::Weight;
 #[cfg(feature = "bitcoinkernel")]
 use bitcoin::consensus::serialize;
 use bitcoin::hashes::sha256;
+use bitcoin::hashes::Hash;
 use bitcoin::merkle_tree;
 use bitcoin::script;
 use bitcoin::Amount;
@@ -25,8 +26,9 @@ use bitcoin::Txid;
 #[cfg(feature = "bitcoinkernel")]
 use bitcoinkernel::PrecomputedTransactionData;
 use floresta_common::prelude::*;
-use rustreexo::accumulator::proof::Proof;
-use rustreexo::accumulator::stump::Stump;
+use rustreexo::node_hash::BitcoinNodeHash;
+use rustreexo::proof::Proof;
+use rustreexo::stump::Stump;
 
 use super::chainparams::ChainParams;
 use super::error::BlockValidationErrors;
@@ -498,7 +500,10 @@ impl Consensus {
         }
 
         // Convert to BitcoinNodeHash, from rustreexo
-        let del_hashes: Vec<_> = del_hashes.into_iter().map(Into::into).collect();
+        let del_hashes: Vec<_> = del_hashes
+            .into_iter()
+            .map(|hash| BitcoinNodeHash::Some(hash.to_byte_array()))
+            .collect();
 
         let adds = udata::proof_util::get_block_adds(block, height, block_hash);
 

crates/floresta-chain/src/pruned_utreexo/consensus.rs

@@ -20,6 +20,7 @@ use bitcoin::OutPoint;
 use bitcoin::Txid;
 use floresta_common::impl_error_from;
 use floresta_common::prelude::*;
+use rustreexo::stump::StumpError;
 
 use crate::proof_util::UtreexoLeafError;
 use crate::pruned_utreexo::chain_state_builder::BlockchainBuilderError;
@@ -35,7 +36,7 @@ pub enum BlockchainError {
     BlockValidation(BlockValidationErrors),
     TransactionError(TransactionError),
     InvalidProof,
-    UtreexoError(String),
+    UtreexoError(StumpError),
     UtreexoLeaf(UtreexoLeafError),
     Database(Box<dyn DatabaseError>),
     ConsensusDecode(bitcoin::consensus::encode::Error),
@@ -196,7 +197,7 @@ impl_error_from!(
     ConsensusDecode
 );
 impl_error_from!(BlockchainError, BlockValidationErrors, BlockValidation);
-impl_error_from!(BlockchainError, String, UtreexoError);
+impl_error_from!(BlockchainError, StumpError, UtreexoError);
 
 impl Display for BlockchainError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {

crates/floresta-chain/src/pruned_utreexo/error.rs

@@ -28,9 +28,9 @@ use bitcoin::hashes::sha256;
 use bitcoin::Block;
 use bitcoin::BlockHash;
 use bitcoin::OutPoint;
-use rustreexo::accumulator::node_hash::BitcoinNodeHash;
-use rustreexo::accumulator::proof::Proof;
-use rustreexo::accumulator::stump::Stump;
+use rustreexo::node_hash::BitcoinNodeHash;
+use rustreexo::proof::Proof;
+use rustreexo::stump::Stump;
 
 use self::partial_chain::PartialChainState;
 use crate::prelude::*;