univo 0.4.0 → 0.4.2

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, f as name } from './shared/univo.mlthZw0m.mjs';
+import { c as createLogger, v as version, f as name } from './shared/univo.CUNaTwXY.mjs';
 
 const log = createLogger({ quiet: false });
 const dev = defineCommand({

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { A as Action, B as Block, E as Event, F as Filter, H as Head, c as Indexer, M as Metadata, e as Result, b as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.DYd1g40o.mjs';
+export { A as Action, B as Block, E as Event, F as Filter, H as Head, e as Indexer, f as PrivateMetadata, P as PublicMetadata, g as Result, c as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.Ckj3I8tQ.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { A as Action, B as Block, E as Event, F as Filter, H as Head, c as Indexer, M as Metadata, e as Result, b as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.CEA4vY0E.js';
+export { A as Action, B as Block, E as Event, F as Filter, H as Head, e as Indexer, f as PrivateMetadata, P as PublicMetadata, g as Result, c as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.7S1OTdpc.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';

package/dist/index.mjs

@@ -1,50 +1,111 @@
-import { hexToNumber, numberToHex, hexToBytes, keccak256, toRlp, hexToBigInt, formatTransaction, serializeTransaction, numberToBytes, isHex, concatBytes } from 'viem';
+import { hexToNumber, numberToHex, hexToBytes, keccak256, toRlp, hexToBigInt, numberToBytes, isHex, concatBytes, concatHex, formatTransaction, serializeTransaction } from 'viem';
 import { local } from './transport.mjs';
-import { c as createLogger, r as retry, v as version, n as normalizeHex, d as decompress, i as isHexEqual, a as compress, b as iife, e as decoder } from './shared/univo.mlthZw0m.mjs';
+import { c as createLogger, r as retry, v as version, n as normalizeHex, d as decompress, i as isHexEqual, a as compress, b as iife, e as decoder } from './shared/univo.CUNaTwXY.mjs';
 import { AdapterError } from './metadata/adapters.mjs';
 import { c as createException, a as catchException } from './shared/univo.C0flyVee.mjs';
 import 'ws';
 import 'partysocket';
 
 function matchFilter(block, filter) {
-  if (!chainValid(block, filter)) return false;
-  if (!toBlockValid(block, filter)) return false;
-  if (!fromBlockValid(block, filter)) return false;
-  if (!includesLogEvent(block, filter)) return false;
-  if (!includesLogAddress(block, filter)) return false;
-  return true;
-}
-const chainValid = (block, filter) => {
-  if (hexToNumber(block.eth_chainId) === filter.chain) return true;
-  return false;
-};
-const fromBlockValid = (block, filter) => {
-  if (hexToNumber(block.eth_getBlockByNumber.number) >= filter.fromBlock) return true;
-  return false;
-};
-const toBlockValid = (block, filter) => {
-  if (filter.toBlock === void 0) return true;
-  if (hexToNumber(block.eth_getBlockByNumber.number) <= filter.toBlock) return true;
-  return false;
-};
-const includesLogAddress = (block, filter) => {
-  if (filter.address === void 0) return true;
-  for (const receipt of block.eth_getBlockReceipts) {
-    for (const log of receipt.logs) {
-      if (isHexEqual(log.address, filter.address)) return true;
+  if (hexToNumber(block.eth_chainId) !== filter.chain) {
+    return false;
+  }
+  if (hexToNumber(block.eth_getBlockByNumber.number) < filter.fromBlock) {
+    return false;
+  }
+  if (typeof filter.toBlock === "number" && hexToNumber(block.eth_getBlockByNumber.number) > filter.toBlock) {
+    return false;
+  }
+  if (filter.address && filter.event && filter.function) {
+    const txs = [];
+    for (const tx of block.eth_getBlockByNumber.transactions) {
+      if (tx.to !== null && isHexEqual(tx.to, filter.address)) {
+        if (isHexEqual(tx.input.slice(0, 10), filter.function)) {
+          txs.push(tx.transactionIndex);
+        }
+      }
+    }
+    for (const receipt of block.eth_getBlockReceipts) {
+      for (const log of receipt.logs) {
+        if (log.topics[0] !== void 0 && isHexEqual(log.topics[0], filter.event)) {
+          if (isHexEqual(log.address, filter.address)) {
+            if (txs.some((tx) => isHexEqual(tx, log.transactionIndex))) {
+              return true;
+            }
+          }
+        }
+      }
+    }
+    return false;
+  }
+  if (filter.address && filter.event && filter.function === void 0) {
+    for (const receipt of block.eth_getBlockReceipts) {
+      for (const log of receipt.logs) {
+        if (log.topics[0] !== void 0 && isHexEqual(log.topics[0], filter.event)) {
+          if (isHexEqual(log.address, filter.address)) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+  if (filter.address && filter.event === void 0 && filter.function) {
+    for (const tx of block.eth_getBlockByNumber.transactions) {
+      if (tx.to !== null && isHexEqual(tx.to, filter.address)) {
+        if (isHexEqual(tx.input.slice(0, 10), filter.function)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  if (filter.address === void 0 && filter.event && filter.function) {
+    const txs = [];
+    for (const tx of block.eth_getBlockByNumber.transactions) {
+      if (tx.to !== null && isHexEqual(tx.input.slice(0, 10), filter.function)) {
+        txs.push(tx.transactionIndex);
+      }
+    }
+    for (const receipt of block.eth_getBlockReceipts) {
+      for (const log of receipt.logs) {
+        if (log.topics[0] !== void 0 && isHexEqual(log.topics[0], filter.event)) {
+          if (txs.some((tx) => isHexEqual(tx, log.transactionIndex))) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+  if (filter.address === void 0 && filter.event && filter.function === void 0) {
+    for (const receipt of block.eth_getBlockReceipts) {
+      for (const log of receipt.logs) {
+        if (log.topics[0] !== void 0 && isHexEqual(log.topics[0], filter.event)) {
+          return true;
+        }
+      }
     }
+    return false;
   }
-  return false;
-};
-const includesLogEvent = (block, filter) => {
-  if (filter.event === void 0) return true;
-  for (const receipt of block.eth_getBlockReceipts) {
-    for (const log of receipt.logs) {
-      if (log.topics[0] === filter.event) return true;
+  if (filter.address === void 0 && filter.event === void 0 && filter.function) {
+    for (const tx of block.eth_getBlockByNumber.transactions) {
+      if (tx.to !== null && isHexEqual(tx.input.slice(0, 10), filter.function)) {
+        return true;
+      }
     }
+    return false;
   }
-  return false;
-};
+  if (filter.address && filter.event === void 0 && filter.function === void 0) {
+    for (const tx of block.eth_getBlockByNumber.transactions) {
+      if (isHexEqual(tx.from, filter.address) || tx.to !== null && isHexEqual(tx.to, filter.address)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  return true;
+}
 function defineEvent(event) {
   return event;
 }
@@ -52,7 +113,7 @@ function defineAction(action) {
   return action;
 }
 function defineIndexer(opts) {
-  const log = createLogger({ quiet: opts.quiet ?? false, prefix: "[indexer]" });
+  const log = createLogger({ quiet: opts.quiet, prefix: "[indexer]" });
   const allEvents = [...opts.events];
   const eventsGroupedByStorageMap = /* @__PURE__ */ new Map();
   for (const event of allEvents) {
@@ -74,6 +135,43 @@ function defineIndexer(opts) {
     }
     actionIds.add(action.id);
   }
+  const public_getMetadata = async () => {
+    return {
+      chains: Array.from(
+        new Set(
+          allEvents.flatMap((event) => {
+            return event.filters.flatMap((filter) => {
+              return numberToHex(filter.chain);
+            });
+          })
+        )
+      )
+    };
+  };
+  const public_getFinalizedHeight = async (chain) => {
+    const manifest = await getOrInitManifest(chain);
+    return manifest.finalized_block_height;
+  };
+  async function getOrInitManifest(chain) {
+    const path = `manifest/v1/${normalizeHex(chain)}`;
+    const manifestRes = await opts.metadataStorage.adapter.get(path);
+    let manifest;
+    if (manifestRes === null) {
+      const block = await getBlockFromChain({ chain, number: "finalized" });
+      const chainFinalizedHeight = hexToNumber(block.eth_getBlockByNumber.number);
+      const newManifest = {
+        finalized_block_height: chainFinalizedHeight,
+        finalized_block_hash: block.eth_getBlockByNumber.hash,
+        next_finalized_height: chainFinalizedHeight,
+        updated_at: Date.now()
+      };
+      await opts.metadataStorage.adapter.put(path, JSON.stringify(newManifest), { ifNoneMatch: "*" });
+      manifest = newManifest;
+    } else {
+      manifest = JSON.parse(decoder.decode(manifestRes.body));
+    }
+    return manifest;
+  }
   async function getBlockFromChain(head) {
     return await retry(() => retry_getBlockFromChain(head), 2);
   }
@@ -261,6 +359,45 @@ function defineIndexer(opts) {
     const type = hexToBigInt(receipt.type);
     return type === 0n ? encoded : concatBytes([Uint8Array.of(Number(type)), encoded]);
   }
+  function serializeTransaction$1(tx) {
+    if (tx.type === "0x4") {
+      return concatHex([
+        "0x04",
+        toRlp([
+          quantityToBytes(tx.chainId),
+          quantityToBytes(tx.nonce),
+          quantityToBytes(tx.maxPriorityFeePerGas),
+          quantityToBytes(tx.maxFeePerGas),
+          quantityToBytes(tx.gas),
+          hexToBytes(tx.to),
+          quantityToBytes(tx.value),
+          hexToBytes(tx.input),
+          tx.accessList.map(({ address, storageKeys }) => [hexToBytes(address), storageKeys.map((key) => hexToBytes(key))]),
+          (tx.authorizationList ?? []).map((authorization) => [
+            quantityToBytes(authorization.chainId),
+            hexToBytes(authorization.address),
+            quantityToBytes(authorization.nonce),
+            quantityToBytes(authorization.yParity),
+            quantityToBytes(authorization.r),
+            quantityToBytes(authorization.s)
+          ]),
+          quantityToBytes(tx.yParity ?? tx.v),
+          quantityToBytes(tx.r),
+          quantityToBytes(tx.s)
+        ])
+      ]);
+    }
+    const { input, ...formatted } = formatTransaction(tx);
+    if (formatted.type === "legacy" && (formatted.v === 27n || formatted.v === 28n)) {
+      formatted.chainId = void 0;
+    }
+    const signature = formatted.type === "legacy" ? { r: formatted.r, s: formatted.s, v: formatted.v } : { r: formatted.r, s: formatted.s, yParity: formatted.yParity };
+    return serializeTransaction(
+      { ...formatted, data: input },
+      //
+      signature
+    );
+  }
   const SUPPORTED_TRANSACTION_TYPES = /* @__PURE__ */ new Set([0n, 1n, 2n, 3n, 4n]);
   function verifyTransactionsRoot(block) {
     const unsupportedTxs = block.eth_getBlockByNumber.transactions.filter((tx) => {
@@ -273,16 +410,7 @@ function defineIndexer(opts) {
       return log.warn("Unable to verify block `transactionsRoot` because of unsupported tx type");
     }
     const transactions = block.eth_getBlockByNumber.transactions.map((tx) => {
-      const { input, ...formatted } = formatTransaction(tx);
-      if (formatted.type === "legacy" && (formatted.v === 27n || formatted.v === 28n)) {
-        formatted.chainId = void 0;
-      }
-      const signature = formatted.type === "legacy" ? { r: formatted.r, s: formatted.s, v: formatted.v } : { r: formatted.r, s: formatted.s, yParity: formatted.yParity };
-      const serialized = serializeTransaction(
-        { ...formatted, data: input },
-        //
-        signature
-      );
+      const serialized = serializeTransaction$1(tx);
       if (!isHexEqual(tx.hash, keccak256(serialized))) {
         throw new Error(`Transaction ${tx.hash} failed serialization check`);
       }
@@ -334,30 +462,6 @@ function defineIndexer(opts) {
       throw new Error("Block returned inconsistent gas used");
     }
   }
-  const public_getFinalizedHeight = async (chain) => {
-    const manifest = await getOrInitManifest(chain);
-    return manifest.finalized_block_height;
-  };
-  async function getOrInitManifest(chain) {
-    const path = `manifest/v1/${normalizeHex(chain)}`;
-    const manifestRes = await opts.metadataStorage.adapter.get(path);
-    let manifest;
-    if (manifestRes === null) {
-      const block = await getBlockFromChain({ chain, number: "finalized" });
-      const chainFinalizedHeight = hexToNumber(block.eth_getBlockByNumber.number);
-      const newManifest = {
-        finalized_block_height: chainFinalizedHeight,
-        finalized_block_hash: block.eth_getBlockByNumber.hash,
-        next_finalized_height: chainFinalizedHeight,
-        updated_at: Date.now()
-      };
-      await opts.metadataStorage.adapter.put(path, JSON.stringify(newManifest), { ifNoneMatch: "*" });
-      manifest = newManifest;
-    } else {
-      manifest = JSON.parse(decoder.decode(manifestRes.body));
-    }
-    return manifest;
-  }
   const public_writeUnfinalizedHead = async (head) => {
     log.debug("Received unfinalized head...");
     const blocksStart = Date.now();
@@ -909,23 +1013,22 @@ function defineIndexer(opts) {
   const private_getMetadata = async () => {
     return {
       version,
-      language: "javascript"
+      language: "javascript",
+      events: allEvents.map((event) => {
+        const filters = event.filters.map((filter) => {
+          return {
+            chain: filter.chain,
+            event: filter.event,
+            address: filter.address,
+            to_block: filter.toBlock,
+            function: filter.function,
+            from_block: filter.fromBlock
+          };
+        });
+        return { id: event.id, filters };
+      })
     };
   };
-  const private_getEvents = async () => {
-    return allEvents.map((event) => {
-      const filters = event.filters.map((filter) => {
-        return {
-          chain: filter.chain,
-          event: filter.event,
-          address: filter.address,
-          to_block: filter.toBlock,
-          from_block: filter.fromBlock
-        };
-      });
-      return { id: event.id, filters };
-    });
-  };
   const ignored = [
     "toJSON",
     "toString",
@@ -1177,12 +1280,12 @@ function defineIndexer(opts) {
   const rpc = {
     request: {
       public_finalize,
+      public_getMetadata,
       public_getFinalizedHeight,
       public_writeFinalizedHead,
       public_writeFinalizedHeight,
       public_writeUnfinalizedHead,
       public_deleteReorganisedHead,
-      private_getEvents,
       private_getMetadata,
       private_writeEvents,
       private_writeEventsAndGetKeys

package/dist/proxy.d.mts

@@ -1,4 +1,4 @@
-import { T as Transport, I as IndexerRpc } from './shared/univo.DYd1g40o.mjs';
+import { T as Transport, I as IndexerRpc } from './shared/univo.Ckj3I8tQ.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';

package/dist/proxy.d.ts

@@ -1,4 +1,4 @@
-import { T as Transport, I as IndexerRpc } from './shared/univo.CEA4vY0E.js';
+import { T as Transport, I as IndexerRpc } from './shared/univo.7S1OTdpc.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';

package/dist/proxy.mjs

@@ -1,8 +1,8 @@
 import { g as getException } from './shared/univo.C0flyVee.mjs';
-import { c as createLogger, d as decompress, e as decoder } from './shared/univo.mlthZw0m.mjs';
+import { c as createLogger, d as decompress, e as decoder } from './shared/univo.CUNaTwXY.mjs';
 
 function http(opts) {
-  const log = createLogger({ quiet: opts.quiet ?? false, prefix: "[proxy]" });
+  const log = createLogger({ quiet: opts.quiet, prefix: "[proxy]" });
   return async function proxy(req) {
     let body_buffer;
     try {

package/dist/realtime.d.mts

@@ -1,4 +1,4 @@
-import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.DYd1g40o.mjs';
+import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.Ckj3I8tQ.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';
@@ -14,9 +14,9 @@ type RealtimeOptions = {
     /**
      * Connection to a blockchain node.
      *
-     * Must use the `wss` transport protocol from `univo/transport`.
+     * Must use the `wss` or `browser` transport protocol from `univo/transport`.
      */
-    node: Transport<Rpc, "wss">;
+    node: Transport<Rpc, "wss" | "browser">;
     /**
      * Connection to a univo indexer.
      *
@@ -25,6 +25,6 @@ type RealtimeOptions = {
      */
     indexer: Transport<IndexerRpc, "http" | "local">;
 };
-declare function realtime(opts: RealtimeOptions): void;
+declare function realtime(realtime: RealtimeOptions): void;
 
 export { realtime };

package/dist/realtime.d.ts

@@ -1,4 +1,4 @@
-import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.CEA4vY0E.js';
+import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.7S1OTdpc.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';
@@ -14,9 +14,9 @@ type RealtimeOptions = {
     /**
      * Connection to a blockchain node.
      *
-     * Must use the `wss` transport protocol from `univo/transport`.
+     * Must use the `wss` or `browser` transport protocol from `univo/transport`.
      */
-    node: Transport<Rpc, "wss">;
+    node: Transport<Rpc, "wss" | "browser">;
     /**
      * Connection to a univo indexer.
      *
@@ -25,6 +25,6 @@ type RealtimeOptions = {
      */
     indexer: Transport<IndexerRpc, "http" | "local">;
 };
-declare function realtime(opts: RealtimeOptions): void;
+declare function realtime(realtime: RealtimeOptions): void;
 
 export { realtime };