Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions dash-spv-ffi/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ pub struct FFIDashSpvClient {
pub(crate) runtime: Arc<Runtime>,
}

impl FFIDashSpvClient {
/// Returns the shared masternode list engine, if initialized.
pub fn masternode_list_engine(
&self,
) -> Option<Arc<tokio::sync::RwLock<dash_spv::MasternodeListEngine>>> {
self.inner.masternode_list_engine().ok()
}
}

/// Create a new SPV client and return an opaque pointer.
///
/// # Safety
Expand Down
10 changes: 0 additions & 10 deletions dash-spv-ffi/src/platform_integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,6 @@ pub unsafe extern "C" fn ffi_dash_spv_get_quorum_public_key(
let llmq_type: LLMQType = (quorum_type as u8).into();
let quorum_hash = QuorumHash::from_byte_array(hash_array);

if let Err(e) = spv_client.masternode_list_engine() {
return FFIResult::error(
FFIErrorCode::RuntimeError,
&format!(
"Masternode list engine not initialized: {}. Core SDK may still be syncing.",
e
),
);
}

let lookup = client.runtime.block_on(spv_client.get_quorum_at_height(
core_chain_locked_height,
llmq_type,
Expand Down
8 changes: 5 additions & 3 deletions dash-spv/src/client/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//! - Configuration updates
//! - Terminal UI accessors

use dashcore::sml::masternode_list_engine::MasternodeListEngine;
use crate::sml_engine::MasternodeListEngine;
use std::sync::Arc;
use tokio::sync::{Mutex, RwLock};
use tokio::task::JoinHandle;
Expand Down Expand Up @@ -111,7 +111,8 @@ pub struct DashSpvClient<W: WalletInterface, N: NetworkManager, S: StorageManage
pub(super) storage: Arc<Mutex<S>>,
/// External wallet implementation (required)
pub(super) wallet: Arc<RwLock<W>>,
pub(super) masternode_engine: Option<Arc<RwLock<MasternodeListEngine>>>,
pub(super) masternode_engine:
Option<Arc<RwLock<MasternodeListEngine<PersistentBlockHeaderStorage>>>>,
pub(super) sync_coordinator: Arc<Mutex<SyncCoordinator>>,
/// The running sync loop, `None` while stopped. A loop whose `shutdown` is
/// cancelled has failed and waits to be torn down. `run` and `stop` hold
Expand Down Expand Up @@ -190,7 +191,8 @@ impl<W: WalletInterface, N: NetworkManager, S: StorageManager> DashSpvClient<W,
self.sync_coordinator.lock().await.reset_progress();
if let Some(engine) = &self.masternode_engine {
let network = self.config.read().await.network;
*engine.write().await = MasternodeListEngine::default_for_network(network);
let headers = self.storage.lock().await.block_headers();
*engine.write().await = MasternodeListEngine::new(network, headers);
}

Ok(())
Expand Down
15 changes: 5 additions & 10 deletions dash-spv/src/client/lifecycle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ use super::{ClientConfig, DashSpvClient, EventHandler};
use crate::chain::checkpoints::CheckpointManager;
use crate::error::{Result, SpvError};
use crate::network::NetworkManager;
use crate::sml_engine::MasternodeListEngine;
use crate::storage::{
BlockHeaderStorage, BlockStorage, FilterHeaderStorage, FilterStorage, MasternodeStorage,
StorageManager,
BlockHeaderStorage, BlockStorage, FilterHeaderStorage, FilterStorage,
PersistentBlockHeaderStorage, StorageManager,
};
use crate::sync::{
BlockHeadersManager, BlocksManager, ChainLockManager, FilterHeadersManager, FiltersManager,
Expand All @@ -25,7 +26,6 @@ use crate::types::HashedBlockHeader;
use dashcore::block::{Header as BlockHeader, Version};
use dashcore::network::constants::NetworkExt;
use dashcore::pow::CompactTarget;
use dashcore::sml::masternode_list_engine::MasternodeListEngine;
use dashcore::TxMerkleNode;
use dashcore_hashes::Hash;
use key_wallet_manager::WalletInterface;
Expand Down Expand Up @@ -57,12 +57,7 @@ impl<W: WalletInterface, N: NetworkManager, S: StorageManager> DashSpvClient<W,

let masternode_engine = {
if config.enable_masternodes {
let loader = storage.masternodes();
let engine = loader.read().await.load_engine().await;
let engine = engine.unwrap_or_else(|e| {
tracing::warn!("Could not replay masternode messages, rebuilding: {}", e);
MasternodeListEngine::default_for_network(config.network)
});
let engine = storage.masternodes().read().await.load_engine().await;
Some(Arc::new(RwLock::new(engine)))
} else {
None
Expand Down Expand Up @@ -123,7 +118,7 @@ impl<W: WalletInterface, N: NetworkManager, S: StorageManager> DashSpvClient<W,
config: &ClientConfig,
storage: &S,
wallet: &Arc<RwLock<W>>,
masternode_engine: Option<&Arc<RwLock<MasternodeListEngine>>>,
masternode_engine: Option<&Arc<RwLock<MasternodeListEngine<PersistentBlockHeaderStorage>>>>,
) -> Result<SyncManagers<W>> {
let mut managers: SyncManagers<W> = Managers::default();

Expand Down
28 changes: 25 additions & 3 deletions dash-spv/src/client/queries.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

use crate::error::{Result, SpvError};
use crate::network::NetworkManager;
use crate::storage::{BlockHeaderStorage, StorageManager};
use crate::sml_engine::MasternodeListEngine;
use crate::storage::{BlockHeaderStorage, PersistentBlockHeaderStorage, StorageManager};
use dashcore::hashes::Hash;
use dashcore::sml::llmq_type::LLMQType;
use dashcore::sml::masternode_list_engine::MasternodeListEngine;
use dashcore::sml::masternode_list::MasternodeList;
use dashcore::sml::quorum_entry::qualified_quorum_entry::QualifiedQuorumEntry;
use dashcore::{BlockHash, QuorumHash};
use key_wallet_manager::WalletInterface;
Expand All @@ -37,13 +38,34 @@ impl<W: WalletInterface, N: NetworkManager, S: StorageManager> DashSpvClient<W,

/// Get a reference to the masternode list engine.
/// Returns an error if the masternode engine is not initialized.
pub fn masternode_list_engine(&self) -> Result<Arc<RwLock<MasternodeListEngine>>> {
pub(crate) fn masternode_list_engine(
&self,
) -> Result<Arc<RwLock<MasternodeListEngine<PersistentBlockHeaderStorage>>>> {
match self.masternode_engine {
Some(ref masternode_engine) => Ok(masternode_engine.clone()),
None => Err(SpvError::Config("Masternode list engine not initialized".to_string())),
}
}

/// The newest masternode list, `None` while masternode sync is off or has
/// not built a list yet.
pub async fn latest_masternode_list(&self) -> Option<MasternodeList> {
let engine = self.masternode_engine.as_ref()?;
engine.read().await.latest_masternode_list().cloned()
}

/// Blocking twin of [`Self::latest_masternode_list`] for threads outside the
/// async runtime, such as FFI callers.
///
/// # Panics
///
/// Panics when called from an async execution context, like
/// [`RwLock::blocking_read`].
pub fn latest_masternode_list_blocking(&self) -> Option<MasternodeList> {
let engine = self.masternode_engine.as_ref()?;
engine.blocking_read().latest_masternode_list().cloned()
}

/// Get a quorum entry by type and hash at a specific block height. A height
/// whose lists the engine no longer holds is rebuilt from storage.
/// Returns `SpvError::QuorumLookupError` if the quorum is not found.
Expand Down
7 changes: 1 addition & 6 deletions dash-spv/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ pub mod client;
pub mod error;
pub mod logging;
pub mod network;
mod sml_engine;
pub mod storage;
pub mod sync;
pub mod types;
Expand All @@ -93,12 +94,6 @@ pub use dashcore::{Address, BlockHash, Network, OutPoint, QuorumHash, ScriptBuf}
// Re-export hash trait
pub use dashcore::hashes::Hash;

// Re-export MasternodeListEngine and related types
pub use dashcore::sml::masternode_list_engine::{
MasternodeListEngine, MasternodeListEngineBTreeMapBlockContainer,
MasternodeListEngineBlockContainer,
};

// Re-export LLMQ types
pub use dashcore::sml::llmq_type::{LLMQType, LlmqDevnetParams};

Expand Down
Loading
Loading