Distribution

src/chain.rs

@@ -47,6 +47,16 @@ impl Chain {
     }
   }
 
+  pub(crate) fn first_rune_height(self) -> u32 {
+    SUBSIDY_HALVING_INTERVAL
+      * match self {
+        Self::Mainnet => 4,
+        Self::Regtest => 0,
+        Self::Signet => 0,
+        Self::Testnet => 12,
+      }
+  }
+
   pub(crate) fn jubilee_height(self) -> u32 {
     match self {
       Self::Mainnet => 824544,

src/index.rs

@@ -470,7 +470,10 @@ impl Index {
       height,
       inscriptions: blessed_inscriptions + cursed_inscriptions,
       lost_sats: statistic(Statistic::LostSats)?,
-      minimum_rune_for_next_block: Rune::minimum_at_height(Height(next_height)),
+      minimum_rune_for_next_block: Rune::minimum_at_height(
+        self.options.chain(),
+        Height(next_height),
+      ),
       rune_index: statistic(Statistic::IndexRunes)? != 0,
       runes: statistic(Statistic::Runes)?,
       sat_index: statistic(Statistic::IndexSats)? != 0,

src/index/testing.rs

@@ -53,6 +53,11 @@ impl ContextBuilder {
     self
   }
 
+  pub(crate) fn chain(mut self, chain: Chain) -> Self {
+    self.chain = chain;
+    self
+  }
+
   pub(crate) fn tempdir(mut self, tempdir: TempDir) -> Self {
     self.tempdir = Some(tempdir);
     self

src/index/updater.rs

@@ -570,7 +570,7 @@ impl<'index> Updater<'_> {
       &inscription_updater.unbound_inscriptions,
     )?;
 
-    if index.index_runes {
+    if index.index_runes && self.height >= self.index.options.first_rune_height() {
       let mut outpoint_to_rune_balances = wtx.open_table(OUTPOINT_TO_RUNE_BALANCES)?;
       let mut rune_id_to_rune_entry = wtx.open_table(RUNE_ID_TO_RUNE_ENTRY)?;
       let mut rune_to_rune_id = wtx.open_table(RUNE_TO_RUNE_ID)?;
@@ -586,7 +586,7 @@ impl<'index> Updater<'_> {
         height: self.height,
         id_to_entry: &mut rune_id_to_rune_entry,
         inscription_id_to_sequence_number: &mut inscription_id_to_sequence_number,
-        minimum: Rune::minimum_at_height(Height(self.height)),
+        minimum: Rune::minimum_at_height(self.index.options.chain(), Height(self.height)),
         outpoint_to_balances: &mut outpoint_to_rune_balances,
         rune_to_id: &mut rune_to_rune_id,
         runes,

src/lib.rs

@@ -37,6 +37,7 @@ use {
   bitcoin::{
     address::{Address, NetworkUnchecked},
     blockdata::constants::COIN_VALUE,
+    blockdata::constants::{DIFFCHANGE_INTERVAL, SUBSIDY_HALVING_INTERVAL},
     consensus::{self, Decodable, Encodable},
     hash_types::BlockHash,
     hashes::Hash,
@@ -140,8 +141,6 @@ mod wallet;
 
 type Result<T = (), E = Error> = std::result::Result<T, E>;
 
-const DIFFCHANGE_INTERVAL: u32 = bitcoin::blockdata::constants::DIFFCHANGE_INTERVAL;
-const SUBSIDY_HALVING_INTERVAL: u32 = bitcoin::blockdata::constants::SUBSIDY_HALVING_INTERVAL;
 const CYCLE_EPOCHS: u32 = 6;
 
 static SHUTTING_DOWN: AtomicBool = AtomicBool::new(false);

src/options.rs

@@ -46,7 +46,7 @@ pub(crate) struct Options {
     long,
     help = "Track location of runes. RUNES ARE IN AN UNFINISHED PRE-ALPHA STATE AND SUBJECT TO CHANGE AT ANY TIME."
   )]
-  pub(crate) index_runes_pre_alpha_i_agree_to_get_rekt: bool,
+  pub(crate) index_runes: bool,
   #[arg(long, help = "Track location of all satoshis.")]
   pub(crate) index_sats: bool,
   #[arg(long, short, help = "Use regtest. Equivalent to `--chain regtest`.")]
@@ -75,9 +75,7 @@ impl Options {
   }
 
   pub(crate) fn first_inscription_height(&self) -> u32 {
-    if self.chain() == Chain::Regtest {
-      self.first_inscription_height.unwrap_or(0)
-    } else if integration_test() {
+    if integration_test() {
       0
     } else {
       self
@@ -86,8 +84,16 @@ impl Options {
     }
   }
 
+  pub(crate) fn first_rune_height(&self) -> u32 {
+    if integration_test() {
+      0
+    } else {
+      self.chain().first_rune_height()
+    }
+  }
+
   pub(crate) fn index_runes(&self) -> bool {
-    self.index_runes_pre_alpha_i_agree_to_get_rekt && self.chain() != Chain::Mainnet
+    self.index_runes && self.chain() != Chain::Mainnet
   }
 
   pub(crate) fn rpc_url(&self) -> String {
@@ -805,26 +811,23 @@ mod tests {
     assert!(Arguments::try_parse_from([
       "ord",
       "--chain=signet",
-      "--index-runes-pre-alpha-i-agree-to-get-rekt",
+      "--index-runes",
       "index",
       "update"
     ])
     .unwrap()
     .options
-    .index_runes(),);
-    assert!(!Arguments::try_parse_from([
-      "ord",
-      "--index-runes-pre-alpha-i-agree-to-get-rekt",
-      "index",
-      "update"
-    ])
-    .unwrap()
-    .options
-    .index_runes(),);
+    .index_runes());
+    assert!(
+      !Arguments::try_parse_from(["ord", "--index-runes", "index", "update"])
+        .unwrap()
+        .options
+        .index_runes()
+    );
     assert!(!Arguments::try_parse_from(["ord", "index", "update"])
       .unwrap()
       .options
-      .index_runes(),);
+      .index_runes());
   }
 
   #[test]