univo 0.2.12 → 0.2.14

package/dist/cli.mjs

@@ -4,8 +4,8 @@ import open from 'open';
 import { config } from 'dotenv';
 import { WebSocket } from 'partysocket';
 import { defineCommand, runMain } from 'citty';
-import { h as http } from './shared/univo.Bb9Aplq9.mjs';
-import { c as createLogger, v as version, f as name } from './shared/univo.DicQZf-2.mjs';
+import { h as http } from './shared/univo.CzTm3CDN.mjs';
+import { c as createLogger, v as version, f as name } from './shared/univo.sqV2c2Yj.mjs';
 
 const log = createLogger({ quiet: false });
 const dev = defineCommand({

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-export { B as Block, E as Event, a as Filter, H as Head, I as Indexer, M as Metadata, R as Result, i as indexer, m as matchFilter } from './shared/univo.Cj4s4jNq.mjs';
+export { B as Block, E as Event, a as Filter, H as Head, I as Indexer, M as Metadata, R as Result, i as indexer, m as matchFilter } from './shared/univo.DcmLb3Hn.mjs';
 import 'unstorage';

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { B as Block, E as Event, a as Filter, H as Head, I as Indexer, M as Metadata, R as Result, i as indexer, m as matchFilter } from './shared/univo.Cj4s4jNq.js';
+export { B as Block, E as Event, a as Filter, H as Head, I as Indexer, M as Metadata, R as Result, i as indexer, m as matchFilter } from './shared/univo.DcmLb3Hn.js';
 import 'unstorage';

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { c as createException, a as catchException, l as local, g as getException } from './shared/univo.Bb9Aplq9.mjs';
-import { c as createLogger, r as retry, v as version, h as hexToNumber, i as isHexEqual, d as decompress, a as decoder, n as normalizeHex } from './shared/univo.DicQZf-2.mjs';
+import { c as createException, a as catchException, l as local, g as getException } from './shared/univo.CzTm3CDN.mjs';
+import { c as createLogger, r as retry, v as version, h as hexToNumber, i as isHexEqual, d as decompress, a as decoder, n as normalizeHex } from './shared/univo.sqV2c2Yj.mjs';
 import 'ws';
 import 'partysocket';
 
@@ -294,7 +294,7 @@ function indexer(opts) {
       if (hexToNumber(head.number) !== hexToNumber(previousHead.number) + 1) {
         throw new Error("Found invalid block number in received heads, aborting...");
       }
-      if (!isHexEqual(head.parentHash, previousHead.hash)) {
+      if (!isHexEqual(head.parent_hash, previousHead.hash)) {
         throw new Error("Found invalid block hash in received heads, aborting...");
       }
       previousHead = head;
@@ -515,8 +515,9 @@ function indexer(opts) {
               status,
               event_id: event2.id,
               chain: block.eth_chainId,
-              block_hash: block.eth_getBlockByNumber.hash,
-              block_number: block.eth_getBlockByNumber.number,
+              hash: block.eth_getBlockByNumber.hash,
+              number: block.eth_getBlockByNumber.number,
+              parent_hash: block.eth_getBlockByNumber.parentHash,
               created_at: Date.now()
             };
           }
@@ -541,8 +542,9 @@ function indexer(opts) {
               status,
               event_id: event2.id,
               chain: block.eth_chainId,
-              block_hash: block.eth_getBlockByNumber.hash,
-              block_number: block.eth_getBlockByNumber.number,
+              hash: block.eth_getBlockByNumber.hash,
+              number: block.eth_getBlockByNumber.number,
+              parent_hash: block.eth_getBlockByNumber.parentHash,
               created_at: Date.now()
             };
           }
@@ -570,7 +572,20 @@ function indexer(opts) {
     }
     const block = await getBlock(params.head);
     if (block === null) {
-      throw new Error(GetBlockError);
+      return {
+        keys: [],
+        results: relevant_events.map((event2) => {
+          return {
+            event_id: event2.id,
+            status: "block_error",
+            chain: params.head.chain,
+            hash: params.head.hash,
+            number: params.head.number,
+            parent_hash: params.head.parent_hash,
+            created_at: Date.now()
+          };
+        })
+      };
     }
     const keys = /* @__PURE__ */ new Set();
     const results = {};
@@ -610,8 +625,9 @@ function indexer(opts) {
             status: "handler_error",
             event_id: event2.id,
             chain: proxy.eth_chainId,
-            block_hash: proxy.eth_getBlockByNumber.hash,
-            block_number: proxy.eth_getBlockByNumber.number,
+            hash: proxy.eth_getBlockByNumber.hash,
+            number: proxy.eth_getBlockByNumber.number,
+            parent_hash: proxy.eth_getBlockByNumber.parentHash,
             created_at: Date.now()
           };
           return;
@@ -621,8 +637,9 @@ function indexer(opts) {
             status: "ok",
             event_id: event2.id,
             chain: proxy.eth_chainId,
-            block_hash: proxy.eth_getBlockByNumber.hash,
-            block_number: proxy.eth_getBlockByNumber.number,
+            hash: proxy.eth_getBlockByNumber.hash,
+            number: proxy.eth_getBlockByNumber.number,
+            parent_hash: proxy.eth_getBlockByNumber.parentHash,
             created_at: Date.now()
           };
           return;
@@ -639,8 +656,9 @@ function indexer(opts) {
             status: "upsert_error",
             event_id: event2.id,
             chain: proxy.eth_chainId,
-            block_hash: proxy.eth_getBlockByNumber.hash,
-            block_number: proxy.eth_getBlockByNumber.number,
+            hash: proxy.eth_getBlockByNumber.hash,
+            number: proxy.eth_getBlockByNumber.number,
+            parent_hash: proxy.eth_getBlockByNumber.parentHash,
             created_at: Date.now()
           };
           return;
@@ -649,8 +667,9 @@ function indexer(opts) {
           status: "ok",
           event_id: event2.id,
           chain: proxy.eth_chainId,
-          block_hash: proxy.eth_getBlockByNumber.hash,
-          block_number: proxy.eth_getBlockByNumber.number,
+          hash: proxy.eth_getBlockByNumber.hash,
+          number: proxy.eth_getBlockByNumber.number,
+          parent_hash: proxy.eth_getBlockByNumber.parentHash,
           created_at: Date.now()
         };
       })

