Display mintability on /rune (ordinals#3324)

raphjaph · Mar 19, 2024 · 737f414 · 737f414
1 parent 33c300c
commit 737f414
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 7 deletions.
diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
@@ -684,12 +684,35 @@ impl Server {
  .rune(rune)?
  .ok_or_not_found(|| format!("rune {rune}"))?;
 
+ let block_height = index.block_height()?.unwrap_or(Height(0));
+
+ let block_time: u32 = index
+ .block_time(block_height)?
+ .unix_timestamp()
+ .try_into()
+ .unwrap_or_default();
+
+ let mintable = entry
+ .mintable(Height(block_height.n() + 1), block_time)
+ .is_ok();
+
  Ok(if accept_json {
- Json(api::Rune { entry, id, parent }).into_response()
+ Json(api::Rune {
+ entry,
+ id,
+ mintable,
+ parent,
+ })
+ .into_response()
  } else {
- RuneHtml { entry, id, parent }
- .page(server_config)
- .into_response()
+ RuneHtml {
+ entry,
+ id,
+ mintable,
+ parent,
+ }
+ .page(server_config)
+ .into_response()
  })
  })
  }

diff --git a/src/templates/rune.rs b/src/templates/rune.rs
@@ -4,6 +4,7 @@ use super::*;
 pub struct RuneHtml {
  pub entry: RuneEntry,
  pub id: RuneId,
+ pub mintable: bool,
  pub parent: Option<InscriptionId>,
 }
 
@@ -40,6 +41,7 @@ mod tests {
  timestamp: 0,
  },
  id: RuneId { block: 10, tx: 9 },
+ mintable: true,
  parent: Some(InscriptionId {
  txid: Txid::all_zeros(),
  index: 0,
@@ -69,6 +71,8 @@ mod tests {
  <dd>1.000000001 %</dd>
  <dt>mints</dt>
  <dd>100</dd>
+ <dt>mintable</dt>
+ <dd>true</dd>
  </dl>
  </dd>
  <dt>supply</dt>
@@ -109,6 +113,7 @@ mod tests {
  timestamp: 0,
  },
  id: RuneId { block: 10, tx: 9 },
+ mintable: false,
  parent: None,
  },
  "<h1>B•CGDENLQRQWDSLRUGSNLBTMFIJAV</h1>
@@ -165,6 +170,7 @@ mod tests {
  timestamp: 0,
  },
  id: RuneId { block: 10, tx: 9 },
+ mintable: false,
  parent: None,
  },
  "<h1>B•CGDENLQRQWDSLRUGSNLBTMFIJAV</h1>
@@ -190,6 +196,8 @@ mod tests {
  <dd>none</dd>
  <dt>mints</dt>
  <dd>0</dd>
+ <dt>mintable</dt>
+ <dd>false</dd>
  </dl>
  </dd>
  <dt>supply</dt>

diff --git a/templates/rune.html b/templates/rune.html
@@ -37,6 +37,8 @@ <h1>{{ self.entry.spaced_rune() }}</h1>
 %% }
  <dt>mints</dt>
  <dd>{{ self.entry.mints }}</dd>
+ <dt>mintable</dt>
+ <dd>{{ self.mintable }}</dd>
  </dl>
  </dd>
 %% } else {

diff --git a/tests/json_api.rs b/tests/json_api.rs
@@ -557,6 +557,7 @@ fn get_runes() {
  timestamp: 11,
  },
  id: RuneId { block: 11, tx: 1 },
+ mintable: false,
  parent: Some(InscriptionId {
  txid: a.inscribe.reveal,
  index: 0,

diff --git a/tests/lib.rs b/tests/lib.rs
@@ -227,10 +227,12 @@ fn batch(
 
  bitcoin_rpc_server.mine_blocks(1);
 
- let height = bitcoin_rpc_server.height();
+ let block_height = bitcoin_rpc_server.height();
+ let block_hash = *bitcoin_rpc_server.state().hashes.last().unwrap();
+ let block_time = bitcoin_rpc_server.state().blocks[&block_hash].header.time;
 
  let id = RuneId {
- block: u32::try_from(height).unwrap(),
+ block: u32::try_from(block_height).unwrap(),
  tx: 1,
  };
 
@@ -250,8 +252,12 @@ fn batch(
  if let Some(mint) = mint {
  mint_definition.push("<dd>".into());
  mint_definition.push("<dl>".into());
+
+ let mut mintable = true;
+
  mint_definition.push("<dt>deadline</dt>".into());
  if let Some(deadline) = mint.deadline {
+ mintable &= block_time < deadline;
  mint_definition.push(format!(
  "<dd><time>{}</time></dd>",
  ord::timestamp(deadline)
@@ -263,7 +269,8 @@ fn batch(
  mint_definition.push("<dt>end</dt>".into());
 
  if let Some(term) = mint.term {
- let end = height + u64::from(term);
+ let end = block_height + u64::from(term);
+ mintable &= block_height + 1 < end;
  mint_definition.push(format!("<dd><a href=/block/{end}>{end}</a></dd>"));
  } else {
  mint_definition.push("<dd>none</dd>".into());
@@ -283,6 +290,9 @@ fn batch(
  mint_definition.push("<dt>mints</dt>".into());
  mint_definition.push("<dd>0</dd>".into());
 
+ mint_definition.push("<dt>mintable</dt>".into());
+ mint_definition.push(format!("<dd>{mintable}</dd>"));
+
  mint_definition.push("</dl>".into());
  mint_definition.push("</dd>".into());
  } else {