refactor TransactionBuilder to centralize as much logic as possible

Author: ZocoLini

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

@@ -46,6 +46,17 @@ pub struct AssetLockPayload {
 }
 
 impl AssetLockPayload {
+    /// Latest spec version of the AssetLock payload.
+    pub const CURRENT_VERSION: u8 = 1;
+
+    /// Create a new AssetLock payload at [`Self::CURRENT_VERSION`].
+    pub fn new(credit_outputs: Vec<TxOut>) -> Self {
+        Self {
+            version: Self::CURRENT_VERSION,
+            credit_outputs,
+        }
+    }
+
     /// The size of the payload in bytes.
     pub fn size(&self) -> usize {
         let size = 1 + VarInt(self.credit_outputs.len() as u64).len();

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

@@ -47,6 +47,29 @@ pub struct CoinbasePayload {
 }
 
 impl CoinbasePayload {
+    /// Latest spec version of the Coinbase payload.
+    pub const CURRENT_VERSION: u16 = 3;
+
+    /// Create a new Coinbase payload at [`Self::CURRENT_VERSION`].
+    pub fn new(
+        height: u32,
+        merkle_root_masternode_list: MerkleRootMasternodeList,
+        merkle_root_quorums: MerkleRootQuorums,
+        best_cl_height: Option<u32>,
+        best_cl_signature: Option<BLSSignature>,
+        asset_locked_amount: Option<u64>,
+    ) -> Self {
+        Self {
+            version: Self::CURRENT_VERSION,
+            height,
+            merkle_root_masternode_list,
+            merkle_root_quorums,
+            best_cl_height,
+            best_cl_signature,
+            asset_locked_amount,
+        }
+    }
+
     /// The size of the payload in bytes.
     /// version(2) + height(4) + merkle_root_masternode_list(32) + merkle_root_quorums(32)
     /// in addition to the above, if version >= 3: asset_locked_amount(8) + best_cl_height(compact_size) +

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

@@ -114,6 +114,46 @@ pub struct ProviderRegistrationPayload {
 }
 
 impl ProviderRegistrationPayload {
+    /// Latest spec version of the ProRegTx payload.
+    pub const CURRENT_VERSION: u16 = 2;
+
+    /// Create a new ProRegTx payload at [`Self::CURRENT_VERSION`].
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        masternode_type: ProviderMasternodeType,
+        masternode_mode: u16,
+        collateral_outpoint: OutPoint,
+        service_address: SocketAddr,
+        owner_key_hash: PubkeyHash,
+        operator_public_key: BLSPublicKey,
+        voting_key_hash: PubkeyHash,
+        operator_reward: u16,
+        script_payout: ScriptBuf,
+        inputs_hash: InputsHash,
+        signature: Vec<u8>,
+        platform_node_id: Option<PubkeyHash>,
+        platform_p2p_port: Option<u16>,
+        platform_http_port: Option<u16>,
+    ) -> Self {
+        Self {
+            version: Self::CURRENT_VERSION,
+            masternode_type,
+            masternode_mode,
+            collateral_outpoint,
+            service_address,
+            owner_key_hash,
+            operator_public_key,
+            voting_key_hash,
+            operator_reward,
+            script_payout,
+            inputs_hash,
+            signature,
+            platform_node_id,
+            platform_p2p_port,
+            platform_http_port,
+        }
+    }
+
     /// A convenience method to get the address from payout script
     pub fn payout_address(&self, network: Network) -> Result<Address, encode::Error> {
         match Address::from_script(&self.script_payout, network) {

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

@@ -58,6 +58,31 @@ pub struct ProviderUpdateRegistrarPayload {
 }
 
 impl ProviderUpdateRegistrarPayload {
+    /// Latest spec version of the ProUpRegTx payload.
+    pub const CURRENT_VERSION: u16 = 2;
+
+    /// Create a new ProUpRegTx payload at [`Self::CURRENT_VERSION`].
+    pub fn new(
+        pro_tx_hash: Txid,
+        provider_mode: u16,
+        operator_public_key: BLSPublicKey,
+        voting_key_hash: PubkeyHash,
+        script_payout: ScriptBuf,
+        inputs_hash: InputsHash,
+        payload_sig: Vec<u8>,
+    ) -> Self {
+        Self {
+            version: Self::CURRENT_VERSION,
+            pro_tx_hash,
+            provider_mode,
+            operator_public_key,
+            voting_key_hash,
+            script_payout,
+            inputs_hash,
+            payload_sig,
+        }
+    }
+
     /// The size of the payload in bytes.
     pub fn size(&self) -> usize {
         let mut size = 2 + 32 + 2 + 48 + 20 + 32; // 136

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

@@ -61,6 +61,25 @@ pub struct ProviderUpdateRevocationPayload {
 }
 
 impl ProviderUpdateRevocationPayload {
+    /// Latest spec version of the ProUpRevTx payload.
+    pub const CURRENT_VERSION: u16 = 2;
+
+    /// Create a new ProUpRevTx payload at [`Self::CURRENT_VERSION`].
+    pub fn new(
+        pro_tx_hash: Txid,
+        reason: u16,
+        inputs_hash: InputsHash,
+        payload_sig: BLSSignature,
+    ) -> Self {
+        Self {
+            version: Self::CURRENT_VERSION,
+            pro_tx_hash,
+            reason,
+            inputs_hash,
+            payload_sig,
+        }
+    }
+
     /// The size of the payload in bytes.
     pub fn size(&self) -> usize {
         2 + 32 + 2 + 32 + 96

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

@@ -76,6 +76,38 @@ pub struct ProviderUpdateServicePayload {
 }
 
 impl ProviderUpdateServicePayload {
+    /// Latest spec version of the ProUpServTx payload (BasicBLS).
+    pub const CURRENT_VERSION: u16 = 2;
+
+    /// Create a new ProUpServTx payload at [`Self::CURRENT_VERSION`].
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        mn_type: Option<u16>,
+        pro_tx_hash: Txid,
+        ip_address: u128,
+        port: u16,
+        script_payout: ScriptBuf,
+        inputs_hash: InputsHash,
+        platform_node_id: Option<[u8; 20]>,
+        platform_p2p_port: Option<u16>,
+        platform_http_port: Option<u16>,
+        payload_sig: BLSSignature,
+    ) -> Self {
+        Self {
+            version: Self::CURRENT_VERSION,
+            mn_type,
+            pro_tx_hash,
+            ip_address,
+            port,
+            script_payout,
+            inputs_hash,
+            platform_node_id,
+            platform_p2p_port,
+            platform_http_port,
+            payload_sig,
+        }
+    }
+
     /// The size of the payload in bytes.
     pub fn size(&self) -> usize {
         let mut size = 2 + 32 + 16 + 2 + 32 + 96; // 180

key-wallet-ffi/src/transaction.rs

@@ -132,12 +132,14 @@ pub unsafe extern "C" fn wallet_build_and_sign_transaction(
             let mut manager = manager_ref.manager.write().await;
 
             let (transaction, fee) = unwrap_or_return!(
-                manager.build_and_sign_transaction(
-                    &wallet_id,
-                    account_index,
-                    outputs,
-                    FeeRate::new(fee_per_kb)
-                ),
+                manager
+                    .build_and_sign_transaction(
+                        &wallet_id,
+                        account_index,
+                        outputs,
+                        FeeRate::new(fee_per_kb)
+                    )
+                    .await,
                 error
             );
             *fee_out = fee;
@@ -837,7 +839,7 @@ pub unsafe extern "C" fn wallet_build_and_sign_asset_lock_transaction(
                 account_index,
                 fundings,
                 fee_per_kb,
-            ), error);
+            ).await, error);
 
             // Write outputs
             *fee_out = result.fee;

key-wallet-manager/src/lib.rs

@@ -602,7 +602,7 @@ impl WalletManager<ManagedWalletInfo> {
         managed_info.next_change_address(wallet, account_index, account_type_pref, mark_as_used)
     }
 
-    pub fn build_and_sign_transaction(
+    pub async fn build_and_sign_transaction(
         &mut self,
         wallet_id: &WalletId,
         account_index: u32,
@@ -616,6 +616,7 @@ impl WalletManager<ManagedWalletInfo> {
 
         managed_wallet
             .build_and_sign_transaction(wallet, account_index, outputs, fee_rate)
+            .await
             .map_err(|e| WalletError::TransactionBuild(e.to_string()))
     }
 }