Skip to content

An alternative approach to how to make Sqlite storage transactions usable in async context #1976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ImplOfAnImpl merged 3 commits into from
Oct 9, 2025
Merged

An alternative approach to how to make Sqlite storage transactions usable in async context #1976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b090781
Make signing an async operation. Sqlite storage tx is now `Send`. `Ba…
ImplOfAnImpl Dec 9, 2024
24d2f18
Fix CI
ImplOfAnImpl Oct 1, 2025
8795797
Fix compilation after rebasing; add a note
ImplOfAnImpl Oct 8, 2025
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
77 changes: 41 additions & 36 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion chainstate/launcher/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub const SUBDIRECTORY_LMDB: &str = "chainstate-lmdb";

pub use storage_compatibility::check_storage_compatibility;

fn make_chainstate_and_storage_impl<B: storage::Backend + 'static>(
fn make_chainstate_and_storage_impl<B: storage::SharedBackend + 'static>(
storage_backend: B,
chain_config: Arc<ChainConfig>,
chainstate_config: ChainstateConfig,
Expand Down
2 changes: 1 addition & 1 deletion chainstate/storage/src/internal/expensive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use storage::MakeMapRef;
use utils::log_error;
use utxo::Utxo;

impl<B: storage::Backend> StoreTxRo<'_, B> {
impl<B: storage::SharedBackend> StoreTxRo<'_, B> {
/// Dump raw database contents
#[log_error]
pub fn dump_raw(&self) -> crate::Result<storage::raw::StorageContents<Schema>> {
Expand Down
26 changes: 14 additions & 12 deletions chainstate/storage/src/internal/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ mod version;
pub use version::ChainstateStorageVersion;

/// Store for blockchain data, parametrized over the backend B
pub struct Store<B: storage::Backend>(storage::Storage<B, Schema>);
pub struct Store<B: storage::SharedBackend>(storage::Storage<B, Schema>);

impl<B: storage::Backend> Store<B> {
impl<B: storage::SharedBackend> Store<B> {
/// Create a new chainstate storage
#[log_error]
pub fn new(backend: B, chain_config: &ChainConfig) -> crate::Result<Self> {
Expand Down Expand Up @@ -76,24 +76,24 @@ impl<B: storage::Backend> Store<B> {
}
}

impl<B: Default + storage::Backend> Store<B> {
impl<B: Default + storage::SharedBackend> Store<B> {
/// Create a default storage (mostly for testing, may want to remove this later)
#[log_error]
pub fn new_empty() -> crate::Result<Self> {
Self::from_backend(B::default())
}
}

impl<B: storage::Backend> Clone for Store<B>
impl<B: storage::SharedBackend> Clone for Store<B>
where
B::Impl: Clone,
storage::Storage<B, Schema>: Clone,
{
fn clone(&self) -> Self {
Self(self.0.clone())
}
}

impl<'tx, B: storage::Backend + 'tx> Transactional<'tx> for Store<B> {
impl<'tx, B: storage::SharedBackend + 'tx> Transactional<'tx> for Store<B> {
type TransactionRo = StoreTxRo<'tx, B>;
type TransactionRw = StoreTxRw<'tx, B>;

Expand All @@ -107,13 +107,15 @@ impl<'tx, B: storage::Backend + 'tx> Transactional<'tx> for Store<B> {
&'st self,
size: Option<usize>,
) -> crate::Result<Self::TransactionRw> {
self.0.transaction_rw(size).map_err(crate::Error::from).map(StoreTxRw::new)
<storage::Storage<_, _> as storage::StorageSharedWrite<_, _>>::transaction_rw(&self.0, size)
.map_err(crate::Error::from)
.map(StoreTxRw::new)
}
}

impl<B: storage::Backend + 'static> BlockchainStorage for Store<B> {}
impl<B: storage::SharedBackend + 'static> BlockchainStorage for Store<B> {}

impl<B: storage::Backend> PoSAccountingStorageRead<TipStorageTag> for Store<B> {
impl<B: storage::SharedBackend> PoSAccountingStorageRead<TipStorageTag> for Store<B> {
type Error = crate::Error;

#[log_error]
Expand Down Expand Up @@ -162,7 +164,7 @@ impl<B: storage::Backend> PoSAccountingStorageRead<TipStorageTag> for Store<B> {
}
}

impl<B: storage::Backend> PoSAccountingStorageRead<SealedStorageTag> for Store<B> {
impl<B: storage::SharedBackend> PoSAccountingStorageRead<SealedStorageTag> for Store<B> {
type Error = crate::Error;

#[log_error]
Expand Down Expand Up @@ -211,7 +213,7 @@ impl<B: storage::Backend> PoSAccountingStorageRead<SealedStorageTag> for Store<B
}
}

impl<B: storage::Backend> PoSAccountingStorageWrite<TipStorageTag> for Store<B> {
impl<B: storage::SharedBackend> PoSAccountingStorageWrite<TipStorageTag> for Store<B> {
#[log_error]
fn set_pool_balance(&mut self, pool_id: PoolId, amount: Amount) -> crate::Result<()> {
let mut tx = self.transaction_rw(None)?;
Expand Down Expand Up @@ -322,7 +324,7 @@ impl<B: storage::Backend> PoSAccountingStorageWrite<TipStorageTag> for Store<B>
}
}

impl<B: storage::Backend> PoSAccountingStorageWrite<SealedStorageTag> for Store<B> {
impl<B: storage::SharedBackend> PoSAccountingStorageWrite<SealedStorageTag> for Store<B> {
#[log_error]
fn set_pool_balance(&mut self, pool_id: PoolId, amount: Amount) -> crate::Result<()> {
let mut tx = self.transaction_rw(None)?;
Expand Down
Loading