Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
64 changes: 32 additions & 32 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion packages/rs-dpp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ strum = { version = "0.26", features = ["derive"] }
json-schema-compatibility-validator = { path = '../rs-json-schema-compatibility-validator', optional = true }
once_cell = "1.19.0"
tracing = { version = "0.1.41" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c", optional = true }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32", optional = true }

[dev-dependencies]
tokio = { version = "1.40", features = ["full"] }
Expand Down
8 changes: 4 additions & 4 deletions packages/rs-drive-abci/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ derive_more = { version = "1.0", features = ["from", "deref", "deref_mut"] }
async-trait = "0.1.77"
console-subscriber = { version = "0.4", optional = true }
bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "0842b17583888e8f46c252a4ee84cdfd58e0546f", optional = true }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32" }
nonempty = "0.11"
# Shielded-pool snapshot needs raw RocksDB SstFileWriter + ingest_external_file_cf
# bindings, and blake3 for the snapshot-file checksum.
Expand All @@ -107,7 +107,7 @@ dpp = { path = "../rs-dpp", default-features = false, features = [
drive = { path = "../rs-drive", features = ["fixtures-and-mocks"] }
drive-proof-verifier = { path = "../rs-drive-proof-verifier" }
strategy-tests = { path = "../strategy-tests" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c", features = ["client"] }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32", features = ["client"] }
assert_matches = "1.5.0"
drive-abci = { path = ".", features = ["testing-config", "mocks"] }
bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "0842b17583888e8f46c252a4ee84cdfd58e0546f" }
Expand All @@ -121,8 +121,8 @@ integer-encoding = { version = "4.0.0" }

# For dump_only_default_and_aux_cfs_under_shielded_subtree_prefix — same
# subtree-prefix algorithm grovedb uses internally.
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c" }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32" }

[features]
default = ["bls-signatures"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,6 @@ mod platform_tests {
/// `commit_mmr` to the end) is what makes multi-batch work; this test
/// pins that contract.
#[test]
#[ignore = "snapshot dump+apply roundtrip; needs the new grovedb branch"]
fn snapshot_dump_apply_preserves_anchor() {
let platform_version = PlatformVersion::latest();

Expand Down
12 changes: 6 additions & 6 deletions packages/rs-drive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ enum-map = { version = "2.0.3", optional = true }
intmap = { version = "3.0.1", features = ["serde"], optional = true }
chrono = { version = "0.4.35", optional = true }
itertools = { version = "0.13", optional = true }
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c", optional = true, default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c", optional = true }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c", optional = true }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c" }
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32", optional = true, default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32", optional = true }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32", optional = true }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32" }

[dev-dependencies]
criterion = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-platform-version/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license = "MIT"
thiserror = { version = "2.0.12" }
bincode = { version = "=2.0.1" }
versioned-feature-core = { git = "https://github.com/dashpay/versioned-feature-core", version = "1.0.0" }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c" }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32" }

[features]
mock-versions = []
2 changes: 1 addition & 1 deletion packages/rs-platform-wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ image = { version = "0.25", default-features = false, features = ["png", "jpeg",
zeroize = "1"

# Shielded pool (optional, behind `shielded` feature)
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c", optional = true }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32", optional = true }
# Direct `rusqlite` access so `FileBackedShieldedStore::open_path` can set
# WAL + synchronous=NORMAL pragmas before handing the connection to
# `ClientPersistentCommitmentTree`. Version locked to match the rev grovedb
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ drive = { path = "../rs-drive", default-features = false, features = [
] }

drive-proof-verifier = { path = "../rs-drive-proof-verifier", default-features = false }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5eb7a5380a6e974513343352acfd6b30a8c1f87c", features = [
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "67acdbcb610d8ff34c8ebeffd8262fa2475e9b32", features = [
"client",
"sqlite",
], optional = true }
Expand Down
Loading