From 7d1a4500ef88d0d817af2abfbe4e77007ad70a8e Mon Sep 17 00:00:00 2001
From: Steve Myers <steve@notmandatory.org>
Date: Wed, 7 Dec 2022 11:46:47 -0600
Subject: [PATCH 1/2] Change TxBuilder.drain_to argument to Script instead of
 address String

---
 bdk-ffi/src/bdk.udl |  2 +-
 bdk-ffi/src/lib.rs  | 33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl
index 00018f24..2a53dd40 100644
--- a/bdk-ffi/src/bdk.udl
+++ b/bdk-ffi/src/bdk.udl
@@ -257,7 +257,7 @@ interface TxBuilder {
 
   TxBuilder drain_wallet();
 
-  TxBuilder drain_to(string address);
+  TxBuilder drain_to(Script script);
 
   TxBuilder enable_rbf();
 
diff --git a/bdk-ffi/src/lib.rs b/bdk-ffi/src/lib.rs
index a936b0ef..1bb5364a 100644
--- a/bdk-ffi/src/lib.rs
+++ b/bdk-ffi/src/lib.rs
@@ -501,12 +501,6 @@ impl Wallet {
     }
 }
 
-fn to_script_pubkey(address: &str) -> Result<BdkScript, BdkError> {
-    BdkAddress::from_str(address)
-        .map(|x| x.script_pubkey())
-        .map_err(|e| BdkError::Generic(e.to_string()))
-}
-
 /// A Bitcoin address.
 struct Address {
     address: BdkAddress,
@@ -527,7 +521,7 @@ impl Address {
 }
 
 /// A Bitcoin script.
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Script {
     script: BdkScript,
 }
@@ -565,7 +559,7 @@ struct TxBuilder {
     fee_rate: Option<f32>,
     fee_absolute: Option<u64>,
     drain_wallet: bool,
-    drain_to: Option<String>,
+    drain_to: Option<BdkScript>,
     rbf: Option<RbfValue>,
     data: Vec<u8>,
 }
@@ -703,9 +697,9 @@ impl TxBuilder {
     /// either provide the utxos that the transaction should spend via add_utxos, or set drain_wallet to spend all of them.
     /// When bumping the fees of a transaction made with this option, you probably want to use BumpFeeTxBuilder.allow_shrinking
     /// to allow this output to be reduced to pay for the extra fees.
-    fn drain_to(&self, address: String) -> Arc<Self> {
+    fn drain_to(&self, script: Arc<Script>) -> Arc<Self> {
         Arc::new(TxBuilder {
-            drain_to: Some(address),
+            drain_to: Some(script.script.clone()),
             ..self.clone()
         })
     }
@@ -766,8 +760,8 @@ impl TxBuilder {
         if self.drain_wallet {
             tx_builder.drain_wallet();
         }
-        if let Some(address) = &self.drain_to {
-            tx_builder.drain_to(to_script_pubkey(address)?);
+        if let Some(script) = &self.drain_to {
+            tx_builder.drain_to(script.clone());
         }
         if let Some(rbf) = &self.rbf {
             match *rbf {
@@ -1125,11 +1119,14 @@ mod test {
             wallet_mutex: Mutex::new(funded_wallet),
         };
         let drain_to_address = "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt".to_string();
+        let drain_to_script = crate::Address::new(drain_to_address)
+            .unwrap()
+            .script_pubkey();
         let tx_builder = TxBuilder::new()
             .drain_wallet()
-            .drain_to(drain_to_address.clone());
+            .drain_to(drain_to_script.clone());
         assert!(tx_builder.drain_wallet);
-        assert_eq!(tx_builder.drain_to, Some(drain_to_address));
+        assert_eq!(tx_builder.drain_to, Some(drain_to_script.script.clone()));
 
         let tx_builder_result = tx_builder.finish(&test_wallet).unwrap();
         let psbt = tx_builder_result.psbt.internal.lock().unwrap().clone();
@@ -1317,13 +1314,17 @@ mod test {
             wallet_mutex: Mutex::new(funded_wallet),
         };
         let drain_to_address = "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt".to_string();
+        let drain_to_script = crate::Address::new(drain_to_address)
+            .unwrap()
+            .script_pubkey();
+
         let tx_builder = TxBuilder::new()
             .fee_rate(2.0)
             .drain_wallet()
-            .drain_to(drain_to_address.clone());
+            .drain_to(drain_to_script.clone());
         //dbg!(&tx_builder);
         assert!(tx_builder.drain_wallet);
-        assert_eq!(tx_builder.drain_to, Some(drain_to_address));
+        assert_eq!(tx_builder.drain_to, Some(drain_to_script.script.clone()));
 
         let tx_builder_result = tx_builder.finish(&test_wallet).unwrap();
 

From f216417fd2722238d9842c152a80445beaf1701e Mon Sep 17 00:00:00 2001
From: Steve Myers <steve@notmandatory.org>
Date: Wed, 7 Dec 2022 15:34:32 -0600
Subject: [PATCH 2/2] Update api-docs for TxBuilder.drain_to change

---
 api-docs/kotlin/src/main/kotlin/org/bitcoindevkit/bdk.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api-docs/kotlin/src/main/kotlin/org/bitcoindevkit/bdk.kt b/api-docs/kotlin/src/main/kotlin/org/bitcoindevkit/bdk.kt
index 5ac06b9d..91422b8b 100644
--- a/api-docs/kotlin/src/main/kotlin/org/bitcoindevkit/bdk.kt
+++ b/api-docs/kotlin/src/main/kotlin/org/bitcoindevkit/bdk.kt
@@ -410,7 +410,7 @@ class TxBuilder() {
      * [drainWallet] to spend all of them. When bumping the fees of a transaction made with this option,
      * you probably want to use [BumpFeeTxBuilder.allowShrinking] to allow this output to be reduced to pay for the extra fees.
      */
-    fun drainTo(address: String): TxBuilder {}
+    fun drainTo(script: Script): TxBuilder {}
 
     /** Enable signaling RBF. This will use the default `nsequence` value of `0xFFFFFFFD`. */
     fun enableRbf(): TxBuilder {}