Rename genesis fee to inscription fee (ordinals#3257)

src/api.rs

@@ -67,18 +67,18 @@ 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_id: InscriptionId,
- pub inscription_number: i32,
+ pub fee: u64,
+ pub height: u32,
+ pub id: InscriptionId,
  pub next: Option<InscriptionId>,
- pub output_value: Option<u64>,
+ pub number: i32,
  pub parent: Option<InscriptionId>,
  pub previous: Option<InscriptionId>,
  pub rune: Option<SpacedRune>,
  pub sat: Option<ordinals::Sat>,
  pub satpoint: SatPoint,
  pub timestamp: i64,
+ pub value: Option<u64>,
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
@@ -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,
 }

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);
 

src/subcommand/server.rs

@@ -1455,18 +1455,6 @@ impl Server {
 
  Ok(if accept_json {
  Json(api::Inscription {
- inscription_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,
- genesis_height: info.entry.height,
- parent: info.parent,
- genesis_fee: info.entry.fee,
- output_value: info.output.as_ref().map(|o| o.value),
  address: info
  .output
  .as_ref()
@@ -1477,26 +1465,38 @@ impl Server {
  .ok()
  })
  .map(|address| address.to_string()),
- sat: info.entry.sat,
- satpoint: info.satpoint,
- content_type: info.inscription.content_type().map(|s| s.to_string()),
+ charms: Charm::ALL
+ .iter()
+ .filter(|charm| charm.is_set(info.charms))
+ .map(|charm| charm.title().into())
+ .collect(),
+ children: info.children,
  content_length: info.inscription.content_length(),
- timestamp: timestamp(info.entry.timestamp).timestamp(),
- previous: info.previous,
+ content_type: info.inscription.content_type().map(|s| s.to_string()),
+ fee: info.entry.fee,
+ height: info.entry.height,
+ id: info.entry.id,
  next: info.next,
+ number: info.entry.inscription_number,
+ parent: info.parent,
+ previous: info.previous,
  rune: info.rune,
+ sat: info.entry.sat,
+ satpoint: info.satpoint,
+ timestamp: timestamp(info.entry.timestamp).timestamp(),
+ value: info.output.as_ref().map(|o| o.value),
  })
  .into_response()
  } else {
  InscriptionHtml {
  chain: server_config.chain,
  charms: Charm::Vindicated.unset(info.charms),
  children: info.children,
- genesis_fee: info.entry.fee,
- genesis_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,
+ id: info.entry.id,
+ number: info.entry.inscription_number,
  next: info.next,
  output: info.output,
  parent: info.parent,
@@ -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,
  })
@@ -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>