added bincode to many types

QuantumExplorer · QuantumExplorer · commit 128ecc7c7776 · 2025-02-25T02:30:43.000+07:00
diff --git a/dash/src/blockdata/script/owned.rs b/dash/src/blockdata/script/owned.rs
@@ -4,6 +4,7 @@
 #[cfg(doc)]
 use core::ops::Deref;
 
+use bincode::{Decode, Encode};
 use hashes::hex;
 use secp256k1::{Secp256k1, Verification};
 
@@ -26,6 +27,7 @@ use crate::taproot::TapNodeHash;
 ///
 /// [deref coercions]: https://doc.rust-lang.org/std/ops/trait.Deref.html#more-on-deref-coercion
 #[derive(Default, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub struct ScriptBuf(pub Vec<u8>);
 
 impl ScriptBuf {
diff --git a/dash/src/blockdata/transaction/mod.rs b/dash/src/blockdata/transaction/mod.rs
@@ -34,6 +34,7 @@ pub mod txout;
 
 use core::default::Default;
 
+use bincode::{Decode, Encode};
 use hashes::{Hash, sha256d};
 
 use crate::blockdata::constants::WITNESS_SCALE_FACTOR;
@@ -158,6 +159,7 @@ impl<E> EncodeSigningDataResult<E> {
 /// We therefore deviate from the spec by always using the Segwit witness encoding
 /// for 0-input transactions, which results in unambiguously parseable transactions.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct Transaction {
diff --git a/dash/src/blockdata/transaction/outpoint.rs b/dash/src/blockdata/transaction/outpoint.rs
@@ -24,6 +24,7 @@ use core::fmt;
 #[cfg(feature = "std")]
 use std::error;
 
+use bincode::{Decode, Encode};
 use hashes::{self, Hash};
 
 use crate::consensus::{Decodable, Encodable, deserialize, encode};
@@ -32,6 +33,7 @@ use crate::io;
 
 /// A reference to a transaction output.
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub struct OutPoint {
     /// The referenced transaction's txid.
     pub txid: Txid,
diff --git a/dash/src/blockdata/transaction/special_transaction/asset_lock.rs b/dash/src/blockdata/transaction/special_transaction/asset_lock.rs
@@ -22,6 +22,8 @@
 //!
 //! The special transaction type used for AssetLockTx Transactions is 8.
 
+use bincode::{Decode, Encode};
+
 use crate::consensus::{Decodable, Encodable, encode};
 use crate::prelude::*;
 use crate::transaction::txout::TxOut;
@@ -35,6 +37,7 @@ use crate::{VarInt, io};
 /// Each TxOut refers to a funding of an Identity.
 ///
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct AssetLockPayload {
diff --git a/dash/src/blockdata/transaction/special_transaction/asset_unlock/qualified_asset_unlock.rs b/dash/src/blockdata/transaction/special_transaction/asset_unlock/qualified_asset_unlock.rs
@@ -22,6 +22,7 @@
 //!
 //! The special transaction type used for CrWithTx Transactions is 9.
 
+use bincode::{Decode, Encode};
 use hashes::Hash;
 
 use crate::blockdata::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
@@ -46,6 +47,7 @@ pub const ASSET_UNLOCK_TX_SIZE: usize = 190;
 /// Transaction using it have no inputs. Hence the proof of validity lies solely on the BLS signature.
 ///
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct AssetUnlockPayload {
diff --git a/dash/src/blockdata/transaction/special_transaction/asset_unlock/request_info.rs b/dash/src/blockdata/transaction/special_transaction/asset_unlock/request_info.rs
@@ -20,6 +20,8 @@
 
 use std::mem::size_of;
 
+use bincode::{Decode, Encode};
+
 use crate::consensus::{Decodable, Encodable, encode};
 use crate::hash_types::QuorumHash;
 use crate::io;
@@ -29,6 +31,7 @@ use crate::prelude::*;
 /// This is the information about the signing quorum
 /// The request height should be the height at which the specified quorum is active on core.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct AssetUnlockRequestInfo {
diff --git a/dash/src/blockdata/transaction/special_transaction/asset_unlock/unqualified_asset_unlock.rs b/dash/src/blockdata/transaction/special_transaction/asset_unlock/unqualified_asset_unlock.rs
@@ -22,6 +22,8 @@
 //!
 //! The special transaction type used for AssetUnlockTx Transactions is 9.
 
+use bincode::{Decode, Encode};
+
 use crate::blockdata::transaction::special_transaction::TransactionType;
 use crate::blockdata::transaction::special_transaction::TransactionType::AssetUnlock;
 use crate::consensus::{Decodable, Encodable, encode};
@@ -33,6 +35,7 @@ use crate::{ScriptBuf, TxIn, VarInt, io};
 /// An Asset Unlock Base payload. This is the base payload of the Asset Unlock. In order to make
 /// it a full payload the request info should be added.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct AssetUnlockBasePayload {
diff --git a/dash/src/blockdata/transaction/special_transaction/coinbase.rs b/dash/src/blockdata/transaction/special_transaction/coinbase.rs
@@ -18,6 +18,8 @@
 //! It is defined in DIP4 [dip-0004](https://github.com/dashpay/dips/blob/master/dip-0004.md).
 //!
 
+use bincode::{Decode, Encode};
+
 use crate::bls_sig_utils::BLSSignature;
 use crate::consensus::encode::{compact_size_len, read_compact_size, write_compact_size};
 use crate::consensus::{Decodable, Encodable, encode};
@@ -29,6 +31,7 @@ use crate::{VarInt, io};
 /// The Coinbase payload is described in DIP4.
 ///
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct CoinbasePayload {
diff --git a/dash/src/blockdata/transaction/special_transaction/mod.rs b/dash/src/blockdata/transaction/special_transaction/mod.rs
@@ -23,6 +23,8 @@
 use core::convert::TryFrom;
 use core::fmt::{Debug, Display, Formatter};
 
+use bincode::{Decode, Encode};
+
 use crate::blockdata::transaction::special_transaction::TransactionPayload::{
     AssetLockPayloadType, AssetUnlockPayloadType, CoinbasePayloadType,
     ProviderRegistrationPayloadType, ProviderUpdateRegistrarPayloadType,
@@ -58,6 +60,7 @@ pub mod quorum_commitment;
 /// An enum wrapper around various special transaction payloads.
 /// Special transactions are defined in DIP 2.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub enum TransactionPayload {
diff --git a/dash/src/blockdata/transaction/special_transaction/provider_registration.rs b/dash/src/blockdata/transaction/special_transaction/provider_registration.rs
@@ -34,6 +34,7 @@
 //! KeyIdVoting (renamed to voting_key_hash): This is the public key ID used for proposal voting.
 //! Votes signed with this key are valid while the masternode is in the registered set.
 
+use bincode::{Decode, Encode};
 use hashes::Hash;
 use internals::hex::Case::Lower;
 
@@ -58,6 +59,7 @@ use crate::{Address, Network, OutPoint, ScriptBuf, VarInt, io};
 /// *The script payout is the script to which one wants to have the masternode pay out.
 /// *The inputs hash is used to guarantee the uniqueness of the payload sig.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct ProviderRegistrationPayload {
diff --git a/dash/src/blockdata/transaction/special_transaction/provider_update_registrar.rs b/dash/src/blockdata/transaction/special_transaction/provider_update_registrar.rs
@@ -29,6 +29,7 @@
 //!
 //! The special transaction type used for ProUpRegTx Transactions is 3.
 
+use bincode::{Decode, Encode};
 use hashes::Hash;
 
 use crate::blockdata::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
@@ -42,6 +43,7 @@ use crate::{ScriptBuf, VarInt, io};
 /// This is used to update the base aspects a Masternode on the network.
 /// It must be signed by the owner's key that was set at registration.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct ProviderUpdateRegistrarPayload {
diff --git a/dash/src/blockdata/transaction/special_transaction/provider_update_revocation.rs b/dash/src/blockdata/transaction/special_transaction/provider_update_revocation.rs
@@ -36,6 +36,7 @@
 
 //! The special transaction type used for Provider Update Revoking Transactions is 4.
 
+use bincode::{Decode, Encode};
 use hashes::Hash;
 
 use crate::blockdata::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
@@ -48,6 +49,7 @@ use crate::io;
 /// This is used to signal and stop a Masternode from the operator.
 /// It must be signed by the operator's key that was set at registration or registrar update.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct ProviderUpdateRevocationPayload {
diff --git a/dash/src/blockdata/transaction/special_transaction/provider_update_service.rs b/dash/src/blockdata/transaction/special_transaction/provider_update_service.rs
@@ -34,6 +34,7 @@
 //!
 //! The special transaction type used for ProUpServTx Transactions is 2.
 
+use bincode::{Decode, Encode};
 use hashes::Hash;
 
 use crate::blockdata::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
@@ -47,6 +48,7 @@ use crate::{ScriptBuf, VarInt, io};
 /// It must be signed by the operator's key that was set either at registration or by the last
 /// registrar update of the masternode.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct ProviderUpdateServicePayload {
diff --git a/dash/src/blockdata/transaction/special_transaction/quorum_commitment.rs b/dash/src/blockdata/transaction/special_transaction/quorum_commitment.rs
@@ -179,6 +179,7 @@ impl Decodable for QuorumEntry {
 ///
 /// Miners take the best final commitment for a DKG session and mine it into a block.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct QuorumCommitmentPayload {
diff --git a/dash/src/blockdata/transaction/txin.rs b/dash/src/blockdata/transaction/txin.rs
@@ -20,6 +20,8 @@
 //! A TxIn is an input to a transaction.
 //!
 
+use bincode::{Decode, Encode};
+
 use crate::blockdata::script::ScriptBuf;
 use crate::consensus::{Decodable, Encodable, encode};
 use crate::transaction::outpoint::OutPoint;
@@ -29,6 +31,7 @@ use crate::{Witness, io};
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub struct TxIn {
     /// The reference to the previous output that is being used an an input.
     pub previous_output: OutPoint,
diff --git a/dash/src/blockdata/transaction/txout.rs b/dash/src/blockdata/transaction/txout.rs
@@ -20,13 +20,16 @@
 //! A TxOut is an output of a transaction.
 //!
 
+use bincode::{Decode, Encode};
+
 use crate::internal_macros::impl_consensus_encoding;
 use crate::{Address, PubkeyHash, ScriptBuf, ScriptHash, VarInt};
 
 /// A transaction output, which defines new coins to be created from old ones.
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub struct TxOut {
     /// The value of the output, in satoshis.
     pub value: u64,
diff --git a/dash/src/blockdata/witness.rs b/dash/src/blockdata/witness.rs
@@ -8,6 +8,7 @@
 use core::convert::TryInto;
 use core::ops::Index;
 
+use bincode::{Decode, Encode};
 use secp256k1::ecdsa;
 
 use crate::consensus::encode::{Error, MAX_VEC_SIZE};
@@ -29,6 +30,7 @@ use crate::{Script, VarInt};
 ///
 /// [segwit upgrade]: <https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki>
 #[derive(Clone, Default, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub struct Witness {
     /// Contains the witness `Vec<Vec<u8>>` serialization without the initial varint indicating the
     /// number of elements (which is stored in `witness_elements`).
diff --git a/dash/src/hash_types.rs b/dash/src/hash_types.rs
@@ -126,8 +126,10 @@ use hashes::{sha256, sha256d, hash160, hash_newtype, Hash, hash_newtype_no_ord};
         /// Dash Additions
         ///
         /// The merkle root of the masternode list
+        #[hash_newtype(forward)]
         pub struct MerkleRootMasternodeList(sha256d::Hash);
         /// The merkle root of the quorums
+        #[hash_newtype(forward)]
         pub struct MerkleRootQuorums(sha256d::Hash);
         /// A special transaction payload hash
         pub struct SpecialTransactionPayloadHash(sha256d::Hash);
diff --git a/dash/src/network/message_sml.rs b/dash/src/network/message_sml.rs
@@ -1,5 +1,6 @@
 use std::io;
 
+use bincode::{Decode, Encode};
 use hashes::sha256::Hash;
 
 use crate::bls_sig_utils::BLSSignature;
@@ -32,6 +33,9 @@ impl_consensus_encoding!(GetMnListDiff, base_block_hash, block_hash);
 ///
 /// https://docs.dash.org/en/stable/docs/core/reference/p2p-network-data-messages.html#mnlistdiff
 #[derive(Clone, PartialEq, Eq, Debug)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct MnListDiff {
     /// Version of the message (currently 1).
     /// In protocol versions 70225 through 70228 this field was located between the `coinbase_tx` and `deleted_masternodes` fields.
@@ -112,6 +116,9 @@ impl Decodable for MnListDiff {
 }
 
 #[derive(PartialEq, Eq, Clone, Debug)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct QuorumCLSigObject {
     pub signature: BLSSignature,
     pub index_set: Vec<u16>,
@@ -120,6 +127,9 @@ pub struct QuorumCLSigObject {
 impl_consensus_encoding!(QuorumCLSigObject, signature, index_set);
 
 #[derive(PartialEq, Eq, Clone, Debug)]
+#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct DeletedQuorum {
     // TODO: Make it enum
     pub llmq_type: LLMQType,
