Skip to content

fix: fix bincode import and pass None to apply diff when validation is false #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuantumExplorer merged 2 commits into from
Apr 13, 2025
Merged

fix: fix bincode import and pass None to apply diff when validation is false #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
112b3c2
small fixes
QuantumExplorer Apr 13, 2025
e9dbc89
fmt
QuantumExplorer Apr 13, 2025
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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["dash", "hashes", "internals", "fuzz", "rpc-client", "rpc-json", "rpc
resolver = "2"

[workspace.package]
version = "0.39.2"
version = "0.39.3"

[patch.crates-io.dashcore_hashes]
path = "hashes"
Expand Down
4 changes: 3 additions & 1 deletion dash/src/pow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//! functions here are designed to be fast, by that we mean it is safe to use them to check headers.
//!

#[cfg(feature = "bincode")]
use bincode::{Decode, Encode};
use core::fmt::{self, LowerHex, UpperHex};
use core::ops::{Add, Div, Mul, Not, Rem, Shl, Shr, Sub};
Expand Down Expand Up @@ -320,7 +321,8 @@ impl Decodable for CompactTarget {

/// Big-endian 256 bit integer type.
// (high, low): u.0 contains the high bits, u.1 contains the low bits.
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Encode, Decode)]
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
struct U256(u128, u128);

impl U256 {
Expand Down
7 changes: 5 additions & 2 deletions dash/src/sml/masternode_list_engine/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,8 +811,11 @@ impl MasternodeListEngine {

#[cfg(not(feature = "quorum_validation"))]
let rotation_sig = {
let (masternode_list, rotation_sig) =
base_masternode_list.apply_diff(masternode_list_diff.clone(), diff_end_height)?;
let (masternode_list, rotation_sig) = base_masternode_list.apply_diff(
masternode_list_diff.clone(),
diff_end_height,
None,
)?;
if verify_quorums {
return Err(SmlError::FeatureNotTurnedOn(
"quorum validation feature is not turned on".to_string(),
Expand Down
Loading