diff --git a/Cargo.lock b/Cargo.lock index 9d14090c3ca..8b498337182 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -513,7 +513,7 @@ dependencies = [ "bitflags 2.11.1", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.10.5", "proc-macro2", "quote", "regex", @@ -1132,7 +1132,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2259,7 +2259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2679,7 +2679,7 @@ dependencies = [ [[package]] name = "grovedb" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "axum 0.8.9", "bincode", @@ -2717,7 +2717,7 @@ dependencies = [ [[package]] name = "grovedb-bulk-append-tree" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "bincode", "blake3", @@ -2733,7 +2733,7 @@ dependencies = [ [[package]] name = "grovedb-commitment-tree" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "blake3", "grovedb-bulk-append-tree", @@ -2749,7 +2749,7 @@ dependencies = [ [[package]] name = "grovedb-costs" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "integer-encoding", "intmap", @@ -2759,7 +2759,7 @@ dependencies = [ [[package]] name = "grovedb-dense-fixed-sized-merkle-tree" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "bincode", "blake3", @@ -2772,7 +2772,7 @@ dependencies = [ [[package]] name = "grovedb-element" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "bincode", "bincode_derive", @@ -2787,7 +2787,7 @@ dependencies = [ [[package]] name = "grovedb-epoch-based-storage-flags" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "grovedb-costs", "hex", @@ -2799,7 +2799,7 @@ dependencies = [ [[package]] name = "grovedb-merk" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "bincode", "bincode_derive", @@ -2825,7 +2825,7 @@ dependencies = [ [[package]] name = "grovedb-merkle-mountain-range" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "bincode", "blake3", @@ -2836,7 +2836,7 @@ dependencies = [ [[package]] name = "grovedb-path" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "hex", ] @@ -2844,7 +2844,7 @@ dependencies = [ [[package]] name = "grovedb-query" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "bincode", "byteorder", @@ -2860,7 +2860,7 @@ dependencies = [ [[package]] name = "grovedb-storage" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "blake3", "grovedb-costs", @@ -2879,7 +2879,7 @@ dependencies = [ [[package]] name = "grovedb-version" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "thiserror 2.0.18", "versioned-feature-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2888,7 +2888,7 @@ dependencies = [ [[package]] name = "grovedb-visualize" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "hex", "itertools 0.14.0", @@ -2897,7 +2897,7 @@ dependencies = [ [[package]] name = "grovedbg-types" version = "4.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=7a649386ac8a06a608a614385a2333e03cd931c3#7a649386ac8a06a608a614385a2333e03cd931c3" +source = "git+https://github.com/dashpay/grovedb?rev=352c2f5504fba8795e8ed1056753bfd73c13b4cc#352c2f5504fba8795e8ed1056753bfd73c13b4cc" dependencies = [ "serde", "serde_with 3.20.0", @@ -3291,7 +3291,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.3", "system-configuration", "tokio", "tower-service", @@ -3542,7 +3542,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4293,7 +4293,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5095,7 +5095,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck 0.4.1", - "itertools 0.13.0", + "itertools 0.10.5", "log", "multimap", "petgraph", @@ -5116,7 +5116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.117", @@ -5129,7 +5129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.117", @@ -5259,7 +5259,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.2", "rustls", - "socket2 0.5.10", + "socket2 0.6.3", "thiserror 2.0.18", "tokio", "tracing", @@ -5297,9 +5297,9 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.3", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6021,7 +6021,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6034,7 +6034,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6093,7 +6093,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6933,7 +6933,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8335,7 +8335,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index 472d91d725e..ccb59612bb8 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -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 = "7a649386ac8a06a608a614385a2333e03cd931c3", optional = true } +grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc", optional = true } [dev-dependencies] tokio = { version = "1.40", features = ["full"] } diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index 2a2fda97c30..89ea120a193 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -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 = "7a649386ac8a06a608a614385a2333e03cd931c3" } +grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc" } nonempty = "0.11" [dev-dependencies] @@ -103,7 +103,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 = "7a649386ac8a06a608a614385a2333e03cd931c3", features = ["client"] } +grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc", 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" } diff --git a/packages/rs-drive/Cargo.toml b/packages/rs-drive/Cargo.toml index e63bfb7d996..76f11244150 100644 --- a/packages/rs-drive/Cargo.toml +++ b/packages/rs-drive/Cargo.toml @@ -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 = "7a649386ac8a06a608a614385a2333e03cd931c3", optional = true, default-features = false } -grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "7a649386ac8a06a608a614385a2333e03cd931c3", optional = true } -grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "7a649386ac8a06a608a614385a2333e03cd931c3" } -grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "7a649386ac8a06a608a614385a2333e03cd931c3", optional = true } -grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "7a649386ac8a06a608a614385a2333e03cd931c3" } -grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "7a649386ac8a06a608a614385a2333e03cd931c3" } +grovedb = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc", optional = true, default-features = false } +grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc", optional = true } +grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc" } +grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc", optional = true } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc" } +grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc" } [dev-dependencies] criterion = "0.5" diff --git a/packages/rs-drive/src/fees/op.rs b/packages/rs-drive/src/fees/op.rs index 55b46bb9684..a9aeb45a4e6 100644 --- a/packages/rs-drive/src/fees/op.rs +++ b/packages/rs-drive/src/fees/op.rs @@ -654,6 +654,10 @@ impl LowLevelDriveOperation { reference_path_type, max_reference_hop, flags, + // Drive only refreshes plain (counted) references; the + // non-counted/`ReferenceWithSumItem` variants added in grovedb + // are not used by platform. + false, trust_refresh_reference, )) } @@ -691,6 +695,7 @@ impl LowLevelDriveOperationTreeTypeConverter for TreeType { TreeType::ProvableCountSumTree => { Element::empty_provable_count_sum_tree_with_flags(element_flags) } + TreeType::ProvableSumTree => Element::empty_provable_sum_tree_with_flags(element_flags), TreeType::CommitmentTree(chunk_power) => { Element::empty_commitment_tree_with_flags(*chunk_power, element_flags)? } @@ -1547,6 +1552,32 @@ mod tests { ); } + /// Covers the `TreeType::ProvableSumTree` arm of + /// `LowLevelDriveOperationTreeTypeConverter::empty_tree_operation_for_known_path_key` + /// added by the grovedb#661 bump. Drive doesn't currently construct + /// `ProvableSumTree` anywhere else, so without this test the new arm is + /// uncovered. + #[test] + fn empty_tree_operation_for_known_path_key_provable_sum_tree() { + use grovedb::batch::GroveOp; + + let op = TreeType::ProvableSumTree + .empty_tree_operation_for_known_path_key(vec![b"root".to_vec()], b"k".to_vec(), None) + .expect("empty_tree_operation_for_known_path_key"); + + match op { + LowLevelDriveOperation::GroveOperation(grove_op) => match grove_op.op { + GroveOp::InsertOrReplace { element } => assert!( + matches!(element, Element::ProvableSumTree(..)), + "expected ProvableSumTree element, got: {:?}", + element + ), + other => panic!("expected GroveOp::InsertOrReplace, got: {:?}", other), + }, + other => panic!("expected GroveOperation, got: {:?}", other), + } + } + #[test] fn ephemeral_cost_overflow_in_addition_chain() { // Use values that individually do not overflow but whose sum does. diff --git a/packages/rs-drive/src/util/grove_operations/grove_insert_empty_tree/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_insert_empty_tree/v0/mod.rs index 80ba1f54a40..a0c3b88fa4f 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_insert_empty_tree/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_insert_empty_tree/v0/mod.rs @@ -28,6 +28,7 @@ impl Drive { TreeType::CountSumTree => Element::empty_count_sum_tree(), TreeType::ProvableCountTree => Element::empty_provable_count_tree(), TreeType::ProvableCountSumTree => Element::empty_provable_count_sum_tree(), + TreeType::ProvableSumTree => Element::empty_provable_sum_tree(), TreeType::CommitmentTree(chunk_power) => Element::empty_commitment_tree(chunk_power)?, TreeType::MmrTree => Element::empty_mmr_tree(), TreeType::BulkAppendTree(chunk_power) => Element::empty_bulk_append_tree(chunk_power)?, diff --git a/packages/rs-platform-version/Cargo.toml b/packages/rs-platform-version/Cargo.toml index 810b613cb4c..5dc13516248 100644 --- a/packages/rs-platform-version/Cargo.toml +++ b/packages/rs-platform-version/Cargo.toml @@ -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 = "7a649386ac8a06a608a614385a2333e03cd931c3" } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc" } [features] mock-versions = [] diff --git a/packages/rs-platform-wallet/Cargo.toml b/packages/rs-platform-wallet/Cargo.toml index 973c010bf2b..22512c8d0e4 100644 --- a/packages/rs-platform-wallet/Cargo.toml +++ b/packages/rs-platform-wallet/Cargo.toml @@ -48,7 +48,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 = "7a649386ac8a06a608a614385a2333e03cd931c3", optional = true } +grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc", optional = true } zip32 = { version = "0.2.0", default-features = false, optional = true } [dev-dependencies] diff --git a/packages/rs-sdk-ffi/src/system/queries/path_elements.rs b/packages/rs-sdk-ffi/src/system/queries/path_elements.rs index 77766fc2e71..d6bd3deea7b 100644 --- a/packages/rs-sdk-ffi/src/system/queries/path_elements.rs +++ b/packages/rs-sdk-ffi/src/system/queries/path_elements.rs @@ -171,10 +171,14 @@ fn format_element_data(element: &Element) -> String { Element::ItemWithSumItem(data, sum, _) => { format!("item_with_sum_item:{}:{}", hex::encode(data), sum) } + Element::ReferenceWithSumItem(reference, _, sum, _) => { + format!("reference_with_sum_item:{:?}:{}", reference, sum) + } Element::ProvableCountTree(_, count, _) => format!("provable_count_tree:{}", count), Element::ProvableCountSumTree(_, count, sum, _) => { format!("provable_count_sum_tree:{}:{}", count, sum) } + Element::ProvableSumTree(_, sum, _) => format!("provable_sum_tree:{}", sum), Element::CommitmentTree(_, _, _) => "commitment_tree".to_string(), Element::MmrTree(_, _) => "mmr_tree".to_string(), Element::BulkAppendTree(_, _, _) => "bulk_append_tree".to_string(), @@ -183,6 +187,9 @@ fn format_element_data(element: &Element) -> String { } Element::NonCounted(inner) => format!("non_counted({})", format_element_data(inner)), Element::NotSummed(inner) => format!("not_summed({})", format_element_data(inner)), + Element::NotCountedOrSummed(inner) => { + format!("not_counted_or_summed({})", format_element_data(inner)) + } } } @@ -198,8 +205,10 @@ fn format_element_type(element: &Element) -> String { Element::CountTree(_, _, _) => "count_tree".to_string(), Element::CountSumTree(_, _, _, _) => "count_sum_tree".to_string(), Element::ItemWithSumItem(_, _, _) => "item_with_sum_item".to_string(), + Element::ReferenceWithSumItem(_, _, _, _) => "reference_with_sum_item".to_string(), Element::ProvableCountTree(_, _, _) => "provable_count_tree".to_string(), Element::ProvableCountSumTree(_, _, _, _) => "provable_count_sum_tree".to_string(), + Element::ProvableSumTree(_, _, _) => "provable_sum_tree".to_string(), Element::CommitmentTree(_, _, _) => "commitment_tree".to_string(), Element::MmrTree(_, _) => "mmr_tree".to_string(), Element::BulkAppendTree(_, _, _) => "bulk_append_tree".to_string(), @@ -208,6 +217,9 @@ fn format_element_type(element: &Element) -> String { } Element::NonCounted(inner) => format!("non_counted({})", format_element_type(inner)), Element::NotSummed(inner) => format!("not_summed({})", format_element_type(inner)), + Element::NotCountedOrSummed(inner) => { + format!("not_counted_or_summed({})", format_element_type(inner)) + } } } diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml index 5c97dca8952..bf1561e6224 100644 --- a/packages/rs-sdk/Cargo.toml +++ b/packages/rs-sdk/Cargo.toml @@ -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 = "7a649386ac8a06a608a614385a2333e03cd931c3", features = ["client", "sqlite"], optional = true } +grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "352c2f5504fba8795e8ed1056753bfd73c13b4cc", features = ["client", "sqlite"], optional = true } dash-async = { path = "../rs-dash-async" } dash-context-provider = { path = "../rs-context-provider", default-features = false } dash-platform-macros = { path = "../rs-dash-platform-macros" } diff --git a/packages/rs-sdk/tests/vectors/test_token_pre_programmed_distributions_absent/msg_GetTokenPreProgrammedDistributionsRequest_a46a647398eedeed648eafe389472c682c883ab61c852a35528493ea2680909b.json b/packages/rs-sdk/tests/vectors/test_token_pre_programmed_distributions_absent/msg_GetTokenPreProgrammedDistributionsRequest_a46a647398eedeed648eafe389472c682c883ab61c852a35528493ea2680909b.json index 3c066e3fec0..6a53fb4f349 100644 Binary files a/packages/rs-sdk/tests/vectors/test_token_pre_programmed_distributions_absent/msg_GetTokenPreProgrammedDistributionsRequest_a46a647398eedeed648eafe389472c682c883ab61c852a35528493ea2680909b.json and b/packages/rs-sdk/tests/vectors/test_token_pre_programmed_distributions_absent/msg_GetTokenPreProgrammedDistributionsRequest_a46a647398eedeed648eafe389472c682c883ab61c852a35528493ea2680909b.json differ diff --git a/packages/rs-sdk/tests/vectors/test_token_pre_programmed_distributions_present/msg_GetTokenPreProgrammedDistributionsRequest_70451dbd24fcfcbf1831ab10f5ae02962217f1ae14791d7fbee47d4e01696b52.json b/packages/rs-sdk/tests/vectors/test_token_pre_programmed_distributions_present/msg_GetTokenPreProgrammedDistributionsRequest_70451dbd24fcfcbf1831ab10f5ae02962217f1ae14791d7fbee47d4e01696b52.json index 32a1e337c18..6a9faec9e29 100644 Binary files a/packages/rs-sdk/tests/vectors/test_token_pre_programmed_distributions_present/msg_GetTokenPreProgrammedDistributionsRequest_70451dbd24fcfcbf1831ab10f5ae02962217f1ae14791d7fbee47d4e01696b52.json and b/packages/rs-sdk/tests/vectors/test_token_pre_programmed_distributions_present/msg_GetTokenPreProgrammedDistributionsRequest_70451dbd24fcfcbf1831ab10f5ae02962217f1ae14791d7fbee47d4e01696b52.json differ diff --git a/packages/wasm-drive-verify/src/state_transition/state_transition_execution_path_queries/token_transition.rs b/packages/wasm-drive-verify/src/state_transition/state_transition_execution_path_queries/token_transition.rs index d78d63eb34b..63a4ed874a5 100644 --- a/packages/wasm-drive-verify/src/state_transition/state_transition_execution_path_queries/token_transition.rs +++ b/packages/wasm-drive-verify/src/state_transition/state_transition_execution_path_queries/token_transition.rs @@ -425,6 +425,11 @@ fn serialize_query_item(item: &QueryItem) -> Result { "AggregateCountOnRange QueryItem is not supported in token-transition path queries", )); } + QueryItem::AggregateSumOnRange(_) => { + return Err(JsValue::from_str( + "AggregateSumOnRange QueryItem is not supported in token-transition path queries", + )); + } } Ok(obj.into())