@hugomrdias/foxer 0.1.9 → 0.1.11

package/src/indexer/queue-block.ts

@@ -5,6 +5,8 @@ import { filterContracts, type InternalConfig } from '../config/config.ts'
 import type { Database } from '../db/client.ts'
 import type { relations, schema } from '../db/schema/index.ts'
 import type { HookRegistry } from '../hooks/registry.ts'
+import { safeGetBlock } from '../rpc/get-block.ts'
+import type { EncodedBlock, EncodedTransaction } from '../types.ts'
 import { startClock } from '../utils/timer.ts'
 import { processBlock } from './process-block.ts'
 
@@ -34,15 +36,36 @@ export async function queueBlock(args: QueueBlockArgs): Promise<void> {
   const endClock = startClock()
   try {
     const contracts = filterContracts(config, blockNumber, blockNumber)
+
+    const [blockResult, logsResult] = await Promise.all([
+      safeGetBlock({ client, blockNumber, db }),
+      client.getLogs({
+        address: contracts.addresses,
+        events: contracts.eventAbis,
+        fromBlock: blockNumber,
+        toBlock: blockNumber,
+      }),
+    ])
+
+    const { transactions, ..._block } = blockResult
+    const block: EncodedBlock = _block
+    const transactionsMap = new Map<`0x${string}`, EncodedTransaction>()
+
+    for (const tx of transactions) {
+      transactionsMap.set(tx.hash, tx)
+    }
+
     const result = await processBlock({
       logger,
       config,
       db,
       client,
       registry,
-      blockNumber,
       type: 'live',
       contracts,
+      block,
+      transactionsMap,
+      logs: logsResult,
     })
 
     if (result.status === 'reorg') {

package/src/indexer/reorg.ts

@@ -3,7 +3,7 @@ import type { PublicClient } from 'viem'
 import { deleteBlocksFrom } from '../db/actions/blocks.ts'
 import type { Database } from '../db/client.ts'
 import { safeGetBlock } from '../rpc/get-block.ts'
-import type { EncodedBlockWithTransactions } from '../types'
+import type { EncodedBlock } from '../types'
 import { hashEquals } from '../utils/hash.ts'
 import type { Logger } from '../utils/logger.ts'
 import { startClock } from '../utils/timer.ts'
@@ -16,7 +16,7 @@ export async function ensureParentContinuity(args: {
   logger: Logger
   db: Database
   client: PublicClient
-  block: EncodedBlockWithTransactions
+  block: EncodedBlock
 }): Promise<bigint | null> {
   const { logger, db, client, block } = args
   if (block.number === 0n) return null

package/src/rpc/get-logs.ts

@@ -30,7 +30,7 @@ export async function getLogsInRange(args: {
   }
   logger.trace(
     {
-      logs: logsByBlock.size,
+      logs: logs.length,
       duration: endClock(),
     },
     'get logs'

package/src/types.ts

@@ -31,3 +31,5 @@ export type EncodedBlockWithTransactions = Simplify<
     transactions: EncodedTransaction[]
   }
 >
+export type TransactionsMap = Map<`0x${string}`, EncodedTransaction>
+export type BlocksMap = Map<bigint, EncodedBlock>