Merge bitcoindevkit/bdk-cli#99: The Great Reset

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Rewrite relevant doc comments as `structopt` help document.
 - Update `bdk` and `bdk-reserves` to v0.19.0.
 - Change default database to `sqlite`.
+- Add the add_data option to create_tx to create an op_return output. 
 
 ## [0.5.0]
 

src/commands.rs

@@ -339,6 +339,22 @@ pub enum OfflineWalletSubCommand {
         /// Selects which policy should be used to satisfy the internal descriptor
         #[structopt(name = "INT_POLICY", long = "internal_policy")]
         internal_policy: Option<String>,
+        /// Add string as an output using OP_RETURN
+        #[structopt(
+            name = "ADD_STRING",
+            long = "add_string",
+            short = "s",
+            conflicts_with = "ADD_DATA"
+        )]
+        add_string: Option<String>,
+        /// Add arbitrary data (max 80-bytes) as an output using OP_RETURN
+        #[structopt(
+            name = "ADD_DATA",
+            long = "add_data",
+            short = "o",
+            conflicts_with = "ADD_STRING"
+        )]
+        add_data: Option<String>,
     },
     /// Bumps the fees of an RBF transaction
     BumpFee {
@@ -944,6 +960,8 @@ mod test {
                     fee_rate: None,
                     external_policy: None,
                     internal_policy: None,
+                    add_data: None,
+                    add_string: None,
                 }),
             },
         };

src/handlers.rs

@@ -125,6 +125,8 @@ where
             fee_rate,
             external_policy,
             internal_policy,
+            add_data,
+            add_string,
         } => {
             let mut tx_builder = wallet.build_tx();
 
@@ -154,6 +156,13 @@ where
                 tx_builder.unspendable(unspendable);
             }
 
+            if let Some(base64_data) = add_data {
+                let op_return_data = base64::decode(&base64_data).unwrap();
+                tx_builder.add_data(op_return_data.as_slice());
+            } else if let Some(string_data) = add_string {
+                tx_builder.add_data(string_data.as_bytes());
+            }
+
             let policies = vec![
                 external_policy.map(|p| (p, KeychainKind::External)),
                 internal_policy.map(|p| (p, KeychainKind::Internal)),