univo 0.4.1 → 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.DD1x3F1G.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, e as Indexer, f as PrivateMetadata, P as PublicMetadata, g as Result, c as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.BcZ0twA5.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, e as Indexer, f as PrivateMetadata, P as PublicMetadata, g as Result, c as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.CNIJRI7c.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.DD1x3F1G.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;
   }
-  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 && 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;
   }
-  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;
+  }
+  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;
+  }
+  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;
 }
@@ -298,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) => {
@@ -310,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`);
       }
@@ -930,6 +1021,7 @@ function defineIndexer(opts) {
             event: filter.event,
             address: filter.address,
             to_block: filter.toBlock,
+            function: filter.function,
             from_block: filter.fromBlock
           };
         });

package/dist/proxy.d.mts

@@ -1,4 +1,4 @@
-import { T as Transport, I as IndexerRpc } from './shared/univo.BcZ0twA5.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.CNIJRI7c.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,5 +1,5 @@
 import { g as getException } from './shared/univo.C0flyVee.mjs';
-import { c as createLogger, d as decompress, e as decoder } from './shared/univo.DD1x3F1G.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, prefix: "[proxy]" });

package/dist/realtime.d.mts

@@ -1,4 +1,4 @@
-import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.BcZ0twA5.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';

package/dist/realtime.d.ts

@@ -1,4 +1,4 @@
-import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.CNIJRI7c.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';

package/dist/realtime.mjs

@@ -1,5 +1,5 @@
 import { hexToNumber } from 'viem';
-import { c as createLogger, b as iife, m as mutex, l as lifecycle, q as queue, r as retry, i as isHexEqual } from './shared/univo.DD1x3F1G.mjs';
+import { c as createLogger, b as iife, m as mutex, l as lifecycle, q as queue, r as retry, i as isHexEqual } from './shared/univo.CUNaTwXY.mjs';
 
 function defineBlockchain(opts) {
   const log = createLogger({ quiet: opts.quiet });

package/dist/rpc.d.mts

@@ -1,4 +1,4 @@
-export { I as IndexerRpc, R as Rpc } from './shared/univo.BcZ0twA5.mjs';
+export { I as IndexerRpc, R as Rpc } from './shared/univo.Ckj3I8tQ.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';

package/dist/rpc.d.ts

@@ -1,4 +1,4 @@
-export { I as IndexerRpc, R as Rpc } from './shared/univo.CNIJRI7c.js';
+export { I as IndexerRpc, R as Rpc } from './shared/univo.7S1OTdpc.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';

package/dist/shared/{univo.CNIJRI7c.d.ts → univo.7S1OTdpc.d.ts}

@@ -119,21 +119,7 @@ type Flatten<T> = {
 };
 
 /**
- * The minimum RPC data required to process a block.
- *
- * Extend this interface in your application to expose additional RPC methods to every event:
- *
- * ```ts
- * import "univo";
- *
- * declare module "univo" {
- *   interface Block {
- *     eth_getBalance: `0x${string}`;
- *   }
- * }
- * ```
- *
- * Your `getBlock` function must also return any required fields added by the augmentation.
+ * Block
  */
 interface Block {
     eth_chainId: `0x${string}`;
@@ -154,6 +140,8 @@ type Filter = {
     event?: `0x${string}`;
     /** Index blocks that involve this address */
     address?: `0x${string}`;
+    /** Index blocks where this function signature was invoked */
+    function?: `0x${string}`;
 };
 /**
  * Events -----------------------------------------------------------------------------------------------------------------------------------

package/dist/shared/{univo.DD1x3F1G.mjs → univo.CUNaTwXY.mjs}

@@ -1,5 +1,5 @@
 const name = "univo";
-const version = "0.4.1";
+const version = "0.4.2";
 
 function createLogger(opts) {
   const noop = (..._) => {

package/dist/shared/{univo.BcZ0twA5.d.mts → univo.Ckj3I8tQ.d.mts}

@@ -119,21 +119,7 @@ type Flatten<T> = {
 };
 
 /**
- * The minimum RPC data required to process a block.
- *
- * Extend this interface in your application to expose additional RPC methods to every event:
- *
- * ```ts
- * import "univo";
- *
- * declare module "univo" {
- *   interface Block {
- *     eth_getBalance: `0x${string}`;
- *   }
- * }
- * ```
- *
- * Your `getBlock` function must also return any required fields added by the augmentation.
+ * Block
  */
 interface Block {
     eth_chainId: `0x${string}`;
@@ -154,6 +140,8 @@ type Filter = {
     event?: `0x${string}`;
     /** Index blocks that involve this address */
     address?: `0x${string}`;
+    /** Index blocks where this function signature was invoked */
+    function?: `0x${string}`;
 };
 /**
  * Events -----------------------------------------------------------------------------------------------------------------------------------

package/dist/transport.d.mts

@@ -1,4 +1,4 @@
-export { T as Transport, b as browser, h as http, l as local, w as wss } from './shared/univo.BcZ0twA5.mjs';
+export { T as Transport, b as browser, h as http, l as local, w as wss } from './shared/univo.Ckj3I8tQ.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';

package/dist/transport.d.ts

@@ -1,4 +1,4 @@
-export { T as Transport, b as browser, h as http, l as local, w as wss } from './shared/univo.CNIJRI7c.js';
+export { T as Transport, b as browser, h as http, l as local, w as wss } from './shared/univo.7S1OTdpc.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';

package/dist/transport.mjs

@@ -1,6 +1,6 @@
 import ws from 'ws';
 import { WebSocket } from 'partysocket';
-import { a as compress, c as createLogger, m as mutex } from './shared/univo.DD1x3F1G.mjs';
+import { a as compress, c as createLogger, m as mutex } from './shared/univo.CUNaTwXY.mjs';
 
 const DEFAULT_TIMEOUT_MS = 60 * 1e3;
 function local(rpc) {

package/package.json

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