Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .github/grpc-queries-cache.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,5 +161,5 @@
"status": "implemented"
}
},
"last_updated": "2026-03-05T17:22:30.340784"
"last_updated": "2026-03-09T19:05:06.309464"
}
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.

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 = "a7b878f72279a4893a7e9dc0ab2973ca0b09ce69", optional = true, default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "a7b878f72279a4893a7e9dc0ab2973ca0b09ce69", optional = true }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "a7b878f72279a4893a7e9dc0ab2973ca0b09ce69" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "a7b878f72279a4893a7e9dc0ab2973ca0b09ce69", optional = true }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "a7b878f72279a4893a7e9dc0ab2973ca0b09ce69" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "a7b878f72279a4893a7e9dc0ab2973ca0b09ce69" }
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "2c9117cf3d77c2ffda060f45242d238fb01dca84", optional = true, default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "2c9117cf3d77c2ffda060f45242d238fb01dca84", optional = true }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "2c9117cf3d77c2ffda060f45242d238fb01dca84" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "2c9117cf3d77c2ffda060f45242d238fb01dca84", optional = true }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "2c9117cf3d77c2ffda060f45242d238fb01dca84" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "2c9117cf3d77c2ffda060f45242d238fb01dca84" }

[dev-dependencies]
criterion = "0.5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use dpp::fee::Credits;
use dpp::prelude::Identifier;
use dpp::util::deserializer::ProtocolVersion;
use dpp::version::PlatformVersion;
use grovedb::batch::QualifiedGroveDbOp;
use grovedb::batch::{QualifiedGroveDbOp, SubelementsDeletionBehavior};
use grovedb::{Element, TransactionArg, TreeType};

/// Operations on Epochs
Expand Down Expand Up @@ -297,6 +297,7 @@ impl EpochOperations for Epoch {
self.get_path_vec(),
KEY_PROPOSERS.to_vec(),
TreeType::NormalTree,
SubelementsDeletionBehavior::DeleteChildren,
)
}

Expand Down
18 changes: 9 additions & 9 deletions packages/rs-drive/src/drive/initialization/v0/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@ mod tests {
drive_version,
)
.expect("expected to get root elements");
assert_eq!(proof.len(), 251); //it + left + right + parent + sibling + parent sibling + grandparent
assert_eq!(proof.len(), 286); //it + left + right + parent + sibling + parent sibling + grandparent (was 251, +35 from KVValueHashFeatureTypeWithChildHash)

let mut query = Query::new();
query.insert_key(vec![RootTree::Pools as u8]);
Expand All @@ -1381,7 +1381,7 @@ mod tests {
drive_version,
)
.expect("expected to get root elements");
assert_eq!(proof.len(), 253); //it + left + parent + sibling + parent sibling + grandparent
assert_eq!(proof.len(), 288); //it + left + parent + sibling + parent sibling + grandparent (was 253, +35 from KVValueHashFeatureTypeWithChildHash)

let mut query = Query::new();
query.insert_key(vec![RootTree::WithdrawalTransactions as u8]);
Expand All @@ -1402,7 +1402,7 @@ mod tests {
drive_version,
)
.expect("expected to get root elements");
assert_eq!(proof.len(), 251); //it + left + right + parent + sibling + parent sibling + grandparent
assert_eq!(proof.len(), 286); //it + left + right + parent + sibling + parent sibling + grandparent (was 251, +35 from KVValueHashFeatureTypeWithChildHash)

let mut query = Query::new();
query.insert_key(vec![RootTree::Votes as u8]);
Expand All @@ -1423,7 +1423,7 @@ mod tests {
drive_version,
)
.expect("expected to get root elements");
assert_eq!(proof.len(), 251); //it + left + right + parent + sibling + parent sibling + grandparent
assert_eq!(proof.len(), 286); //it + left + right + parent + sibling + parent sibling + grandparent (was 251, +35 from KVValueHashFeatureTypeWithChildHash)

// Merk Level 3

