Add sat ranges to output

src/subcommand/wallet/label.rs

@@ -23,7 +23,7 @@ struct Line {
 pub(crate) fn run(wallet: Wallet) -> SubcommandResult {
   let mut lines: Vec<Line> = Vec::new();
 
-  let sat_ranges = wallet.get_output_sat_ranges()?;
+  let sat_ranges = wallet.get_wallet_sat_ranges()?;
 
   let mut inscriptions_by_output: BTreeMap<OutPoint, BTreeMap<u64, Vec<InscriptionId>>> =
     BTreeMap::new();

src/subcommand/wallet/outputs.rs

@@ -4,14 +4,26 @@ use super::*;
 pub struct Output {
   pub output: OutPoint,
   pub amount: u64,
+  pub sat_ranges: Vec<String>,
 }
 
 pub(crate) fn run(wallet: Wallet) -> SubcommandResult {
   let mut outputs = Vec::new();
   for (output, txout) in wallet.utxos() {
+    let sat_ranges = if wallet.has_sat_index() {
+      wallet
+        .get_output_sat_ranges(output)?
+        .into_iter()
+        .map(|(start, end)| format!("{start}-{end}"))
+        .collect()
+    } else {
+      Vec::new()
+    };
+
     outputs.push(Output {
       output: *output,
       amount: txout.value,
+      sat_ranges,
     });
   }
 

src/subcommand/wallet/sats.rs

@@ -30,7 +30,7 @@ impl Sats {
       "sats requires index created with `--index-sats` flag"
     );
 
-    let haystacks = wallet.get_output_sat_ranges()?;
+    let haystacks = wallet.get_wallet_sat_ranges()?;
 
     if let Some(path) = &self.tsv {
       let tsv = fs::read_to_string(path)

src/wallet.rs

@@ -72,7 +72,7 @@ pub(crate) struct Wallet {
 }
 
 impl Wallet {
-  pub(crate) fn get_output_sat_ranges(&self) -> Result<Vec<(OutPoint, Vec<(u64, u64)>)>> {
+  pub(crate) fn get_wallet_sat_ranges(&self) -> Result<Vec<(OutPoint, Vec<(u64, u64)>)>> {
     ensure!(
       self.has_sat_index,
       "ord index must be built with `--index-sats` to use `--sat`"
@@ -90,6 +90,23 @@ impl Wallet {
     Ok(output_sat_ranges)
   }
 
+  pub(crate) fn get_output_sat_ranges(&self, output: &OutPoint) -> Result<Vec<(u64, u64)>> {
+    ensure!(
+      self.has_sat_index,
+      "ord index must be built with `--index-sats` to see sat ranges"
+    );
+
+    if let Some(info) = self.output_info.get(output) {
+      if let Some(sat_ranges) = &info.sat_ranges {
+        Ok(sat_ranges.clone())
+      } else {
+        bail!("output {output} in wallet but is spent according to ord server");
+      }
+    } else {
+      bail!("output {output} not found in wallet");
+    }
+  }
+
   pub(crate) fn find_sat_in_outputs(&self, sat: Sat) -> Result<SatPoint> {
     ensure!(
       self.has_sat_index,

tests/wallet/outputs.rs

@@ -66,3 +66,25 @@ fn outputs_includes_unbound_outputs() {
   assert_eq!(output[0].output, outpoint);
   assert_eq!(output[0].amount, amount);
 }
+
+#[test]
+fn outputs_includes_sat_ranges() {
+  let core = mockcore::spawn();
+
+  let ord = TestServer::spawn_with_server_args(&core, &["--index-sats"], &[]);
+
+  create_wallet(&core, &ord);
+
+  let coinbase_tx = &core.mine_blocks_with_subsidy(1, 1_000_000)[0].txdata[0];
+  let outpoint = OutPoint::new(coinbase_tx.txid(), 0);
+  let amount = coinbase_tx.output[0].value;
+
+  let output = CommandBuilder::new("wallet outputs")
+    .core(&core)
+    .ord(&ord)
+    .run_and_deserialize_output::<Vec<Output>>();
+
+  assert_eq!(output[0].output, outpoint);
+  assert_eq!(output[0].amount, amount);
+  assert_eq!(output[0].sat_ranges, vec!["5000000000-5001000000"]);
+}