evm-rpc: sort block numbers

Author: fracek

package.json

@@ -33,6 +33,7 @@
           "packages/beaconchain",
           "packages/cli",
           "packages/evm",
+          "packages/evm-rpc",
           "packages/indexer",
           "packages/protocol",
           "packages/starknet",

packages/evm-rpc/src/log-fetcher.ts

@@ -1,8 +1,9 @@
+import type { LogFilter } from "@apibara/evm";
 import type { Bytes } from "@apibara/protocol";
 import type { RpcLog } from "viem";
 import { hexToNumber, isHex, numberToHex, pad, trim } from "viem";
 import type { Log } from "./block";
-import type { Filter, LogFilter } from "./filter";
+import type { Filter } from "./filter";
 import type { ViemRpcClient } from "./stream-config";
 import { viemRpcLogToDna } from "./transform";
 
@@ -85,6 +86,21 @@ export async function fetchLogsForRange({
     return { logs: logsByBlock, blockNumbers: [] };
   }
 
+  console.log("Fetching in range", fromBlock, toBlock);
+  // console.log("filter: ", filter.logs);
+  // console.log(
+  //   "req: ",
+  //   filter.logs.map((logFilter) => [
+  //     {
+  //       fromBlock: numberToHex(fromBlock),
+  //       toBlock: numberToHex(toBlock),
+  //       address: logFilter.address,
+  //       topics:
+  //         logFilter.topics !== undefined ? [...logFilter.topics] : undefined,
+  //     },
+  //   ]),
+  // );
+
   const responses = await Promise.all(
     filter.logs.map(async (logFilter) => {
       const logs = await client.request({
@@ -94,7 +110,10 @@ export async function fetchLogsForRange({
             fromBlock: numberToHex(fromBlock),
             toBlock: numberToHex(toBlock),
             address: logFilter.address,
-            topics: logFilter.topics ? [...logFilter.topics] : undefined,
+            topics:
+              logFilter.topics !== undefined
+                ? [...logFilter.topics]
+                : undefined,
           },
         ],
       });
@@ -149,7 +168,7 @@ export async function fetchLogsForRange({
     }
   }
 
-  return { logs: logsByBlock, blockNumbers: Array.from(blockNumbers) };
+  return { logs: logsByBlock, blockNumbers: Array.from(blockNumbers).sort() };
 }
 
 function refineLog(log: RpcLog, filter: LogFilter): Log | null {