From 38ec572ffb882d86989bcf90b57c064857030bd0 Mon Sep 17 00:00:00 2001 From: QuantumExplorer Date: Tue, 10 Nov 2026 00:33:13 +0700 Subject: [PATCH 1/2] chore: bump GroveDB past the flags handover and count tree offset work Moves the pin from 12adbd35 to 45e2d84f, bringing in dashpay/grovedb#1025 and dashpay/grovedb#1033. Both are gated on GROVE_V5, which only protocol version 15 selects. The new struct fields keep today's behaviour: `offset: None` on the Query literals and `allow_replacement_accounting: false` on the BatchApplyOptions literals. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 32 +++++++++---------- Cargo.toml | 18 +++++------ .../query/shielded/encrypted_notes/v0/mod.rs | 1 + .../v0/mod.rs | 1 + .../v0/mod.rs | 1 + .../grove_batch_operations_costs/v0/mod.rs | 1 + .../verify_shielded_encrypted_notes/v0/mod.rs | 2 ++ 7 files changed, 31 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c903b1a44ec..389510f9340 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3237,7 +3237,7 @@ dependencies = [ [[package]] name = "grovedb" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "axum 0.8.9", "blake3", @@ -3296,7 +3296,7 @@ dependencies = [ [[package]] name = "grovedb-bulk-append-tree" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "blake3", "grovedb-bincode", @@ -3314,7 +3314,7 @@ dependencies = [ [[package]] name = "grovedb-commitment-tree" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "blake3", "grovedb-bulk-append-tree", @@ -3331,7 +3331,7 @@ dependencies = [ [[package]] name = "grovedb-costs" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "integer-encoding", "intmap", @@ -3341,7 +3341,7 @@ dependencies = [ [[package]] name = "grovedb-dense-fixed-sized-merkle-tree" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "blake3", "grovedb-bincode", @@ -3355,7 +3355,7 @@ dependencies = [ [[package]] name = "grovedb-element" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "grovedb-bincode", "grovedb-bincode-derive", @@ -3371,7 +3371,7 @@ dependencies = [ [[package]] name = "grovedb-epoch-based-storage-flags" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "grovedb-costs", "hex", @@ -3383,7 +3383,7 @@ dependencies = [ [[package]] name = "grovedb-merk" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "blake3", "byteorder", @@ -3409,7 +3409,7 @@ dependencies = [ [[package]] name = "grovedb-merkle-mountain-range" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "blake3", "grovedb-bincode", @@ -3422,7 +3422,7 @@ dependencies = [ [[package]] name = "grovedb-path" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "hex", ] @@ -3430,7 +3430,7 @@ dependencies = [ [[package]] name = "grovedb-private-document-store" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "blake3", "grovedb-bulk-append-tree", @@ -3443,7 +3443,7 @@ dependencies = [ [[package]] name = "grovedb-query" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "byteorder", "ed", @@ -3459,7 +3459,7 @@ dependencies = [ [[package]] name = "grovedb-storage" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "blake3", "grovedb-costs", @@ -3478,7 +3478,7 @@ dependencies = [ [[package]] name = "grovedb-version" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "thiserror 2.0.18", "versioned-feature-core", @@ -3487,7 +3487,7 @@ dependencies = [ [[package]] name = "grovedb-visualize" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "hex", "itertools 0.14.0", @@ -3496,7 +3496,7 @@ dependencies = [ [[package]] name = "grovedbg-types" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=12adbd357522a03efad4ae609499c93fe8cc3e2c#12adbd357522a03efad4ae609499c93fe8cc3e2c" +source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" dependencies = [ "serde", "serde_with 3.21.0", diff --git a/Cargo.toml b/Cargo.toml index 6da85829926..814ffeba878 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,15 +61,15 @@ members = [ [workspace.dependencies] secp256k1 = { version = "=0.33.1", features = ["rand", "serde", "recovery"] } bincode = { package = "grovedb-bincode", version = "=2.1.0" } -grovedb = { git = "https://github.com/dashpay/grovedb", rev = "12adbd357522a03efad4ae609499c93fe8cc3e2c", default-features = false } -grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "12adbd357522a03efad4ae609499c93fe8cc3e2c" } -grovedb-merk = { git = "https://github.com/dashpay/grovedb", rev = "12adbd357522a03efad4ae609499c93fe8cc3e2c", default-features = false } -grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "12adbd357522a03efad4ae609499c93fe8cc3e2c" } -grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "12adbd357522a03efad4ae609499c93fe8cc3e2c" } -grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "12adbd357522a03efad4ae609499c93fe8cc3e2c" } -grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "12adbd357522a03efad4ae609499c93fe8cc3e2c" } -grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "12adbd357522a03efad4ae609499c93fe8cc3e2c" } -grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "12adbd357522a03efad4ae609499c93fe8cc3e2c" } +grovedb = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c", default-features = false } +grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } +grovedb-merk = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c", default-features = false } +grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } +grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } +grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } +grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } +grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } diff --git a/packages/rs-drive-abci/src/query/shielded/encrypted_notes/v0/mod.rs b/packages/rs-drive-abci/src/query/shielded/encrypted_notes/v0/mod.rs index 31485ba8348..ef0c9dd87aa 100644 --- a/packages/rs-drive-abci/src/query/shielded/encrypted_notes/v0/mod.rs +++ b/packages/rs-drive-abci/src/query/shielded/encrypted_notes/v0/mod.rs @@ -92,6 +92,7 @@ impl Platform { query: Query { read_mode: None, limit: None, + offset: None, items: vec![QueryItem::Key(vec![SHIELDED_NOTES_KEY])], default_subquery_branch: SubqueryBranch { subquery_path: None, diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/v0/mod.rs index 35b7b05e957..baf9070b52c 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/v0/mod.rs @@ -71,6 +71,7 @@ impl Drive { disable_operation_consistency_check: !self.config.batching_consistency_verification, base_root_storage_is_free: true, batch_pause_height: None, + allow_replacement_accounting: false, }), |cost, old_flags, new_flags| { StorageFlags::update_element_flags(cost, old_flags, new_flags) diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/v0/mod.rs index b32807379e3..f3ad2d1f531 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/v0/mod.rs @@ -56,6 +56,7 @@ impl Drive { disable_operation_consistency_check: false, base_root_storage_is_free: true, batch_pause_height: None, + allow_replacement_accounting: false, }), |cost, old_flags, new_flags| { // if there were no flags before then the new flags are used diff --git a/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/v0/mod.rs index 42dec3e28cf..fa19668c8c2 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/v0/mod.rs @@ -29,6 +29,7 @@ impl Drive { disable_operation_consistency_check: false, base_root_storage_is_free: true, batch_pause_height: None, + allow_replacement_accounting: false, }), |_, _, _| Ok(false), |_, _, _| Err(GroveError::InternalError("not implemented".to_string())), diff --git a/packages/rs-drive/src/verify/shielded/verify_shielded_encrypted_notes/v0/mod.rs b/packages/rs-drive/src/verify/shielded/verify_shielded_encrypted_notes/v0/mod.rs index 033dcb99047..08972c37da3 100644 --- a/packages/rs-drive/src/verify/shielded/verify_shielded_encrypted_notes/v0/mod.rs +++ b/packages/rs-drive/src/verify/shielded/verify_shielded_encrypted_notes/v0/mod.rs @@ -111,6 +111,7 @@ impl Drive { query: Query { read_mode: None, limit: None, + offset: None, items: vec![QueryItem::Key(vec![SHIELDED_NOTES_KEY])], default_subquery_branch: SubqueryBranch { subquery_path: None, @@ -300,6 +301,7 @@ mod tests { query: Query { read_mode: None, limit: None, + offset: None, items: vec![QueryItem::Key(vec![SHIELDED_NOTES_KEY])], default_subquery_branch: SubqueryBranch { subquery_path: None, From 704d3f03bf86d12512cac1c8d5243d3e41abc77b Mon Sep 17 00:00:00 2001 From: QuantumExplorer Date: Tue, 10 Nov 2026 01:41:18 +0700 Subject: [PATCH 2/2] chore: move the GroveDB pin past allow_replacement_accounting Moves the pin to fa92511c, which removes that batch option and bundles SQLite 3.54 through rusqlite 0.41. Only one SQLite can be linked, so the wallet crates move to rusqlite 0.41 and refinery 0.10, whose migrations support it. That also picks up the fix for RUSTSEC-2026-0459. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 88 ++++++++++--------- Cargo.toml | 18 ++-- .../v0/mod.rs | 1 - .../v0/mod.rs | 1 - .../grove_batch_operations_costs/v0/mod.rs | 1 - .../rs-platform-wallet-storage/Cargo.toml | 6 +- .../integration/sqlite_buffer_semantics.rs | 6 +- .../integration/sqlite_load_reconstruction.rs | 13 ++- packages/rs-platform-wallet/Cargo.toml | 4 +- 9 files changed, 71 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 389510f9340..e2fd994e2b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1273,7 +1273,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2756,7 +2756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3237,7 +3237,7 @@ dependencies = [ [[package]] name = "grovedb" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "axum 0.8.9", "blake3", @@ -3296,7 +3296,7 @@ dependencies = [ [[package]] name = "grovedb-bulk-append-tree" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "blake3", "grovedb-bincode", @@ -3314,7 +3314,7 @@ dependencies = [ [[package]] name = "grovedb-commitment-tree" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "blake3", "grovedb-bulk-append-tree", @@ -3331,7 +3331,7 @@ dependencies = [ [[package]] name = "grovedb-costs" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "integer-encoding", "intmap", @@ -3341,7 +3341,7 @@ dependencies = [ [[package]] name = "grovedb-dense-fixed-sized-merkle-tree" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "blake3", "grovedb-bincode", @@ -3355,7 +3355,7 @@ dependencies = [ [[package]] name = "grovedb-element" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "grovedb-bincode", "grovedb-bincode-derive", @@ -3371,7 +3371,7 @@ dependencies = [ [[package]] name = "grovedb-epoch-based-storage-flags" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "grovedb-costs", "hex", @@ -3383,7 +3383,7 @@ dependencies = [ [[package]] name = "grovedb-merk" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "blake3", "byteorder", @@ -3409,7 +3409,7 @@ dependencies = [ [[package]] name = "grovedb-merkle-mountain-range" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "blake3", "grovedb-bincode", @@ -3422,7 +3422,7 @@ dependencies = [ [[package]] name = "grovedb-path" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "hex", ] @@ -3430,7 +3430,7 @@ dependencies = [ [[package]] name = "grovedb-private-document-store" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "blake3", "grovedb-bulk-append-tree", @@ -3443,7 +3443,7 @@ dependencies = [ [[package]] name = "grovedb-query" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "byteorder", "ed", @@ -3459,7 +3459,7 @@ dependencies = [ [[package]] name = "grovedb-storage" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "blake3", "grovedb-costs", @@ -3478,7 +3478,7 @@ dependencies = [ [[package]] name = "grovedb-version" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "thiserror 2.0.18", "versioned-feature-core", @@ -3487,7 +3487,7 @@ dependencies = [ [[package]] name = "grovedb-visualize" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "hex", "itertools 0.14.0", @@ -3496,7 +3496,7 @@ dependencies = [ [[package]] name = "grovedbg-types" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=45e2d84fb9a7f30d1221a432613948a98184a12c#45e2d84fb9a7f30d1221a432613948a98184a12c" +source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" dependencies = [ "serde", "serde_with 3.21.0", @@ -3627,14 +3627,17 @@ name = "hashbrown" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +dependencies = [ + "foldhash 0.2.0", +] [[package]] name = "hashlink" -version = "0.11.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f" +checksum = "a596f1b20ed2cc5ecac41a164aaebc7258057060f06c0cf7a2ba3991ee7990fb" dependencies = [ - "hashbrown 0.16.1", + "hashbrown 0.17.1", ] [[package]] @@ -3908,7 +3911,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.4", "system-configuration", "tokio", "tower-service", @@ -4152,7 +4155,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4529,9 +4532,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4103cffefa72eb8428cb6b47d6627161e51c2739fc5e3b734584157bc642a" +checksum = "14a5f01b87b92705d07b433c06f96cbc764637d81a0bffb5734ce17cf0f9a2b3" dependencies = [ "cc", "pkg-config", @@ -4939,7 +4942,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5086,7 +5089,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.117", @@ -5811,7 +5814,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03da047801ff44bb6a4d407d4860c05fd70bb81714e6b2f3812603d5b145b042" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "itertools 0.14.0", "log", "multimap", @@ -5962,7 +5965,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.2", "rustls", - "socket2 0.5.10", + "socket2 0.6.4", "thiserror 2.0.18", "tokio", "tracing", @@ -6001,7 +6004,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.4", "tracing", "windows-sys 0.59.0", ] @@ -6224,9 +6227,9 @@ dependencies = [ [[package]] name = "refinery" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2a344cdb48871e27addeafbbaffab8828cc12cec2b9041119e9bea0c0f551a" +checksum = "8e48a123dfddb4e33b888a233e3dd8f428d0dadbe8a2302177fcad504b9fb0e3" dependencies = [ "refinery-core", "refinery-macros", @@ -6234,11 +6237,10 @@ dependencies = [ [[package]] name = "refinery-core" -version = "0.9.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eeafd893124f29183dd6afa9137a27e7bef59250223b8b660005279c60aea4" +checksum = "07f0a6b2d031aec7903f7ce81c723bbe7d3d8667441012b2a4388af0f3a70ef3" dependencies = [ - "async-trait", "cfg-if", "log", "regex", @@ -6252,9 +6254,9 @@ dependencies = [ [[package]] name = "refinery-macros" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90cea6d11a9a4e8a85a884b6305461004101b28ca65dd35ec028e009a898e16" +checksum = "623c53cdc704ababffe5361be8cb726f874fcd4e97b945741aa69b15d0406f36" dependencies = [ "proc-macro2", "quote", @@ -6724,9 +6726,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.38.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c93dd1c9683b438c392c492109cb702b8090b2bfc8fed6f6e4eb4523f17af3" +checksum = "da9bba6f3506135e120a6586df05be18b48d18896600646a4bec8f993d91a594" dependencies = [ "bitflags 2.13.0", "fallible-iterator", @@ -6814,7 +6816,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6873,7 +6875,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -7704,7 +7706,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -9149,7 +9151,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 814ffeba878..ae9ae03aa37 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,15 +61,15 @@ members = [ [workspace.dependencies] secp256k1 = { version = "=0.33.1", features = ["rand", "serde", "recovery"] } bincode = { package = "grovedb-bincode", version = "=2.1.0" } -grovedb = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c", default-features = false } -grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } -grovedb-merk = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c", default-features = false } -grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } -grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } -grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } -grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } -grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } -grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "45e2d84fb9a7f30d1221a432613948a98184a12c" } +grovedb = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1", default-features = false } +grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" } +grovedb-merk = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1", default-features = false } +grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" } +grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" } +grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" } +grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" } +grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" } dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" } diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/v0/mod.rs index baf9070b52c..35b7b05e957 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/v0/mod.rs @@ -71,7 +71,6 @@ impl Drive { disable_operation_consistency_check: !self.config.batching_consistency_verification, base_root_storage_is_free: true, batch_pause_height: None, - allow_replacement_accounting: false, }), |cost, old_flags, new_flags| { StorageFlags::update_element_flags(cost, old_flags, new_flags) diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/v0/mod.rs index f3ad2d1f531..b32807379e3 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/v0/mod.rs @@ -56,7 +56,6 @@ impl Drive { disable_operation_consistency_check: false, base_root_storage_is_free: true, batch_pause_height: None, - allow_replacement_accounting: false, }), |cost, old_flags, new_flags| { // if there were no flags before then the new flags are used diff --git a/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/v0/mod.rs index fa19668c8c2..42dec3e28cf 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/v0/mod.rs @@ -29,7 +29,6 @@ impl Drive { disable_operation_consistency_check: false, base_root_storage_is_free: true, batch_pause_height: None, - allow_replacement_accounting: false, }), |_, _, _| Ok(false), |_, _, _| Err(GroveError::InternalError("not implemented".to_string())), diff --git a/packages/rs-platform-wallet-storage/Cargo.toml b/packages/rs-platform-wallet-storage/Cargo.toml index 69f3ca9aefc..6877f8ba404 100644 --- a/packages/rs-platform-wallet-storage/Cargo.toml +++ b/packages/rs-platform-wallet-storage/Cargo.toml @@ -48,7 +48,7 @@ dash-sdk = { path = "../rs-sdk", default-features = false, features = [ "dashpay-contract", "dpns-contract", ], optional = true } -rusqlite = { version = "0.38", features = [ +rusqlite = { version = "0.41", features = [ "bundled", "backup", "blob", @@ -56,12 +56,12 @@ rusqlite = { version = "0.38", features = [ "limits", "trace", ], optional = true } -refinery = { version = "=0.9.2", default-features = false, features = [ +refinery = { version = "=0.10.0", default-features = false, features = [ "rusqlite", ], optional = true } # The migration adapter uses refinery's supported synchronous driver traits. # Match refinery's driver traits and applied-history timestamp types. -refinery-core = { version = "=0.9.2", default-features = false, optional = true } +refinery-core = { version = "=0.10.1", default-features = false, optional = true } time = { version = "=0.3.49", features = ["parsing"], optional = true } # bincode 2 is required directly: we encode `dpp::IdentityPublicKey` # (which derives bincode 2 `Encode`/`Decode`) and decode diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_buffer_semantics.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_buffer_semantics.rs index af151578e6a..72c89318136 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_buffer_semantics.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_buffer_semantics.rs @@ -459,7 +459,7 @@ fn tc023_one_flush_is_one_transaction() { let commits = Arc::new(AtomicUsize::new(0)); { let commits_clone = Arc::clone(&commits); - let conn = persister.lock_conn_for_test(); + let mut conn = persister.lock_conn_for_test(); conn.commit_hook(Some(move || { commits_clone.fetch_add(1, Ordering::SeqCst); false @@ -471,7 +471,7 @@ fn tc023_one_flush_is_one_transaction() { // Remove the hook so the persister is reusable elsewhere. { - let conn = persister.lock_conn_for_test(); + let mut conn = persister.lock_conn_for_test(); conn.commit_hook(None:: bool>) .expect("remove commit hook"); } @@ -515,7 +515,7 @@ fn install_commit_counter( use std::sync::Arc; let counter = Arc::new(std::sync::atomic::AtomicUsize::new(0)); let counter_clone = Arc::clone(&counter); - let conn = persister.lock_conn_for_test(); + let mut conn = persister.lock_conn_for_test(); conn.commit_hook(Some(move || { counter_clone.fetch_add(1, Ordering::SeqCst); false diff --git a/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_reconstruction.rs b/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_reconstruction.rs index b473251becb..51343313cb8 100644 --- a/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_reconstruction.rs +++ b/packages/rs-platform-wallet-storage/tests/integration/sqlite_load_reconstruction.rs @@ -1488,19 +1488,24 @@ fn tc_p4_012_load_query_count_bounded() { // Hold the conn briefly to install the trace, then drop the // guard before calling load() (load takes its own lock). { - let conn = persister.lock_conn_for_test(); + let mut conn = persister.lock_conn_for_test(); conn.trace_v2( rusqlite::trace::TraceEventCodes::SQLITE_TRACE_STMT, Some(cb), - ); + ) + .expect("install trace"); } COUNTER.store(0, Ordering::Relaxed); persister.load().expect("load"); let n = COUNTER.load(Ordering::Relaxed); // Disable trace so other tests don't accidentally inherit it. { - let conn = persister.lock_conn_for_test(); - conn.trace_v2(rusqlite::trace::TraceEventCodes::SQLITE_TRACE_STMT, None); + let mut conn = persister.lock_conn_for_test(); + conn.trace_v2( + rusqlite::trace::TraceEventCodes::SQLITE_TRACE_STMT, + None::)>, + ) + .expect("remove trace"); } n } diff --git a/packages/rs-platform-wallet/Cargo.toml b/packages/rs-platform-wallet/Cargo.toml index 7da2bb5ce6c..b47c5662fa4 100644 --- a/packages/rs-platform-wallet/Cargo.toml +++ b/packages/rs-platform-wallet/Cargo.toml @@ -59,7 +59,7 @@ grovedb-commitment-tree = { workspace = true, optional = true } # WAL + synchronous=NORMAL pragmas before handing the connection to # `ClientPersistentCommitmentTree`. Version locked to match the rev grovedb # is built against (its `Cargo.lock` resolves rusqlite at this major). -rusqlite = { version = "0.38", optional = true } +rusqlite = { version = "0.41", optional = true } zip32 = { version = "0.2.0", default-features = false, optional = true } # `StreamExt`/`pin_mut!` to consume the SDK's `sync_shielded_notes_stream` # in the interleaved fetch/tree-append consumer (shielded sync only). @@ -108,7 +108,7 @@ rayon = "1.10" # Used by `shielded_tree_append_bench.rs` to open SQLite with tuned PRAGMAs # (WAL vs DELETE, sync mode) — confirms whether journal mode is what's # making the simulator path so slow. -rusqlite = "0.38" +rusqlite = "0.41" static_assertions = "1.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } # `test-util` brings `tokio::time::pause` / `tokio::test(start_paused = true)`