@hugomrdias/foxer 0.1.9 → 0.2.1

package/dist/indexer/backfill.js

@@ -39,32 +39,39 @@ export async function runBackfill(args) {
             batchBlockNumbers.push(blockNumber);
             blockNumber += 1n;
         }
-        const [blocksByNumber, logsByBlock] = await Promise.all([
-            getBlocksInRange(logger, db, batchBlockNumbers, client, windowContracts),
-            getLogsInRange({
-                logger,
-                client,
-                addresses: windowContracts.addresses,
-                events: windowContracts.eventAbis,
-                fromBlock: cursor,
-                toBlock,
-            }),
-        ]);
+        const logsByBlock = await getLogsInRange({
+            logger,
+            client,
+            addresses: windowContracts.addresses,
+            events: windowContracts.eventAbis,
+            fromBlock: cursor,
+            toBlock,
+        });
+        const logsTxsSet = new Set();
+        for (const logs of logsByBlock.values()) {
+            for (const log of logs) {
+                logsTxsSet.add(log.transactionHash);
+            }
+        }
+        const { blocks: blocksByNumber, transactions: transactionsMap } = await getBlocksInRange(logger, db, batchBlockNumbers, client, Array.from(logsTxsSet));
         let blockIndex = 0;
         const endClockBatch = startClock();
         await withTransaction(db, async (tx) => {
             while (blockIndex < batchBlockNumbers.length) {
                 const blockNumber = batchBlockNumbers[blockIndex];
                 const prefetchedBlock = blocksByNumber.get(blockNumber);
+                if (!prefetchedBlock) {
+                    throw new Error(`Block ${blockNumber} not found`);
+                }
                 await processBlock({
                     logger,
                     config,
                     db: tx,
                     client,
                     registry,
-                    blockNumber,
                     logs: logsByBlock.get(blockNumber) ?? [],
                     block: prefetchedBlock,
+                    transactionsMap,
                     type: 'backfill',
                     contracts: windowContracts,
                 });

package/dist/indexer/backfill.js.map

@@ -1 +1 @@
-{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../src/indexer/backfill.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../src/indexer/backfill.ts"],"names":[],"mappings":"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"}

package/dist/indexer/process-block.d.ts

@@ -3,7 +3,7 @@ import type { FilteredContracts, 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 type { EncodedBlockWithTransactions } from '../types';
+import type { EncodedBlock, TransactionsMap } from '../types';
 import type { Logger } from '../utils/logger.ts';
 export type ProcessBlockResult = {
     status: 'processed';
@@ -20,9 +20,9 @@ export declare function processBlock(args: {
     db: Database<typeof schema, typeof relations>;
     client: PublicClient;
     registry: HookRegistry<NonNullable<unknown>>;
-    blockNumber: bigint;
-    logs?: Log<bigint, number, false, AbiEvent>[];
-    block?: EncodedBlockWithTransactions;
+    logs: Log<bigint, number, false, AbiEvent>[];
+    block: EncodedBlock;
+    transactionsMap: TransactionsMap;
     type: 'backfill' | 'live';
     contracts: FilteredContracts;
 }): Promise<ProcessBlockResult>;

package/dist/indexer/process-block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-block.d.ts","sourceRoot":"","sources":["../../src/indexer/process-block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAE5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAExD,OAAO,KAAK,EAAE,4BAA4B,EAAsB,MAAM,UAAU,CAAA;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAGhD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GACvB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAA;AAEzC;;GAEG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,cAAc,CAAA;IACtB,EAAE,EAAE,QAAQ,CAAC,OAAO,MAAM,EAAE,OAAO,SAAS,CAAC,CAAA;IAC7C,MAAM,EAAE,YAAY,CAAA;IACpB,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;IAC5C,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAA;IAC7C,KAAK,CAAC,EAAE,4BAA4B,CAAA;IACpC,IAAI,EAAE,UAAU,GAAG,MAAM,CAAA;IACzB,SAAS,EAAE,iBAAiB,CAAA;CAC7B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA+G9B"}
+{"version":3,"file":"process-block.d.ts","sourceRoot":"","sources":["../../src/indexer/process-block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAE5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAGhD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GACvB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAA;AAEzC;;GAEG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,cAAc,CAAA;IACtB,EAAE,EAAE,QAAQ,CAAC,OAAO,MAAM,EAAE,OAAO,SAAS,CAAC,CAAA;IAC7C,MAAM,EAAE,YAAY,CAAA;IACpB,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;IAC5C,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAA;IAC5C,KAAK,EAAE,YAAY,CAAA;IACnB,eAAe,EAAE,eAAe,CAAA;IAChC,IAAI,EAAE,UAAU,GAAG,MAAM,CAAA;IACzB,SAAS,EAAE,iBAAiB,CAAA;CAC7B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAmF9B"}

package/dist/indexer/process-block.js

@@ -1,37 +1,11 @@
 import { cacheBlockAndTransactions } from "../db/actions/blocks.js";
 import { withTransaction } from "../db/transaction.js";
-import { safeGetBlock } from "../rpc/get-block.js";
 import { ensureParentContinuity } from "./reorg.js";
 /**
  * Processes one block: continuity check, event writes, and optional cursor update.
  */
 export async function processBlock(args) {
-    const { logger, config, db, client, registry, blockNumber, block: prefetchedBlock, logs: prefetchedLogs, type, contracts, } = args;
-    const transactionByHash = new Map();
-    let block;
-    let logs;
-    if (prefetchedBlock) {
-        block = prefetchedBlock;
-    }
-    if (prefetchedLogs) {
-        logs = prefetchedLogs;
-    }
-    if (!block || !logs) {
-        const [blockResult, logsResult] = await Promise.all([
-            safeGetBlock({ client, blockNumber, db }),
-            client.getLogs({
-                address: contracts.addresses,
-                events: contracts.eventAbis,
-                fromBlock: blockNumber,
-                toBlock: blockNumber,
-            }),
-        ]);
-        block = blockResult;
-        logs = logsResult;
-    }
-    for (const tx of block.transactions) {
-        transactionByHash.set(tx.hash, tx);
-    }
+    const { logger, config, db, client, registry, block, transactionsMap, logs, type, contracts, } = args;
     if (type === 'live') {
         const rewindTo = await ensureParentContinuity({
             logger,
@@ -47,7 +21,8 @@ export async function processBlock(args) {
         if (type === 'live') {
             await cacheBlockAndTransactions({
                 db: tx,
-                block,
+                blocks: [block],
+                transactions: Array.from(transactionsMap.values()),
                 logger,
             });
         }
@@ -61,7 +36,7 @@ export async function processBlock(args) {
             if (!contracts.eventNames.has(eventName)) {
                 continue;
             }
-            const transaction = transactionByHash.get(log.transactionHash);
+            const transaction = transactionsMap.get(log.transactionHash);
             if (!transaction) {
                 logger.debug({ transactionHash: log.transactionHash }, 'transaction not found in block transaction list');
                 continue;

package/dist/indexer/process-block.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-block.js","sourceRoot":"","sources":["../../src/indexer/process-block.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process-block.js","sourceRoot":"","sources":["../../src/indexer/process-block.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAGnE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAItD,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAMnD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAWlC;IACC,MAAM,EACJ,MAAM,EACN,MAAM,EACN,EAAE,EACF,MAAM,EACN,QAAQ,EACR,KAAK,EACL,eAAe,EACf,IAAI,EACJ,IAAI,EACJ,SAAS,GACV,GAAG,IAAI,CAAA;IAER,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC;YAC5C,MAAM;YACN,EAAE;YACF,MAAM;YACN,KAAK;SACN,CAAC,CAAA;QACF,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAA;QACtC,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,EAAE,EAA6C,EAAE,EAAE;QACpE,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,MAAM,yBAAyB,CAAC;gBAC9B,EAAE,EAAE,EAAE;gBACN,MAAM,EAAE,CAAC,KAAK,CAAC;gBACf,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;gBAClD,MAAM;aACP,CAAC,CAAA;QACJ,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,YAAY,GAAG,SAAS,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAEjE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,EACxB,gDAAgD,CACjD,CAAA;gBACD,SAAQ;YACV,CAAC;YACD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;YAE/B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACzC,SAAQ;YACV,CAAC;YACD,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YAE5D,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,CAAC,KAAK,CACV,EAAE,eAAe,EAAE,GAAG,CAAC,eAAe,EAAE,EAExC,iDAAiD,CAClD,CAAA;gBACD,SAAQ;YACV,CAAC;YACD,MAAM,QAAQ,CAAC,QAAQ,CAAC;gBACtB,GAAG,EAAE,GAAG,YAAY,IAAI,SAAS,EAAW;gBAC5C,IAAI,EAAE,GAAG,CAAC,IAAa;gBACvB,GAAG,EAAE,GAAY;gBACjB,KAAK;gBACL,WAAW;gBACX,OAAO,EAAE;oBACP,EAAE,EAAE,EAAE;oBACN,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oBAC/B,MAAM;iBACP;aACF,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAA;IAED,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,MAAM,KAAK,CAAC,EAAE,CAAC,CAAA;IACjB,CAAC;SAAM,CAAC;QACN,MAAM,eAAe,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;IAClC,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAA;AAChC,CAAC"}

package/dist/indexer/queue-block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue-block.d.ts","sourceRoot":"","sources":["../../src/indexer/queue-block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC,OAAO,EAAmB,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAIxD,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC,MAAM,EAAE,cAAc,CAAA;IACtB,EAAE,EAAE,QAAQ,CAAC,OAAO,MAAM,EAAE,OAAO,SAAS,CAAC,CAAA;IAC7C,MAAM,EAAE,YAAY,CAAA;IACpB,QAAQ,EAAE,YAAY,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAqDpE"}
+{"version":3,"file":"queue-block.d.ts","sourceRoot":"","sources":["../../src/indexer/queue-block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC,OAAO,EAAmB,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAMxD,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC,MAAM,EAAE,cAAc,CAAA;IACtB,EAAE,EAAE,QAAQ,CAAC,OAAO,MAAM,EAAE,OAAO,SAAS,CAAC,CAAA;IAC7C,MAAM,EAAE,YAAY,CAAA;IACpB,QAAQ,EAAE,YAAY,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA0EpE"}

package/dist/indexer/queue-block.js

@@ -1,4 +1,5 @@
 import { filterContracts } from "../config/config.js";
+import { safeGetBlock } from "../rpc/get-block.js";
 import { startClock } from "../utils/timer.js";
 import { processBlock } from "./process-block.js";
 export async function queueBlock(args) {
@@ -6,15 +7,32 @@ export async function queueBlock(args) {
     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 = _block;
+        const transactionsMap = new Map();
+        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') {
             logger.warn({

package/dist/indexer/queue-block.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue-block.js","sourceRoot":"","sources":["../../src/indexer/queue-block.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAuB,MAAM,qBAAqB,CAAA;AAI1E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAajD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAoB;IACnD,MAAM,EACJ,MAAM,EACN,EAAE,EACF,MAAM,EACN,QAAQ,EACR,WAAW,EACX,MAAM,EACN,QAAQ,EACR,SAAS,GACV,GAAG,IAAI,CAAA;IAER,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAA;IAC7B,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;QACnE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;YAChC,MAAM;YACN,MAAM;YACN,EAAE;YACF,MAAM;YACN,QAAQ;YACR,WAAW;YACX,IAAI,EAAE,MAAM;YACZ,SAAS;SACV,CAAC,CAAA;QAEF,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CACT;gBACE,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;gBACnC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE;aACrC,EACD,kDAAkD,CACnD,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YACzB,OAAM;QACR,CAAC;QAED,MAAM,CAAC,IAAI,CACT;YACE,QAAQ,EAAE,QAAQ,EAAE;YACpB,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;YACnC,SAAS;SACV,EACD,sBAAsB,CACvB,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CACV,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,EAC9C,oCAAoC,CACrC,CAAA;QACD,QAAQ,CAAC,WAAW,GAAG,EAAE,CAAC,CAAA;IAC5B,CAAC;AACH,CAAC"}
+{"version":3,"file":"queue-block.js","sourceRoot":"","sources":["../../src/indexer/queue-block.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAuB,MAAM,qBAAqB,CAAA;AAI1E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAajD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAoB;IACnD,MAAM,EACJ,MAAM,EACN,EAAE,EACF,MAAM,EACN,QAAQ,EACR,WAAW,EACX,MAAM,EACN,QAAQ,EACR,SAAS,GACV,GAAG,IAAI,CAAA;IAER,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAA;IAC7B,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;QAEnE,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClD,YAAY,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC;gBACb,OAAO,EAAE,SAAS,CAAC,SAAS;gBAC5B,MAAM,EAAE,SAAS,CAAC,SAAS;gBAC3B,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE,WAAW;aACrB,CAAC;SACH,CAAC,CAAA;QAEF,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,GAAG,WAAW,CAAA;QAC/C,MAAM,KAAK,GAAiB,MAAM,CAAA;QAClC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAqC,CAAA;QAEpE,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE,CAAC;YAC9B,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QAClC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;YAChC,MAAM;YACN,MAAM;YACN,EAAE;YACF,MAAM;YACN,QAAQ;YACR,IAAI,EAAE,MAAM;YACZ,SAAS;YACT,KAAK;YACL,eAAe;YACf,IAAI,EAAE,UAAU;SACjB,CAAC,CAAA;QAEF,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CACT;gBACE,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;gBACnC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE;aACrC,EACD,kDAAkD,CACnD,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YACzB,OAAM;QACR,CAAC;QAED,MAAM,CAAC,IAAI,CACT;YACE,QAAQ,EAAE,QAAQ,EAAE;YACpB,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;YACnC,SAAS;SACV,EACD,sBAAsB,CACvB,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CACV,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,EAC9C,oCAAoC,CACrC,CAAA;QACD,QAAQ,CAAC,WAAW,GAAG,EAAE,CAAC,CAAA;IAC5B,CAAC;AACH,CAAC"}

package/dist/indexer/reorg.d.ts

@@ -1,6 +1,6 @@
 import type { PublicClient } from 'viem';
 import type { Database } from '../db/client.ts';
-import type { EncodedBlockWithTransactions } from '../types';
+import type { EncodedBlock } from '../types';
 import type { Logger } from '../utils/logger.ts';
 /**
  * Verifies parent-hash continuity and rolls back divergent canonical rows if needed.
@@ -10,7 +10,7 @@ export declare function ensureParentContinuity(args: {
     logger: Logger;
     db: Database;
     client: PublicClient;
-    block: EncodedBlockWithTransactions;
+    block: EncodedBlock;
 }): Promise<bigint | null>;
 /**
  * Validates recent indexed blocks against chain state on startup.

package/dist/indexer/reorg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reorg.d.ts","sourceRoot":"","sources":["../../src/indexer/reorg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAGxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAE5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAGhD;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,MAAM,EAAE,MAAM,CAAA;IACd,EAAE,EAAE,QAAQ,CAAA;IACZ,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,4BAA4B,CAAA;CACpC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA2DzB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,MAAM,EAAE,MAAM,CAAA;IACd,EAAE,EAAE,QAAQ,CAAA;IACZ,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;CACd,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChB"}
+{"version":3,"file":"reorg.d.ts","sourceRoot":"","sources":["../../src/indexer/reorg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAGxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAGhD;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,MAAM,EAAE,MAAM,CAAA;IACd,EAAE,EAAE,QAAQ,CAAA;IACZ,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,YAAY,CAAA;CACpB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA2DzB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,MAAM,EAAE,MAAM,CAAA;IACd,EAAE,EAAE,QAAQ,CAAA;IACZ,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;CACd,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChB"}

package/dist/rpc/get-logs.js

@@ -15,7 +15,7 @@ export async function getLogsInRange(args) {
         logsByBlock.set(log.blockNumber, byBlock);
     }
     logger.trace({
-        logs: logsByBlock.size,
+        logs: logs.length,
         duration: endClock(),
     }, 'get logs');
     return logsByBlock;

package/dist/rpc/get-logs.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-logs.js","sourceRoot":"","sources":["../../src/rpc/get-logs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAOpC;IACC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;IAEtE,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAA;IAE7B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkD,CAAA;IAC7E,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAA;IAEF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;QACtD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACjB,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAC3C,CAAC;IACD,MAAM,CAAC,KAAK,CACV;QACE,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,QAAQ,EAAE,QAAQ,EAAE;KACrB,EACD,UAAU,CACX,CAAA;IACD,OAAO,WAAW,CAAA;AACpB,CAAC"}
+{"version":3,"file":"get-logs.js","sourceRoot":"","sources":["../../src/rpc/get-logs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAOpC;IACC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;IAEtE,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAA;IAE7B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkD,CAAA;IAC7E,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAA;IAEF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;QACtD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACjB,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAC3C,CAAC;IACD,MAAM,CAAC,KAAK,CACV;QACE,IAAI,EAAE,IAAI,CAAC,MAAM;QACjB,QAAQ,EAAE,QAAQ,EAAE;KACrB,EACD,UAAU,CACX,CAAA;IACD,OAAO,WAAW,CAAA;AACpB,CAAC"}

package/dist/types.d.ts

@@ -19,4 +19,6 @@ export type EncodedTransaction = Schema['transactions']['$inferInsert'];
 export type EncodedBlockWithTransactions = Simplify<EncodedBlock & {
     transactions: EncodedTransaction[];
 }>;
+export type TransactionsMap = Map<`0x${string}`, EncodedTransaction>;
+export type BlocksMap = Map<bigint, EncodedBlock>;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAE9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,UAAU,GAAG,OAAO,EAAE,SAAS,GAAG,KAAK,IAC3D;IACE,KAAK,EAAE,SAAS,CAAA;IAChB,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB,GACD;IACE,MAAM,EAAE,UAAU,CAAA;IAClB,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAEL,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;AAEhD,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AACjE,MAAM,MAAM,UAAU,GAAG,KAAK,CAC5B,MAAM,EACN,IAAI,EACJ,QAAQ,GAAG,MAAM,GAAG,WAAW,EAC/B,gBAAgB,CACjB,CAAA;AACD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,CAAA;AAC3D,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,CAAA;AACvE,MAAM,MAAM,4BAA4B,GAAG,QAAQ,CACjD,YAAY,GAAG;IACb,YAAY,EAAE,kBAAkB,EAAE,CAAA;CACnC,CACF,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAE9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,UAAU,GAAG,OAAO,EAAE,SAAS,GAAG,KAAK,IAC3D;IACE,KAAK,EAAE,SAAS,CAAA;IAChB,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB,GACD;IACE,MAAM,EAAE,UAAU,CAAA;IAClB,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAEL,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;AAEhD,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AACjE,MAAM,MAAM,UAAU,GAAG,KAAK,CAC5B,MAAM,EACN,IAAI,EACJ,QAAQ,GAAG,MAAM,GAAG,WAAW,EAC/B,gBAAgB,CACjB,CAAA;AACD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,CAAA;AAC3D,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,CAAA;AACvE,MAAM,MAAM,4BAA4B,GAAG,QAAQ,CACjD,YAAY,GAAG;IACb,YAAY,EAAE,kBAAkB,EAAE,CAAA;CACnC,CACF,CAAA;AACD,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,KAAK,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAA;AACpE,MAAM,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hugomrdias/foxer",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "description": "Foxer is a all-in-one application server for Filecoin.",
   "license": "Apache-2.0 OR MIT",
   "author": "Hugo Dias <hugomrdias@gmail.com>",
@@ -45,28 +45,25 @@
     "access": "public",
     "provenance": true
   },
-  "scripts": {
-    "check": "tsc --noEmit && biome check .",
-    "build": "tsc -b",
-    "prepublishOnly": "bun run build"
-  },
   "dependencies": {
-    "@bluwy/giget-core": "^0.1.6",
+    "@bluwy/giget-core": "^0.1.7",
     "@clack/prompts": "^1.1.0",
-    "@electric-sql/pglite": "^0.3.16",
+    "@electric-sql/pglite": "^0.4.1",
     "@hono/node-server": "^1.19.11",
     "@libpg-query/parser": "^17.6.3",
     "@pgsql/traverse": "^17.2.4",
     "abitype": "^1.2.3",
     "cleye": "^2.3.0",
     "dotenv": "^17.2.3",
-    "drizzle-orm": "1.0.0-beta.15-859cf75",
+    "drizzle-orm": "1.0.0-beta.17-67b1795",
     "exit-hook": "^5.1.0",
-    "hono": "^4.12.7",
+    "hono": "^4.12.9",
     "hono-pino": "^0.10.3",
     "http-shutdown": "^1.2.2",
+    "iso-base": "^4.3.1",
     "p-queue": "^9.1.0",
     "pg": "^8.20.0",
+    "pgserve": "^1.1.6",
     "picocolors": "^1.1.1",
     "pino": "^10.3.1",
     "postgres": "^3.4.8",
@@ -77,12 +74,16 @@
   "devDependencies": {
     "@pgsql/types": "^17.6.2",
     "@types/node": "^25.5.0",
-    "@types/pg": "^8.18.0",
-    "type-fest": "^5.4.4",
+    "@types/pg": "^8.20.0",
+    "type-fest": "^5.5.0",
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "hono": ">=4.5",
-    "viem": "2.x"
+    "hono": ">=4.12.9",
+    "viem": "2.47.6"
+  },
+  "scripts": {
+    "check": "tsc --noEmit && biome check .",
+    "build": "tsc -b"
   }
-}
+}

package/src/bin/create.ts

@@ -149,6 +149,7 @@ export const create: Command = command(
     mkdirSync(root, { recursive: true })
     p.log.step(`Scaffolding project in ${root}...`)
 
+    // copy package.json
     const pkg = JSON.parse(
       readFileSync(
         resolve(__dirname, `../../template/package.json.tpl`),
@@ -163,6 +164,7 @@ export const create: Command = command(
       `${JSON.stringify(pkg, null, 2)}\n`
     )
 
+    // copy pnpm-workspace.yaml
     if (pm === 'pnpm') {
       copy(
         resolve(__dirname, `../../template/pnpm-workspace.yaml.tpl`),
@@ -170,14 +172,26 @@ export const create: Command = command(
       )
     }
 
+    // copy .gitignore
     copy(
-      resolve(__dirname, `../../template/turbo.json.tpl`),
-      resolve(root, 'turbo.json')
+      resolve(__dirname, `../../template/.gitignore.tpl`),
+      resolve(root, '.gitignore')
+    )
+    // copy biome.json
+    copy(
+      resolve(__dirname, `../../template/biome.json.tpl`),
+      resolve(root, 'biome.json')
     )
+    // copy tsconfig.json
     copy(
       resolve(__dirname, `../../template/tsconfig.json.tpl`),
       resolve(root, 'tsconfig.json')
     )
+    // copy turbo.json
+    copy(
+      resolve(__dirname, `../../template/turbo.json.tpl`),
+      resolve(root, 'turbo.json')
+    )
 
     // copy apps/foc-api
     await downloadTemplate('hugomrdias/foxer/examples/api', {

package/src/config/env.ts

@@ -17,7 +17,7 @@ const envSchema = z.object({
   LOG_MODE: z.enum(['pretty', 'json']).default('pretty'),
 })
 
-export function createEnv(logger: Logger) {
+export function createEnv(_logger: Logger) {
   const parsed = envSchema.safeParse(process.env)
 
   if (!parsed.success) {
@@ -25,6 +25,6 @@ export function createEnv(logger: Logger) {
       `Failed to parse environment variables: \n ${z.prettifyError(parsed.error)}`
     )
   }
-  logger.debug({ env: parsed.data }, 'env parsed')
+  // logger.debug({ env: parsed.data }, 'env parsed')
   return parsed.data
 }

package/src/db/actions/blocks.ts

@@ -1,6 +1,6 @@
 /** biome-ignore-all lint/style/noNonNullAssertion: its ok */
 
-import { gte } from 'drizzle-orm'
+import { and, gte, inArray } from 'drizzle-orm'
 import {
   getTableConfig,
   type PgAsyncTransaction,
@@ -8,14 +8,15 @@ import {
   type PgQueryResultHKT,
   type PgTable,
 } from 'drizzle-orm/pg-core'
-import type { PublicClient } from 'viem'
+import type { Hash, PublicClient } from 'viem'
 
-import type { FilteredContracts } from '../../config/config.ts'
 import { MAX_QUERY_PARAMS } from '../../contants.ts'
 import { safeGetBlock } from '../../rpc/get-block.ts'
 import type {
-  EncodedBlockWithTransactions,
+  BlocksMap,
+  EncodedBlock,
   EncodedTransaction,
+  TransactionsMap,
 } from '../../types.ts'
 import type { Logger } from '../../utils/logger.ts'
 import { startClock } from '../../utils/timer.ts'
@@ -73,19 +74,20 @@ function getTablesWithBlockNumberColumn(fullSchema: Record<string, unknown>) {
  */
 export async function cacheBlockAndTransactions(args: {
   db: Database<typeof schema, typeof relations>
-  block: EncodedBlockWithTransactions
+  blocks: EncodedBlock[]
+  transactions: EncodedTransaction[]
   logger: Logger
 }): Promise<void> {
-  const { db, block } = args
+  const { db, blocks, transactions } = args
 
   await db.transaction(async (tx) => {
     await insertBlocksInChunks({
       db: tx,
-      blocks: [block],
+      blocks,
     })
     await insertTransactionsInChunks({
       db: tx,
-      transactions: block.transactions,
+      transactions,
     })
   })
 }
@@ -105,8 +107,8 @@ export async function getBlocksInRange(
   db: Database<typeof schema, typeof relations>,
   blockNumbers: bigint[],
   client: PublicClient,
-  contracts: FilteredContracts
-): Promise<Map<bigint, EncodedBlockWithTransactions>> {
+  logsTxs: Hash[]
+): Promise<{ blocks: BlocksMap; transactions: TransactionsMap }> {
   const endClock = startClock()
   const firstBlockNumber = blockNumbers[0]!
   const lastBlockNumber = blockNumbers[blockNumbers.length - 1]!
@@ -117,74 +119,72 @@ export async function getBlocksInRange(
   //   contractAddresses: contracts.addresses,
   // })
 
-  const r = await db.query.blocks.findMany({
-    with: {
-      transactions: {
-        where: {
-          AND: [
-            { blockNumber: { gte: firstBlockNumber } },
-            { blockNumber: { lte: lastBlockNumber } },
-            {
-              to: {
-                in: contracts.addresses,
-              },
-            },
-          ],
-        },
+  const [blocks, txs] = await Promise.all([
+    db.query.blocks.findMany({
+      where: {
+        AND: [
+          { number: { gte: firstBlockNumber } },
+          { number: { lte: lastBlockNumber } },
+        ],
       },
-    },
-    where: {
-      AND: [
-        { number: { gte: firstBlockNumber } },
-        { number: { lte: lastBlockNumber } },
-      ],
-    },
-  })
+    }),
+    db
+      .select()
+      .from(schema.transactions)
+      .where(and(inArray(schema.transactions.hash, logsTxs))),
+  ])
+
+  const transactionByHash = new Map<`0x${string}`, EncodedTransaction>()
+  for (const tx of txs) {
+    transactionByHash.set(tx.hash, tx)
+  }
 
-  const blocksByNumber = new Map<bigint, EncodedBlockWithTransactions>()
+  const blocksByNumber = new Map<bigint, EncodedBlock>()
   const missing = new Set(blockNumbers)
 
-  for (const block of r) {
+  for (const block of blocks) {
     blocksByNumber.set(block.number, block)
     missing.delete(block.number)
   }
 
   const missingBlockNumbers = [...missing]
-  const newBlocks: EncodedBlockWithTransactions[] = []
+  const newBlocks: EncodedBlock[] = []
   const newTransactions: EncodedTransaction[] = []
 
   await Promise.all(
     missingBlockNumbers.map(async (blockNumber) => {
       const block = await safeGetBlock({ client, blockNumber, db })
-      const transactions = block.transactions
       blocksByNumber.set(blockNumber, block)
-      newBlocks.push(block)
+      const { transactions, ..._block } = block
+      newBlocks.push(_block)
+
       if (transactions.length > 0) {
         newTransactions.push(...transactions)
       }
+      for (const tx of transactions) {
+        transactionByHash.set(tx.hash, tx)
+      }
     })
   )
 
-  await db.transaction(async (tx) => {
-    await insertBlocksInChunks({
-      db: tx,
-      blocks: newBlocks,
-    })
-    await insertTransactionsInChunks({
-      db: tx,
-      transactions: newTransactions,
-    })
+  await cacheBlockAndTransactions({
+    db,
+    blocks: newBlocks,
+    transactions: newTransactions,
+    logger,
   })
 
   logger.trace(
     {
-      blocks: blocksByNumber.size,
-      missing: missingBlockNumbers.length,
+      blocks: blocks.length,
+      txs: txs.length,
+      newBlocks: newBlocks.length,
+      newTxs: newTransactions.length,
       duration: endClock(),
     },
-    'get blocks'
+    'get blocks and txs'
   )
-  return blocksByNumber
+  return { blocks: blocksByNumber, transactions: transactionByHash }
 }
 
 /**
@@ -192,7 +192,7 @@ export async function getBlocksInRange(
  */
 export async function insertBlocksInChunks(args: {
   db: PgAsyncTransaction<PgQueryResultHKT, typeof schema>
-  blocks: EncodedBlockWithTransactions[]
+  blocks: EncodedBlock[]
 }): Promise<void> {
   const { db, blocks } = args
   if (blocks.length === 0) return

package/src/db/client.ts

@@ -84,8 +84,12 @@ export function createDatabase<
   // Postgres
   if (driver === 'postgres' && url) {
     const pool = new Pool({
-      ...options,
+      application_name: 'foxer',
+      connectionTimeoutMillis: 5_000,
+      idleTimeoutMillis: 30_000,
+      max: 10,
       connectionString: url,
+      ...options,
     })
     const db = drizzleNodePostgres({
       client: pool,