From bcce994b977ae3bf0cbdac79544f1ec81ffc461f Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Thu, 12 Jan 2023 15:45:23 -0800
Subject: [PATCH] Output inscription ID from `ord wallet inscribe` (#1208)

---
 src/inscription_id.rs             |   9 ++
 src/main.rs                       |   2 +-
 src/subcommand/wallet/inscribe.rs |  22 ++++-
 tests/command_builder.rs          |   6 ++
 tests/lib.rs                      |  35 +++-----
 tests/server.rs                   | 133 +++++++++++++-----------------
 tests/wallet/inscribe.rs          | 132 ++++++++---------------------
 tests/wallet/inscriptions.rs      |  40 ++++-----
 tests/wallet/send.rs              |  76 ++++++-----------
 9 files changed, 178 insertions(+), 277 deletions(-)

diff --git a/src/inscription_id.rs b/src/inscription_id.rs
index ca9dc263e6..a970ffe770 100644
--- a/src/inscription_id.rs
+++ b/src/inscription_id.rs
@@ -15,6 +15,15 @@ impl<'de> Deserialize<'de> for InscriptionId {
   }
 }
 
+impl Serialize for InscriptionId {
+  fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+  where
+    S: Serializer,
+  {
+    serializer.collect_str(self)
+  }
+}
+
 impl Display for InscriptionId {
   fn fmt(&self, f: &mut Formatter) -> fmt::Result {
     write!(f, "{}i{}", self.txid, self.index)
diff --git a/src/main.rs b/src/main.rs
index 016031854c..ab8f2b3df3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -49,7 +49,7 @@ use {
   html_escaper::{Escape, Trusted},
   lazy_static::lazy_static,
   regex::Regex,
-  serde::{Deserialize, Deserializer, Serialize},
+  serde::{Deserialize, Deserializer, Serialize, Serializer},
   std::{
     cmp,
     collections::{BTreeMap, HashSet, VecDeque},
diff --git a/src/subcommand/wallet/inscribe.rs b/src/subcommand/wallet/inscribe.rs
index fb01fa97f7..4c33f0ee53 100644
--- a/src/subcommand/wallet/inscribe.rs
+++ b/src/subcommand/wallet/inscribe.rs
@@ -16,6 +16,13 @@ use {
   std::collections::BTreeSet,
 };
 
+#[derive(Serialize)]
+struct Output {
+  commit: Txid,
+  inscription: InscriptionId,
+  reveal: Txid,
+}
+
 #[derive(Debug, Parser)]
 pub(crate) struct Inscribe {
   #[clap(long, help = "Inscribe <SATPOINT>")]
@@ -69,16 +76,23 @@ impl Inscribe {
       .sign_raw_transaction_with_wallet(&unsigned_commit_tx, None, None)?
       .hex;
 
-    let commit_txid = client
+    let commit = client
       .send_raw_transaction(&signed_raw_commit_tx)
       .context("Failed to send commit transaction")?;
 
-    let reveal_txid = client
+    let reveal = client
       .send_raw_transaction(&reveal_tx)
       .context("Failed to send reveal transaction")?;
 
-    println!("commit\t{commit_txid}");
-    println!("reveal\t{reveal_txid}");
+    serde_json::to_writer_pretty(
+      io::stdout(),
+      &Output {
+        commit,
+        reveal,
+        inscription: reveal.into(),
+      },
+    )?;
+
     Ok(())
   }
 
diff --git a/tests/command_builder.rs b/tests/command_builder.rs
index 7c16286986..0c4c5c58d4 100644
--- a/tests/command_builder.rs
+++ b/tests/command_builder.rs
@@ -134,4 +134,10 @@ impl CommandBuilder {
 
     stdout.into()
   }
+
+  pub(crate) fn output<T: DeserializeOwned>(self) -> T {
+    let stdout = self.stdout_regex(".*").run();
+    serde_json::from_str(&stdout)
+      .unwrap_or_else(|err| panic!("Failed to deserialize JSON: {err}\n{stdout}"))
+  }
 }
diff --git a/tests/lib.rs b/tests/lib.rs
index 4516b772fd..ae6dcac460 100644
--- a/tests/lib.rs
+++ b/tests/lib.rs
@@ -7,6 +7,7 @@ use {
   pretty_assertions::assert_eq as pretty_assert_eq,
   regex::Regex,
   reqwest::{StatusCode, Url},
+  serde::{de::DeserializeOwned, Deserialize},
   std::{
     fs,
     net::TcpListener,
@@ -35,35 +36,25 @@ macro_rules! assert_regex_match {
   };
 }
 
-fn reveal_txid_from_inscribe_stdout(stdout: &str) -> Txid {
-  stdout
-    .lines()
-    .nth(1)
-    .unwrap()
-    .split('\t')
-    .nth(1)
-    .unwrap()
-    .parse()
-    .unwrap()
+#[derive(Deserialize)]
+struct Inscribe {
+  #[allow(dead_code)]
+  commit: Txid,
+  inscription: String,
+  reveal: Txid,
 }
 
-fn create_inscription(rpc_server: &test_bitcoincore_rpc::Handle, filename: &str) -> String {
+fn inscribe(rpc_server: &test_bitcoincore_rpc::Handle) -> Inscribe {
   rpc_server.mine_blocks(1);
 
-  let stdout = CommandBuilder::new(format!(
-    "--chain {} wallet inscribe {filename}",
-    rpc_server.network()
-  ))
-  .write(filename, "HELLOWORLD")
-  .rpc_server(rpc_server)
-  .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-  .run();
-
-  let reveal_txid = reveal_txid_from_inscribe_stdout(&stdout);
+  let output = CommandBuilder::new("wallet inscribe foo.txt")
+    .write("foo.txt", "FOO")
+    .rpc_server(rpc_server)
+    .output();
 
   rpc_server.mine_blocks(1);
 
-  format!("{reveal_txid}i0")
+  output
 }
 
 fn create_wallet(rpc_server: &test_bitcoincore_rpc::Handle) {
diff --git a/tests/server.rs b/tests/server.rs
index d71bedcb42..160f364f3a 100644
--- a/tests/server.rs
+++ b/tests/server.rs
@@ -38,37 +38,30 @@ fn run() {
 fn inscription_page() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
-  rpc_server.mine_blocks(1);
-
-  let stdout = CommandBuilder::new("wallet inscribe hello.txt")
-    .write("hello.txt", "HELLOWORLD")
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
 
-  let reveal_tx = reveal_txid_from_inscribe_stdout(&stdout);
-
-  let inscription_id = format!("{reveal_tx}i0");
-
-  rpc_server.mine_blocks(1);
+  let Inscribe {
+    inscription,
+    reveal,
+    ..
+  } = inscribe(&rpc_server);
 
   TestServer::spawn_with_args(&rpc_server, &[]).assert_response_regex(
-    format!("/inscription/{inscription_id}"),
+    format!("/inscription/{inscription}"),
     format!(
-      ".*<meta property=og:image content='/content/{inscription_id}'>.*
+      ".*<meta property=og:image content='/content/{inscription}'>.*
 <h1>Inscription 0</h1>
-.*<a href=/preview/{inscription_id}><iframe .* src=/preview/{inscription_id}></iframe></a>.*
+.*<a href=/preview/{inscription}><iframe .* src=/preview/{inscription}></iframe></a>.*
 <dl>
   <dt>id</dt>
-  <dd class=monospace>{inscription_id}</dd>
+  <dd class=monospace>{inscription}</dd>
   <dt>address</dt>
   <dd class=monospace>bc1.*</dd>
   <dt>output value</dt>
-  <dd>9860</dd>
+  <dd>9862</dd>
   <dt>content</dt>
-  <dd><a href=/content/{inscription_id}>link</a></dd>
+  <dd><a href=/content/{inscription}>link</a></dd>
   <dt>content size</dt>
-  <dd>10 bytes</dd>
+  <dd>3 bytes</dd>
   <dt>content type</dt>
   <dd>text/plain;charset=utf-8</dd>
   <dt>timestamp</dt>
@@ -76,11 +69,11 @@ fn inscription_page() {
   <dt>genesis height</dt>
   <dd>2</dd>
   <dt>genesis transaction</dt>
-  <dd><a class=monospace href=/tx/{reveal_tx}>{reveal_tx}</a></dd>
+  <dd><a class=monospace href=/tx/{reveal}>{reveal}</a></dd>
   <dt>location</dt>
-  <dd class=monospace>{reveal_tx}:0:0</dd>
+  <dd class=monospace>{reveal}:0:0</dd>
   <dt>output</dt>
-  <dd><a class=monospace href=/output/{reveal_tx}:0>{reveal_tx}:0</a></dd>
+  <dd><a class=monospace href=/output/{reveal}:0>{reveal}:0</a></dd>
   <dt>offset</dt>
   <dd>0</dd>
 </dl>.*",
@@ -92,21 +85,14 @@ fn inscription_page() {
 fn inscription_appears_on_reveal_transaction_page() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
-  let txid = rpc_server.mine_blocks(1)[0].txdata[0].txid();
-
-  let stdout = CommandBuilder::new(format!("wallet inscribe --satpoint {txid}:0:0 hello.txt"))
-    .write("hello.txt", "HELLOWORLD")
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
 
-  let reveal_tx = reveal_txid_from_inscribe_stdout(&stdout);
+  let Inscribe { reveal, .. } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks(1);
 
   TestServer::spawn_with_args(&rpc_server, &[]).assert_response_regex(
-    format!("/tx/{reveal_tx}"),
-    format!(".*<h1>Transaction .*</h1>.*<a href=/inscription/{reveal_tx}.*"),
+    format!("/tx/{reveal}"),
+    format!(".*<h1>Transaction .*</h1>.*<a href=/inscription/{reveal}.*"),
   );
 }
 
@@ -114,21 +100,18 @@ fn inscription_appears_on_reveal_transaction_page() {
 fn inscription_appears_on_output_page() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
-  rpc_server.mine_blocks(1);
 
-  let stdout = CommandBuilder::new("wallet inscribe hello.txt")
-    .write("hello.txt", "HELLOWORLD")
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
-
-  let reveal_tx = reveal_txid_from_inscribe_stdout(&stdout);
+  let Inscribe {
+    reveal,
+    inscription,
+    ..
+  } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks(1);
 
   TestServer::spawn_with_args(&rpc_server, &[]).assert_response_regex(
-    format!("/output/{reveal_tx}:0"),
-    format!(".*<h1>Output <span class=monospace>{reveal_tx}:0</span></h1>.*<a href=/inscription/{reveal_tx}.*"),
+    format!("/output/{reveal}:0"),
+    format!(".*<h1>Output <span class=monospace>{reveal}:0</span></h1>.*<a href=/inscription/{inscription}.*"),
   );
 }
 
@@ -136,30 +119,25 @@ fn inscription_appears_on_output_page() {
 fn inscription_page_after_send() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
-  rpc_server.mine_blocks(1);
-
-  let stdout = CommandBuilder::new("wallet inscribe hello.txt")
-    .write("hello.txt", "HELLOWORLD")
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
 
-  let reveal_txid = reveal_txid_from_inscribe_stdout(&stdout);
-
-  let inscription_id = format!("{reveal_txid}i0");
+  let Inscribe {
+    reveal,
+    inscription,
+    ..
+  } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks(1);
 
   let ord_server = TestServer::spawn_with_args(&rpc_server, &[]);
   ord_server.assert_response_regex(
-    format!("/inscription/{inscription_id}"),
+    format!("/inscription/{inscription}"),
     format!(
-      r".*<h1>Inscription 0</h1>.*<dt>location</dt>\s*<dd class=monospace>{reveal_txid}:0:0</dd>.*",
+      r".*<h1>Inscription 0</h1>.*<dt>location</dt>\s*<dd class=monospace>{reveal}:0:0</dd>.*",
     ),
   );
 
   let txid = CommandBuilder::new(format!(
-    "wallet send bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv {inscription_id}"
+    "wallet send bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv {inscription}"
   ))
   .rpc_server(&rpc_server)
   .stdout_regex(".*")
@@ -167,13 +145,13 @@ fn inscription_page_after_send() {
 
   rpc_server.mine_blocks(1);
 
-  let send_txid = txid.trim();
+  let send = txid.trim();
 
   let ord_server = TestServer::spawn_with_args(&rpc_server, &[]);
   ord_server.assert_response_regex(
-    format!("/inscription/{inscription_id}"),
+    format!("/inscription/{inscription}"),
     format!(
-      r".*<h1>Inscription 0</h1>.*<dt>address</dt>\s*<dd class=monospace>bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv</dd>.*<dt>location</dt>\s*<dd class=monospace>{send_txid}:0:0</dd>.*",
+      r".*<h1>Inscription 0</h1>.*<dt>address</dt>\s*<dd class=monospace>bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv</dd>.*<dt>location</dt>\s*<dd class=monospace>{send}:0:0</dd>.*",
     ),
   )
 }
@@ -185,12 +163,12 @@ fn inscription_content() {
 
   rpc_server.mine_blocks(1);
 
-  let inscription_id = create_inscription(&rpc_server, "foo.txt");
+  let Inscribe { inscription, .. } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks(1);
 
   let response =
-    TestServer::spawn_with_args(&rpc_server, &[]).request(&format!("/content/{inscription_id}"));
+    TestServer::spawn_with_args(&rpc_server, &[]).request(&format!("/content/{inscription}"));
 
   assert_eq!(response.status(), StatusCode::OK);
   assert_eq!(
@@ -201,7 +179,7 @@ fn inscription_content() {
     response.headers().get("content-security-policy").unwrap(),
     "default-src 'unsafe-eval' 'unsafe-inline'"
   );
-  assert_eq!(response.bytes().unwrap(), "HELLOWORLD");
+  assert_eq!(response.bytes().unwrap(), "FOO");
 }
 
 #[test]
@@ -209,15 +187,15 @@ fn home_page_includes_latest_inscriptions() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
 
-  let inscription_id = create_inscription(&rpc_server, "foo.png");
+  let Inscribe { inscription, .. } = inscribe(&rpc_server);
 
   TestServer::spawn_with_args(&rpc_server, &[]).assert_response_regex(
     "/",
     format!(
       ".*<h2>Latest Inscriptions</h2>
 <div class=thumbnails>
-  <a href=/inscription/{inscription_id}><iframe .*></a>
-</div>.*"
+  <a href=/inscription/{inscription}><iframe .*></a>
+</div>.*",
     ),
   );
 }
@@ -229,9 +207,12 @@ fn home_page_inscriptions_are_sorted() {
 
   let mut inscriptions = String::new();
 
-  for i in 0..8 {
-    let id = create_inscription(&rpc_server, &format!("{i}.png"));
-    inscriptions.insert_str(0, &format!("\n  <a href=/inscription/{id}><iframe .*></a>"));
+  for _ in 0..8 {
+    let Inscribe { inscription, .. } = inscribe(&rpc_server);
+    inscriptions.insert_str(
+      0,
+      &format!("\n  <a href=/inscription/{inscription}><iframe .*></a>"),
+    );
   }
 
   TestServer::spawn_with_args(&rpc_server, &[]).assert_response_regex(
@@ -249,14 +230,14 @@ fn inscriptions_page() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
 
-  let inscription_id = create_inscription(&rpc_server, "foo.png");
+  let Inscribe { inscription, .. } = inscribe(&rpc_server);
 
   TestServer::spawn_with_args(&rpc_server, &[]).assert_response_regex(
     "/inscriptions",
     format!(
       ".*<h1>Inscriptions</h1>
 <div class=thumbnails>
-  <a href=/inscription/{inscription_id}>.*</a>
+  <a href=/inscription/{inscription}>.*</a>
 </div>
 .*",
     ),
@@ -270,9 +251,9 @@ fn inscriptions_page_is_sorted() {
 
   let mut inscriptions = String::new();
 
-  for i in 0..8 {
-    let id = create_inscription(&rpc_server, &format!("{i}.png"));
-    inscriptions.insert_str(0, &format!(".*<a href=/inscription/{id}>.*"));
+  for _ in 0..8 {
+    let Inscribe { inscription, .. } = inscribe(&rpc_server);
+    inscriptions.insert_str(0, &format!(".*<a href=/inscription/{inscription}>.*"));
   }
 
   TestServer::spawn_with_args(&rpc_server, &[])
@@ -284,9 +265,9 @@ fn inscriptions_page_has_next_and_previous() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
 
-  let a = create_inscription(&rpc_server, "a.txt");
-  let b = create_inscription(&rpc_server, "b.txt");
-  let c = create_inscription(&rpc_server, "c.txt");
+  let Inscribe { inscription: a, .. } = inscribe(&rpc_server);
+  let Inscribe { inscription: b, .. } = inscribe(&rpc_server);
+  let Inscribe { inscription: c, .. } = inscribe(&rpc_server);
 
   TestServer::spawn_with_args(&rpc_server, &[]).assert_response_regex(
     format!("/inscription/{b}"),
@@ -296,7 +277,7 @@ fn inscriptions_page_has_next_and_previous() {
 <a class=previous href=/inscription/{a}>❮</a>
 <a href=/preview/{b}>.*</a>
 <a class=next href=/inscription/{c}>❯</a>
-</div>.*"
+</div>.*",
     ),
   );
 }
diff --git a/tests/wallet/inscribe.rs b/tests/wallet/inscribe.rs
index 22eebe2a0b..550913c39e 100644
--- a/tests/wallet/inscribe.rs
+++ b/tests/wallet/inscribe.rs
@@ -1,7 +1,7 @@
 use super::*;
 
 #[test]
-fn inscribe_creates_inscription_transactions() {
+fn inscribe_creates_inscriptions() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   rpc_server.mine_blocks(1);
 
@@ -9,65 +9,26 @@ fn inscribe_creates_inscription_transactions() {
 
   create_wallet(&rpc_server);
 
-  let stdout = CommandBuilder::new("wallet inscribe hello.txt")
-    .write("hello.txt", "HELLOWORLD")
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
-
-  let reveal_txid = reveal_txid_from_inscribe_stdout(&stdout);
-
-  let inscription_id = format!("{reveal_txid}i0");
-
-  assert_eq!(rpc_server.descriptors().len(), 3);
-
-  rpc_server.mine_blocks(1);
-
-  let request =
-    TestServer::spawn_with_args(&rpc_server, &[]).request(&format!("/content/{inscription_id}"));
-
-  assert_eq!(request.status(), 200);
-  assert_eq!(
-    request.headers().get("content-type").unwrap(),
-    "text/plain;charset=utf-8"
-  );
-  assert_eq!(request.text().unwrap(), "HELLOWORLD");
-}
-
-#[test]
-fn inscribe_with_satpoint_arg_inscribes_specific_satpoint() {
-  let rpc_server = test_bitcoincore_rpc::spawn();
-  rpc_server.mine_blocks(1);
-
-  assert_eq!(rpc_server.descriptors().len(), 0);
-
-  create_wallet(&rpc_server);
-
-  assert_eq!(rpc_server.descriptors().len(), 2);
-
-  let inscription_id = create_inscription(&rpc_server, "foo.txt");
+  let Inscribe { inscription, .. } = inscribe(&rpc_server);
 
   assert_eq!(rpc_server.descriptors().len(), 3);
 
   let request =
-    TestServer::spawn_with_args(&rpc_server, &[]).request(&format!("/content/{inscription_id}"));
+    TestServer::spawn_with_args(&rpc_server, &[]).request(&format!("/content/{inscription}"));
 
   assert_eq!(request.status(), 200);
   assert_eq!(
     request.headers().get("content-type").unwrap(),
     "text/plain;charset=utf-8"
   );
-  assert_eq!(request.text().unwrap(), "HELLOWORLD");
+  assert_eq!(request.text().unwrap(), "FOO");
 }
 
 #[test]
 fn inscribe_fails_if_bitcoin_core_is_too_old() {
   let rpc_server = test_bitcoincore_rpc::builder().version(230000).build();
 
-  rpc_server.mine_blocks(1);
-
   CommandBuilder::new("wallet inscribe hello.txt")
-    .write("hello.txt", "HELLOWORLD")
     .expected_exit_code(1)
     .expected_stderr("error: Bitcoin Core 24.0.0 or newer required, current version is 23.0.0\n")
     .rpc_server(&rpc_server)
@@ -85,8 +46,7 @@ fn inscribe_no_backup() {
   CommandBuilder::new("wallet inscribe hello.txt --no-backup")
     .write("hello.txt", "HELLOWORLD")
     .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
+    .output::<Inscribe>();
 
   assert_eq!(rpc_server.descriptors().len(), 2);
 }
@@ -134,7 +94,7 @@ fn regtest_has_no_content_size_limit() {
   CommandBuilder::new("--chain regtest wallet inscribe degenerate.png")
     .write("degenerate.png", [1; 1025])
     .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
+    .stdout_regex(".*")
     .run();
 }
 
@@ -149,7 +109,7 @@ fn mainnet_has_no_content_size_limit() {
   CommandBuilder::new("wallet inscribe degenerate.png")
     .write("degenerate.png", [1; 1025])
     .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
+    .stdout_regex(".*")
     .run();
 }
 
@@ -157,12 +117,6 @@ fn mainnet_has_no_content_size_limit() {
 fn inscribe_does_not_use_inscribed_sats_as_cardinal_utxos() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
-  rpc_server.mine_blocks_with_subsidy(1, 800);
-  CommandBuilder::new("wallet inscribe degenerate.png")
-    .write("degenerate.png", [1; 100])
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
 
   rpc_server.mine_blocks_with_subsidy(1, 100);
 
@@ -181,58 +135,44 @@ fn refuse_to_reinscribe_sats() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
 
-  rpc_server.mine_blocks_with_subsidy(1, 800);
-  let stdout = CommandBuilder::new("wallet inscribe degenerate.png")
-    .write("degenerate.png", [1; 100])
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
+  rpc_server.mine_blocks(1);
 
-  let first_inscription_id = reveal_txid_from_inscribe_stdout(&stdout);
+  let Inscribe { reveal, .. } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks_with_subsidy(1, 100);
 
-  CommandBuilder::new(format!(
-    "wallet inscribe --satpoint {first_inscription_id}:0:0 hello.txt"
-  ))
-  .write("hello.txt", "HELLOWORLD")
-  .rpc_server(&rpc_server)
-  .expected_exit_code(1)
-  .expected_stderr(format!(
-    "error: sat at {first_inscription_id}:0:0 already inscribed\n"
-  ))
-  .run();
+  CommandBuilder::new(format!("wallet inscribe --satpoint {reveal}:0:0 hello.txt"))
+    .write("hello.txt", "HELLOWORLD")
+    .rpc_server(&rpc_server)
+    .expected_exit_code(1)
+    .expected_stderr(format!("error: sat at {reveal}:0:0 already inscribed\n"))
+    .run();
 }
 
 #[test]
 fn refuse_to_inscribe_already_inscribed_utxo() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
-  rpc_server.mine_blocks(1);
-
-  let stdout = CommandBuilder::new("wallet inscribe degenerate.png")
-    .write("degenerate.png", [1; 100])
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
-
-  rpc_server.mine_blocks(1);
 
-  let reveal_txid = reveal_txid_from_inscribe_stdout(&stdout);
+  let Inscribe {
+    reveal,
+    inscription,
+    ..
+  } = inscribe(&rpc_server);
 
-  let inscription_utxo = OutPoint {
-    txid: reveal_txid_from_inscribe_stdout(&stdout),
+  let output = OutPoint {
+    txid: reveal,
     vout: 0,
   };
 
   CommandBuilder::new(format!(
-    "wallet inscribe --satpoint {inscription_utxo}:55555 hello.txt"
+    "wallet inscribe --satpoint {output}:55555 hello.txt"
   ))
   .write("hello.txt", "HELLOWORLD")
   .rpc_server(&rpc_server)
   .expected_exit_code(1)
   .expected_stderr(format!(
-    "error: utxo {inscription_utxo} already inscribed with inscription {reveal_txid}i0 on sat {inscription_utxo}:0\n",
+    "error: utxo {output} already inscribed with inscription {inscription} on sat {output}:0\n",
   ))
   .run();
 }
@@ -243,25 +183,21 @@ fn inscribe_with_optional_satpoint_arg() {
   create_wallet(&rpc_server);
   let txid = rpc_server.mine_blocks(1)[0].txdata[0].txid();
 
-  let stdout = CommandBuilder::new(format!("wallet inscribe hello.txt --satpoint {txid}:0:0"))
-    .write("hello.txt", "HELLOWORLD")
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
-
-  let reveal_txid = reveal_txid_from_inscribe_stdout(&stdout);
-
-  let inscription_id = format!("{reveal_txid}i0");
+  let Inscribe { inscription, .. } =
+    CommandBuilder::new(format!("wallet inscribe foo.txt --satpoint {txid}:0:0"))
+      .write("foo.txt", "FOO")
+      .rpc_server(&rpc_server)
+      .output();
 
   rpc_server.mine_blocks(1);
 
   TestServer::spawn_with_args(&rpc_server, &["--index-sats"]).assert_response_regex(
     "/sat/5000000000",
-    format!(".*<a href=/inscription/{inscription_id}>.*"),
+    format!(".*<a href=/inscription/{inscription}>.*"),
   );
 
   TestServer::spawn_with_args(&rpc_server, &[])
-    .assert_response_regex(format!("/content/{inscription_id}",), ".*HELLOWORLD.*");
+    .assert_response_regex(format!("/content/{inscription}",), "FOO");
 }
 
 #[test]
@@ -273,8 +209,7 @@ fn inscribe_with_fee_rate() {
   CommandBuilder::new("--index-sats wallet inscribe degenerate.png --fee-rate 2.0")
     .write("degenerate.png", [1; 520])
     .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
+    .output::<Inscribe>();
 
   let tx = &rpc_server.mempool()[0];
   let mut fee = 0;
@@ -306,6 +241,5 @@ fn inscribe_with_wallet_named_foo() {
   CommandBuilder::new("--wallet foo wallet inscribe degenerate.png")
     .write("degenerate.png", [1; 520])
     .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
+    .output::<Inscribe>();
 }
diff --git a/tests/wallet/inscriptions.rs b/tests/wallet/inscriptions.rs
index b81503b1fc..3874669e3b 100644
--- a/tests/wallet/inscriptions.rs
+++ b/tests/wallet/inscriptions.rs
@@ -6,20 +6,15 @@ fn inscriptions() {
   create_wallet(&rpc_server);
   rpc_server.mine_blocks(1);
 
-  let reveal_txid = reveal_txid_from_inscribe_stdout(
-    &CommandBuilder::new("wallet inscribe hello.txt")
-      .write("hello.txt", "HELLOWORLD")
-      .rpc_server(&rpc_server)
-      .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-      .run(),
-  );
-  rpc_server.mine_blocks(1);
-
-  let inscription_id = format!("{reveal_txid}i0");
+  let Inscribe {
+    reveal,
+    inscription,
+    ..
+  } = inscribe(&rpc_server);
 
   CommandBuilder::new("wallet inscriptions")
     .rpc_server(&rpc_server)
-    .expected_stdout(format!("{inscription_id}\t{reveal_txid}:0:0\n"))
+    .expected_stdout(format!("{inscription}\t{reveal}:0:0\n"))
     .run();
 
   let stdout = CommandBuilder::new("wallet receive")
@@ -30,7 +25,7 @@ fn inscriptions() {
 
   let address = stdout.trim();
 
-  let stdout = CommandBuilder::new(format!("wallet send {address} {inscription_id}"))
+  let stdout = CommandBuilder::new(format!("wallet send {address} {inscription}"))
     .rpc_server(&rpc_server)
     .expected_exit_code(0)
     .stdout_regex(".*")
@@ -44,7 +39,7 @@ fn inscriptions() {
 
   CommandBuilder::new("wallet inscriptions")
     .rpc_server(&rpc_server)
-    .expected_stdout(format!("{inscription_id}\t{outpoint}:0\n"))
+    .expected_stdout(format!("{inscription}\t{outpoint}:0\n"))
     .run();
 }
 
@@ -55,20 +50,21 @@ fn inscriptions_includes_locked_utxos() {
 
   rpc_server.mine_blocks(1);
 
-  let txid = reveal_txid_from_inscribe_stdout(
-    &CommandBuilder::new("wallet inscribe hello.txt")
-      .write("hello.txt", "HELLOWORLD")
-      .rpc_server(&rpc_server)
-      .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-      .run(),
-  );
+  let Inscribe {
+    inscription,
+    reveal,
+    ..
+  } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks(1);
 
-  rpc_server.lock(OutPoint { txid, vout: 0 });
+  rpc_server.lock(OutPoint {
+    txid: reveal,
+    vout: 0,
+  });
 
   CommandBuilder::new("wallet inscriptions")
     .rpc_server(&rpc_server)
-    .expected_stdout(format!("{txid}i0\t{txid}:0:0\n"))
+    .expected_stdout(format!("{inscription}\t{reveal}:0:0\n"))
     .run();
 }
diff --git a/tests/wallet/send.rs b/tests/wallet/send.rs
index 296c2c4d84..7443dfcdf1 100644
--- a/tests/wallet/send.rs
+++ b/tests/wallet/send.rs
@@ -6,12 +6,12 @@ fn inscriptions_can_be_sent() {
   create_wallet(&rpc_server);
   rpc_server.mine_blocks(1);
 
-  let inscription_id = create_inscription(&rpc_server, "foo.txt");
+  let Inscribe { inscription, .. } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks(1);
 
   let stdout = CommandBuilder::new(format!(
-    "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {inscription_id}"
+    "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {inscription}",
   ))
   .rpc_server(&rpc_server)
   .stdout_regex(r".*")
@@ -26,11 +26,11 @@ fn inscriptions_can_be_sent() {
 
   let ord_server = TestServer::spawn_with_args(&rpc_server, &[]);
   ord_server.assert_response_regex(
-    format!("/inscription/{inscription_id}"),
+    format!("/inscription/{inscription}"),
     format!(
       ".*<h1>Inscription 0</h1>.*<dl>.*
   <dt>content size</dt>
-  <dd>10 bytes</dd>
+  <dd>3 bytes</dd>
   <dt>content type</dt>
   <dd>text/plain;charset=utf-8</dd>
   .*
@@ -65,12 +65,12 @@ fn send_inscribed_sat() {
   create_wallet(&rpc_server);
   rpc_server.mine_blocks(1);
 
-  let inscription_id = create_inscription(&rpc_server, "foo.txt");
+  let Inscribe { inscription, .. } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks(1);
 
   let stdout = CommandBuilder::new(format!(
-    "wallet send bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv  {inscription_id}"
+    "wallet send bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv {inscription}",
   ))
   .rpc_server(&rpc_server)
   .stdout_regex("[[:xdigit:]]{64}\n")
@@ -82,7 +82,7 @@ fn send_inscribed_sat() {
 
   let ord_server = TestServer::spawn_with_args(&rpc_server, &[]);
   ord_server.assert_response_regex(
-    format!("/inscription/{inscription_id}"),
+    format!("/inscription/{inscription}"),
     format!(
       ".*<h1>Inscription 0</h1>.*<dt>location</dt>.*<dd class=monospace>{send_txid}:0:0</dd>.*",
     ),
@@ -169,8 +169,7 @@ fn send_does_not_use_inscribed_sats_as_cardinal_utxos() {
   ))
   .write("degenerate.png", [1; 100])
   .rpc_server(&rpc_server)
-  .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-  .run();
+  .output::<Inscribe>();
 
   let txid = rpc_server.mine_blocks_with_subsidy(1, 100)[0].txdata[0].txid();
 
@@ -188,31 +187,26 @@ fn do_not_accidentally_send_an_inscription() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
 
-  let txid = rpc_server.mine_blocks(1)[0].txdata[0].txid();
-  let stdout = CommandBuilder::new(format!(
-    "wallet inscribe --satpoint {txid}:0:0 degenerate.png"
-  ))
-  .write("degenerate.png", [1; 100])
-  .rpc_server(&rpc_server)
-  .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-  .run();
-
-  let reveal_txid = reveal_txid_from_inscribe_stdout(&stdout);
+  let Inscribe {
+    reveal,
+    inscription,
+    ..
+  } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks(1);
 
-  let inscription_utxo = OutPoint {
-    txid: reveal_txid_from_inscribe_stdout(&stdout),
+  let output = OutPoint {
+    txid: reveal,
     vout: 0,
   };
 
   CommandBuilder::new(format!(
-    "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4  {inscription_utxo}:55"
+    "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {output}:55"
   ))
   .rpc_server(&rpc_server)
   .expected_exit_code(1)
   .expected_stderr(format!(
-    "error: cannot send {inscription_utxo}:55 without also sending inscription {reveal_txid}i0 at {inscription_utxo}:0\n"
+    "error: cannot send {output}:55 without also sending inscription {inscription} at {output}:0\n"
   ))
   .run();
 }
@@ -221,22 +215,14 @@ fn do_not_accidentally_send_an_inscription() {
 fn inscriptions_cannot_be_sent_by_satpoint() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   create_wallet(&rpc_server);
-  let txid = rpc_server.mine_blocks(1)[0].txdata[0].txid();
 
-  let stdout = CommandBuilder::new(format!("wallet inscribe --satpoint {txid}:0:0 hello.txt"))
-    .write("hello.txt", "HELLOWORLD")
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
-
-  let reveal_txid = reveal_txid_from_inscribe_stdout(&stdout);
+  let Inscribe { reveal, .. } = inscribe(&rpc_server);
 
   rpc_server.mine_blocks(1);
 
   CommandBuilder::new(format!(
-    "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4   {reveal_txid}:0:0"
+    "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {reveal}:0:0"
   ))
-  .write("hello.txt", "HELLOWORLD")
   .rpc_server(&rpc_server)
   .expected_stderr("error: inscriptions must be sent by inscription ID\n")
   .expected_exit_code(1)
@@ -274,15 +260,7 @@ fn send_btc_locks_inscriptions() {
 
   rpc_server.mine_blocks(1);
 
-  let stdout = CommandBuilder::new("wallet inscribe hello.txt")
-    .write("hello.txt", "HELLOWORLD")
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
-
-  let inscription_id = reveal_txid_from_inscribe_stdout(&stdout);
-
-  rpc_server.mine_blocks(1);
+  let Inscribe { reveal, .. } = inscribe(&rpc_server);
 
   CommandBuilder::new("wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 1btc")
     .rpc_server(&rpc_server)
@@ -297,7 +275,7 @@ fn send_btc_locks_inscriptions() {
         .parse()
         .unwrap(),
       locked: vec![OutPoint {
-        txid: inscription_id,
+        txid: reveal,
         vout: 0,
       }]
     }]
@@ -326,18 +304,10 @@ fn wallet_send_with_fee_rate() {
   create_wallet(&rpc_server);
   rpc_server.mine_blocks(1);
 
-  let stdout = CommandBuilder::new("--index-sats wallet inscribe degenerate.png")
-    .write("degenerate.png", [1; 520])
-    .rpc_server(&rpc_server)
-    .stdout_regex("commit\t[[:xdigit:]]{64}\nreveal\t[[:xdigit:]]{64}\n")
-    .run();
-
-  rpc_server.mine_blocks(1);
-
-  let reveal_txid = reveal_txid_from_inscribe_stdout(&stdout);
+  let Inscribe { inscription, .. } = inscribe(&rpc_server);
 
   CommandBuilder::new(format!(
-    "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {reveal_txid}i0 --fee-rate 2.0"
+    "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {inscription} --fee-rate 2.0"
   ))
   .rpc_server(&rpc_server)
   .stdout_regex("[[:xdigit:]]{64}\n")