Added reorg flag to RuneUpdater/RuneBlockIndex (#44)

me-foundation · Apr 16, 2024 · fc61296 · fc61296
1 parent 669c472
commit fc61296
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magiceden-oss/runestone-lib",
-  "version": "0.7.1-alpha",
+  "version": "0.7.2-alpha",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/src/indexer/index.ts b/src/indexer/index.ts
@@ -183,8 +183,9 @@ export class RunestoneIndexer {
         throw blockResult.error;
       }
       const block = blockResult.result;
+      const reorg = currentStorageBlock ? currentStorageBlock.height >= block.height : false;
 
-      const runeUpdater = new RuneUpdater(this._network, block, this._storage, this._rpc);
+      const runeUpdater = new RuneUpdater(this._network, block, reorg, this._storage, this._rpc);
 
       for (const [txIndex, tx] of block.tx.entries()) {
         await runeUpdater.indexRunes(tx, txIndex);

diff --git a/src/indexer/types.ts b/src/indexer/types.ts
@@ -148,6 +148,7 @@ export type RuneEtching = ({ valid: false } | ({ valid: true } & RuneEtchingBase
 
 export type RuneBlockIndex = {
   block: BlockInfo;
+  reorg: boolean;
   etchings: RuneEtching[];
   mintCounts: RuneMintCount[];
   utxoBalances: RuneUtxoBalance[];

diff --git a/src/indexer/updater.ts b/src/indexer/updater.ts
@@ -50,6 +50,7 @@ export class RuneUpdater implements RuneBlockIndex {
   constructor(
     network: Network,
     block: BlockInfo,
+    readonly reorg: boolean,
     private readonly _storage: RunestoneStorage,
     private readonly _rpc: BitcoinRpcClient
   ) {

diff --git a/test/updater.test.ts b/test/updater.test.ts
@@ -23,7 +23,7 @@ function getDefaultRuneUpdaterContext() {
 
   const rpc = mock<BitcoinRpcClient>();
 
-  const runeUpdater = new RuneUpdater(Network.MAINNET, block, storage, rpc);
+  const runeUpdater = new RuneUpdater(Network.MAINNET, block, false, storage, rpc);
 
   return { runeUpdater, block, storage, rpc };
 }