feat: support for more address formats in btc transfers

Author: Ludo Galabru

components/clarinet-cli/src/deployments/bitcoin_deployment.rs

@@ -4,7 +4,7 @@ use base58::FromBase58;
 use bitcoin::blockdata::opcodes;
 use bitcoin::blockdata::script::Builder;
 use bitcoin::consensus::encode;
-use bitcoin::{OutPoint, Script, Transaction, TxIn, TxOut, Txid, Witness};
+use bitcoin::{OutPoint, Script, Transaction, TxIn, TxOut, Txid, Witness, PubkeyHash, WPubkeyHash};
 use bitcoincore_rpc::bitcoin::secp256k1::{Message, PublicKey, Secp256k1, SecretKey};
 use bitcoincore_rpc::bitcoin::Address;
 use bitcoincore_rpc::Client;
@@ -61,20 +61,19 @@ pub fn build_transaction_spec(
         selected_utxos.push(utxo);
     }
 
+    
     // Prepare Recipient output
-    let recipient_pub_key_hash = tx_spec
-        .recipient
-        .from_base58()
-        .expect("Unable to get bytes recipient btc address");
+    let address = {
+        use bitcoin::Address;
+        match Address::from_str(&tx_spec.recipient) {
+            Ok(address) => address,
+            Err(e) => panic!("{:?}", e),
+        }
+    };
+
     let txout = TxOut {
         value: tx_spec.sats_amount,
-        script_pubkey: Builder::new()
-            .push_opcode(opcodes::all::OP_DUP)
-            .push_opcode(opcodes::all::OP_HASH160)
-            .push_slice(&recipient_pub_key_hash[1..21])
-            .push_opcode(opcodes::all::OP_EQUALVERIFY)
-            .push_opcode(opcodes::all::OP_CHECKSIG)
-            .into_script(),
+        script_pubkey: address.script_pubkey()
     };
     transaction.output.push(txout);
 

components/clarinet-cli/src/deployments/mod.rs

@@ -160,7 +160,6 @@ fn sign_transaction_payload(
     Ok(signed_tx)
 }
 
-#[allow(dead_code)]
 pub fn encode_contract_call(
     contract_id: &QualifiedContractIdentifier,
     function_name: ClarityName,