package/dist/realtime.d.mts

@@ -1,6 +1,6 @@
 import { NodeRpc, IndexerRpc } from './rpc.mjs';
 import { Transport } from './transport.mjs';
-import './shared/univo.Cj4s4jNq.mjs';
+import './shared/univo.DcmLb3Hn.mjs';
 import 'unstorage';
 
 type RealtimeOptions = {

package/dist/realtime.d.ts

@@ -1,6 +1,6 @@
 import { NodeRpc, IndexerRpc } from './rpc.js';
 import { Transport } from './transport.js';
-import './shared/univo.Cj4s4jNq.js';
+import './shared/univo.DcmLb3Hn.js';
 import 'unstorage';
 
 type RealtimeOptions = {

package/dist/realtime.mjs

@@ -1,4 +1,4 @@
-import { c as createLogger, b as iife, h as hexToNumber, e as numberToHex, m as mutex, r as retry, i as isHexEqual } from './shared/univo.DicQZf-2.mjs';
+import { c as createLogger, b as iife, h as hexToNumber, e as numberToHex, m as mutex, r as retry, i as isHexEqual } from './shared/univo.sqV2c2Yj.mjs';
 
 const MAX_LENGTH = 1e4;
 function defineBlockchain(opts) {
@@ -47,26 +47,26 @@ function defineBlockchain(opts) {
     if (chain.some((block) => block.hash === newBlock.hash)) {
       return;
     }
-    if (getHeadBlock().hash === newBlock.parentHash) {
+    if (getHeadBlock().hash === newBlock.parent_hash) {
       return setHeadBlock(newBlock);
     }
-    if (chain.some((block) => block.hash === newBlock.parentHash)) {
-      while (getHeadBlock().hash !== newBlock.parentHash) {
+    if (chain.some((block) => block.hash === newBlock.parent_hash)) {
+      while (getHeadBlock().hash !== newBlock.parent_hash) {
         removeHeadBlock();
       }
       return setHeadBlock(newBlock);
     }
-    if (newBlock.parentHash === "0x0000000000000000000000000000000000000000000000000000000000000000") {
+    if (newBlock.parent_hash === "0x0000000000000000000000000000000000000000000000000000000000000000") {
       while (chain.length > 0) {
         removeHeadBlock();
       }
       return setHeadBlock(newBlock);
     }
-    const parentBlock = await retry(() => opts.getBlockByHash(newBlock.parentHash), 5);
+    const parentBlock = await retry(() => opts.getBlockByHash(newBlock.parent_hash), 5);
     if (parentBlock === null) {
-      throw new Error(`Failed to fetch parent block ${hexToNumber(newBlock.number)} ${newBlock.parentHash.slice(0, 16)}`);
+      throw new Error(`Failed to fetch parent block ${hexToNumber(newBlock.number)} ${newBlock.parent_hash.slice(0, 16)}`);
     }
-    if (!isHexEqual(parentBlock.hash, newBlock.parentHash)) {
+    if (!isHexEqual(parentBlock.hash, newBlock.parent_hash)) {
       throw new Error("Expected block hashes to match");
     }
     await reconcile(parentBlock);
@@ -82,7 +82,7 @@ function realtime(opts) {
   const log = createLogger({ quiet: opts.quiet ?? false, prefix: "[realtime]" });
   const getBlockByHash = async (hash) => {
     const block = await opts.node.request({ method: "eth_getBlockByHash", params: [hash, false] });
-    return { number: block.number, hash: block.hash, parentHash: block.parentHash };
+    return { number: block.number, hash: block.hash, parent_hash: block.parentHash };
   };
   const promise = iife(async () => {
     log.debug("Initialising realtime client for indexer");
@@ -124,15 +124,17 @@ function realtime(opts) {
         }
       }
     });
-    await latest.reconcile(latestBlock);
+    await latest.reconcile({
+      hash: latestBlock.hash,
+      number: latestBlock.number,
+      parent_hash: latestBlock.parentHash
+    });
     await opts.node.subscribe("newHeads", async (head) => {
-      try {
-        await latest.reconcile(head);
-      } catch (error) {
+      await latest.reconcile({ hash: head.hash, number: head.number, parent_hash: head.parentHash }).catch((error) => {
         if (error instanceof Error) {
           log.error(`Failed to reconcile latest head: ${error.message}`);
         }
-      }
+      });
     });
     log.debug("Subscribed latest chain to new heads");
     const indexer = defineBlockchain({
@@ -144,17 +146,23 @@ function realtime(opts) {
       method: "eth_getBlockByNumber",
       params: [numberToHex(initialIndexerHeight), false]
     });
-    await indexer.reconcile(indexerBlock);
-    await indexer.reconcile(latestBlock);
+    await indexer.reconcile({
+      hash: indexerBlock.hash,
+      number: indexerBlock.number,
+      parent_hash: indexerBlock.parentHash
+    });
+    await indexer.reconcile({
+      hash: latestBlock.hash,
+      number: latestBlock.number,
+      parent_hash: latestBlock.parentHash
+    });
     log.debug("Reconciled local indexer chain");
     await opts.node.subscribe("newHeads", async (head) => {
-      try {
-        await indexer.reconcile(head);
-      } catch (error) {
+      await indexer.reconcile({ hash: head.hash, number: head.number, parent_hash: head.parentHash }).catch((error) => {
         if (error instanceof Error) {
           log.debug(`Failed to reconcile latest indexer head: ${error.message}`);
         }
-      }
+      });
     });
     log.debug("Subscribed indexer chain to new heads");
     let indexerHeight = initialIndexerHeight;

package/dist/rpc.d.mts

@@ -1,4 +1,4 @@
-import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.Cj4s4jNq.mjs';
+import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.DcmLb3Hn.mjs';
 import 'unstorage';
 
 type Rpc = {
@@ -24,25 +24,22 @@ type NodeRpc = {
          * Accepts a block tag and boolean for including receipts
          * @returns A block with optional receipts
          */
-        eth_getBlockByNumber: (number: string, receipts: boolean) => Promise<{
-            hash: `0x${string}`;
-            number: `0x${string}`;
-            parentHash: `0x${string}`;
-        }>;
+        eth_getBlockByNumber: (number: string, receipts: boolean) => Promise<NodeBlock>;
         /**
          * Accepts a block hash and boolean for including receipts
          * @returns A block with optional receipts
          */
-        eth_getBlockByHash: (hash: `0x${string}`, receipts: boolean) => Promise<{
-            hash: `0x${string}`;
-            number: `0x${string}`;
-            parentHash: `0x${string}`;
-        }>;
+        eth_getBlockByHash: (hash: `0x${string}`, receipts: boolean) => Promise<NodeBlock>;
     };
     subscribe: {
-        newHeads: Head;
+        newHeads: NodeBlock;
     };
 };
+type NodeBlock = {
+    hash: `0x${string}`;
+    number: `0x${string}`;
+    parentHash: `0x${string}`;
+};
 /**
  * Indexer -----------------------------------------------------------------------------------------------------------------------------------
  */

package/dist/rpc.d.ts

@@ -1,4 +1,4 @@
-import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.Cj4s4jNq.js';
+import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.DcmLb3Hn.js';
 import 'unstorage';
 
 type Rpc = {
@@ -24,25 +24,22 @@ type NodeRpc = {
          * Accepts a block tag and boolean for including receipts
          * @returns A block with optional receipts
          */
-        eth_getBlockByNumber: (number: string, receipts: boolean) => Promise<{
-            hash: `0x${string}`;
-            number: `0x${string}`;
-            parentHash: `0x${string}`;
-        }>;
+        eth_getBlockByNumber: (number: string, receipts: boolean) => Promise<NodeBlock>;
         /**
          * Accepts a block hash and boolean for including receipts
          * @returns A block with optional receipts
          */
-        eth_getBlockByHash: (hash: `0x${string}`, receipts: boolean) => Promise<{
-            hash: `0x${string}`;
-            number: `0x${string}`;
-            parentHash: `0x${string}`;
-        }>;
+        eth_getBlockByHash: (hash: `0x${string}`, receipts: boolean) => Promise<NodeBlock>;
     };
     subscribe: {
-        newHeads: Head;
+        newHeads: NodeBlock;
     };
 };
+type NodeBlock = {
+    hash: `0x${string}`;
+    number: `0x${string}`;
+    parentHash: `0x${string}`;
+};
 /**
  * Indexer -----------------------------------------------------------------------------------------------------------------------------------
  */

package/dist/shared/{univo.Bb9Aplq9.mjs → univo.CzTm3CDN.mjs}

@@ -1,6 +1,6 @@
 import ws from 'ws';
 import { WebSocket } from 'partysocket';
-import { g as compress, j as raise, c as createLogger } from './univo.DicQZf-2.mjs';
+import { g as compress, j as raise, c as createLogger } from './univo.sqV2c2Yj.mjs';
 
 function createException(message) {
   return `univo:${message}`;

package/dist/shared/{univo.Cj4s4jNq.d.mts → univo.DcmLb3Hn.d.mts}

@@ -117,7 +117,7 @@ type Head = {
     hash: `0x${string}`;
     chain: `0x${string}`;
     number: `0x${string}`;
-    parentHash: `0x${string}`;
+    parent_hash: `0x${string}`;
 };
 type Metadata = {
     version: string;
@@ -126,9 +126,10 @@ type Metadata = {
 type Result = {
     status: string;
     event_id: string;
+    hash: `0x${string}`;
     chain: `0x${string}`;
-    block_hash: `0x${string}`;
-    block_number: `0x${string}`;
+    number: `0x${string}`;
+    parent_hash: `0x${string}`;
     created_at: number;
 };
 type IndexerOptions<TBlock> = {

package/dist/shared/{univo.Cj4s4jNq.d.ts → univo.DcmLb3Hn.d.ts}

@@ -117,7 +117,7 @@ type Head = {
     hash: `0x${string}`;
     chain: `0x${string}`;
     number: `0x${string}`;
-    parentHash: `0x${string}`;
+    parent_hash: `0x${string}`;
 };
 type Metadata = {
     version: string;
@@ -126,9 +126,10 @@ type Metadata = {
 type Result = {
     status: string;
     event_id: string;
+    hash: `0x${string}`;
     chain: `0x${string}`;
-    block_hash: `0x${string}`;
-    block_number: `0x${string}`;
+    number: `0x${string}`;
+    parent_hash: `0x${string}`;
     created_at: number;
 };
 type IndexerOptions<TBlock> = {

package/dist/shared/{univo.DicQZf-2.mjs → univo.sqV2c2Yj.mjs}

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

package/dist/transport.d.mts

@@ -1,5 +1,5 @@
 import { Rpc } from './rpc.mjs';
-import './shared/univo.Cj4s4jNq.mjs';
+import './shared/univo.DcmLb3Hn.mjs';
 import 'unstorage';
 
 type Protocol = "http" | "wss" | "local";

package/dist/transport.d.ts

@@ -1,5 +1,5 @@
 import { Rpc } from './rpc.js';
-import './shared/univo.Cj4s4jNq.js';
+import './shared/univo.DcmLb3Hn.js';
 import 'unstorage';
 
 type Protocol = "http" | "wss" | "local";

package/dist/transport.mjs

@@ -1,4 +1,4 @@
 import 'ws';
 import 'partysocket';
-export { h as http, l as local, w as wss } from './shared/univo.Bb9Aplq9.mjs';
-import './shared/univo.DicQZf-2.mjs';
+export { h as http, l as local, w as wss } from './shared/univo.CzTm3CDN.mjs';
+import './shared/univo.sqV2c2Yj.mjs';

package/package.json

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