Real fix is adjusting getRuneLocation's usage (#50)

Author: summraznboi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magiceden-oss/runestone-lib",
-  "version": "0.9.4-alpha",
+  "version": "0.9.5-alpha",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/indexer/types.ts

@@ -43,11 +43,10 @@ export interface RunestoneStorage {
   saveBlockIndex(runeBlockIndex: RuneBlockIndex): Promise<void>;
 
   /**
-   * Get the etching that deployed the rune if it exists (up to given blockheight).
+   * Get the etching that deployed the rune if it exists.
    * @param runeLocation rune id string representation
-   * @param blockheight the block height
    */
-  getEtching(runeLocation: string, blockheight: number): Promise<RuneEtching | null>;
+  getEtching(runeLocation: string): Promise<RuneEtching | null>;
 
   /**
    * Get the total valid mint counts for rune up to and including specified block height.
@@ -56,6 +55,10 @@ export interface RunestoneStorage {
    */
   getValidMintCount(runeLocation: string, blockheight: number): Promise<number>;
 
+  /**
+   * Get rune location given rune ticker.
+   * @param runeTicker rune ticker
+   */
   getRuneLocation(runeTicker: string): Promise<RuneLocation | null>;
 
   /**

src/indexer/updater.ts

@@ -280,8 +280,7 @@ export class RuneUpdater implements RuneBlockIndex {
       for (const balance of balances.values()) {
         const runeIdString = RuneLocation.toString(balance.runeId);
         const etching =
-          etchingByRuneId.get(runeIdString) ??
-          (await this._storage.getEtching(runeIdString, this.block.height - 1));
+          etchingByRuneId.get(runeIdString) ?? (await this._storage.getEtching(runeIdString));
         if (etching === null) {
           throw new Error('Rune should exist at this point');
         }
@@ -330,17 +329,31 @@ export class RuneUpdater implements RuneBlockIndex {
     if (optionRune.isSome()) {
       rune = optionRune.unwrap();
 
+      if (rune.value < this._minimum.value) {
+        return None;
+      }
+
+      if (rune.reserved) {
+        return None;
+      }
+
       if (
-        rune.value < this._minimum.value ||
-        rune.reserved ||
         this.etchings.find(
           (etching) => SpacedRune.fromString(etching.runeName).rune.toString() === rune.toString()
-        ) ||
-        (await this._storage.getRuneLocation(rune.toString())) !== null ||
-        !(await this.txCommitsToRune(tx, rune))
+        )
       ) {
         return None;
       }
+
+      const runeLocation = await this._storage.getRuneLocation(rune.toString());
+      if (runeLocation && runeLocation.block < this.block.height) {
+        return None;
+      }
+
+      const txCommitsToRune = await this.txCommitsToRune(tx, rune);
+      if (!txCommitsToRune) {
+        return None;
+      }
     } else {
       rune = Rune.getReserved(u64(this.block.height), u32(txIndex));
     }
@@ -362,8 +375,7 @@ export class RuneUpdater implements RuneBlockIndex {
     );
 
     const etching =
-      etchingByRuneId.get(runeLocation) ??
-      (await this._storage.getEtching(runeLocation, this.block.height - 1));
+      etchingByRuneId.get(runeLocation) ?? (await this._storage.getEtching(runeLocation));
     if (etching === null || !etching.valid || !etching.terms) {
       return None;
     }