From e50844ab24f8021c5fadcd5c89d6c2f873dd4781 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Sun, 10 Mar 2024 17:53:44 -0700
Subject: [PATCH 1/9] Rename genesis fee to inscription fee

---
 src/api.rs                   |  4 +--
 src/index.rs                 |  2 +-
 src/subcommand/server.rs     |  8 +++---
 src/templates/inscription.rs | 48 ++++++++++++++++++------------------
 templates/inscription.html   | 10 ++++----
 tests/json_api.rs            |  4 +--
 tests/server.rs              |  6 ++---
 7 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/api.rs b/src/api.rs
index e1db4f0b4a..355ae83805 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -67,8 +67,8 @@ pub struct Inscription {
   pub children: Vec<InscriptionId>,
   pub content_length: Option<usize>,
   pub content_type: Option<String>,
-  pub genesis_fee: u64,
-  pub genesis_height: u32,
+  pub inscription_fee: u64,
+  pub inscription_height: u32,
   pub inscription_id: InscriptionId,
   pub inscription_number: i32,
   pub next: Option<InscriptionId>,
diff --git a/src/index.rs b/src/index.rs
index 2a91505261..6d0b1f251a 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -3832,7 +3832,7 @@ mod tests {
   }
 
   #[test]
-  fn genesis_fee_distributed_evenly() {
+  fn inscription_fee_distributed_evenly() {
     for context in Context::configurations() {
       context.rpc_server.mine_blocks(1);
 
diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
index ce8eaebea5..8f505b96cc 100644
--- a/src/subcommand/server.rs
+++ b/src/subcommand/server.rs
@@ -1463,9 +1463,9 @@ impl Server {
             .collect(),
           children: info.children,
           inscription_number: info.entry.inscription_number,
-          genesis_height: info.entry.height,
+          inscription_height: info.entry.height,
           parent: info.parent,
-          genesis_fee: info.entry.fee,
+          inscription_fee: info.entry.fee,
           output_value: info.output.as_ref().map(|o| o.value),
           address: info
             .output
@@ -1492,8 +1492,8 @@ impl Server {
           chain: server_config.chain,
           charms: Charm::Vindicated.unset(info.charms),
           children: info.children,
-          genesis_fee: info.entry.fee,
-          genesis_height: info.entry.height,
+          inscription_fee: info.entry.fee,
+          inscription_height: info.entry.height,
           inscription: info.inscription,
           inscription_id: info.entry.id,
           inscription_number: info.entry.inscription_number,
diff --git a/src/templates/inscription.rs b/src/templates/inscription.rs
index 9f3ae8a947..e7cc5ff63c 100644
--- a/src/templates/inscription.rs
+++ b/src/templates/inscription.rs
@@ -4,8 +4,8 @@ use super::*;
 pub(crate) struct InscriptionHtml {
   pub(crate) chain: Chain,
   pub(crate) children: Vec<InscriptionId>,
-  pub(crate) genesis_fee: u64,
-  pub(crate) genesis_height: u32,
+  pub(crate) inscription_fee: u64,
+  pub(crate) inscription_height: u32,
   pub(crate) inscription: Inscription,
   pub(crate) inscription_id: InscriptionId,
   pub(crate) inscription_number: i32,
@@ -38,7 +38,7 @@ mod tests {
   fn without_sat_nav_links_or_output() {
     assert_regex_match!(
       InscriptionHtml {
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -65,11 +65,11 @@ mod tests {
           <dd>text/plain;charset=utf-8</dd>
           <dt>timestamp</dt>
           <dd><time>1970-01-01 00:00:00 UTC</time></dd>
-          <dt>genesis height</dt>
+          <dt>inscription height</dt>
           <dd><a href=/block/0>0</a></dd>
-          <dt>genesis fee</dt>
+          <dt>inscription fee</dt>
           <dd>1</dd>
-          <dt>genesis transaction</dt>
+          <dt>reveal transaction</dt>
           <dd><a class=monospace href=/tx/1{64}>1{64}</a></dd>
           <dt>location</dt>
           <dd class=monospace>1{64}:1:0</dd>
@@ -89,7 +89,7 @@ mod tests {
   fn with_output() {
     assert_regex_match!(
       InscriptionHtml {
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -121,7 +121,7 @@ mod tests {
   fn with_sat() {
     assert_regex_match!(
       InscriptionHtml {
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -150,7 +150,7 @@ mod tests {
     assert_regex_match!(
       InscriptionHtml {
         children: Vec::new(),
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(2),
         next: Some(inscription_id(3)),
@@ -177,7 +177,7 @@ mod tests {
   fn with_cursed_and_unbound() {
     assert_regex_match!(
       InscriptionHtml {
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(2),
         inscription_number: -1,
@@ -210,7 +210,7 @@ mod tests {
     assert_regex_match!(
       InscriptionHtml {
         parent: Some(inscription_id(2)),
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -243,11 +243,11 @@ mod tests {
           <dd>text/plain;charset=utf-8</dd>
           <dt>timestamp</dt>
           <dd><time>1970-01-01 00:00:00 UTC</time></dd>
-          <dt>genesis height</dt>
+          <dt>inscription height</dt>
           <dd><a href=/block/0>0</a></dd>
-          <dt>genesis fee</dt>
+          <dt>inscription fee</dt>
           <dd>1</dd>
-          <dt>genesis transaction</dt>
+          <dt>reveal transaction</dt>
           <dd><a class=monospace href=/tx/1{64}>1{64}</a></dd>
           <dt>location</dt>
           <dd class=monospace>1{64}:1:0</dd>
@@ -268,7 +268,7 @@ mod tests {
     assert_regex_match!(
       InscriptionHtml {
         children: vec![inscription_id(2), inscription_id(3)],
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -305,11 +305,11 @@ mod tests {
           <dd>text/plain;charset=utf-8</dd>
           <dt>timestamp</dt>
           <dd><time>1970-01-01 00:00:00 UTC</time></dd>
-          <dt>genesis height</dt>
+          <dt>inscription height</dt>
           <dd><a href=/block/0>0</a></dd>
-          <dt>genesis fee</dt>
+          <dt>inscription fee</dt>
           <dd>1</dd>
-          <dt>genesis transaction</dt>
+          <dt>reveal transaction</dt>
           <dd><a class=monospace href=/tx/1{64}>1{64}</a></dd>
           <dt>location</dt>
           <dd class=monospace>1{64}:1:0</dd>
@@ -330,7 +330,7 @@ mod tests {
     assert_regex_match!(
       InscriptionHtml {
         children: vec![inscription_id(2)],
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -366,11 +366,11 @@ mod tests {
           <dd>text/plain;charset=utf-8</dd>
           <dt>timestamp</dt>
           <dd><time>1970-01-01 00:00:00 UTC</time></dd>
-          <dt>genesis height</dt>
+          <dt>inscription height</dt>
           <dd><a href=/block/0>0</a></dd>
-          <dt>genesis fee</dt>
+          <dt>inscription fee</dt>
           <dd>1</dd>
-          <dt>genesis transaction</dt>
+          <dt>reveal transaction</dt>
           <dd><a class=monospace href=/tx/1{64}>1{64}</a></dd>
           <dt>location</dt>
           <dd class=monospace>1{64}:1:0</dd>
@@ -390,7 +390,7 @@ mod tests {
   fn with_rune() {
     assert_regex_match!(
       InscriptionHtml {
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -418,7 +418,7 @@ mod tests {
   fn with_content_encoding() {
     assert_regex_match!(
       InscriptionHtml {
-        genesis_fee: 1,
+        inscription_fee: 1,
         inscription: Inscription {
           content_encoding: Some("br".into()),
           ..inscription("text/plain;charset=utf-8", "HELLOWORLD")
diff --git a/templates/inscription.html b/templates/inscription.html
index 373f11ccf2..78976b50eb 100644
--- a/templates/inscription.html
+++ b/templates/inscription.html
@@ -92,11 +92,11 @@ <h1>Inscription {{ self.inscription_number }}</h1>
 %% }
   <dt>timestamp</dt>
   <dd><time>{{ self.timestamp }}</time></dd>
-  <dt>genesis height</dt>
-  <dd><a href=/block/{{ self.genesis_height }}>{{ self.genesis_height }}</a></dd>
-  <dt>genesis fee</dt>
-  <dd>{{ self.genesis_fee }}</dd>
-  <dt>genesis transaction</dt>
+  <dt>inscription height</dt>
+  <dd><a href=/block/{{ self.inscription_height }}>{{ self.inscription_height }}</a></dd>
+  <dt>inscription fee</dt>
+  <dd>{{ self.inscription_fee }}</dd>
+  <dt>reveal transaction</dt>
   <dd><a class=monospace href=/tx/{{ self.inscription_id.txid }}>{{ self.inscription_id.txid }}</a></dd>
   <dt>location</dt>
   <dd class=monospace>{{ self.satpoint }}</dd>
diff --git a/tests/json_api.rs b/tests/json_api.rs
index 77bd07ec99..1d0a95df06 100644
--- a/tests/json_api.rs
+++ b/tests/json_api.rs
@@ -157,8 +157,8 @@ fn get_inscription() {
       children: Vec::new(),
       content_length: Some(3),
       content_type: Some("text/plain;charset=utf-8".to_string()),
-      genesis_fee: 138,
-      genesis_height: 2,
+      inscription_fee: 138,
+      inscription_height: 2,
       inscription_id,
       inscription_number: 0,
       next: None,
diff --git a/tests/server.rs b/tests/server.rs
index 0654992ba4..71b81a8a1e 100644
--- a/tests/server.rs
+++ b/tests/server.rs
@@ -73,11 +73,11 @@ fn inscription_page() {
   <dd>text/plain;charset=utf-8</dd>
   <dt>timestamp</dt>
   <dd><time>1970-01-01 00:00:02 UTC</time></dd>
-  <dt>genesis height</dt>
+  <dt>inscription height</dt>
   <dd><a href=/block/2>2</a></dd>
-  <dt>genesis fee</dt>
+  <dt>inscription fee</dt>
   <dd>138</dd>
-  <dt>genesis transaction</dt>
+  <dt>reveal transaction</dt>
   <dd><a class=monospace href=/tx/{reveal}>{reveal}</a></dd>
   <dt>location</dt>
   <dd class=monospace>{reveal}:0:0</dd>

From b5cf28e90f63b883f7f1ad6386731a697f658a28 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Sun, 10 Mar 2024 18:08:47 -0700
Subject: [PATCH 2/9] Amend

---
 src/subcommand/server.rs     |  4 ++--
 src/templates/inscription.rs | 40 ++++++++++++++++++------------------
 tests/server.rs              |  4 ++--
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
index 8f505b96cc..43c5fac673 100644
--- a/src/subcommand/server.rs
+++ b/src/subcommand/server.rs
@@ -1492,8 +1492,8 @@ impl Server {
           chain: server_config.chain,
           charms: Charm::Vindicated.unset(info.charms),
           children: info.children,
-          inscription_fee: info.entry.fee,
-          inscription_height: info.entry.height,
+          fee: info.entry.fee,
+          height: info.entry.height,
           inscription: info.inscription,
           inscription_id: info.entry.id,
           inscription_number: info.entry.inscription_number,
diff --git a/src/templates/inscription.rs b/src/templates/inscription.rs
index e7cc5ff63c..85c28c5d15 100644
--- a/src/templates/inscription.rs
+++ b/src/templates/inscription.rs
@@ -4,8 +4,8 @@ use super::*;
 pub(crate) struct InscriptionHtml {
   pub(crate) chain: Chain,
   pub(crate) children: Vec<InscriptionId>,
-  pub(crate) inscription_fee: u64,
-  pub(crate) inscription_height: u32,
+  pub(crate) fee: u64,
+  pub(crate) height: u32,
   pub(crate) inscription: Inscription,
   pub(crate) inscription_id: InscriptionId,
   pub(crate) inscription_number: i32,
@@ -38,7 +38,7 @@ mod tests {
   fn without_sat_nav_links_or_output() {
     assert_regex_match!(
       InscriptionHtml {
-        inscription_fee: 1,
+        fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -65,9 +65,9 @@ mod tests {
           <dd>text/plain;charset=utf-8</dd>
           <dt>timestamp</dt>
           <dd><time>1970-01-01 00:00:00 UTC</time></dd>
-          <dt>inscription height</dt>
+          <dt>height</dt>
           <dd><a href=/block/0>0</a></dd>
-          <dt>inscription fee</dt>
+          <dt>fee</dt>
           <dd>1</dd>
           <dt>reveal transaction</dt>
           <dd><a class=monospace href=/tx/1{64}>1{64}</a></dd>
@@ -89,7 +89,7 @@ mod tests {
   fn with_output() {
     assert_regex_match!(
       InscriptionHtml {
-        inscription_fee: 1,
+        fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -121,7 +121,7 @@ mod tests {
   fn with_sat() {
     assert_regex_match!(
       InscriptionHtml {
-        inscription_fee: 1,
+        fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -150,7 +150,7 @@ mod tests {
     assert_regex_match!(
       InscriptionHtml {
         children: Vec::new(),
-        inscription_fee: 1,
+        fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(2),
         next: Some(inscription_id(3)),
@@ -177,7 +177,7 @@ mod tests {
   fn with_cursed_and_unbound() {
     assert_regex_match!(
       InscriptionHtml {
-        inscription_fee: 1,
+        fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(2),
         inscription_number: -1,
@@ -210,7 +210,7 @@ mod tests {
     assert_regex_match!(
       InscriptionHtml {
         parent: Some(inscription_id(2)),
-        inscription_fee: 1,
+        fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -243,9 +243,9 @@ mod tests {
           <dd>text/plain;charset=utf-8</dd>
           <dt>timestamp</dt>
           <dd><time>1970-01-01 00:00:00 UTC</time></dd>
-          <dt>inscription height</dt>
+          <dt>height</dt>
           <dd><a href=/block/0>0</a></dd>
-          <dt>inscription fee</dt>
+          <dt>fee</dt>
           <dd>1</dd>
           <dt>reveal transaction</dt>
           <dd><a class=monospace href=/tx/1{64}>1{64}</a></dd>
@@ -268,7 +268,7 @@ mod tests {
     assert_regex_match!(
       InscriptionHtml {
         children: vec![inscription_id(2), inscription_id(3)],
-        inscription_fee: 1,
+        fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -305,9 +305,9 @@ mod tests {
           <dd>text/plain;charset=utf-8</dd>
           <dt>timestamp</dt>
           <dd><time>1970-01-01 00:00:00 UTC</time></dd>
-          <dt>inscription height</dt>
+          <dt>height</dt>
           <dd><a href=/block/0>0</a></dd>
-          <dt>inscription fee</dt>
+          <dt>fee</dt>
           <dd>1</dd>
           <dt>reveal transaction</dt>
           <dd><a class=monospace href=/tx/1{64}>1{64}</a></dd>
@@ -330,7 +330,7 @@ mod tests {
     assert_regex_match!(
       InscriptionHtml {
         children: vec![inscription_id(2)],
-        inscription_fee: 1,
+        fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -366,9 +366,9 @@ mod tests {
           <dd>text/plain;charset=utf-8</dd>
           <dt>timestamp</dt>
           <dd><time>1970-01-01 00:00:00 UTC</time></dd>
-          <dt>inscription height</dt>
+          <dt>height</dt>
           <dd><a href=/block/0>0</a></dd>
-          <dt>inscription fee</dt>
+          <dt>fee</dt>
           <dd>1</dd>
           <dt>reveal transaction</dt>
           <dd><a class=monospace href=/tx/1{64}>1{64}</a></dd>
@@ -390,7 +390,7 @@ mod tests {
   fn with_rune() {
     assert_regex_match!(
       InscriptionHtml {
-        inscription_fee: 1,
+        fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
         inscription_id: inscription_id(1),
         inscription_number: 1,
@@ -418,7 +418,7 @@ mod tests {
   fn with_content_encoding() {
     assert_regex_match!(
       InscriptionHtml {
-        inscription_fee: 1,
+        fee: 1,
         inscription: Inscription {
           content_encoding: Some("br".into()),
           ..inscription("text/plain;charset=utf-8", "HELLOWORLD")
diff --git a/tests/server.rs b/tests/server.rs
index 71b81a8a1e..5b1025ef9b 100644
--- a/tests/server.rs
+++ b/tests/server.rs
@@ -73,9 +73,9 @@ fn inscription_page() {
   <dd>text/plain;charset=utf-8</dd>
   <dt>timestamp</dt>
   <dd><time>1970-01-01 00:00:02 UTC</time></dd>
-  <dt>inscription height</dt>
+  <dt>height</dt>
   <dd><a href=/block/2>2</a></dd>
-  <dt>inscription fee</dt>
+  <dt>fee</dt>
   <dd>138</dd>
   <dt>reveal transaction</dt>
   <dd><a class=monospace href=/tx/{reveal}>{reveal}</a></dd>

From 3ff8c21687281a254888e6e4a9402f0b103ff3c5 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Sun, 10 Mar 2024 18:12:11 -0700
Subject: [PATCH 3/9] Amend

---
 src/subcommand/server.rs     |  4 +--
 src/templates/inscription.rs | 50 ++++++++++++++++++------------------
 templates/inscription.html   | 24 ++++++++---------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
index 43c5fac673..87c737b496 100644
--- a/src/subcommand/server.rs
+++ b/src/subcommand/server.rs
@@ -1495,8 +1495,8 @@ impl Server {
           fee: info.entry.fee,
           height: info.entry.height,
           inscription: info.inscription,
-          inscription_id: info.entry.id,
-          inscription_number: info.entry.inscription_number,
+          id: info.entry.id,
+          number: info.entry.inscription_number,
           next: info.next,
           output: info.output,
           parent: info.parent,
diff --git a/src/templates/inscription.rs b/src/templates/inscription.rs
index 85c28c5d15..bc1958a55d 100644
--- a/src/templates/inscription.rs
+++ b/src/templates/inscription.rs
@@ -3,12 +3,13 @@ use super::*;
 #[derive(Boilerplate, Default)]
 pub(crate) struct InscriptionHtml {
   pub(crate) chain: Chain,
+  pub(crate) charms: u16,
   pub(crate) children: Vec<InscriptionId>,
   pub(crate) fee: u64,
   pub(crate) height: u32,
   pub(crate) inscription: Inscription,
-  pub(crate) inscription_id: InscriptionId,
-  pub(crate) inscription_number: i32,
+  pub(crate) id: InscriptionId,
+  pub(crate) number: i32,
   pub(crate) next: Option<InscriptionId>,
   pub(crate) output: Option<TxOut>,
   pub(crate) parent: Option<InscriptionId>,
@@ -17,16 +18,15 @@ pub(crate) struct InscriptionHtml {
   pub(crate) sat: Option<Sat>,
   pub(crate) satpoint: SatPoint,
   pub(crate) timestamp: DateTime<Utc>,
-  pub(crate) charms: u16,
 }
 
 impl PageContent for InscriptionHtml {
   fn title(&self) -> String {
-    format!("Inscription {}", self.inscription_number)
+    format!("Inscription {}", self.number)
   }
 
   fn preview_image_url(&self) -> Option<Trusted<String>> {
-    Some(Trusted(format!("/content/{}", self.inscription_id)))
+    Some(Trusted(format!("/content/{}", self.id)))
   }
 }
 
@@ -40,8 +40,8 @@ mod tests {
       InscriptionHtml {
         fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
-        inscription_id: inscription_id(1),
-        inscription_number: 1,
+        id: inscription_id(1),
+        number: 1,
         satpoint: satpoint(1, 0),
         ..Default::default()
       },
@@ -91,8 +91,8 @@ mod tests {
       InscriptionHtml {
         fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
-        inscription_id: inscription_id(1),
-        inscription_number: 1,
+        id: inscription_id(1),
+        number: 1,
         output: Some(tx_out(1, address())),
         satpoint: satpoint(1, 0),
         ..Default::default()
@@ -123,8 +123,8 @@ mod tests {
       InscriptionHtml {
         fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
-        inscription_id: inscription_id(1),
-        inscription_number: 1,
+        id: inscription_id(1),
+        number: 1,
         output: Some(tx_out(1, address())),
         sat: Some(Sat(1)),
         satpoint: satpoint(1, 0),
@@ -152,9 +152,9 @@ mod tests {
         children: Vec::new(),
         fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
-        inscription_id: inscription_id(2),
+        id: inscription_id(2),
         next: Some(inscription_id(3)),
-        inscription_number: 1,
+        number: 1,
         output: Some(tx_out(1, address())),
         previous: Some(inscription_id(1)),
         satpoint: satpoint(1, 0),
@@ -179,8 +179,8 @@ mod tests {
       InscriptionHtml {
         fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
-        inscription_id: inscription_id(2),
-        inscription_number: -1,
+        id: inscription_id(2),
+        number: -1,
         output: Some(tx_out(1, address())),
         satpoint: SatPoint {
           outpoint: unbound_outpoint(),
@@ -212,8 +212,8 @@ mod tests {
         parent: Some(inscription_id(2)),
         fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
-        inscription_id: inscription_id(1),
-        inscription_number: 1,
+        id: inscription_id(1),
+        number: 1,
         satpoint: satpoint(1, 0),
         ..Default::default()
       },
@@ -270,8 +270,8 @@ mod tests {
         children: vec![inscription_id(2), inscription_id(3)],
         fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
-        inscription_id: inscription_id(1),
-        inscription_number: 1,
+        id: inscription_id(1),
+        number: 1,
         satpoint: satpoint(1, 0),
         ..Default::default()
       },
@@ -332,8 +332,8 @@ mod tests {
         children: vec![inscription_id(2)],
         fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
-        inscription_id: inscription_id(1),
-        inscription_number: 1,
+        id: inscription_id(1),
+        number: 1,
         satpoint: satpoint(1, 0),
         ..Default::default()
       },
@@ -392,8 +392,8 @@ mod tests {
       InscriptionHtml {
         fee: 1,
         inscription: inscription("text/plain;charset=utf-8", "HELLOWORLD"),
-        inscription_id: inscription_id(1),
-        inscription_number: 1,
+        id: inscription_id(1),
+        number: 1,
         satpoint: satpoint(1, 0),
         rune: Some(SpacedRune {
           rune: Rune(26),
@@ -423,8 +423,8 @@ mod tests {
           content_encoding: Some("br".into()),
           ..inscription("text/plain;charset=utf-8", "HELLOWORLD")
         },
-        inscription_id: inscription_id(1),
-        inscription_number: 1,
+        id: inscription_id(1),
+        number: 1,
         satpoint: satpoint(1, 0),
         ..Default::default()
       },
diff --git a/templates/inscription.html b/templates/inscription.html
index 78976b50eb..66a1d92b80 100644
--- a/templates/inscription.html
+++ b/templates/inscription.html
@@ -1,11 +1,11 @@
-<h1>Inscription {{ self.inscription_number }}</h1>
+<h1>Inscription {{ self.number }}</h1>
 <div class=inscription>
 %% if let Some(previous) = self.previous {
 <a class=prev href=/inscription/{{previous}}>❮</a>
 %% } else {
 <div>❮</div>
 %% }
-{{Iframe::main(self.inscription_id)}}
+{{Iframe::main(self.id)}}
 %% if let Some(next) = self.next {
 <a class=next href=/inscription/{{next}}>❯</a>
 %% } else {
@@ -22,12 +22,12 @@ <h1>Inscription {{ self.inscription_number }}</h1>
 %% }
     </div>
     <div class=center>
-      <a href=/children/{{self.inscription_id}}>all</a>
+      <a href=/children/{{self.id}}>all</a>
     </div>
   </dd>
 %% }
   <dt>id</dt>
-  <dd class=monospace>{{ self.inscription_id }}</dd>
+  <dd class=monospace>{{ self.id }}</dd>
 %% if let Some(parent) = &self.parent {
   <dt>parent</dt>
   <dd>
@@ -74,9 +74,9 @@ <h1>Inscription {{ self.inscription_number }}</h1>
   <dd><a href=/inscription/{{ delegate }}>{{ delegate }}</a></dd>
 %% }
   <dt>preview</dt>
-  <dd><a href=/preview/{{self.inscription_id}}>link</a></dd>
+  <dd><a href=/preview/{{self.id}}>link</a></dd>
   <dt>content</dt>
-  <dd><a href=/content/{{self.inscription_id}}>link</a></dd>
+  <dd><a href=/content/{{self.id}}>link</a></dd>
 %% if let Some(content_length) = self.inscription.content_length() {
   <dt>content length</dt>
   <dd>{{ content_length }} bytes</dd>
@@ -92,12 +92,12 @@ <h1>Inscription {{ self.inscription_number }}</h1>
 %% }
   <dt>timestamp</dt>
   <dd><time>{{ self.timestamp }}</time></dd>
-  <dt>inscription height</dt>
-  <dd><a href=/block/{{ self.inscription_height }}>{{ self.inscription_height }}</a></dd>
-  <dt>inscription fee</dt>
-  <dd>{{ self.inscription_fee }}</dd>
+  <dt>height</dt>
+  <dd><a href=/block/{{ self.height }}>{{ self.height }}</a></dd>
+  <dt>fee</dt>
+  <dd>{{ self.fee }}</dd>
   <dt>reveal transaction</dt>
-  <dd><a class=monospace href=/tx/{{ self.inscription_id.txid }}>{{ self.inscription_id.txid }}</a></dd>
+  <dd><a class=monospace href=/tx/{{ self.id.txid }}>{{ self.id.txid }}</a></dd>
   <dt>location</dt>
   <dd class=monospace>{{ self.satpoint }}</dd>
   <dt>output</dt>
@@ -105,7 +105,7 @@ <h1>Inscription {{ self.inscription_number }}</h1>
   <dt>offset</dt>
   <dd>{{ self.satpoint.offset }}</dd>
   <dt>ethereum teleburn address</dt>
-  <dd>{{ teleburn::Ethereum::from(self.inscription_id) }}</dd>
+  <dd>{{ teleburn::Ethereum::from(self.id) }}</dd>
 %% if let Some(rune) = self.rune {
   <dt>rune</dt>
   <dd><a href=/rune/{{ rune }}>{{ rune }}</a></dd>

From b5ac8f147c3a0d2461320887f69199c445c4f3f4 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Sun, 10 Mar 2024 18:17:46 -0700
Subject: [PATCH 4/9] Amend

---
 src/api.rs               | 10 +++++-----
 src/subcommand/server.rs | 12 ++++++------
 tests/json_api.rs        | 14 +++++++-------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/api.rs b/src/api.rs
index 355ae83805..3742f5b35f 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -67,10 +67,10 @@ pub struct Inscription {
   pub children: Vec<InscriptionId>,
   pub content_length: Option<usize>,
   pub content_type: Option<String>,
-  pub inscription_fee: u64,
-  pub inscription_height: u32,
-  pub inscription_id: InscriptionId,
-  pub inscription_number: i32,
+  pub fee: u64,
+  pub height: u32,
+  pub id: InscriptionId,
+  pub number: i32,
   pub next: Option<InscriptionId>,
   pub output_value: Option<u64>,
   pub parent: Option<InscriptionId>,
@@ -98,7 +98,7 @@ pub struct InscriptionRecursive {
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct Inscriptions {
-  pub inscriptions: Vec<InscriptionId>,
+  pub ids: Vec<InscriptionId>,
   pub more: bool,
   pub page_index: u32,
 }
diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
index 87c737b496..0b46ce9841 100644
--- a/src/subcommand/server.rs
+++ b/src/subcommand/server.rs
@@ -1455,17 +1455,17 @@ impl Server {
 
       Ok(if accept_json {
         Json(api::Inscription {
-          inscription_id: info.entry.id,
+          id: info.entry.id,
           charms: Charm::ALL
             .iter()
             .filter(|charm| charm.is_set(info.charms))
             .map(|charm| charm.title().into())
             .collect(),
           children: info.children,
-          inscription_number: info.entry.inscription_number,
-          inscription_height: info.entry.height,
+          number: info.entry.inscription_number,
+          height: info.entry.height,
           parent: info.parent,
-          inscription_fee: info.entry.fee,
+          fee: info.entry.fee,
           output_value: info.output.as_ref().map(|o| o.value),
           address: info
             .output
@@ -1642,7 +1642,7 @@ impl Server {
 
       Ok(if accept_json {
         Json(api::Inscriptions {
-          inscriptions,
+          ids: inscriptions,
           page_index,
           more,
         })
@@ -1701,7 +1701,7 @@ impl Server {
 
       Ok(if accept_json {
         Json(api::Inscriptions {
-          inscriptions,
+          ids: inscriptions,
           page_index,
           more,
         })
diff --git a/tests/json_api.rs b/tests/json_api.rs
index 1d0a95df06..7441003acb 100644
--- a/tests/json_api.rs
+++ b/tests/json_api.rs
@@ -157,10 +157,10 @@ fn get_inscription() {
       children: Vec::new(),
       content_length: Some(3),
       content_type: Some("text/plain;charset=utf-8".to_string()),
-      inscription_fee: 138,
-      inscription_height: 2,
-      inscription_id,
-      inscription_number: 0,
+      fee: 138,
+      height: 2,
+      id: inscription_id,
+      number: 0,
       next: None,
       output_value: Some(10000),
       parent: None,
@@ -213,7 +213,7 @@ fn get_inscriptions() {
   let inscriptions_json: api::Inscriptions =
     serde_json::from_str(&response.text().unwrap()).unwrap();
 
-  assert_eq!(inscriptions_json.inscriptions.len(), 100);
+  assert_eq!(inscriptions_json.ids.len(), 100);
   assert!(inscriptions_json.more);
   assert_eq!(inscriptions_json.page_index, 0);
 
@@ -222,7 +222,7 @@ fn get_inscriptions() {
   let inscriptions_json: api::Inscriptions =
     serde_json::from_str(&response.text().unwrap()).unwrap();
 
-  assert_eq!(inscriptions_json.inscriptions.len(), 50);
+  assert_eq!(inscriptions_json.ids.len(), 50);
   assert!(!inscriptions_json.more);
   assert_eq!(inscriptions_json.page_index, 1);
 }
@@ -276,7 +276,7 @@ fn get_inscriptions_in_block() {
     serde_json::from_str(&response.text().unwrap()).unwrap();
 
   pretty_assert_eq!(
-    inscriptions_json.inscriptions,
+    inscriptions_json.ids,
     vec![
       InscriptionId { txid, index: 0 },
       InscriptionId { txid, index: 1 },

From f108157bc61160d68e3a71ce8a7207941670b097 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Sun, 10 Mar 2024 18:34:09 -0700
Subject: [PATCH 5/9] return id as well

---
 src/api.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/api.rs b/src/api.rs
index 3742f5b35f..89452a6c3d 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -88,6 +88,7 @@ pub struct InscriptionRecursive {
   pub content_length: Option<usize>,
   pub fee: u64,
   pub height: u32,
+  pub id: InscriptionId,
   pub number: i32,
   pub output: OutPoint,
   pub sat: Option<ordinals::Sat>,

From 494945285693d9fecb9a2f8b2c425b471178a714 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Sun, 10 Mar 2024 18:35:57 -0700
Subject: [PATCH 6/9] Amend

---
 src/api.rs               | 2 +-
 src/subcommand/server.rs | 2 +-
 tests/json_api.rs        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api.rs b/src/api.rs
index 3742f5b35f..4e2d522444 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -72,7 +72,7 @@ pub struct Inscription {
   pub id: InscriptionId,
   pub number: i32,
   pub next: Option<InscriptionId>,
-  pub output_value: Option<u64>,
+  pub value: Option<u64>,
   pub parent: Option<InscriptionId>,
   pub previous: Option<InscriptionId>,
   pub rune: Option<SpacedRune>,
diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
index 0b46ce9841..b4efc6a3bf 100644
--- a/src/subcommand/server.rs
+++ b/src/subcommand/server.rs
@@ -1466,7 +1466,7 @@ impl Server {
           height: info.entry.height,
           parent: info.parent,
           fee: info.entry.fee,
-          output_value: info.output.as_ref().map(|o| o.value),
+          value: info.output.as_ref().map(|o| o.value),
           address: info
             .output
             .as_ref()
diff --git a/tests/json_api.rs b/tests/json_api.rs
index 7441003acb..612f18481e 100644
--- a/tests/json_api.rs
+++ b/tests/json_api.rs
@@ -162,7 +162,7 @@ fn get_inscription() {
       id: inscription_id,
       number: 0,
       next: None,
-      output_value: Some(10000),
+      value: Some(10000),
       parent: None,
       previous: None,
       rune: None,

From 867c3d2d26fce89d4a055cfdec3f413c97baeab5 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Sun, 10 Mar 2024 18:41:10 -0700
Subject: [PATCH 7/9] Amend

---
 src/subcommand/server.rs     | 10 +++++-----
 src/templates/inscription.rs |  2 +-
 templates/inscription.html   |  2 +-
 tests/server.rs              |  2 +-
 tests/wallet/inscribe.rs     | 24 ++++++++++++------------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
index b4efc6a3bf..d57e3ec54d 100644
--- a/src/subcommand/server.rs
+++ b/src/subcommand/server.rs
@@ -4187,7 +4187,7 @@ mod tests {
     server.assert_response_regex(
       format!("/inscription/{}", InscriptionId { txid, index: 0 }),
       StatusCode::OK,
-      r".*<dt>output value</dt>\s*<dd>5000000000</dd>\s*<dt>preview</dt>.*",
+      r".*<dt>value</dt>\s*<dd>5000000000</dd>\s*<dt>preview</dt>.*",
     );
   }
 
@@ -4839,7 +4839,7 @@ next
 <dl>
   <dt>id</dt>
   <dd class=monospace>{id}</dd>
-  <dt>output value</dt>
+  <dt>value</dt>
   .*
 </dl>
 .*
@@ -5050,7 +5050,7 @@ next
 <dl>
   <dt>id</dt>
   <dd class=monospace>{id}</dd>
-  <dt>output value</dt>
+  <dt>value</dt>
   .*
 </dl>
 .*
@@ -5110,7 +5110,7 @@ next
 <dl>
   <dt>id</dt>
   <dd class=monospace>{id}</dd>
-  <dt>output value</dt>
+  <dt>value</dt>
   .*
 </dl>
 .*
@@ -5195,7 +5195,7 @@ next
 <dl>
   <dt>id</dt>
   <dd class=monospace>{id}</dd>
-  <dt>output value</dt>
+  <dt>value</dt>
   <dd>5000000000</dd>
   .*
 </dl>
diff --git a/src/templates/inscription.rs b/src/templates/inscription.rs
index bc1958a55d..1a3984475f 100644
--- a/src/templates/inscription.rs
+++ b/src/templates/inscription.rs
@@ -108,7 +108,7 @@ mod tests {
           .*
           <dt>address</dt>
           <dd class=monospace>bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4</dd>
-          <dt>output value</dt>
+          <dt>value</dt>
           <dd>1</dd>
           .*
         </dl>
diff --git a/templates/inscription.html b/templates/inscription.html
index 66a1d92b80..005940ae81 100644
--- a/templates/inscription.html
+++ b/templates/inscription.html
@@ -57,7 +57,7 @@ <h1>Inscription {{ self.number }}</h1>
   <dt>address</dt>
   <dd class=monospace>{{ address }}</dd>
 %% }
-  <dt>output value</dt>
+  <dt>value</dt>
   <dd>{{ output.value }}</dd>
 %% }
 %% if let Some(sat) = self.sat {
diff --git a/tests/server.rs b/tests/server.rs
index 5b1025ef9b..4e689dd8cd 100644
--- a/tests/server.rs
+++ b/tests/server.rs
@@ -61,7 +61,7 @@ fn inscription_page() {
   <dd class=monospace>{inscription}</dd>
   <dt>address</dt>
   <dd class=monospace>bc1.*</dd>
-  <dt>output value</dt>
+  <dt>value</dt>
   <dd>10000</dd>
   <dt>preview</dt>
   <dd><a href=/preview/{inscription}>link</a></dd>
diff --git a/tests/wallet/inscribe.rs b/tests/wallet/inscribe.rs
index b543dd2e7e..877de7edb2 100644
--- a/tests/wallet/inscribe.rs
+++ b/tests/wallet/inscribe.rs
@@ -1275,7 +1275,7 @@ fn batch_in_separate_outputs_with_parent() {
   ord_rpc_server.assert_response_regex(
     format!("/inscription/{}", output.inscriptions[0].id),
     format!(
-      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>output value</dt>.*<dd>10000</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
+      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>value</dt>.*<dd>10000</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
       output_1
     ),
   );
@@ -1283,7 +1283,7 @@ fn batch_in_separate_outputs_with_parent() {
   ord_rpc_server.assert_response_regex(
     format!("/inscription/{}", output.inscriptions[1].id),
     format!(
-      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>output value</dt>.*<dd>10000</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
+      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>value</dt>.*<dd>10000</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
       output_2
     ),
   );
@@ -1291,7 +1291,7 @@ fn batch_in_separate_outputs_with_parent() {
   ord_rpc_server.assert_response_regex(
     format!("/inscription/{}", output.inscriptions[2].id),
     format!(
-      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>output value</dt>.*<dd>10000</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
+      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>value</dt>.*<dd>10000</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
       output_3
     ),
   );
@@ -1353,7 +1353,7 @@ fn batch_in_separate_outputs_with_parent_and_non_default_postage() {
   ord_rpc_server.assert_response_regex(
     format!("/inscription/{}", output.inscriptions[0].id),
     format!(
-      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>output value</dt>.*<dd>777</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
+      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>value</dt>.*<dd>777</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
       output_1
     ),
   );
@@ -1361,7 +1361,7 @@ fn batch_in_separate_outputs_with_parent_and_non_default_postage() {
   ord_rpc_server.assert_response_regex(
     format!("/inscription/{}", output.inscriptions[1].id),
     format!(
-      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>output value</dt>.*<dd>777</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
+      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>value</dt>.*<dd>777</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
       output_2
     ),
   );
@@ -1369,7 +1369,7 @@ fn batch_in_separate_outputs_with_parent_and_non_default_postage() {
   ord_rpc_server.assert_response_regex(
     format!("/inscription/{}", output.inscriptions[2].id),
     format!(
-      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>output value</dt>.*<dd>777</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
+      r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>value</dt>.*<dd>777</dd>.*.*<dt>location</dt>.*<dd class=monospace>{}:0</dd>.*",
       output_3
     ),
   );
@@ -2400,7 +2400,7 @@ inscriptions:
 
   ord_rpc_server.assert_response_regex(
     format!("/inscription/{}", inscription_1.id),
-    format!(r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>output value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
+    format!(r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
       50 * COIN_VALUE,
       sat_1,
       inscription_1.location,
@@ -2409,7 +2409,7 @@ inscriptions:
 
   ord_rpc_server.assert_response_regex(
       format!("/inscription/{}", inscription_2.id),
-      format!(r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>output value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
+      format!(r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
          50 * COIN_VALUE,
          sat_2,
          inscription_2.location
@@ -2418,7 +2418,7 @@ inscriptions:
 
   ord_rpc_server.assert_response_regex(
       format!("/inscription/{}", inscription_3.id),
-      format!(r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>output value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
+      format!(r".*<dt>parent</dt>\s*<dd>.*{parent_id}.*</dd>.*<dt>value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
         50 * COIN_VALUE,
         sat_3,
         inscription_3.location
@@ -2570,7 +2570,7 @@ inscriptions:
   ord_rpc_server.assert_response_regex(
      format!("/inscription/{}", inscription_1.id),
      format!(
-       r".*<dt>output value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
+       r".*<dt>value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
        25 * COIN_VALUE,
        sat_1,
        inscription_1.location
@@ -2580,7 +2580,7 @@ inscriptions:
   ord_rpc_server.assert_response_regex(
       format!("/inscription/{}", inscription_2.id),
       format!(
-        r".*<dt>output value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
+        r".*<dt>value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
         COIN_VALUE,
         sat_2,
         inscription_2.location
@@ -2590,7 +2590,7 @@ inscriptions:
   ord_rpc_server.assert_response_regex(
          format!("/inscription/{}", inscription_3.id),
          format!(
-           r".*<dt>output value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
+           r".*<dt>value</dt>.*<dd>{}</dd>.*<dt>sat</dt>.*<dd>.*{}.*</dd>.*<dt>location</dt>.*<dd class=monospace>{}</dd>.*",
            3 * COIN_VALUE,
            sat_3,
            inscription_3.location

From 71bad432962a8f3fede1cdf623ffa4790c88d387 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Sun, 10 Mar 2024 19:54:49 -0700
Subject: [PATCH 8/9] Amend

---
 src/subcommand/server.rs | 1 +
 tests/server.rs          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
index d57e3ec54d..cb92e3f53f 100644
--- a/src/subcommand/server.rs
+++ b/src/subcommand/server.rs
@@ -902,6 +902,7 @@ impl Server {
           content_length: inscription.content_length(),
           fee: entry.fee,
           height: entry.height,
+          id: inscription_id,
           number: entry.inscription_number,
           output: satpoint.outpoint,
           value: output.as_ref().map(|o| o.value),
diff --git a/tests/server.rs b/tests/server.rs
index 4e689dd8cd..5f50b03537 100644
--- a/tests/server.rs
+++ b/tests/server.rs
@@ -316,6 +316,7 @@ fn recursive_inscription_endpoint() {
       content_length: Some(3),
       fee: 138,
       height: 2,
+      id: inscription.id,
       number: 0,
       output: inscription.location.outpoint,
       sat: Some(Sat(50 * COIN_VALUE)),

From 8530b8909f8e06fd526e4dae3367af35574ddbb5 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Mon, 11 Mar 2024 12:35:36 -0700
Subject: [PATCH 9/9] document

---
 docs/src/inscriptions/recursion.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/src/inscriptions/recursion.md b/docs/src/inscriptions/recursion.md
index 1deab60581..64ad4f5cc8 100644
--- a/docs/src/inscriptions/recursion.md
+++ b/docs/src/inscriptions/recursion.md
@@ -116,6 +116,7 @@ Examples
   "content_length": 144037,
   "fee": 36352,
   "height": 209,
+  "id": "3bd72a7ef68776c9429961e43043ff65efa7fb2d8bb407386a9e3b19f149bc36i0",
   "number": 2,
   "output": "3bd72a7ef68776c9429961e43043ff65efa7fb2d8bb407386a9e3b19f149bc36:0",
   "sat": null,