Skip to content

Commit 2d3bc73

Browse files
chore: bump grovedb to 5b5f4bf1 (merge grafts limited branches below a shared key, #850)
Pins grovedb at dashpay/grovedb#850: `PathQuery::merge` (v1) now descends into a key another grafted branch already owns and grafts a limited branch where the two actually diverge, instead of refusing the collision at the first key past the common path; a lone body landing at a merged root keeps the caps on its own branches. Composite document queries (a page plus derived sub-queries under one merged proof) need this: a limited page on `post` merged with a by-id fetch on `post`, or a limited page and a limited lookup under one contract once a cross-contract sub-query lifts the common path to the root, all collide one level above where they diverge. Also carries #849 (flat-subtree drop) from develop. No API change on the platform side. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
1 parent 8f1aadf commit 2d3bc73

7 files changed

Lines changed: 31 additions & 31 deletions

File tree

Cargo.lock

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/rs-dpp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ strum = { version = "0.26", features = ["derive"] }
7171
json-schema-compatibility-validator = { path = '../rs-json-schema-compatibility-validator', optional = true }
7272
once_cell = "1.19.0"
7373
tracing = { version = "0.1.41" }
74-
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883", optional = true }
74+
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8", optional = true }
7575

7676
[dev-dependencies]
7777
tokio = { version = "1.40", features = ["full"] }

packages/rs-drive-abci/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ derive_more = { version = "1.0", features = ["from", "deref", "deref_mut"] }
8282
async-trait = "0.1.77"
8383
console-subscriber = { version = "0.4", optional = true }
8484
bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "0842b17583888e8f46c252a4ee84cdfd58e0546f", optional = true }
85-
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883" }
85+
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8" }
8686
nonempty = "0.11"
8787
# Shielded-pool snapshot needs raw RocksDB SstFileWriter + ingest_external_file_cf
8888
# bindings, and blake3 for the snapshot-file checksum.
@@ -108,7 +108,7 @@ dpp = { path = "../rs-dpp", default-features = false, features = [
108108
drive = { path = "../rs-drive", features = ["fixtures-and-mocks"] }
109109
drive-proof-verifier = { path = "../rs-drive-proof-verifier" }
110110
strategy-tests = { path = "../strategy-tests" }
111-
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883", features = ["client"] }
111+
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8", features = ["client"] }
112112
assert_matches = "1.5.0"
113113
drive-abci = { path = ".", features = ["testing-config", "mocks", "shielded_test_data"] }
114114
bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "0842b17583888e8f46c252a4ee84cdfd58e0546f" }
@@ -122,8 +122,8 @@ integer-encoding = { version = "4.0.0" }
122122

123123
# For dump_only_default_and_aux_cfs_under_shielded_subtree_prefix — same
124124
# subtree-prefix algorithm grovedb uses internally.
125-
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883" }
126-
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883" }
125+
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8" }
126+
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8" }
127127

128128
[features]
129129
default = ["bls-signatures"]

packages/rs-drive/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ enum-map = { version = "2.0.3", optional = true }
5252
intmap = { version = "3.0.1", features = ["serde"], optional = true }
5353
chrono = { version = "0.4.35", optional = true }
5454
itertools = { version = "0.13", optional = true }
55-
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883", optional = true, default-features = false }
56-
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883", optional = true }
57-
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883" }
58-
grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883" }
59-
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883", optional = true }
60-
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883" }
61-
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883" }
55+
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8", optional = true, default-features = false }
56+
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8", optional = true }
57+
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8" }
58+
grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8" }
59+
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8", optional = true }
60+
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8" }
61+
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8" }
6262

6363
[dev-dependencies]
6464
criterion = "0.5"

packages/rs-platform-version/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ license = "MIT"
1111
thiserror = { version = "2.0.12" }
1212
bincode = { version = "=2.0.1" }
1313
versioned-feature-core = { git = "https://github.com/dashpay/versioned-feature-core", version = "1.0.0" }
14-
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883" }
14+
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8" }
1515

1616
[features]
1717
mock-versions = []

packages/rs-platform-wallet/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ zeroize = "1"
6161
log = "0.4"
6262

6363
# Shielded pool (optional, behind `shielded` feature)
64-
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883", optional = true }
64+
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8", optional = true }
6565
# Direct `rusqlite` access so `FileBackedShieldedStore::open_path` can set
6666
# WAL + synchronous=NORMAL pragmas before handing the connection to
6767
# `ClientPersistentCommitmentTree`. Version locked to match the rev grovedb

packages/rs-sdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ drive = { path = "../rs-drive", default-features = false, features = [
1818
] }
1919

2020
drive-proof-verifier = { path = "../rs-drive-proof-verifier", default-features = false }
21-
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "97250247423ddc7fcc2865ea0025fc5bd41d0883", features = [
21+
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5b5f4bf1e419afc647de1f1bd96cd2046aec63f8", features = [
2222
"client",
2323
"sqlite",
2424
], optional = true }

0 commit comments

Comments
 (0)