diff --git a/Cargo.lock b/Cargo.lock index 41667b74a60..a438e16df3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2983,8 +2983,8 @@ dependencies = [ [[package]] name = "grovedb" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "axum 0.8.9", "blake3", @@ -3042,8 +3042,8 @@ dependencies = [ [[package]] name = "grovedb-bulk-append-tree" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "blake3", "grovedb-bincode", @@ -3060,8 +3060,8 @@ dependencies = [ [[package]] name = "grovedb-commitment-tree" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "blake3", "grovedb-bulk-append-tree", @@ -3077,8 +3077,8 @@ dependencies = [ [[package]] name = "grovedb-costs" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "integer-encoding", "intmap", @@ -3087,8 +3087,8 @@ dependencies = [ [[package]] name = "grovedb-dense-fixed-sized-merkle-tree" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "blake3", "grovedb-bincode", @@ -3101,8 +3101,8 @@ dependencies = [ [[package]] name = "grovedb-element" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "grovedb-bincode", "grovedb-bincode-derive", @@ -3117,8 +3117,8 @@ dependencies = [ [[package]] name = "grovedb-epoch-based-storage-flags" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "grovedb-costs", "hex", @@ -3129,8 +3129,8 @@ dependencies = [ [[package]] name = "grovedb-merk" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "blake3", "byteorder", @@ -3155,8 +3155,8 @@ dependencies = [ [[package]] name = "grovedb-merkle-mountain-range" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "blake3", "grovedb-bincode", @@ -3168,16 +3168,16 @@ dependencies = [ [[package]] name = "grovedb-path" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "hex", ] [[package]] name = "grovedb-private-document-store" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "blake3", "grovedb-bulk-append-tree", @@ -3189,8 +3189,8 @@ dependencies = [ [[package]] name = "grovedb-query" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "byteorder", "ed", @@ -3205,8 +3205,8 @@ dependencies = [ [[package]] name = "grovedb-storage" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "blake3", "grovedb-costs", @@ -3224,8 +3224,8 @@ dependencies = [ [[package]] name = "grovedb-version" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "thiserror 2.0.18", "versioned-feature-core", @@ -3233,8 +3233,8 @@ dependencies = [ [[package]] name = "grovedb-visualize" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "hex", "itertools 0.14.0", @@ -3242,8 +3242,8 @@ dependencies = [ [[package]] name = "grovedbg-types" -version = "6.0.1" -source = "git+https://github.com/dashpay/grovedb?rev=5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5#5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" +version = "6.1.0" +source = "git+https://github.com/dashpay/grovedb?rev=fc7028d83114d86f88222e7ff09fc47ae75360f0#fc7028d83114d86f88222e7ff09fc47ae75360f0" dependencies = [ "serde", "serde_with 3.21.0", diff --git a/Cargo.toml b/Cargo.toml index 46497e7b44b..eb48b4a9098 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,15 +56,15 @@ members = [ [workspace.dependencies] bincode = { package = "grovedb-bincode", version = "=2.1.0" } -grovedb = { git = "https://github.com/dashpay/grovedb", rev = "5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5", default-features = false } -grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" } -grovedb-merk = { git = "https://github.com/dashpay/grovedb", rev = "5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5", default-features = false } -grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" } -grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" } -grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" } -grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" } -grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" } -grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "5cb0962afdd3df8d58cd9f40cc723ce1f475aeb5" } +grovedb = { git = "https://github.com/dashpay/grovedb", rev = "fc7028d83114d86f88222e7ff09fc47ae75360f0", default-features = false } +grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "fc7028d83114d86f88222e7ff09fc47ae75360f0" } +grovedb-merk = { git = "https://github.com/dashpay/grovedb", rev = "fc7028d83114d86f88222e7ff09fc47ae75360f0", default-features = false } +grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "fc7028d83114d86f88222e7ff09fc47ae75360f0" } +grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "fc7028d83114d86f88222e7ff09fc47ae75360f0" } +grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "fc7028d83114d86f88222e7ff09fc47ae75360f0" } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "fc7028d83114d86f88222e7ff09fc47ae75360f0" } +grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "fc7028d83114d86f88222e7ff09fc47ae75360f0" } +grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "fc7028d83114d86f88222e7ff09fc47ae75360f0" } dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "6c5775cf3293c9906367c04ac243a764ef836349" } dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "6c5775cf3293c9906367c04ac243a764ef836349" } dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "6c5775cf3293c9906367c04ac243a764ef836349" } diff --git a/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/token_history_storage_flags_tests.rs b/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/token_history_storage_flags_tests.rs index 639b3d5982e..8ec69c2fd60 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/token_history_storage_flags_tests.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/token_history_storage_flags_tests.rs @@ -177,24 +177,27 @@ fn should_attribute_unflagged_replacement_cost_mismatch_to_token_history_version 7 ); let id = SystemDataContract::TokenHistory.id().to_buffer(); - let op = QualifiedGroveDbOp::insert_or_replace_op( - contract_other_path(&id) - .iter() - .map(|p| p.to_vec()) - .collect(), - vec![CONTRACT_VERSION_KEY], - new, - ); - let error = platform - .drive - .grove_apply_batch( + let replace = |drive_version| { + let op = QualifiedGroveDbOp::insert_or_replace_op( + contract_other_path(&id) + .iter() + .map(|p| p.to_vec()) + .collect(), + vec![CONTRACT_VERSION_KEY], + new.clone(), + ); + platform.drive.grove_apply_batch( LowLevelDriveOperation::grovedb_operations_batch_consume(vec![ LowLevelDriveOperation::GroveOperation(op), ]), false, Some(&tx), - &pv.drive, + drive_version, ) + }; + // GROVE_V3 (protocol version 13) measures the replacement with the old + // flags and fails the commit. + let error = replace(&PlatformVersion::get(13).expect("PV13").drive) .expect_err("unflagged replacement must expose the accounting mismatch"); assert!( error @@ -206,6 +209,9 @@ fn should_attribute_unflagged_replacement_cost_mismatch_to_token_history_version "attributed path=[64,{},2]/64 old={old:?} error={error}", hex::encode(id) ); + // GROVE_V4 measures it from the bytes it stores, so it applies. + replace(&pv.drive).expect("GROVE_V4 charges the unflagged replacement for its own bytes"); + assert_eq!(version_item(&platform, Some(&tx)), new); } fn contract_element(platform: &TempPlatform, tx: TransactionArg) -> Element {