From 97263a116b885d3c0b63b6b2ae5e61bf8c366e46 Mon Sep 17 00:00:00 2001
From: Rafael Cardenas <rafael@rafaelcr.com>
Date: Sat, 29 Jun 2024 14:23:19 -0600
Subject: [PATCH] fix: consider mint terms block height

---
 src/db/cache/index_cache.rs       |  5 ++-
 src/db/cache/transaction_cache.rs | 59 ++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/db/cache/index_cache.rs b/src/db/cache/index_cache.rs
index 0673462..a63f601 100644
--- a/src/db/cache/index_cache.rs
+++ b/src/db/cache/index_cache.rs
@@ -107,7 +107,10 @@ impl IndexCache {
         db_tx: &mut Transaction<'_>,
         ctx: &Context,
     ) {
-        debug!(ctx.expect_logger(), "Cenotaph {}", self.tx_cache.location);
+        debug!(
+            ctx.expect_logger(),
+            "{:?} {}", cenotaph, self.tx_cache.location
+        );
         self.scan_tx_input_rune_balance(tx_inputs, db_tx, ctx).await;
         let entries = self.tx_cache.apply_cenotaph_input_burn(cenotaph);
         self.add_ledger_entries_to_db_cache(&entries);
diff --git a/src/db/cache/transaction_cache.rs b/src/db/cache/transaction_cache.rs
index a0b228b..764c28c 100644
--- a/src/db/cache/transaction_cache.rs
+++ b/src/db/cache/transaction_cache.rs
@@ -239,14 +239,12 @@ impl TransactionCache {
     ) -> Option<DbLedgerEntry> {
         // TODO: What's the default mint amount if none was provided?
         let terms_amount = db_rune.terms_amount.unwrap_or(PgNumericU128(0));
-        if let Some(terms_cap) = db_rune.terms_cap {
-            if total_mints >= terms_cap.0 {
-                debug!(
-                    ctx.expect_logger(),
-                    "Mint {} exceeds mint cap, ignoring {}", rune_id, self.location
-                );
-                return None;
-            }
+        if !is_valid_mint(db_rune, total_mints, &self.location) {
+            debug!(
+                ctx.expect_logger(),
+                "Invalid mint {} {}", rune_id, self.location
+            );
+            return None;
         }
         info!(
             ctx.expect_logger(),
@@ -280,14 +278,12 @@ impl TransactionCache {
     ) -> Option<DbLedgerEntry> {
         // TODO: What's the default mint amount if none was provided?
         let terms_amount = db_rune.terms_amount.unwrap_or(PgNumericU128(0));
-        if let Some(terms_cap) = db_rune.terms_cap {
-            if total_mints >= terms_cap.0 {
-                debug!(
-                    ctx.expect_logger(),
-                    "Cenotaph mint {} exceeds mint cap, ignoring {}", rune_id, self.location
-                );
-                return None;
-            }
+        if !is_valid_mint(db_rune, total_mints, &self.location) {
+            debug!(
+                ctx.expect_logger(),
+                "Invalid mint {} {}", rune_id, self.location
+            );
+            return None;
         }
         info!(
             ctx.expect_logger(),
@@ -452,6 +448,37 @@ impl TransactionCache {
     }
 }
 
+/// Determines if a mint is valid depending on the rune's mint terms.
+fn is_valid_mint(db_rune: &DbRune, total_mints: u128, location: &TransactionLocation) -> bool {
+    if let Some(terms_cap) = db_rune.terms_cap {
+        if total_mints >= terms_cap.0 {
+            return false;
+        }
+    }
+    if let Some(terms_height_start) = db_rune.terms_height_start {
+        if location.block_height < terms_height_start.0 {
+            return false;
+        }
+    }
+    if let Some(terms_height_end) = db_rune.terms_height_end {
+        if location.block_height > terms_height_end.0 {
+            return false;
+        }
+    }
+    if let Some(terms_offset_start) = db_rune.terms_offset_start {
+        if location.block_height < db_rune.block_height.0 + terms_offset_start.0 {
+            return false;
+        }
+    }
+    if let Some(terms_offset_end) = db_rune.terms_offset_end {
+        if location.block_height > db_rune.block_height.0 + terms_offset_end.0 {
+            return false;
+        }
+    }
+    true
+}
+
+/// Creates a new ledger entry.
 fn new_ledger_entry(
     location: &TransactionLocation,
     amount: u128,