Fixed incorrect mapping of height/offset ends to starts (#45)

Author: summraznboi

index.ts

@@ -3,7 +3,6 @@ import { Etching } from './src/etching';
 import { RuneEtchingSpec } from './src/indexer';
 import { u128, u32, u64, u8 } from './src/integer';
 import { None, Option, Some } from './src/monads';
-import { Rune } from './src/rune';
 import { RuneId } from './src/runeid';
 import { Runestone } from './src/runestone';
 import { SpacedRune } from './src/spacedrune';
@@ -84,8 +83,6 @@ const u128Strict = (n: bigint) => {
   return u128(bigN);
 };
 
-const SPACERS = ['•', '.'];
-
 // TODO: Add unit tests
 /**
  * Low level function to allow for encoding runestones without any indexer and transaction checks.

package.json

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

src/indexer/index.ts

@@ -71,14 +71,82 @@ export class RunestoneIndexer {
       return;
     }
 
-    this._updateInProgress = this.updateRuneUtxoBalancesImpl();
+    this._updateInProgress = this._rpc.getblockhashbyheight
+      ? this.updateRuneUtxoBalancesWithBlockHeightImpl(
+          this._rpc.getblockhashbyheight.bind(this._rpc)
+        )
+      : this.updateRuneUtxoBalancesImpl();
     try {
       await this._updateInProgress;
     } finally {
       this._updateInProgress = null;
     }
   }
 
+  private async updateRuneUtxoBalancesWithBlockHeightImpl(
+    getblockhashbyheight: (blockheight: number) => Promise<string | null>
+  ) {
+    const currentStorageBlock = await this._storage.getCurrentBlock();
+    if (currentStorageBlock) {
+      // walk down until matching hash is found
+      const reorgBlockhashesToIndex: string[] = [];
+      let blockheight = currentStorageBlock.height;
+      let blockhash = await getblockhashbyheight(blockheight);
+      let storageBlockHash: string | null = currentStorageBlock.hash;
+      while (storageBlockHash !== blockhash) {
+        if (blockhash) {
+          reorgBlockhashesToIndex.push(blockhash);
+        }
+
+        blockheight--;
+        blockhash = await getblockhashbyheight(blockheight);
+        storageBlockHash = await this._storage.getBlockhash(blockheight);
+      }
+
+      // process blocks that are reorgs
+      for (const blockhash of reorgBlockhashesToIndex) {
+        const blockResult = await this._rpc.getblock({ blockhash, verbosity: 2 });
+        if (blockResult.error !== null) {
+          throw blockResult.error;
+        }
+        const block = blockResult.result;
+
+        const runeUpdater = new RuneUpdater(this._network, block, true, this._storage, this._rpc);
+
+        for (const [txIndex, tx] of block.tx.entries()) {
+          await runeUpdater.indexRunes(tx, txIndex);
+        }
+
+        await this._storage.saveBlockIndex(runeUpdater);
+      }
+    }
+
+    // start from first rune height or next block height, whichever is greater
+    let blockheight = Math.max(
+      Network.getFirstRuneHeight(this._network),
+      currentStorageBlock ? currentStorageBlock.height + 1 : 0
+    );
+    let blockhash = await getblockhashbyheight(blockheight);
+    while (blockhash !== null) {
+      const blockResult = await this._rpc.getblock({ blockhash, verbosity: 2 });
+      if (blockResult.error !== null) {
+        throw blockResult.error;
+      }
+      const block = blockResult.result;
+
+      const runeUpdater = new RuneUpdater(this._network, block, false, this._storage, this._rpc);
+
+      for (const [txIndex, tx] of block.tx.entries()) {
+        await runeUpdater.indexRunes(tx, txIndex);
+      }
+
+      await this._storage.saveBlockIndex(runeUpdater);
+
+      blockheight++;
+      blockhash = await getblockhashbyheight(blockheight);
+    }
+  }
+
   private async updateRuneUtxoBalancesImpl() {
     const newBlockhashesToIndex: string[] = [];
 

src/indexer/updater.ts

@@ -1,4 +1,3 @@
-import * as assert from 'node:assert/strict';
 import { Artifact, isRunestone } from '../artifact';
 import {
   COMMIT_CONFIRMATIONS,
@@ -224,7 +223,9 @@ export class RuneUpdater implements RuneBlockIndex {
 
       const optionVout = pointer
         .map((pointer) => Number(pointer))
-        .inspect((pointer) => assert(pointer < allocated.length))
+        .inspect((pointer) => {
+          if (pointer < 0 || pointer >= allocated.length) throw new Error('Pointer is invalid');
+        })
         .orElse(() => {
           const entry = [...tx.vout.entries()].find(
             ([_, txOut]) => !isScriptPubKeyHexOpReturn(txOut.scriptPubKey.hex)
@@ -536,7 +537,7 @@ export class RuneUpdater implements RuneBlockIndex {
                             ? { start: unwrappedTerms.height[0].unwrap() }
                             : {}),
                           ...(unwrappedTerms.height[1].isSome()
-                            ? { start: unwrappedTerms.height[1].unwrap() }
+                            ? { end: unwrappedTerms.height[1].unwrap() }
                             : {}),
                         },
                       }
@@ -548,7 +549,7 @@ export class RuneUpdater implements RuneBlockIndex {
                             ? { start: unwrappedTerms.offset[0].unwrap() }
                             : {}),
                           ...(unwrappedTerms.offset[1].isSome()
-                            ? { start: unwrappedTerms.offset[1].unwrap() }
+                            ? { end: unwrappedTerms.offset[1].unwrap() }
                             : {}),
                         },
                       }

src/rpcclient.ts

@@ -103,4 +103,6 @@ export interface BitcoinRpcClient {
     verbose,
     blockhash,
   }: T): Promise<RpcResponse<GetRawTransactionReturn<T>>>;
+
+  getblockhashbyheight?(blockheight: number): Promise<string | null>;
 }