From 2c169b5473f38bb0f3b4c1f21ba726e50fd49732 Mon Sep 17 00:00:00 2001 From: pankcuf Date: Wed, 16 Apr 2025 21:41:33 +0800 Subject: [PATCH 1/2] fix: testnet genesis reversed + quorum snapshot field is actually Vec --- dash/src/consensus/encode.rs | 1 + dash/src/network/constants.rs | 7 +------ dash/src/network/message_qrinfo.rs | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dash/src/consensus/encode.rs b/dash/src/consensus/encode.rs index ac55c3226..e61c7f956 100644 --- a/dash/src/consensus/encode.rs +++ b/dash/src/consensus/encode.rs @@ -738,6 +738,7 @@ impl_vec!(TxIn); impl_vec!(Vec); impl_vec!(u16); impl_vec!(u32); +impl_vec!(i32); impl_vec!(u64); impl_vec!(TapLeafHash); impl_vec!(VarInt); diff --git a/dash/src/network/constants.rs b/dash/src/network/constants.rs index f325af732..9a1fb31e0 100644 --- a/dash/src/network/constants.rs +++ b/dash/src/network/constants.rs @@ -163,12 +163,7 @@ impl Network { hex::decode("00000bafbc94add76cb75e2ec92894837288a481e5c005f6563d91623bf8bc2c") .expect("expected valid hex"); block_hash.reverse(); - Some(BlockHash::from_byte_array( - hex::decode("00000bafbc94add76cb75e2ec92894837288a481e5c005f6563d91623bf8bc2c") - .expect("expected valid hex") - .try_into() - .expect("expected 32 bytes"), - )) + Some(BlockHash::from_byte_array(block_hash.try_into().expect("expected 32 bytes"))) } Network::Devnet => None, Network::Regtest => None, diff --git a/dash/src/network/message_qrinfo.rs b/dash/src/network/message_qrinfo.rs index 8b6720486..0b741b990 100644 --- a/dash/src/network/message_qrinfo.rs +++ b/dash/src/network/message_qrinfo.rs @@ -157,7 +157,7 @@ impl Decodable for QRInfo { pub struct QuorumSnapshot { pub skip_list_mode: MNSkipListMode, pub active_quorum_members: Vec, // Bitset, length = (active_quorum_members_count + 7) / 8 - pub skip_list: Vec, // Array of uint32_t + pub skip_list: Vec, // Array of uint32_t } impl Display for QuorumSnapshot { From ecd9960ac8a51b702c1f19a0687b6291aa230cc3 Mon Sep 17 00:00:00 2001 From: pankcuf Date: Wed, 16 Apr 2025 21:45:07 +0800 Subject: [PATCH 2/2] chore: bump up version to 0.39.6 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1c6ac9f95..bd4edb26c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["dash", "hashes", "internals", "fuzz", "rpc-client", "rpc-json", "rpc resolver = "2" [workspace.package] -version = "0.39.4" +version = "0.39.6" [patch.crates-io.dashcore_hashes] path = "hashes"