Expand Down Expand Up @@ -1490,7 +1490,7 @@ mod tests {
drive_version,
)
.expect("expected to get root elements");
assert_eq!(proof.len(), 288); //it + parent + sibling + parent sibling + grandparent + grandparent sibling + great-grandparent
assert_eq!(proof.len(), 321); //it + parent + sibling + parent sibling + grandparent + grandparent sibling + great-grandparent (was 288, +33 from KVValueHashFeatureTypeWithChildHash)

let mut query = Query::new();
query.insert_key(vec![RootTree::AddressBalances as u8]);
Expand All @@ -1511,7 +1511,7 @@ mod tests {
drive_version,
)
.expect("expected to get root elements");
assert_eq!(proof.len(), 252); //it + parent + sibling + parent sibling + grandparent + grandparent sibling + great-grandparent
assert_eq!(proof.len(), 287); //it + parent + sibling + parent sibling + grandparent + grandparent sibling + great-grandparent (was 252, +35 from KVValueHashFeatureTypeWithChildHash)

let mut query = Query::new();
query.insert_key(vec![RootTree::SpentAssetLockTransactions as u8]);
Expand Down Expand Up @@ -1574,7 +1574,7 @@ mod tests {
drive_version,
)
.expect("expected to get root elements");
assert_eq!(proof.len(), 251); //it + parent + sibling + parent sibling + grandparent + grandparent sibling + great-grandparent
assert_eq!(proof.len(), 286); //it + parent + sibling + parent sibling + grandparent + grandparent sibling + great-grandparent (was 251, +35 from KVValueHashFeatureTypeWithChildHash)

let mut query = Query::new();
query.insert_key(vec![RootTree::Versions as u8]);
Expand All @@ -1595,7 +1595,7 @@ mod tests {
drive_version,
)
.expect("expected to get root elements");
assert_eq!(proof.len(), 251); //it + parent + sibling + parent sibling + grandparent + grandparent sibling + great-grandparent
assert_eq!(proof.len(), 286); //it + parent + sibling + parent sibling + grandparent + grandparent sibling + great-grandparent (was 251, +35 from KVValueHashFeatureTypeWithChildHash)

// Merk Level 4

Expand All @@ -1618,6 +1618,6 @@ mod tests {
drive_version,
)
.expect("expected to get root elements");
assert_eq!(proof.len(), 287); //it + parent + parent sibling + grandparent + grandparent sibling + great-grandparent + great-grandparent sibling + great-great-grandparent
assert_eq!(proof.len(), 320); //it + parent + parent sibling + grandparent + grandparent sibling + great-grandparent + great-grandparent sibling + great-great-grandparent (was 287, +33 from KVValueHashFeatureTypeWithChildHash)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@ impl DriveHighLevelOperationConverter for PenalizeShieldedPoolAction {
}

// 2. Deduct penalty from pool total balance
let new_total_balance =
v0.current_total_balance
.checked_sub(v0.penalty_amount)
.ok_or_else(|| {
Error::Drive(DriveError::CorruptedDriveState(
"shielded pool total balance underflow when subtracting penalty_amount".to_string(),
))
})?;
let new_total_balance = v0
.current_total_balance
.checked_sub(v0.penalty_amount)
.ok_or_else(|| {
Error::Drive(DriveError::CorruptedDriveState(
"shielded pool total balance underflow when subtracting penalty_amount"
.to_string(),
))
})?;
ops.push(DriveOperation::ShieldedPoolOperation(
ShieldedPoolOperationType::UpdateTotalBalance { new_total_balance },
));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ pub trait DriveOperationFinalizationTasks {
}

impl DriveOperationFinalizeTask {
pub fn execute(
self,
drive: &Drive,
_platform_version: &PlatformVersion,
) -> Result<(), Error> {
pub fn execute(self, drive: &Drive, _platform_version: &PlatformVersion) -> Result<(), Error> {
match self {
DriveOperationFinalizeTask::RemoveDataContractFromCache { contract_id } => {
drive.cache.data_contracts.remove(contract_id.to_buffer());
Expand Down
Loading