feat: basic ferment integration

dash/Cargo.toml

@@ -33,6 +33,7 @@ eddsa = ["ed25519-dalek"]
 quorum_validation = ["bls", "bls-signatures"]
 message_verification = ["bls"]
 bincode = [ "dep:bincode", "dashcore_hashes/bincode" ]
+apple = [ "ferment", "ferment-macro", "bls-signatures/legacy", "bls-signatures/bip32", "bls-signatures/apple", "bls-signatures/use_serde" ]
 
 # At least one of std, no-std must be enabled.
 #
@@ -62,14 +63,15 @@ hex_lit = "0.1.1"
 anyhow = { version= "1.0" }
 hex = { version= "0.4" }
 bincode = { version= "=2.0.0-rc.3", optional = true }
+bincode_derive = { version= "=2.0.0-rc.3", optional = true }
 bitflags = "2.9.0"
 blsful = { version = "3.0.0-pre8", optional = true }
 ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true }
 blake3 = "1.8.1"
 thiserror = "2"
-# version 1.3.5 is 0bb5c5b03249c463debb5cef5f7e52ee66f3aaab
-bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "0bb5c5b03249c463debb5cef5f7e52ee66f3aaab", optional = true }
-
+bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "a0fec2f4da2bdbb753e6287b0546ae0b08e74e02", optional = true  }
+ferment = { version = "0.2", package = "ferment", optional = true }
+ferment-macro = { version = "0.2", package = "ferment-macro", optional = true }
 [dev-dependencies]
 serde_json = "1.0.140"
 serde_test = "1.0.177"

dash/src/bip158.rs

