Merge branch 'add-sat-and-number-to-wallet-inscriptions'

src/subcommand/wallet/inscriptions.rs

@@ -1,7 +1,7 @@
 use {super::*, crate::wallet::Wallet};
 
 #[derive(Serialize, Deserialize)]
-pub struct Output {
+pub struct OutputWithSat {
   pub sat: Sat,
   pub number: u64,
   pub inscription: InscriptionId,
@@ -10,10 +10,21 @@ pub struct Output {
   pub amount: u64,
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct OutputWithoutSat {
+  pub number: u64,
+  pub inscription: InscriptionId,
+  pub location: SatPoint,
+  pub explorer: String,
+  pub amount: u64,
+}
+
 pub(crate) fn run(options: Options) -> Result {
   let index = Index::open(&options)?;
   index.update()?;
 
+  let index_has_sats = index.has_sat_index()?;
+
   let inscriptions = index.get_inscriptions(None)?;
   let unspent_outputs = index.get_unspent_outputs(Wallet::load(&options)?)?;
 
@@ -24,25 +35,40 @@ pub(crate) fn run(options: Options) -> Result {
     Chain::Testnet => "https://testnet.ordinals.com/inscription/",
   };
 
-  let mut output = Vec::new();
+  let mut output_with_sat = Vec::new();
+  let mut output_without_sat = Vec::new();
 
   for (location, inscription) in inscriptions {
     if unspent_outputs.contains_key(&location.outpoint) {
       let entry = index
         .get_inscription_entry(inscription)?
         .ok_or_else(|| anyhow!("Inscription {inscription} not found"))?;
-      output.push(Output {
-        sat: entry.sat.unwrap(),
-        number: entry.number,
-        location,
-        inscription,
-        explorer: format!("{explorer}{inscription}"),
-        amount: unspent_outputs.get(&location.outpoint).unwrap().to_sat(),
-      });
+      if index_has_sats {
+        output_with_sat.push(OutputWithSat {
+          sat: entry.sat.unwrap(),
+          number: entry.number,
+          location,
+          inscription,
+          explorer: format!("{explorer}{inscription}"),
+          amount: unspent_outputs.get(&location.outpoint).unwrap().to_sat(),
+        });
+      } else {
+        output_without_sat.push(OutputWithoutSat {
+          number: entry.number,
+          location,
+          inscription,
+          explorer: format!("{explorer}{inscription}"),
+          amount: unspent_outputs.get(&location.outpoint).unwrap().to_sat(),
+        });
+      }
     }
   }
 
-  print_json(&output)?;
+  if index_has_sats {
+    print_json(&output_with_sat)?;
+  } else {
+    print_json(&output_without_sat)?;
+  }
 
   Ok(())
 }

tests/wallet/inscriptions.rs

@@ -1,6 +1,6 @@
 use {
   super::*,
-  ord::subcommand::wallet::{inscriptions::Output, receive},
+  ord::subcommand::wallet::{inscriptions::OutputWithoutSat, receive},
 };
 
 #[test]
@@ -19,7 +19,7 @@ fn inscriptions() {
 
   let output = CommandBuilder::new("wallet inscriptions")
     .rpc_server(&rpc_server)
-    .output::<Vec<Output>>();
+    .output::<Vec<OutputWithoutSat>>();
 
   assert_eq!(output.len(), 1);
   assert_eq!(output[0].inscription, inscription.parse().unwrap());
@@ -46,7 +46,7 @@ fn inscriptions() {
 
   let output = CommandBuilder::new("wallet inscriptions")
     .rpc_server(&rpc_server)
-    .output::<Vec<Output>>();
+    .output::<Vec<OutputWithoutSat>>();
 
   assert_eq!(output.len(), 1);
   assert_eq!(output[0].inscription, inscription.parse().unwrap());
@@ -77,7 +77,7 @@ fn inscriptions_includes_locked_utxos() {
 
   let output = CommandBuilder::new("wallet inscriptions")
     .rpc_server(&rpc_server)
-    .output::<Vec<Output>>();
+    .output::<Vec<OutputWithoutSat>>();
 
   assert_eq!(output.len(), 1);
   assert_eq!(output[0].inscription, inscription.parse().unwrap());