Merge branch 'master' into delegation

ordinals · Dec 25, 2023 · 8ee70c7 · 8ee70c7
2 parents 108892a + 72ad9fc
commit 8ee70c7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/index.rs b/src/index.rs
@@ -489,6 +489,7 @@ impl Index {
       runes: statistic(Statistic::Runes)?,
       sat_index: statistic(Statistic::IndexSats)? != 0,
       started: self.started,
+      transaction_index: statistic(Statistic::IndexTransactions)? != 0,
       unrecoverably_reorged: self.unrecoverably_reorged.load(atomic::Ordering::Relaxed),
       uptime: (Utc::now() - self.started).to_std()?,
     })

diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
@@ -2572,9 +2572,11 @@ mod tests {
   <dd>.*</dd>
   <dt>unrecoverably reorged</dt>
   <dd>false</dd>
+  <dt>rune index</dt>
+  <dd>false</dd>
   <dt>sat index</dt>
   <dd>false</dd>
-  <dt>rune index</dt>
+  <dt>transaction index</dt>
   <dd>false</dd>
   <dt>git branch</dt>
   <dd>.*</dd>

diff --git a/src/templates/status.rs b/src/templates/status.rs
@@ -12,6 +12,7 @@ pub(crate) struct StatusHtml {
   pub(crate) runes: u64,
   pub(crate) sat_index: bool,
   pub(crate) started: DateTime<Utc>,
+  pub(crate) transaction_index: bool,
   pub(crate) unrecoverably_reorged: bool,
   pub(crate) uptime: Duration,
 }

diff --git a/templates/status.html b/templates/status.html
@@ -24,10 +24,12 @@ <h1>Status</h1>
   <dd>{{ env!("CARGO_PKG_VERSION") }}</dd>
   <dt>unrecoverably reorged</dt>
   <dd>{{ self.unrecoverably_reorged }}</dd>
-  <dt>sat index</dt>
-  <dd>{{ self.sat_index }}</dd>
   <dt>rune index</dt>
   <dd>{{ self.rune_index }}</dd>
+  <dt>sat index</dt>
+  <dd>{{ self.sat_index }}</dd>
+  <dt>transaction index</dt>
+  <dd>{{ self.transaction_index }}</dd>
 %% if !env!("GIT_BRANCH").is_empty() {
   <dt>git branch</dt>
   <dd>{{ env!("GIT_BRANCH") }}</dd>