From 3dcd6089f7ae20d9863980d378ae76f1bab71d0d Mon Sep 17 00:00:00 2001 From: QuantumExplorer Date: Mon, 16 Nov 2026 14:03:31 +0700 Subject: [PATCH] chore(platform)!: pin GroveDB at develop 89dc7351 Moves every grovedb crate from fa92511c to 89dc7351, bringing in dashpay/grovedb#1036, #1037, #1038, #1039, #1040, #1041, #1042, #1043, #1044, #1045, #1046, #1047 and #1048. #1037, #1040, #1041 and #1043 are gated on GROVE_V5, which protocol version 15 selects; protocol version 14 stays on GROVE_V4, whose tables only gain new slots set to 0. Cargo.lock changes only the grovedb source lines. finalize_block and the startup flush now warn when a pending prefix drop flush leaves records unresolved (the new unresolved_records and first_unresolved_error fields of PendingPrefixDropsReport from #1045), as agreed in that PR's review. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 32 +++++++++---------- Cargo.toml | 18 +++++------ .../src/abci/handler/finalize_block.rs | 10 ++++++ .../src/platform_types/platform/mod.rs | 24 ++++++++++---- 4 files changed, 53 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 99233b4a698..0302ca6d566 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3221,7 +3221,7 @@ dependencies = [ [[package]] name = "grovedb" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "axum 0.8.9", "blake3", @@ -3280,7 +3280,7 @@ dependencies = [ [[package]] name = "grovedb-bulk-append-tree" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "blake3", "grovedb-bincode", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "grovedb-commitment-tree" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "blake3", "grovedb-bulk-append-tree", @@ -3315,7 +3315,7 @@ dependencies = [ [[package]] name = "grovedb-costs" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "integer-encoding", "intmap", @@ -3325,7 +3325,7 @@ dependencies = [ [[package]] name = "grovedb-dense-fixed-sized-merkle-tree" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "blake3", "grovedb-bincode", @@ -3339,7 +3339,7 @@ dependencies = [ [[package]] name = "grovedb-element" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "grovedb-bincode", "grovedb-bincode-derive", @@ -3355,7 +3355,7 @@ dependencies = [ [[package]] name = "grovedb-epoch-based-storage-flags" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "grovedb-costs", "hex", @@ -3367,7 +3367,7 @@ dependencies = [ [[package]] name = "grovedb-merk" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "blake3", "byteorder", @@ -3393,7 +3393,7 @@ dependencies = [ [[package]] name = "grovedb-merkle-mountain-range" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "blake3", "grovedb-bincode", @@ -3406,7 +3406,7 @@ dependencies = [ [[package]] name = "grovedb-path" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "hex", ] @@ -3414,7 +3414,7 @@ dependencies = [ [[package]] name = "grovedb-private-document-store" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "blake3", "grovedb-bulk-append-tree", @@ -3427,7 +3427,7 @@ dependencies = [ [[package]] name = "grovedb-query" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "byteorder", "ed", @@ -3443,7 +3443,7 @@ dependencies = [ [[package]] name = "grovedb-storage" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "blake3", "grovedb-costs", @@ -3462,7 +3462,7 @@ dependencies = [ [[package]] name = "grovedb-version" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "thiserror 2.0.18", "versioned-feature-core", @@ -3471,7 +3471,7 @@ dependencies = [ [[package]] name = "grovedb-visualize" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "hex", "itertools 0.14.0", @@ -3480,7 +3480,7 @@ dependencies = [ [[package]] name = "grovedbg-types" version = "6.1.1" -source = "git+https://github.com/dashpay/grovedb?rev=fa92511cb7cdc19f5977d64f20f93107f62844b1#fa92511cb7cdc19f5977d64f20f93107f62844b1" +source = "git+https://github.com/dashpay/grovedb?rev=89dc7351f09f5e5425025861fdc1892473569917#89dc7351f09f5e5425025861fdc1892473569917" dependencies = [ "serde", "serde_with 3.21.0", diff --git a/Cargo.toml b/Cargo.toml index 6a6c9e28a9d..ced2e355c1e 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 = "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" } +grovedb = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917", default-features = false } +grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" } +grovedb-merk = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917", default-features = false } +grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" } +grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" } +grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" } +grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" } +grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" } dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "f6bb90cbbcae3d401bb3c9ebc4a9a26873a41404" } dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "f6bb90cbbcae3d401bb3c9ebc4a9a26873a41404" } dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "f6bb90cbbcae3d401bb3c9ebc4a9a26873a41404" } diff --git a/packages/rs-drive-abci/src/abci/handler/finalize_block.rs b/packages/rs-drive-abci/src/abci/handler/finalize_block.rs index bc11a538d60..0b4b8525a0b 100644 --- a/packages/rs-drive-abci/src/abci/handler/finalize_block.rs +++ b/packages/rs-drive-abci/src/abci/handler/finalize_block.rs @@ -281,6 +281,16 @@ where "flushed pending prefix drops" ); } + // A record whose liveness check failed stays queued and is + // retried on the next flush; a count that keeps coming back + // points at a storage fault or undecodable bytes. + if report.unresolved_records > 0 { + tracing::warn!( + unresolved_records = report.unresolved_records, + first_unresolved_error = report.first_unresolved_error.as_deref(), + "pending prefix drops left unresolved; records persist and will be retried" + ); + } } Err(error) => { tracing::warn!( diff --git a/packages/rs-drive-abci/src/platform_types/platform/mod.rs b/packages/rs-drive-abci/src/platform_types/platform/mod.rs index e779a5f1685..49b18030f11 100644 --- a/packages/rs-drive-abci/src/platform_types/platform/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/platform/mod.rs @@ -167,15 +167,27 @@ impl Platform { // when no records exist; a failure leaves the records for the // per-block flush to retry. if let Some(platform_version) = current_platform_version { - if let Err(error) = drive + match drive .grove .flush_pending_prefix_drops(&platform_version.drive.grove_version) { - tracing::warn!( - ?error, - "failed to flush pending prefix drops at startup; records persist and \ - will be retried after the next block" - ); + Ok(report) => { + if report.unresolved_records > 0 { + tracing::warn!( + unresolved_records = report.unresolved_records, + first_unresolved_error = report.first_unresolved_error.as_deref(), + "pending prefix drops left unresolved at startup; records persist \ + and will be retried after the next block" + ); + } + } + Err(error) => { + tracing::warn!( + ?error, + "failed to flush pending prefix drops at startup; records persist and \ + will be retried after the next block" + ); + } } }