@@ -601,7 +601,7 @@ mod test {
     use serde_json::Value;
 
     use super::*;
-    use crate::ScriptBuf;
+    use crate::blockdata::script::ScriptBuf;
     use crate::consensus::encode::deserialize;
     use crate::hash_types::BlockHash;
     use crate::internal_macros::hex;

dash/src/blockdata/script/mod.rs

@@ -69,15 +69,15 @@ use crate::{OutPoint, io};
 mod borrowed;
 mod builder;
 mod instruction;
-mod owned;
+pub mod owned;
 mod push_bytes;
 #[cfg(test)]
 mod tests;
 
 pub use self::borrowed::*;
 pub use self::builder::*;
 pub use self::instruction::*;
-pub use self::owned::*;
+pub use self::owned::ScriptBuf;
 pub use self::push_bytes::*;
 
 /// Encodes an integer in script(minimal CScriptNum) format.

dash/src/blockdata/script/owned.rs

@@ -29,6 +29,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))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct ScriptBuf(pub Vec<u8>);
 
 impl ScriptBuf {

dash/src/blockdata/transaction/mod.rs

@@ -41,7 +41,7 @@ use hashes::{Hash, sha256d};
 use crate::blockdata::constants::WITNESS_SCALE_FACTOR;
 #[cfg(feature = "bitcoinconsensus")]
 use crate::blockdata::script;
-use crate::blockdata::script::Script;
+use crate::blockdata::script::{Script, ScriptBuf};
 use crate::blockdata::transaction::hash_type::EcdsaSighashType;
 use crate::blockdata::transaction::special_transaction::{TransactionPayload, TransactionType};
 use crate::blockdata::transaction::txin::TxIn;
@@ -52,8 +52,8 @@ use crate::consensus::{Decodable, Encodable, encode};
 use crate::hash_types::{InputsHash, Txid, Wtxid};
 use crate::prelude::*;
 use crate::sighash::LegacySighash;
-pub use crate::transaction::outpoint::*;
-use crate::{ScriptBuf, Weight, io};
+pub use self::outpoint::OutPoint;
+use crate::{Weight, io};
 
 /// Used for signature hash for invalid use of SIGHASH_SINGLE.
 const UINT256_ONE: [u8; 32] = [
@@ -165,6 +165,7 @@ impl<E> EncodeSigningDataResult<E> {
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct Transaction {
     /// The protocol version, is currently expected to be 1 or 2 (BIP 68).
     pub version: u16,

dash/src/blockdata/transaction/outpoint.rs

@@ -35,6 +35,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))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct OutPoint {
     /// The referenced transaction's txid.
     pub txid: Txid,

dash/src/blockdata/transaction/special_transaction/asset_lock.rs

@@ -27,7 +27,7 @@ use bincode::{Decode, Encode};
 
 use crate::consensus::{Decodable, Encodable, encode};
 use crate::prelude::*;
-use crate::transaction::txout::TxOut;
+use crate::blockdata::transaction::txout::TxOut;
 use crate::{VarInt, io};
 
 /// An Asset Lock payload. This is contained as the payload of an asset lock special transaction.
@@ -41,6 +41,7 @@ use crate::{VarInt, io};
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct AssetLockPayload {
     pub version: u8,
     pub credit_outputs: Vec<TxOut>,

dash/src/blockdata/transaction/special_transaction/asset_unlock/qualified_asset_unlock.rs

@@ -51,6 +51,7 @@ pub const ASSET_UNLOCK_TX_SIZE: usize = 190;
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct AssetUnlockPayload {
     /// The base information about the asset unlock. This base information is the information that
     /// should be put into a queue.

dash/src/blockdata/transaction/special_transaction/asset_unlock/request_info.rs

@@ -35,6 +35,7 @@ use crate::prelude::*;
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct AssetUnlockRequestInfo {
     /// The core request height of the transaction. This should match a period where the quorum_hash
     /// is still active

dash/src/blockdata/transaction/special_transaction/asset_unlock/unqualified_asset_unlock.rs

@@ -25,20 +25,23 @@
 #[cfg(feature = "bincode")]
 use bincode::{Decode, Encode};
 
+use crate::blockdata::script::ScriptBuf;
 use crate::blockdata::transaction::special_transaction::TransactionType;
 use crate::blockdata::transaction::special_transaction::TransactionType::AssetUnlock;
+use crate::blockdata::transaction::txin::TxIn;
+use crate::blockdata::transaction::txout::TxOut;
 use crate::consensus::{Decodable, Encodable, encode};
 use crate::hash_types::{PubkeyHash, ScriptHash};
 use crate::prelude::*;
-use crate::transaction::TxOut;
-use crate::{ScriptBuf, TxIn, VarInt, io};
+use crate::{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"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct AssetUnlockBasePayload {
     /// The payload protocol version, is currently expected to be 0.
     pub version: u8,

dash/src/blockdata/transaction/special_transaction/coinbase.rs

@@ -35,6 +35,7 @@ use crate::io::{Error, ErrorKind};
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct CoinbasePayload {
     pub version: u16,
     pub height: u32,

dash/src/blockdata/transaction/special_transaction/mod.rs

@@ -64,6 +64,7 @@ pub mod quorum_commitment;
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub enum TransactionPayload {
     /// A wrapper for a Masternode Registration payload
     ProviderRegistrationPayloadType(ProviderRegistrationPayload),

dash/src/blockdata/transaction/special_transaction/provider_registration.rs

@@ -42,12 +42,14 @@ use hashes::Hash;
 use internals::hex::Case::Lower;
 
 use crate::address::Payload;
+use crate::blockdata::script::ScriptBuf;
+use crate::blockdata::transaction::OutPoint;
 use crate::blockdata::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
 use crate::bls_sig_utils::BLSPublicKey;
 use crate::consensus::{Decodable, Encodable, encode};
 use crate::hash_types::{InputsHash, PubkeyHash, SpecialTransactionPayloadHash};
 use crate::prelude::*;
-use crate::{Address, Network, OutPoint, ScriptBuf, VarInt, io};
+use crate::{Address, Network, VarInt, io};
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash, Copy)]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
@@ -97,6 +99,7 @@ impl Decodable for ProviderMasternodeType {
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct ProviderRegistrationPayload {
     pub version: u16,
     pub masternode_type: ProviderMasternodeType,

dash/src/blockdata/transaction/special_transaction/provider_update_registrar.rs

@@ -32,13 +32,13 @@
 #[cfg(feature = "bincode")]
 use bincode::{Decode, Encode};
 use hashes::Hash;
-
+use crate::blockdata::script::ScriptBuf;
 use crate::blockdata::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
 use crate::bls_sig_utils::BLSPublicKey;
 use crate::consensus::{Decodable, Encodable, encode};
 use crate::hash_types::{InputsHash, PubkeyHash, SpecialTransactionPayloadHash, Txid};
 use crate::prelude::*;
-use crate::{ScriptBuf, VarInt, io};
+use crate::{VarInt, io};
 
 /// A Provider Update Registrar Payload used in a Provider Update Registrar Special Transaction.
 /// This is used to update the base aspects a Masternode on the network.
@@ -47,6 +47,7 @@ use crate::{ScriptBuf, VarInt, io};
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct ProviderUpdateRegistrarPayload {
     pub version: u16,
     pub pro_tx_hash: Txid,

dash/src/blockdata/transaction/special_transaction/provider_update_revocation.rs

@@ -53,6 +53,7 @@ use crate::io;
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct ProviderUpdateRevocationPayload {
     pub version: u16,
     pub pro_tx_hash: Txid,

dash/src/blockdata/transaction/special_transaction/provider_update_service.rs

@@ -37,12 +37,12 @@
 #[cfg(feature = "bincode")]
 use bincode::{Decode, Encode};
 use hashes::Hash;
-
+use crate::blockdata::script::ScriptBuf;
 use crate::blockdata::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
 use crate::bls_sig_utils::BLSSignature;
 use crate::consensus::{Decodable, Encodable, encode};
 use crate::hash_types::{InputsHash, SpecialTransactionPayloadHash, Txid};
-use crate::{ScriptBuf, VarInt, io};
+use crate::{VarInt, io};
 
 /// A Provider Update Service Payload used in a Provider Update Service Special Transaction.
 /// This is used to update the operational aspects a Masternode on the network.
@@ -52,6 +52,7 @@ use crate::{ScriptBuf, VarInt, io};
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct ProviderUpdateServicePayload {
     pub version: u16,
     pub pro_tx_hash: Txid,

dash/src/blockdata/transaction/special_transaction/quorum_commitment.rs

@@ -39,6 +39,7 @@ use crate::sml::quorum_validation_error::QuorumValidationError;
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct QuorumEntry {
     pub version: u16,
     pub llmq_type: LLMQType,
@@ -183,10 +184,11 @@ impl Decodable for QuorumEntry {
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct QuorumCommitmentPayload {
-    version: u16,
-    height: u32,
-    finalization_commitment: QuorumEntry,
+    pub version: u16,
+    pub height: u32,
+    pub finalization_commitment: QuorumEntry,
 }
 
 impl QuorumCommitmentPayload {

dash/src/blockdata/transaction/txin.rs

@@ -24,15 +24,17 @@
 use bincode::{Decode, Encode};
 
 use crate::blockdata::script::ScriptBuf;
-use crate::consensus::{Decodable, Encodable, encode};
-use crate::transaction::outpoint::OutPoint;
-use crate::{Witness, io};
+use crate::blockdata::transaction::outpoint::OutPoint;
+use crate::blockdata::witness::Witness;
+use crate::consensus::{encode, Decodable, Encodable};
+use crate::io;
 
 /// A transaction input, which defines old coins to be consumed
 #[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))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct TxIn {
     /// The reference to the previous output that is being used an an input.
     pub previous_output: OutPoint,

dash/src/blockdata/transaction/txout.rs

@@ -24,13 +24,16 @@
 use bincode::{Decode, Encode};
 
 use crate::internal_macros::impl_consensus_encoding;
-use crate::{Address, PubkeyHash, ScriptBuf, ScriptHash, VarInt};
+use crate::{Address, VarInt};
+use crate::blockdata::script::ScriptBuf;
+use crate::hash_types::{PubkeyHash, ScriptHash};
 
 /// 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))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 pub struct TxOut {
     /// The value of the output, in satoshis.
     pub value: u64,

dash/src/blockdata/witness.rs

@@ -32,20 +32,21 @@ 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))]
+#[cfg_attr(feature = "apple", ferment_macro::export)]
 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`).
-    content: Vec<u8>,
+    pub content: Vec<u8>,
 
     /// The number of elements in the witness.
     ///
     /// Stored separately (instead of as a VarInt in the initial part of content) so that methods
     /// like [`Witness::push`] don't have to shift the entire array.
-    witness_elements: usize,
+    pub witness_elements: usize,
 
     /// This is the valid index pointing to the beginning of the index area. This area is 4 *
     /// stack_size bytes at the end of the content vector which stores the indices of each item.
-    indices_start: usize,
+    pub indices_start: usize,
 }
 
 /// An iterator returning individual witness elements.

dash/src/bls_sig_utils.rs

@@ -34,7 +34,8 @@ use crate::sml::quorum_validation_error::QuorumValidationError;
 #[rustversion::attr(since(1.48), derive(PartialEq, Eq, Ord, PartialOrd, Hash))]
 #[derive(Clone, Copy, Debug)]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
-pub struct BLSPublicKey([u8; 48]);
+#[cfg_attr(feature = "apple", ferment_macro::export)]
+pub struct BLSPublicKey(pub [u8; 48]);
 
 impl BLSPublicKey {
     pub fn is_zeroed(&self) -> bool {
@@ -96,7 +97,8 @@ impl fmt::Display for BLSPublicKey {
 #[rustversion::attr(since(1.48), derive(PartialEq, Eq, Ord, PartialOrd, Hash))]
 #[derive(Clone, Copy)]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
-pub struct BLSSignature([u8; 96]);
+#[cfg_attr(feature = "apple", ferment_macro::export)]
+pub struct BLSSignature(pub [u8; 96]);
 
 impl BLSSignature {
     pub fn is_zeroed(&self) -> bool {

dash/src/consensus/encode.rs

@@ -46,6 +46,7 @@ use crate::hash_types::{
     BlockHash, FilterHash, FilterHeader, MerkleRootMasternodeList, TxMerkleNode,
 };
 use crate::io::{self, Cursor, Read};
+use crate::hash_types::ProTxHash;
 use crate::network::message_qrinfo::QuorumSnapshot;
 use crate::network::message_sml::{DeletedQuorum, MnListDiff, QuorumCLSigObject};
 #[cfg(feature = "std")]
@@ -56,11 +57,13 @@ use crate::network::{
 use crate::prelude::*;
 use crate::sml::masternode_list_entry::MasternodeListEntry;
 use crate::taproot::TapLeafHash;
-use crate::transaction::special_transaction::TransactionType;
-use crate::transaction::special_transaction::quorum_commitment::QuorumEntry;
-use crate::transaction::txin::TxIn;
-use crate::transaction::txout::TxOut;
-use crate::{OutPoint, ProTxHash, ScriptBuf, address};
+use crate::blockdata::script::ScriptBuf;
+use crate::blockdata::transaction::OutPoint;
+use crate::blockdata::transaction::special_transaction::TransactionType;
+use crate::blockdata::transaction::special_transaction::quorum_commitment::QuorumEntry;
+use crate::blockdata::transaction::txin::TxIn;
+use crate::blockdata::transaction::txout::TxOut;
+use crate::address;
 
 /// Encoding error.
 #[derive(Debug)]

dash/src/crypto/sighash.rs

@@ -24,7 +24,7 @@ use crate::consensus::{Encodable, encode};
 use crate::error::impl_std_error;
 use crate::io;
 use crate::prelude::*;
-use crate::script::{Script, ScriptBuf};
+use crate::blockdata::script::{Script, ScriptBuf};
 use crate::taproot::{LeafVersion, TAPROOT_ANNEX_PREFIX, TapLeafHash};
 
 /// Used for signature hash for invalid use of SIGHASH_SINGLE.