univo 0.2.6 → 0.2.8

package/dist/cli.mjs

@@ -5,7 +5,7 @@ import { config } from 'dotenv';
 import { WebSocket } from 'partysocket';
 import { defineCommand, runMain } from 'citty';
 import { http } from './transport.mjs';
-import { c as createLogger, v as version, g as name } from './shared/univo.CTWk2lBv.mjs';
+import { c as createLogger, v as version, g as name } from './shared/univo.Br975GsZ.mjs';
 import './shared/univo.C0flyVee.mjs';
 
 const log = createLogger({ quiet: false });

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { c as createLogger, d as decompress, a as decoder, h as hexToNumber, i as isHexEqual, r as retry, v as version, n as nonNullable, b as normalizeHex } from './shared/univo.CTWk2lBv.mjs';
+import { c as createLogger, d as decompress, a as decoder, h as hexToNumber, i as isHexEqual, r as retry, v as version, n as nonNullable, b as normalizeHex } from './shared/univo.Br975GsZ.mjs';
 import { c as createException, g as getException, a as catchException } from './shared/univo.C0flyVee.mjs';
 
 function matchFilter(block, filter) {
@@ -130,11 +130,21 @@ function indexer(opts) {
     return block;
   }
   const public_getFinalizedHeight = async (chain) => {
-    const [stored] = await metadata.blocks.list({ chain });
+    const [[stored], finalizedBlock] = await Promise.all([
+      metadata.blocks.list({ chain }),
+      //
+      getBlock({ chain, number: "finalized" })
+    ]);
+    if (finalizedBlock === null) {
+      log.debug("Failed to fetch finalized block and unable to determine finalized height, aborting...");
+      throw new Error(GetBlockError);
+    }
+    const finalizedHeight = hexToNumber(finalizedBlock.eth_getBlockByNumber.number);
     if (stored === void 0) {
-      return null;
+      return finalizedHeight;
     }
-    return hexToNumber(stored.number) - 1;
+    const indexerHeight = hexToNumber(stored.number) - 1;
+    return Math.min(indexerHeight, finalizedHeight);
   };
   const public_writeUnfinalizedHeads = async (heads) => {
     let chain = void 0;
@@ -239,6 +249,10 @@ function indexer(opts) {
     await Promise.all(promises);
   };
   const public_writeFinalizedHeads = async (heads) => {
+    if (heads.length === 0) {
+      return log.debug("No heads received, returning...");
+    }
+    log.debug(`Received ${heads.length} finalized heads...`);
     let chain = void 0;
     for (const head of heads) {
       if (chain === void 0) {
@@ -249,40 +263,11 @@ function indexer(opts) {
       }
     }
     if (chain === void 0) {
-      throw new Error(InvalidHeadsError);
+      throw new Error("Internal error. Expected chain to be defined after checking heads length");
     }
-    log.debug(`Received ${heads.length} finalized heads...`);
-    const [indexerHeight, finalizedBlock] = await Promise.all([
-      public_getFinalizedHeight(chain),
-      //
-      getBlock({ chain, number: "finalized" })
-    ]);
-    if (indexerHeight === null) {
-      return log.debug(`No unfinalized blocks processed for chain ${hexToNumber(chain)}, aborting...`);
-    }
-    if (finalizedBlock === null) {
-      log.debug("Failed to load finalized block, aborting...");
-      throw new Error(GetBlockError);
-    }
-    const finalizedHeight = hexToNumber(finalizedBlock.eth_getBlockByNumber.number);
-    log.debug(`Indexer height ${indexerHeight}, finalized height ${finalizedHeight}`);
-    const newHeads = heads.filter((head) => {
-      if (hexToNumber(head.number) > finalizedHeight) {
-        return false;
-      }
-      if (hexToNumber(head.number) > indexerHeight) {
-        return true;
-      }
-      return false;
-    });
-    const [firstHead, ...remainingHeads] = newHeads;
+    const [firstHead, ...remainingHeads] = heads;
     if (firstHead === void 0) {
-      log.debug("Received no new finalized heads, aborting...");
-      throw new Error(InvalidHeadsError);
-    }
-    if (hexToNumber(firstHead.number) !== indexerHeight + 1) {
-      log.debug("First unfinalized head received didn't match metadata, aborting...");
-      throw new Error(InvalidHeadsError);
+      throw new Error("Internal error. Expected firstHead to be defined after checking heads length");
     }
     let previousHead = firstHead;
     for (const head of remainingHeads) {
@@ -296,6 +281,28 @@ function indexer(opts) {
       }
       previousHead = head;
     }
+    const [indexerHeight, finalizedBlock] = await Promise.all([
+      public_getFinalizedHeight(chain),
+      //
+      getBlock({ chain, number: "finalized" })
+    ]);
+    if (finalizedBlock === null) {
+      log.debug("Failed to load chain finalized block. Request should be retried");
+      throw new Error(GetBlockError);
+    }
+    const finalizedHeight = hexToNumber(finalizedBlock.eth_getBlockByNumber.number);
+    for (const head of heads) {
+      if (hexToNumber(head.number) > finalizedHeight) {
+        throw new Error(InvalidHeadsError);
+      }
+    }
+    log.debug(`Indexer height ${indexerHeight}, finalized height ${finalizedHeight}`);
+    const newHeads = heads.filter((head) => {
+      return hexToNumber(head.number) > indexerHeight;
+    });
+    if (newHeads.length === 0) {
+      return log.debug("No new heads received, returning...");
+    }
     for (const head of newHeads) {
       const processed = await metadata.blocks.get({ chain: head.chain, number: head.number });
       if (processed.length === 0) {

package/dist/realtime.mjs

@@ -1,4 +1,4 @@
-import { c as createLogger, e as iife, h as hexToNumber, f as numberToHex, m as mutex, r as retry, i as isHexEqual } from './shared/univo.CTWk2lBv.mjs';
+import { c as createLogger, e as iife, h as hexToNumber, f as numberToHex, m as mutex, r as retry, i as isHexEqual } from './shared/univo.Br975GsZ.mjs';
 
 const MAX_LENGTH = 1e4;
 function defineBlockchain(opts) {
@@ -139,18 +139,14 @@ function realtime(opts) {
       getBlockByHash,
       quiet: opts.quiet ?? false
     });
-    if (initialIndexerHeight === null) {
-      await indexer.reconcile(latestBlock);
-    } else {
-      log.debug(`Indexer last finalized at ${initialIndexerHeight}, reconciling local chain...`);
-      const indexerBlock = await opts.node.request({
-        method: "eth_getBlockByNumber",
-        params: [numberToHex(initialIndexerHeight), false]
-      });
-      await indexer.reconcile(indexerBlock);
-      await indexer.reconcile(latestBlock);
-      log.debug("Reconciled local indexer chain");
-    }
+    log.debug(`Indexer last finalized at ${initialIndexerHeight}, reconciling local chain...`);
+    const indexerBlock = await opts.node.request({
+      method: "eth_getBlockByNumber",
+      params: [numberToHex(initialIndexerHeight), false]
+    });
+    await indexer.reconcile(indexerBlock);
+    await indexer.reconcile(latestBlock);
+    log.debug("Reconciled local indexer chain");
     await opts.node.subscribe("newHeads", async (head) => {
       try {
         await indexer.reconcile(head);
@@ -161,7 +157,7 @@ function realtime(opts) {
       }
     });
     log.debug("Subscribed indexer chain to new heads");
-    let indexerHeight = initialIndexerHeight || hexToNumber(latestBlock.number);
+    let indexerHeight = initialIndexerHeight;
     const poll = async () => {
       try {
         const finalizedBlock = await opts.node.request({

package/dist/rpc.d.mts

@@ -57,7 +57,7 @@ type IndexerRpc = {
          * Accepts a chain identifier
          * @returns Height of the last finalized block indexed
          */
-        public_getFinalizedHeight: (chain: `0x${string}`) => Promise<number | null>;
+        public_getFinalizedHeight: (chain: `0x${string}`) => Promise<number>;
         /**
          * Accepts a reorganised block and deletes all related events from storage
          */

package/dist/rpc.d.ts

@@ -57,7 +57,7 @@ type IndexerRpc = {
          * Accepts a chain identifier
          * @returns Height of the last finalized block indexed
          */
-        public_getFinalizedHeight: (chain: `0x${string}`) => Promise<number | null>;
+        public_getFinalizedHeight: (chain: `0x${string}`) => Promise<number>;
         /**
          * Accepts a reorganised block and deletes all related events from storage
          */

package/dist/shared/{univo.CTWk2lBv.mjs → univo.Br975GsZ.mjs}

@@ -1,5 +1,5 @@
 const name = "univo";
-const version = "0.2.6";
+const version = "0.2.8";
 
 function createLogger(opts) {
   let prefix = `[${name}@${version}]`;

package/dist/transport.mjs

@@ -1,7 +1,7 @@
 import ws from 'ws';
 import { WebSocket } from 'partysocket';
 import { c as createException } from './shared/univo.C0flyVee.mjs';
-import { j as compress, k as raise, c as createLogger } from './shared/univo.CTWk2lBv.mjs';
+import { j as compress, k as raise, c as createLogger } from './shared/univo.Br975GsZ.mjs';
 
 function createSocket(url, opts) {
   const socket = new WebSocket(url, [], { WebSocket: ws });

package/package.json

@@ -2,7 +2,7 @@
 	"name": "univo",
 	"license": "MIT",
 	"type": "module",
-	"version": "0.2.6",
+	"version": "0.2.8",
 	"sideEffects": false,
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",