Merge branch 'master' of github.com:ordinals/ord into add-opus

ordinals · Jan 24, 2025 · 4f93be4 · 4f93be4
2 parents 8f7822e + 2dae21f
commit 4f93be4
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 20 deletions.
diff --git a/src/index.rs b/src/index.rs
@@ -1789,13 +1789,17 @@ impl Index {
       .with_context(|| format!("current {current} height is greater than sat height {height}"))?;
 
     Ok(Blocktime::Expected(
-      Utc::now()
-        .round_subsecs(0)
-        .checked_add_signed(
-          chrono::Duration::try_seconds(10 * 60 * i64::from(expected_blocks))
-            .context("timestamp out of range")?,
-        )
-        .context("timestamp out of range")?,
+      if self.settings.chain() == Chain::Regtest {
+        DateTime::default()
+      } else {
+        Utc::now()
+      }
+      .round_subsecs(0)
+      .checked_add_signed(
+        chrono::Duration::try_seconds(10 * 60 * i64::from(expected_blocks))
+          .context("timestamp out of range")?,
+      )
+      .context("timestamp out of range")?,
     ))
   }
 

diff --git a/src/inscriptions/media.rs b/src/inscriptions/media.rs
@@ -75,6 +75,7 @@ impl Media {
     ("application/pdf",             GENERIC, Pdf,              &["pdf"]),
     ("application/pgp-signature",   TEXT,    Text,             &["asc"]),
     ("application/protobuf",        GENERIC, Unknown,          &["binpb"]),
+    ("application/x-bittorrent",    GENERIC, Unknown,          &["torrent"]),
     ("application/x-javascript",    TEXT,    Code(JavaScript), &[]),
     ("application/yaml",            TEXT,    Code(Yaml),       &["yaml", "yml"]),
     ("audio/flac",                  GENERIC, Audio,            &["flac"]),

diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
@@ -849,13 +849,15 @@ impl Server {
         return Ok(if accept_json {
           StatusCode::NOT_FOUND.into_response()
         } else {
+          let unlock = if let Some(height) = rune.unlock_height(server_config.chain.network()) {
+            Some((height, index.block_time(height)?.timestamp()))
+          } else {
+            None
+          };
+
           (
             StatusCode::NOT_FOUND,
-            RuneNotFoundHtml {
-              rune,
-              unlock_height: rune.unlock_height(server_config.chain.network()),
-            }
-            .page(server_config),
+            RuneNotFoundHtml { rune, unlock }.page(server_config),
           )
             .into_response()
         });
@@ -3295,7 +3297,10 @@ mod tests {
       StatusCode::NOT_FOUND,
       RuneNotFoundHtml {
         rune: Rune(0),
-        unlock_height: Some(Height(209999)),
+        unlock: Some((
+          Height(209999),
+          DateTime::from_timestamp(125998800, 0).unwrap(),
+        )),
       },
     );
   }
@@ -3314,7 +3319,7 @@ mod tests {
       StatusCode::NOT_FOUND,
       RuneNotFoundHtml {
         rune: Rune(Rune::RESERVED),
-        unlock_height: None,
+        unlock: None,
       },
     );
   }

diff --git a/src/templates/rune_not_found.rs b/src/templates/rune_not_found.rs
@@ -3,7 +3,7 @@ use super::*;
 #[derive(Boilerplate, Debug, PartialEq, Serialize)]
 pub struct RuneNotFoundHtml {
   pub rune: Rune,
-  pub unlock_height: Option<Height>,
+  pub unlock: Option<(Height, DateTime<Utc>)>,
 }
 
 impl PageContent for RuneNotFoundHtml {
@@ -21,12 +21,14 @@ mod tests {
     assert_regex_match!(
       RuneNotFoundHtml {
         rune: Rune(u128::MAX),
-        unlock_height: Some(Height(111)),
+        unlock: Some((Height(111), DateTime::default())),
       },
-      "<h1>BCGDENLQRQWDSLRUGSNLBTMFIJAV</h1>
+      r"<h1>BCGDENLQRQWDSLRUGSNLBTMFIJAV</h1>
 <dl>
   <dt>unlock height</dt>
   <dd>111</dd>
+  <dt>unlock time</dt>
+  <dd><time>1970-01-01 00:00:00 UTC</time> \(expected\)</dd>
   <dt>reserved</dt>
   <dd>false</dd>
 </dl>
@@ -39,7 +41,7 @@ mod tests {
     assert_regex_match!(
       RuneNotFoundHtml {
         rune: Rune(Rune::RESERVED),
-        unlock_height: None,
+        unlock: None,
       },
       "<h1>AAAAAAAAAAAAAAAAAAAAAAAAAAA</h1>
 <dl>

diff --git a/templates/rune-not-found.html b/templates/rune-not-found.html
@@ -1,8 +1,10 @@
 <h1>{{ self.rune }}</h1>
 <dl>
-%% if let Some(unlock_height) = self.unlock_height {
+%% if let Some((height, time)) = self.unlock {
   <dt>unlock height</dt>
-  <dd>{{ unlock_height }}</dd>
+  <dd>{{ height }}</dd>
+  <dt>unlock time</dt>
+  <dd><time>{{ time }}</time> (expected)</dd>
   <dt>reserved</dt>
   <dd>false</dd>
 %% } else {