diff --git a/sequencer/src/api/endpoints.rs b/sequencer/src/api/endpoints.rs index 3ccc819c7..9d9d362cb 100644 --- a/sequencer/src/api/endpoints.rs +++ b/sequencer/src/api/endpoints.rs @@ -7,9 +7,7 @@ use std::{ use anyhow::Result; use committable::Committable; -use espresso_types::{ - FeeAccount, FeeMerkleTree, NamespaceId, NsProof, PubKey, Transaction, FEE_MERKLE_TREE_ARITY, -}; +use espresso_types::{FeeAccount, FeeMerkleTree, NamespaceId, NsProof, PubKey, Transaction}; use futures::{try_join, FutureExt}; use hotshot_query_service::merklized_state::Snapshot; use hotshot_query_service::{ @@ -27,6 +25,7 @@ use hotshot_types::{ node_implementation::{ConsensusTime, Versions}, }, }; +use jf_merkle_tree::MerkleTreeScheme; use serde::{de::Error as _, Deserialize, Serialize}; use snafu::OptionExt; use tagged_base64::TaggedBase64; @@ -54,7 +53,7 @@ where Ver: 'static + StaticVersionType, ::State: Send + Sync - + MerklizedStateDataSource + + MerklizedStateDataSource + MerklizedStateHeightPersistence, { let mut options = merklized_state::Options::default(); diff --git a/types/src/v0/mod.rs b/types/src/v0/mod.rs index f3033a566..953c8b1f0 100644 --- a/types/src/v0/mod.rs +++ b/types/src/v0/mod.rs @@ -183,7 +183,7 @@ pub type NetworkConfig = hotshot_types::network::NetworkConfig; pub use self::impls::{NodeState, SolverAuctionResultsProvider, ValidatedState}; pub use crate::v0_1::{ - BLOCK_MERKLE_TREE_HEIGHT, FEE_MERKLE_TREE_ARITY, FEE_MERKLE_TREE_HEIGHT, NS_ID_BYTE_LEN, - NS_OFFSET_BYTE_LEN, NUM_NSS_BYTE_LEN, NUM_TXS_BYTE_LEN, TX_OFFSET_BYTE_LEN, + BLOCK_MERKLE_TREE_HEIGHT, FEE_MERKLE_TREE_HEIGHT, NS_ID_BYTE_LEN, NS_OFFSET_BYTE_LEN, + NUM_NSS_BYTE_LEN, NUM_TXS_BYTE_LEN, TX_OFFSET_BYTE_LEN, }; use crate::v0_3::SolverAuctionResults; diff --git a/types/src/v0/v0_1/state.rs b/types/src/v0/v0_1/state.rs index 7711d37c0..d0134d089 100644 --- a/types/src/v0/v0_1/state.rs +++ b/types/src/v0/v0_1/state.rs @@ -20,7 +20,7 @@ pub type FeeMerkleCommitment = ::Commitment; pub const BLOCK_MERKLE_TREE_HEIGHT: usize = 32; pub const FEE_MERKLE_TREE_HEIGHT: usize = 20; -pub const FEE_MERKLE_TREE_ARITY: usize = 256; +const FEE_MERKLE_TREE_ARITY: usize = 256; #[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq, Eq)] pub struct Delta {