ponder 0.9.3 → 0.9.4

package/dist/bin/ponder.js

@@ -1655,6 +1655,9 @@ var shouldGetTransactionReceipt = (filter) => {
   return false;
 };
 
+// src/build/configAndIndexingFunctions.ts
+import { BlockNotFoundError, hexToNumber as hexToNumber2 } from "viem";
+
 // src/utils/offset.ts
 import { InvalidAbiDecodingTypeError } from "viem";
 function getBytesConsumedByParam(param) {
@@ -1785,6 +1788,37 @@ async function buildConfigAndIndexingFunctions({
   rawIndexingFunctions
 }) {
   const logs = [];
+  const perNetworkLatestBlockNumber = /* @__PURE__ */ new Map();
+  const resolveBlockNumber = async (blockNumberOrTag, network) => {
+    if (blockNumberOrTag === void 0) {
+      return void 0;
+    }
+    if (Number.isNaN(blockNumberOrTag)) {
+      return void 0;
+    }
+    if (blockNumberOrTag === "latest") {
+      if (perNetworkLatestBlockNumber.has(network.name)) {
+        return perNetworkLatestBlockNumber.get(network.name);
+      } else {
+        const blockPromise = network.transport.request({
+          method: "eth_getBlockByNumber",
+          params: ["latest", false]
+        }).then((block) => {
+          if (!block)
+            throw new BlockNotFoundError({ blockNumber: "latest" });
+          return hexToNumber2(block.number);
+        }).catch((e) => {
+          throw new Error(
+            `Unable to fetch "latest" block for network '${network.name}':
+${e.message}`
+          );
+        });
+        perNetworkLatestBlockNumber.set(network.name, blockPromise);
+        return blockPromise;
+      }
+    }
+    return blockNumberOrTag;
+  };
   const networks = await Promise.all(
     Object.entries(config.networks).map(async ([networkName, network]) => {
       const { chainId, transport } = network;
@@ -1893,230 +1927,233 @@ async function buildConfigAndIndexingFunctions({
         `Validation failed: Network for '${source.name}' is null or undefined. Expected one of [${networks.map((n) => `'${n.name}'`).join(", ")}].`
       );
     }
-    const startBlockMaybeNan = source.startBlock;
-    const startBlock = Number.isNaN(startBlockMaybeNan) ? void 0 : startBlockMaybeNan;
-    const endBlockMaybeNan = source.endBlock;
-    const endBlock = Number.isNaN(endBlockMaybeNan) ? void 0 : endBlockMaybeNan;
-    if (startBlock !== void 0 && endBlock !== void 0 && endBlock < startBlock) {
-      throw new Error(
-        `Validation failed: Start block for '${source.name}' is after end block (${startBlock} > ${endBlock}).`
-      );
-    }
     const network = networks.find((n) => n.name === source.network);
     if (!network) {
       throw new Error(
         `Validation failed: Invalid network for '${source.name}'. Got '${source.network}', expected one of [${networks.map((n) => `'${n.name}'`).join(", ")}].`
       );
     }
+    const startBlock = await resolveBlockNumber(source.startBlock, network);
+    const endBlock = await resolveBlockNumber(source.endBlock, network);
+    if (startBlock !== void 0 && endBlock !== void 0 && endBlock < startBlock) {
+      throw new Error(
+        `Validation failed: Start block for '${source.name}' is after end block (${startBlock} > ${endBlock}).`
+      );
+    }
   }
-  const contractSources = flattenSources(
-    config.contracts ?? {}
-  ).flatMap((source) => {
-    const network = networks.find((n) => n.name === source.network);
-    const registeredLogEvents = [];
-    const registeredCallTraceEvents = [];
-    for (const eventName of Object.keys(indexingFunctions)) {
-      if (eventName.includes(":")) {
-        const [logContractName, logEventName] = eventName.split(":");
-        if (logContractName === source.name && logEventName !== "setup") {
-          registeredLogEvents.push(logEventName);
+  const contractSources = (await Promise.all(
+    flattenSources(config.contracts ?? {}).map(
+      async (source) => {
+        const network = networks.find((n) => n.name === source.network);
+        const registeredLogEvents = [];
+        const registeredCallTraceEvents = [];
+        for (const eventName of Object.keys(indexingFunctions)) {
+          if (eventName.includes(":")) {
+            const [logContractName, logEventName] = eventName.split(":");
+            if (logContractName === source.name && logEventName !== "setup") {
+              registeredLogEvents.push(logEventName);
+            }
+          }
+          if (eventName.includes(".")) {
+            const [functionContractName, functionName] = eventName.split(
+              "."
+            );
+            if (functionContractName === source.name) {
+              registeredCallTraceEvents.push(functionName);
+            }
+          }
         }
-      }
-      if (eventName.includes(".")) {
-        const [functionContractName, functionName] = eventName.split(".");
-        if (functionContractName === source.name) {
-          registeredCallTraceEvents.push(functionName);
+        const abiEvents = buildAbiEvents({ abi: source.abi });
+        const abiFunctions = buildAbiFunctions({ abi: source.abi });
+        const registeredEventSelectors = [];
+        for (const logEvent of registeredLogEvents) {
+          const abiEvent = abiEvents.bySafeName[logEvent];
+          if (abiEvent === void 0) {
+            throw new Error(
+              `Validation failed: Event name for event '${logEvent}' not found in the contract ABI. Got '${logEvent}', expected one of [${Object.keys(
+                abiEvents.bySafeName
+              ).map((eventName) => `'${eventName}'`).join(", ")}].`
+            );
+          }
+          registeredEventSelectors.push(abiEvent.selector);
         }
-      }
-    }
-    const abiEvents = buildAbiEvents({ abi: source.abi });
-    const abiFunctions = buildAbiFunctions({ abi: source.abi });
-    const registeredEventSelectors = [];
-    for (const logEvent of registeredLogEvents) {
-      const abiEvent = abiEvents.bySafeName[logEvent];
-      if (abiEvent === void 0) {
-        throw new Error(
-          `Validation failed: Event name for event '${logEvent}' not found in the contract ABI. Got '${logEvent}', expected one of [${Object.keys(
-            abiEvents.bySafeName
-          ).map((eventName) => `'${eventName}'`).join(", ")}].`
-        );
-      }
-      registeredEventSelectors.push(abiEvent.selector);
-    }
-    const registeredFunctionSelectors = [];
-    for (const _function of registeredCallTraceEvents) {
-      const abiFunction = abiFunctions.bySafeName[_function];
-      if (abiFunction === void 0) {
-        throw new Error(
-          `Validation failed: Function name for function '${_function}' not found in the contract ABI. Got '${_function}', expected one of [${Object.keys(
-            abiFunctions.bySafeName
-          ).map((eventName) => `'${eventName}'`).join(", ")}].`
-        );
-      }
-      registeredFunctionSelectors.push(abiFunction.selector);
-    }
-    const topicsArray = [];
-    if (source.filter !== void 0) {
-      const eventFilters = Array.isArray(source.filter) ? source.filter : [source.filter];
-      for (const filter of eventFilters) {
-        const abiEvent = abiEvents.bySafeName[filter.event];
-        if (!abiEvent) {
-          throw new Error(
-            `Validation failed: Invalid filter for contract '${source.name}'. Got event name '${filter.event}', expected one of [${Object.keys(
-              abiEvents.bySafeName
-            ).map((n) => `'${n}'`).join(", ")}].`
+        const registeredFunctionSelectors = [];
+        for (const _function of registeredCallTraceEvents) {
+          const abiFunction = abiFunctions.bySafeName[_function];
+          if (abiFunction === void 0) {
+            throw new Error(
+              `Validation failed: Function name for function '${_function}' not found in the contract ABI. Got '${_function}', expected one of [${Object.keys(
+                abiFunctions.bySafeName
+              ).map((eventName) => `'${eventName}'`).join(", ")}].`
+            );
+          }
+          registeredFunctionSelectors.push(abiFunction.selector);
+        }
+        const topicsArray = [];
+        if (source.filter !== void 0) {
+          const eventFilters = Array.isArray(source.filter) ? source.filter : [source.filter];
+          for (const filter of eventFilters) {
+            const abiEvent = abiEvents.bySafeName[filter.event];
+            if (!abiEvent) {
+              throw new Error(
+                `Validation failed: Invalid filter for contract '${source.name}'. Got event name '${filter.event}', expected one of [${Object.keys(
+                  abiEvents.bySafeName
+                ).map((n) => `'${n}'`).join(", ")}].`
+              );
+            }
+          }
+          topicsArray.push(...buildTopics(source.abi, eventFilters));
+          const filteredEventSelectors = topicsArray.map(
+            (t) => t.topic0
           );
-        }
-      }
-      topicsArray.push(...buildTopics(source.abi, eventFilters));
-      const filteredEventSelectors = topicsArray.map(
-        (t) => t.topic0
-      );
-      const excludedRegisteredEventSelectors = registeredEventSelectors.filter(
-        (s) => filteredEventSelectors.includes(s) === false
-      );
-      for (const selector of filteredEventSelectors) {
-        if (registeredEventSelectors.includes(selector) === false) {
-          throw new Error(
-            `Validation failed: Event selector '${abiEvents.bySelector[selector]?.safeName}' is used in a filter but does not have a corresponding indexing function.`
+          const excludedRegisteredEventSelectors = registeredEventSelectors.filter(
+            (s) => filteredEventSelectors.includes(s) === false
           );
+          for (const selector of filteredEventSelectors) {
+            if (registeredEventSelectors.includes(selector) === false) {
+              throw new Error(
+                `Validation failed: Event selector '${abiEvents.bySelector[selector]?.safeName}' is used in a filter but does not have a corresponding indexing function.`
+              );
+            }
+          }
+          if (excludedRegisteredEventSelectors.length > 0) {
+            topicsArray.push({
+              topic0: excludedRegisteredEventSelectors,
+              topic1: null,
+              topic2: null,
+              topic3: null
+            });
+          }
+        } else {
+          topicsArray.push({
+            topic0: registeredEventSelectors,
+            topic1: null,
+            topic2: null,
+            topic3: null
+          });
         }
-      }
-      if (excludedRegisteredEventSelectors.length > 0) {
-        topicsArray.push({
-          topic0: excludedRegisteredEventSelectors,
-          topic1: null,
-          topic2: null,
-          topic3: null
-        });
-      }
-    } else {
-      topicsArray.push({
-        topic0: registeredEventSelectors,
-        topic1: null,
-        topic2: null,
-        topic3: null
-      });
-    }
-    const startBlockMaybeNan = source.startBlock;
-    const fromBlock = Number.isNaN(startBlockMaybeNan) ? void 0 : startBlockMaybeNan;
-    const endBlockMaybeNan = source.endBlock;
-    const toBlock = Number.isNaN(endBlockMaybeNan) ? void 0 : endBlockMaybeNan;
-    const contractMetadata = {
-      type: "contract",
-      abi: source.abi,
-      abiEvents,
-      abiFunctions,
-      name: source.name,
-      network
-    };
-    const resolvedAddress = source?.address;
-    if (typeof resolvedAddress === "object" && !Array.isArray(resolvedAddress)) {
-      const logFactory = buildLogFactory({
-        chainId: network.chainId,
-        ...resolvedAddress
-      });
-      const logSources2 = topicsArray.map(
-        (topics) => ({
-          ...contractMetadata,
-          filter: {
-            type: "log",
+        const fromBlock = await resolveBlockNumber(
+          source.startBlock,
+          network
+        );
+        const toBlock = await resolveBlockNumber(source.endBlock, network);
+        const contractMetadata = {
+          type: "contract",
+          abi: source.abi,
+          abiEvents,
+          abiFunctions,
+          name: source.name,
+          network
+        };
+        const resolvedAddress = source?.address;
+        if (typeof resolvedAddress === "object" && !Array.isArray(resolvedAddress)) {
+          const logFactory = buildLogFactory({
             chainId: network.chainId,
-            address: logFactory,
-            topic0: topics.topic0,
-            topic1: topics.topic1,
-            topic2: topics.topic2,
-            topic3: topics.topic3,
-            fromBlock,
-            toBlock,
-            include: defaultLogFilterInclude.concat(
-              source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
-            )
+            ...resolvedAddress
+          });
+          const logSources2 = topicsArray.map(
+            (topics) => ({
+              ...contractMetadata,
+              filter: {
+                type: "log",
+                chainId: network.chainId,
+                address: logFactory,
+                topic0: topics.topic0,
+                topic1: topics.topic1,
+                topic2: topics.topic2,
+                topic3: topics.topic3,
+                fromBlock,
+                toBlock,
+                include: defaultLogFilterInclude.concat(
+                  source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
+                )
+              }
+            })
+          );
+          if (source.includeCallTraces) {
+            return [
+              ...logSources2,
+              {
+                ...contractMetadata,
+                filter: {
+                  type: "trace",
+                  chainId: network.chainId,
+                  fromAddress: void 0,
+                  toAddress: logFactory,
+                  callType: "CALL",
+                  functionSelector: registeredFunctionSelectors,
+                  includeReverted: false,
+                  fromBlock,
+                  toBlock,
+                  include: defaultTraceFilterInclude.concat(
+                    source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
+                  )
+                }
+              }
+            ];
           }
-        })
-      );
-      if (source.includeCallTraces) {
-        return [
-          ...logSources2,
-          {
+          return logSources2;
+        } else if (resolvedAddress !== void 0) {
+          for (const address of Array.isArray(resolvedAddress) ? resolvedAddress : [resolvedAddress]) {
+            if (!address.startsWith("0x"))
+              throw new Error(
+                `Validation failed: Invalid prefix for address '${address}'. Got '${address.slice(
+                  0,
+                  2
+                )}', expected '0x'.`
+              );
+            if (address.length !== 42)
+              throw new Error(
+                `Validation failed: Invalid length for address '${address}'. Got ${address.length}, expected 42 characters.`
+              );
+          }
+        }
+        const validatedAddress = Array.isArray(resolvedAddress) ? dedupe(resolvedAddress).map((r) => toLowerCase(r)) : resolvedAddress !== void 0 ? toLowerCase(resolvedAddress) : void 0;
+        const logSources = topicsArray.map(
+          (topics) => ({
             ...contractMetadata,
             filter: {
-              type: "trace",
+              type: "log",
               chainId: network.chainId,
-              fromAddress: void 0,
-              toAddress: logFactory,
-              callType: "CALL",
-              functionSelector: registeredFunctionSelectors,
-              includeReverted: false,
+              address: validatedAddress,
+              topic0: topics.topic0,
+              topic1: topics.topic1,
+              topic2: topics.topic2,
+              topic3: topics.topic3,
               fromBlock,
               toBlock,
-              include: defaultTraceFilterInclude.concat(
+              include: defaultLogFilterInclude.concat(
                 source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
               )
             }
-          }
-        ];
-      }
-      return logSources2;
-    } else if (resolvedAddress !== void 0) {
-      for (const address of Array.isArray(resolvedAddress) ? resolvedAddress : [resolvedAddress]) {
-        if (!address.startsWith("0x"))
-          throw new Error(
-            `Validation failed: Invalid prefix for address '${address}'. Got '${address.slice(
-              0,
-              2
-            )}', expected '0x'.`
-          );
-        if (address.length !== 42)
-          throw new Error(
-            `Validation failed: Invalid length for address '${address}'. Got ${address.length}, expected 42 characters.`
-          );
+          })
+        );
+        if (source.includeCallTraces) {
+          return [
+            ...logSources,
+            {
+              ...contractMetadata,
+              filter: {
+                type: "trace",
+                chainId: network.chainId,
+                fromAddress: void 0,
+                toAddress: Array.isArray(validatedAddress) ? validatedAddress : validatedAddress === void 0 ? void 0 : [validatedAddress],
+                callType: "CALL",
+                functionSelector: registeredFunctionSelectors,
+                includeReverted: false,
+                fromBlock,
+                toBlock,
+                include: defaultTraceFilterInclude.concat(
+                  source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
+                )
+              }
+            }
+          ];
+        } else
+          return logSources;
       }
-    }
-    const validatedAddress = Array.isArray(resolvedAddress) ? dedupe(resolvedAddress).map((r) => toLowerCase(r)) : resolvedAddress !== void 0 ? toLowerCase(resolvedAddress) : void 0;
-    const logSources = topicsArray.map(
-      (topics) => ({
-        ...contractMetadata,
-        filter: {
-          type: "log",
-          chainId: network.chainId,
-          address: validatedAddress,
-          topic0: topics.topic0,
-          topic1: topics.topic1,
-          topic2: topics.topic2,
-          topic3: topics.topic3,
-          fromBlock,
-          toBlock,
-          include: defaultLogFilterInclude.concat(
-            source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
-          )
-        }
-      })
-    );
-    if (source.includeCallTraces) {
-      return [
-        ...logSources,
-        {
-          ...contractMetadata,
-          filter: {
-            type: "trace",
-            chainId: network.chainId,
-            fromAddress: void 0,
-            toAddress: Array.isArray(validatedAddress) ? validatedAddress : validatedAddress === void 0 ? void 0 : [validatedAddress],
-            callType: "CALL",
-            functionSelector: registeredFunctionSelectors,
-            includeReverted: false,
-            fromBlock,
-            toBlock,
-            include: defaultTraceFilterInclude.concat(
-              source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
-            )
-          }
-        }
-      ];
-    } else
-      return logSources;
-  }).filter((source) => {
+    )
+  )).flat().filter((source) => {
     const hasNoRegisteredIndexingFunctions = source.filter.type === "trace" ? Array.isArray(source.filter.functionSelector) && source.filter.functionSelector.length === 0 : Array.isArray(source.filter.topic0) && source.filter.topic0?.length === 0;
     if (hasNoRegisteredIndexingFunctions) {
       logs.push({
@@ -2126,171 +2163,176 @@ async function buildConfigAndIndexingFunctions({
     }
     return hasNoRegisteredIndexingFunctions === false;
   });
-  const accountSources = flattenSources(config.accounts ?? {}).flatMap((source) => {
-    const network = networks.find((n) => n.name === source.network);
-    const startBlockMaybeNan = source.startBlock;
-    const fromBlock = Number.isNaN(startBlockMaybeNan) ? void 0 : startBlockMaybeNan;
-    const endBlockMaybeNan = source.endBlock;
-    const toBlock = Number.isNaN(endBlockMaybeNan) ? void 0 : endBlockMaybeNan;
-    const resolvedAddress = source?.address;
-    if (resolvedAddress === void 0) {
-      throw new Error(
-        `Validation failed: Account '${source.name}' must specify an 'address'.`
-      );
-    }
-    if (typeof resolvedAddress === "object" && !Array.isArray(resolvedAddress)) {
-      const logFactory = buildLogFactory({
-        chainId: network.chainId,
-        ...resolvedAddress
-      });
-      return [
-        {
-          type: "account",
-          name: source.name,
-          network,
-          filter: {
-            type: "transaction",
-            chainId: network.chainId,
-            fromAddress: void 0,
-            toAddress: logFactory,
-            includeReverted: false,
-            fromBlock,
-            toBlock,
-            include: defaultTransactionFilterInclude
-          }
-        },
-        {
-          type: "account",
-          name: source.name,
-          network,
-          filter: {
-            type: "transaction",
-            chainId: network.chainId,
-            fromAddress: logFactory,
-            toAddress: void 0,
-            includeReverted: false,
-            fromBlock,
-            toBlock,
-            include: defaultTransactionFilterInclude
-          }
-        },
-        {
-          type: "account",
-          name: source.name,
-          network,
-          filter: {
-            type: "transfer",
-            chainId: network.chainId,
-            fromAddress: void 0,
-            toAddress: logFactory,
-            includeReverted: false,
-            fromBlock,
-            toBlock,
-            include: defaultTransferFilterInclude.concat(
-              source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
-            )
-          }
-        },
-        {
-          type: "account",
-          name: source.name,
-          network,
-          filter: {
-            type: "transfer",
-            chainId: network.chainId,
-            fromAddress: logFactory,
-            toAddress: void 0,
-            includeReverted: false,
-            fromBlock,
-            toBlock,
-            include: defaultTransferFilterInclude.concat(
-              source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
-            )
-          }
-        }
-      ];
-    }
-    for (const address of Array.isArray(resolvedAddress) ? resolvedAddress : [resolvedAddress]) {
-      if (!address.startsWith("0x"))
-        throw new Error(
-          `Validation failed: Invalid prefix for address '${address}'. Got '${address.slice(
-            0,
-            2
-          )}', expected '0x'.`
-        );
-      if (address.length !== 42)
-        throw new Error(
-          `Validation failed: Invalid length for address '${address}'. Got ${address.length}, expected 42 characters.`
+  const accountSources = (await Promise.all(
+    flattenSources(config.accounts ?? {}).map(
+      async (source) => {
+        const network = networks.find((n) => n.name === source.network);
+        const fromBlock = await resolveBlockNumber(
+          source.startBlock,
+          network
         );
-    }
-    const validatedAddress = Array.isArray(resolvedAddress) ? dedupe(resolvedAddress).map((r) => toLowerCase(r)) : resolvedAddress !== void 0 ? toLowerCase(resolvedAddress) : void 0;
-    return [
-      {
-        type: "account",
-        name: source.name,
-        network,
-        filter: {
-          type: "transaction",
-          chainId: network.chainId,
-          fromAddress: void 0,
-          toAddress: validatedAddress,
-          includeReverted: false,
-          fromBlock,
-          toBlock,
-          include: defaultTransactionFilterInclude
-        }
-      },
-      {
-        type: "account",
-        name: source.name,
-        network,
-        filter: {
-          type: "transaction",
-          chainId: network.chainId,
-          fromAddress: validatedAddress,
-          toAddress: void 0,
-          includeReverted: false,
-          fromBlock,
-          toBlock,
-          include: defaultTransactionFilterInclude
+        const toBlock = await resolveBlockNumber(source.endBlock, network);
+        const resolvedAddress = source?.address;
+        if (resolvedAddress === void 0) {
+          throw new Error(
+            `Validation failed: Account '${source.name}' must specify an 'address'.`
+          );
         }
-      },
-      {
-        type: "account",
-        name: source.name,
-        network,
-        filter: {
-          type: "transfer",
-          chainId: network.chainId,
-          fromAddress: void 0,
-          toAddress: validatedAddress,
-          includeReverted: false,
-          fromBlock,
-          toBlock,
-          include: defaultTransferFilterInclude.concat(
-            source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
-          )
+        if (typeof resolvedAddress === "object" && !Array.isArray(resolvedAddress)) {
+          const logFactory = buildLogFactory({
+            chainId: network.chainId,
+            ...resolvedAddress
+          });
+          return [
+            {
+              type: "account",
+              name: source.name,
+              network,
+              filter: {
+                type: "transaction",
+                chainId: network.chainId,
+                fromAddress: void 0,
+                toAddress: logFactory,
+                includeReverted: false,
+                fromBlock,
+                toBlock,
+                include: defaultTransactionFilterInclude
+              }
+            },
+            {
+              type: "account",
+              name: source.name,
+              network,
+              filter: {
+                type: "transaction",
+                chainId: network.chainId,
+                fromAddress: logFactory,
+                toAddress: void 0,
+                includeReverted: false,
+                fromBlock,
+                toBlock,
+                include: defaultTransactionFilterInclude
+              }
+            },
+            {
+              type: "account",
+              name: source.name,
+              network,
+              filter: {
+                type: "transfer",
+                chainId: network.chainId,
+                fromAddress: void 0,
+                toAddress: logFactory,
+                includeReverted: false,
+                fromBlock,
+                toBlock,
+                include: defaultTransferFilterInclude.concat(
+                  source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
+                )
+              }
+            },
+            {
+              type: "account",
+              name: source.name,
+              network,
+              filter: {
+                type: "transfer",
+                chainId: network.chainId,
+                fromAddress: logFactory,
+                toAddress: void 0,
+                includeReverted: false,
+                fromBlock,
+                toBlock,
+                include: defaultTransferFilterInclude.concat(
+                  source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
+                )
+              }
+            }
+          ];
         }
-      },
-      {
-        type: "account",
-        name: source.name,
-        network,
-        filter: {
-          type: "transfer",
-          chainId: network.chainId,
-          fromAddress: validatedAddress,
-          toAddress: void 0,
-          includeReverted: false,
-          fromBlock,
-          toBlock,
-          include: defaultTransferFilterInclude.concat(
-            source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
-          )
+        for (const address of Array.isArray(resolvedAddress) ? resolvedAddress : [resolvedAddress]) {
+          if (!address.startsWith("0x"))
+            throw new Error(
+              `Validation failed: Invalid prefix for address '${address}'. Got '${address.slice(
+                0,
+                2
+              )}', expected '0x'.`
+            );
+          if (address.length !== 42)
+            throw new Error(
+              `Validation failed: Invalid length for address '${address}'. Got ${address.length}, expected 42 characters.`
+            );
         }
+        const validatedAddress = Array.isArray(resolvedAddress) ? dedupe(resolvedAddress).map((r) => toLowerCase(r)) : resolvedAddress !== void 0 ? toLowerCase(resolvedAddress) : void 0;
+        return [
+          {
+            type: "account",
+            name: source.name,
+            network,
+            filter: {
+              type: "transaction",
+              chainId: network.chainId,
+              fromAddress: void 0,
+              toAddress: validatedAddress,
+              includeReverted: false,
+              fromBlock,
+              toBlock,
+              include: defaultTransactionFilterInclude
+            }
+          },
+          {
+            type: "account",
+            name: source.name,
+            network,
+            filter: {
+              type: "transaction",
+              chainId: network.chainId,
+              fromAddress: validatedAddress,
+              toAddress: void 0,
+              includeReverted: false,
+              fromBlock,
+              toBlock,
+              include: defaultTransactionFilterInclude
+            }
+          },
+          {
+            type: "account",
+            name: source.name,
+            network,
+            filter: {
+              type: "transfer",
+              chainId: network.chainId,
+              fromAddress: void 0,
+              toAddress: validatedAddress,
+              includeReverted: false,
+              fromBlock,
+              toBlock,
+              include: defaultTransferFilterInclude.concat(
+                source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
+              )
+            }
+          },
+          {
+            type: "account",
+            name: source.name,
+            network,
+            filter: {
+              type: "transfer",
+              chainId: network.chainId,
+              fromAddress: validatedAddress,
+              toAddress: void 0,
+              includeReverted: false,
+              fromBlock,
+              toBlock,
+              include: defaultTransferFilterInclude.concat(
+                source.includeTransactionReceipts ? defaultTransactionReceiptInclude : []
+              )
+            }
+          }
+        ];
       }
-    ];
-  }).filter((source) => {
+    )
+  )).flat().filter((source) => {
     const eventName = source.filter.type === "transaction" ? source.filter.fromAddress === void 0 ? `${source.name}:transaction:to` : `${source.name}:transaction:from` : source.filter.fromAddress === void 0 ? `${source.name}:transfer:to` : `${source.name}:transfer:from`;
     const hasRegisteredIndexingFunction = indexingFunctions[eventName] !== void 0;
     if (!hasRegisteredIndexingFunction) {
@@ -2301,34 +2343,34 @@ async function buildConfigAndIndexingFunctions({
     }
     return hasRegisteredIndexingFunction;
   });
-  const blockSources = flattenSources(config.blocks ?? {}).map((source) => {
-    const network = networks.find((n) => n.name === source.network);
-    const intervalMaybeNan = source.interval ?? 1;
-    const interval = Number.isNaN(intervalMaybeNan) ? 0 : intervalMaybeNan;
-    if (!Number.isInteger(interval) || interval === 0) {
-      throw new Error(
-        `Validation failed: Invalid interval for block source '${source.name}'. Got ${interval}, expected a non-zero integer.`
-      );
-    }
-    const startBlockMaybeNan = source.startBlock;
-    const fromBlock = Number.isNaN(startBlockMaybeNan) ? void 0 : startBlockMaybeNan;
-    const endBlockMaybeNan = source.endBlock;
-    const toBlock = Number.isNaN(endBlockMaybeNan) ? void 0 : endBlockMaybeNan;
-    return {
-      type: "block",
-      name: source.name,
-      network,
-      filter: {
-        type: "block",
-        chainId: network.chainId,
-        interval,
-        offset: (fromBlock ?? 0) % interval,
-        fromBlock,
-        toBlock,
-        include: defaultBlockFilterInclude
+  const blockSources = (await Promise.all(
+    flattenSources(config.blocks ?? {}).map(async (source) => {
+      const network = networks.find((n) => n.name === source.network);
+      const intervalMaybeNan = source.interval ?? 1;
+      const interval = Number.isNaN(intervalMaybeNan) ? 0 : intervalMaybeNan;
+      if (!Number.isInteger(interval) || interval === 0) {
+        throw new Error(
+          `Validation failed: Invalid interval for block source '${source.name}'. Got ${interval}, expected a non-zero integer.`
+        );
       }
-    };
-  }).filter((blockSource) => {
+      const fromBlock = await resolveBlockNumber(source.startBlock, network);
+      const toBlock = await resolveBlockNumber(source.endBlock, network);
+      return {
+        type: "block",
+        name: source.name,
+        network,
+        filter: {
+          type: "block",
+          chainId: network.chainId,
+          interval,
+          offset: (fromBlock ?? 0) % interval,
+          fromBlock,
+          toBlock,
+          include: defaultBlockFilterInclude
+        }
+      };
+    })
+  )).flat().filter((blockSource) => {
     const hasRegisteredIndexingFunction = indexingFunctions[`${blockSource.name}:block`] !== void 0;
     if (!hasRegisteredIndexingFunction) {
       logs.push({
@@ -7528,7 +7570,7 @@ import {
 } from "viem";
 
 // src/sync-store/encoding.ts
-import { hexToBigInt as hexToBigInt3, hexToNumber as hexToNumber2 } from "viem";
+import { hexToBigInt as hexToBigInt3, hexToNumber as hexToNumber3 } from "viem";
 var encodeBlock = ({
   block,
   chainId
@@ -7537,7 +7579,7 @@ var encodeBlock = ({
     hash: block.hash,
     chainId,
     checkpoint: encodeCheckpoint({
-      blockTimestamp: hexToNumber2(block.timestamp),
+      blockTimestamp: hexToNumber3(block.timestamp),
       chainId: BigInt(chainId),
       blockNumber: hexToBigInt3(block.number),
       transactionIndex: MAX_CHECKPOINT.transactionIndex,
@@ -7573,7 +7615,7 @@ var encodeLog = ({
     id: `${log.blockHash}-${log.logIndex}`,
     chainId,
     checkpoint: block === void 0 ? null : encodeCheckpoint({
-      blockTimestamp: hexToNumber2(block.timestamp),
+      blockTimestamp: hexToNumber3(block.timestamp),
       chainId: BigInt(chainId),
       blockNumber: hexToBigInt3(log.blockNumber),
       transactionIndex: hexToBigInt3(log.transactionIndex),
@@ -7582,9 +7624,9 @@ var encodeLog = ({
     }),
     blockHash: log.blockHash,
     blockNumber: hexToBigInt3(log.blockNumber),
-    logIndex: hexToNumber2(log.logIndex),
+    logIndex: hexToNumber3(log.logIndex),
     transactionHash: log.transactionHash,
-    transactionIndex: hexToNumber2(log.transactionIndex),
+    transactionIndex: hexToNumber3(log.transactionIndex),
     address: toLowerCase(log.address),
     topic0: log.topics[0] ? log.topics[0] : null,
     topic1: log.topics[1] ? log.topics[1] : null,
@@ -7601,7 +7643,7 @@ var encodeTransaction = ({
   return {
     hash: transaction.hash,
     checkpoint: encodeCheckpoint({
-      blockTimestamp: hexToNumber2(block.timestamp),
+      blockTimestamp: hexToNumber3(block.timestamp),
       chainId: BigInt(chainId),
       blockNumber: hexToBigInt3(transaction.blockNumber),
       transactionIndex: hexToBigInt3(transaction.transactionIndex),
@@ -7618,11 +7660,11 @@ var encodeTransaction = ({
     input: transaction.input,
     maxFeePerGas: transaction.maxFeePerGas ? hexToBigInt3(transaction.maxFeePerGas) : null,
     maxPriorityFeePerGas: transaction.maxPriorityFeePerGas ? hexToBigInt3(transaction.maxPriorityFeePerGas) : null,
-    nonce: hexToNumber2(transaction.nonce),
+    nonce: hexToNumber3(transaction.nonce),
     r: transaction.r ?? null,
     s: transaction.s ?? null,
     to: transaction.to ? toLowerCase(transaction.to) : null,
-    transactionIndex: hexToNumber2(transaction.transactionIndex),
+    transactionIndex: hexToNumber3(transaction.transactionIndex),
     type: transaction.type ?? "0x0",
     value: hexToBigInt3(transaction.value),
     v: transaction.v ? hexToBigInt3(transaction.v) : null
@@ -7645,7 +7687,7 @@ var encodeTransactionReceipt = ({
     logsBloom: transactionReceipt.logsBloom,
     status: transactionReceipt.status,
     to: transactionReceipt.to ? toLowerCase(transactionReceipt.to) : null,
-    transactionIndex: hexToNumber2(transactionReceipt.transactionIndex),
+    transactionIndex: hexToNumber3(transactionReceipt.transactionIndex),
     type: transactionReceipt.type
   };
 };
@@ -7659,7 +7701,7 @@ function encodeTrace({
     id: `${transaction.hash}-${trace.index}`,
     chainId,
     checkpoint: encodeCheckpoint({
-      blockTimestamp: hexToNumber2(block.timestamp),
+      blockTimestamp: hexToNumber3(block.timestamp),
       chainId: BigInt(chainId),
       blockNumber: hexToBigInt3(block.number),
       transactionIndex: hexToBigInt3(transaction.transactionIndex),
@@ -8346,7 +8388,7 @@ import {
   decodeFunctionData,
   decodeFunctionResult,
   hexToBigInt as hexToBigInt5,
-  hexToNumber as hexToNumber3
+  hexToNumber as hexToNumber4
 } from "viem";
 var buildEvents = ({
   sources,
@@ -8388,7 +8430,7 @@ var buildEvents = ({
                   chainId: filter.chainId,
                   sourceIndex: i,
                   checkpoint: encodeCheckpoint({
-                    blockTimestamp: hexToNumber3(block.timestamp),
+                    blockTimestamp: hexToNumber4(block.timestamp),
                     chainId: BigInt(filter.chainId),
                     blockNumber: hexToBigInt5(log.blockNumber),
                     transactionIndex: hexToBigInt5(log.transactionIndex),
@@ -8436,7 +8478,7 @@ var buildEvents = ({
                   chainId: filter.chainId,
                   sourceIndex: i,
                   checkpoint: encodeCheckpoint({
-                    blockTimestamp: hexToNumber3(block.timestamp),
+                    blockTimestamp: hexToNumber4(block.timestamp),
                     chainId: BigInt(filter.chainId),
                     blockNumber: hexToBigInt5(block.number),
                     transactionIndex: BigInt(transaction.transactionIndex),
@@ -8479,7 +8521,7 @@ var buildEvents = ({
                   chainId: filter.chainId,
                   sourceIndex: i,
                   checkpoint: encodeCheckpoint({
-                    blockTimestamp: hexToNumber3(block.timestamp),
+                    blockTimestamp: hexToNumber4(block.timestamp),
                     chainId: BigInt(filter.chainId),
                     blockNumber: hexToBigInt5(block.number),
                     transactionIndex: BigInt(transaction.transactionIndex),
@@ -8525,7 +8567,7 @@ var buildEvents = ({
                   chainId: filter.chainId,
                   sourceIndex: i,
                   checkpoint: encodeCheckpoint({
-                    blockTimestamp: hexToNumber3(block.timestamp),
+                    blockTimestamp: hexToNumber4(block.timestamp),
                     chainId: BigInt(filter.chainId),
                     blockNumber: hexToBigInt5(block.number),
                     transactionIndex: BigInt(transaction.transactionIndex),
@@ -8551,7 +8593,7 @@ var buildEvents = ({
             chainId: filter.chainId,
             sourceIndex: i,
             checkpoint: encodeCheckpoint({
-              blockTimestamp: hexToNumber3(block.timestamp),
+              blockTimestamp: hexToNumber4(block.timestamp),
               chainId: BigInt(filter.chainId),
               blockNumber: hexToBigInt5(block.number),
               transactionIndex: MAX_CHECKPOINT.transactionIndex,
@@ -9020,7 +9062,7 @@ function intervalRange(interval) {
 
 // src/utils/rpc.ts
 import {
-  BlockNotFoundError,
+  BlockNotFoundError as BlockNotFoundError2,
   TransactionReceiptNotFoundError,
   numberToHex
 } from "viem";
@@ -9035,7 +9077,7 @@ var _eth_getBlockByNumber = (requestQueue, {
   ]
 }).then((_block) => {
   if (!_block)
-    throw new BlockNotFoundError({
+    throw new BlockNotFoundError2({
       blockNumber: blockNumber ?? blockTag
     });
   return _block;
@@ -9045,7 +9087,7 @@ var _eth_getBlockByHash = (requestQueue, { hash }) => requestQueue.request({
   params: [hash, true]
 }).then((_block) => {
   if (!_block)
-    throw new BlockNotFoundError({
+    throw new BlockNotFoundError2({
       blockHash: hash
     });
   return _block;
@@ -9171,7 +9213,7 @@ var _debug_traceBlockByHash = (requestQueue, {
 import { getLogsRetryHelper } from "@ponder/utils";
 import {
   hexToBigInt as hexToBigInt6,
-  hexToNumber as hexToNumber4,
+  hexToNumber as hexToNumber5,
   toHex,
   zeroHash
 } from "viem";
@@ -9258,7 +9300,7 @@ var createHistoricalSync = async (args) => {
             });
             if (getLogsErrorResponse.shouldRetry === false)
               throw error;
-            const range2 = hexToNumber4(getLogsErrorResponse.ranges[0].toBlock) - hexToNumber4(getLogsErrorResponse.ranges[0].fromBlock);
+            const range2 = hexToNumber5(getLogsErrorResponse.ranges[0].toBlock) - hexToNumber5(getLogsErrorResponse.ranges[0].fromBlock);
             args.common.logger.debug({
               service: "sync",
               msg: `Caught eth_getLogs error on '${args.network.name}', updating recommended range to ${range2}.`
@@ -9407,7 +9449,7 @@ var createHistoricalSync = async (args) => {
     const address = isAddressFactory(filter.address) ? await syncAddressFactory(filter.address, interval) : filter.address;
     const logs = await syncLogsDynamic({ filter, interval, address });
     const blocks = await Promise.all(
-      logs.map((log) => syncBlock(hexToNumber4(log.blockNumber)))
+      logs.map((log) => syncBlock(hexToNumber5(log.blockNumber)))
     );
     const requiredBlocks = new Set(blocks.map((b) => b.hash));
     for (let i = 0; i < logs.length; i++) {
@@ -9422,7 +9464,7 @@ var createHistoricalSync = async (args) => {
         if (log.transactionHash === zeroHash) {
           args.common.logger.warn({
             service: "sync",
-            msg: `Detected log with empty transaction hash in block ${block.hash} at log index ${hexToNumber4(log.logIndex)}. This is expected for some networks like ZKsync.`
+            msg: `Detected log with empty transaction hash in block ${block.hash} at log index ${hexToNumber5(log.logIndex)}. This is expected for some networks like ZKsync.`
           });
         } else {
           throw new Error(
@@ -9449,7 +9491,7 @@ var createHistoricalSync = async (args) => {
               if (log.transactionHash === zeroHash) {
                 args.common.logger.warn({
                   service: "sync",
-                  msg: `Detected log with empty transaction hash in block ${log.blockHash} at log index ${hexToNumber4(log.logIndex)}. This is expected for some networks like ZKsync.`
+                  msg: `Detected log with empty transaction hash in block ${log.blockHash} at log index ${hexToNumber5(log.logIndex)}. This is expected for some networks like ZKsync.`
                 });
               } else {
                 blockTransactionHashes.add(log.transactionHash);
@@ -9715,10 +9757,10 @@ var createMutex = () => {
 };
 
 // src/sync-realtime/index.ts
-import { hexToNumber as hexToNumber6, zeroHash as zeroHash2 } from "viem";
+import { hexToNumber as hexToNumber7, zeroHash as zeroHash2 } from "viem";
 
 // src/sync-realtime/bloom.ts
-import { hexToBytes, hexToNumber as hexToNumber5, keccak256 } from "viem";
+import { hexToBytes, hexToNumber as hexToNumber6, keccak256 } from "viem";
 var zeroLogsBloom = "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
 var BLOOM_SIZE_BYTES = 256;
 var isInBloom = (_bloom, input) => {
@@ -9735,7 +9777,7 @@ function isFilterInBloom({
   block,
   filter
 }) {
-  if (hexToNumber5(block.number) < (filter.fromBlock ?? 0) || hexToNumber5(block.number) > (filter.toBlock ?? Number.POSITIVE_INFINITY)) {
+  if (hexToNumber6(block.number) < (filter.fromBlock ?? 0) || hexToNumber6(block.number) > (filter.toBlock ?? Number.POSITIVE_INFINITY)) {
     return false;
   }
   const isTopicsInBloom = [
@@ -9861,7 +9903,7 @@ var createRealtimeSync = (args) => {
   }) => {
     args.common.logger.debug({
       service: "realtime",
-      msg: `Started syncing '${args.network.name}' block ${hexToNumber6(block.number)}`
+      msg: `Started syncing '${args.network.name}' block ${hexToNumber7(block.number)}`
     });
     for (const log of factoryLogs) {
       for (const filter of factories) {
@@ -9996,12 +10038,12 @@ var createRealtimeSync = (args) => {
       const text = _text.filter((t) => t !== void 0).join(" and ");
       args.common.logger.info({
         service: "realtime",
-        msg: `Synced ${text} from '${args.network.name}' block ${hexToNumber6(block.number)}`
+        msg: `Synced ${text} from '${args.network.name}' block ${hexToNumber7(block.number)}`
       });
     } else {
       args.common.logger.info({
         service: "realtime",
-        msg: `Synced block ${hexToNumber6(block.number)} from '${args.network.name}' `
+        msg: `Synced block ${hexToNumber7(block.number)} from '${args.network.name}' `
       });
     }
     unfinalizedBlocks.push(syncBlockToLightBlock(block));
@@ -10017,20 +10059,20 @@ var createRealtimeSync = (args) => {
       transactionReceipts,
       endClock
     });
-    const blockMovesFinality = hexToNumber6(block.number) >= hexToNumber6(finalizedBlock.number) + 2 * args.network.finalityBlockCount;
+    const blockMovesFinality = hexToNumber7(block.number) >= hexToNumber7(finalizedBlock.number) + 2 * args.network.finalityBlockCount;
     if (blockMovesFinality) {
       const pendingFinalizedBlock = unfinalizedBlocks.find(
-        (lb) => hexToNumber6(lb.number) === hexToNumber6(block.number) - args.network.finalityBlockCount
+        (lb) => hexToNumber7(lb.number) === hexToNumber7(block.number) - args.network.finalityBlockCount
       );
       args.common.logger.debug({
         service: "realtime",
-        msg: `Finalized ${hexToNumber6(pendingFinalizedBlock.number) - hexToNumber6(finalizedBlock.number) + 1} '${args.network.name}' blocks [${hexToNumber6(finalizedBlock.number) + 1}, ${hexToNumber6(pendingFinalizedBlock.number)}]`
+        msg: `Finalized ${hexToNumber7(pendingFinalizedBlock.number) - hexToNumber7(finalizedBlock.number) + 1} '${args.network.name}' blocks [${hexToNumber7(finalizedBlock.number) + 1}, ${hexToNumber7(pendingFinalizedBlock.number)}]`
       });
       const finalizedBlocks = unfinalizedBlocks.filter(
-        (lb) => hexToNumber6(lb.number) <= hexToNumber6(pendingFinalizedBlock.number)
+        (lb) => hexToNumber7(lb.number) <= hexToNumber7(pendingFinalizedBlock.number)
       );
       unfinalizedBlocks = unfinalizedBlocks.filter(
-        (lb) => hexToNumber6(lb.number) > hexToNumber6(pendingFinalizedBlock.number)
+        (lb) => hexToNumber7(lb.number) > hexToNumber7(pendingFinalizedBlock.number)
       );
       for (const filter of factories) {
         for (const { hash } of finalizedBlocks) {
@@ -10068,13 +10110,13 @@ var createRealtimeSync = (args) => {
   const handleReorg = async (block) => {
     args.common.logger.warn({
       service: "realtime",
-      msg: `Detected forked '${args.network.name}' block at height ${hexToNumber6(block.number)}`
+      msg: `Detected forked '${args.network.name}' block at height ${hexToNumber7(block.number)}`
     });
     const reorgedBlocks = unfinalizedBlocks.filter(
-      (lb) => hexToNumber6(lb.number) >= hexToNumber6(block.number)
+      (lb) => hexToNumber7(lb.number) >= hexToNumber7(block.number)
     );
     unfinalizedBlocks = unfinalizedBlocks.filter(
-      (lb) => hexToNumber6(lb.number) < hexToNumber6(block.number)
+      (lb) => hexToNumber7(lb.number) < hexToNumber7(block.number)
     );
     let remoteBlock = block;
     while (true) {
@@ -10082,7 +10124,7 @@ var createRealtimeSync = (args) => {
       if (parentBlock.hash === remoteBlock.parentHash)
         break;
       if (unfinalizedBlocks.length === 0) {
-        const msg = `Encountered unrecoverable '${args.network.name}' reorg beyond finalized block ${hexToNumber6(finalizedBlock.number)}`;
+        const msg = `Encountered unrecoverable '${args.network.name}' reorg beyond finalized block ${hexToNumber7(finalizedBlock.number)}`;
         args.common.logger.warn({ service: "realtime", msg });
         throw new Error(msg);
       } else {
@@ -10096,7 +10138,7 @@ var createRealtimeSync = (args) => {
     await args.onEvent({ type: "reorg", block: commonAncestor, reorgedBlocks });
     args.common.logger.warn({
       service: "realtime",
-      msg: `Reconciled ${reorgedBlocks.length}-block '${args.network.name}' reorg with common ancestor block ${hexToNumber6(commonAncestor.number)}`
+      msg: `Reconciled ${reorgedBlocks.length}-block '${args.network.name}' reorg with common ancestor block ${hexToNumber7(commonAncestor.number)}`
     });
     unfinalizedChildAddresses.clear();
     for (const filter of factories) {
@@ -10188,7 +10230,7 @@ var createRealtimeSync = (args) => {
           if (log.transactionHash === zeroHash2) {
             args.common.logger.warn({
               service: "sync",
-              msg: `Detected '${args.network.name}' log with empty transaction hash in block ${block.hash} at log index ${hexToNumber6(log.logIndex)}. This is expected for some networks like ZKsync.`
+              msg: `Detected '${args.network.name}' log with empty transaction hash in block ${block.hash} at log index ${hexToNumber7(log.logIndex)}. This is expected for some networks like ZKsync.`
             });
           } else {
             throw new Error(
@@ -10201,7 +10243,7 @@ var createRealtimeSync = (args) => {
     if (shouldRequestLogs === false && args.sources.some((s) => s.filter.type === "log")) {
       args.common.logger.debug({
         service: "realtime",
-        msg: `Skipped fetching '${args.network.name}' logs for block ${hexToNumber6(block.number)} due to bloom filter result`
+        msg: `Skipped fetching '${args.network.name}' logs for block ${hexToNumber7(block.number)} due to bloom filter result`
       });
     }
     const shouldRequestTraces = traceFilters.length > 0 || transferFilters.length > 0;
@@ -10246,7 +10288,7 @@ var createRealtimeSync = (args) => {
           if (log.transactionHash === zeroHash2) {
             args.common.logger.warn({
               service: "sync",
-              msg: `Detected '${args.network.name}' log with empty transaction hash in block ${block.hash} at log index ${hexToNumber6(log.logIndex)}. This is expected for some networks like ZKsync.`
+              msg: `Detected '${args.network.name}' log with empty transaction hash in block ${block.hash} at log index ${hexToNumber7(log.logIndex)}. This is expected for some networks like ZKsync.`
             });
           } else {
             requiredTransactions.add(log.transactionHash);
@@ -10344,22 +10386,22 @@ var createRealtimeSync = (args) => {
           if (latestBlock.hash === block.hash) {
             args.common.logger.trace({
               service: "realtime",
-              msg: `Skipped processing '${args.network.name}' block ${hexToNumber6(block.number)}, already synced`
+              msg: `Skipped processing '${args.network.name}' block ${hexToNumber7(block.number)}, already synced`
             });
             return;
           }
           try {
-            if (hexToNumber6(latestBlock.number) >= hexToNumber6(block.number)) {
+            if (hexToNumber7(latestBlock.number) >= hexToNumber7(block.number)) {
               await handleReorg(block);
               processBlock.clear();
               return;
             }
-            if (hexToNumber6(latestBlock.number) + 1 < hexToNumber6(block.number)) {
+            if (hexToNumber7(latestBlock.number) + 1 < hexToNumber7(block.number)) {
               const missingBlockRange = range(
-                hexToNumber6(latestBlock.number) + 1,
+                hexToNumber7(latestBlock.number) + 1,
                 Math.min(
-                  hexToNumber6(block.number),
-                  hexToNumber6(latestBlock.number) + MAX_QUEUED_BLOCKS
+                  hexToNumber7(block.number),
+                  hexToNumber7(latestBlock.number) + MAX_QUEUED_BLOCKS
                 )
               );
               const pendingBlocks = await Promise.all(
@@ -10371,9 +10413,9 @@ var createRealtimeSync = (args) => {
               );
               args.common.logger.debug({
                 service: "realtime",
-                msg: `Fetched ${missingBlockRange.length} missing '${args.network.name}' blocks [${hexToNumber6(latestBlock.number) + 1}, ${Math.min(
-                  hexToNumber6(block.number),
-                  hexToNumber6(latestBlock.number) + MAX_QUEUED_BLOCKS
+                msg: `Fetched ${missingBlockRange.length} missing '${args.network.name}' blocks [${hexToNumber7(latestBlock.number) + 1}, ${Math.min(
+                  hexToNumber7(block.number),
+                  hexToNumber7(latestBlock.number) + MAX_QUEUED_BLOCKS
                 )}]`
               });
               processBlock.clear();
@@ -10398,7 +10440,7 @@ var createRealtimeSync = (args) => {
             }
             args.common.logger.warn({
               service: "realtime",
-              msg: `Failed to process '${args.network.name}' block ${hexToNumber6(block.number)}`,
+              msg: `Failed to process '${args.network.name}' block ${hexToNumber7(block.number)}`,
               error
             });
             const duration = ERROR_TIMEOUT[consecutiveErrors];
@@ -10411,7 +10453,7 @@ var createRealtimeSync = (args) => {
             if (++consecutiveErrors === ERROR_TIMEOUT.length) {
               args.common.logger.error({
                 service: "realtime",
-                msg: `Fatal error: Unable to process '${args.network.name}' block ${hexToNumber6(block.number)} after ${ERROR_TIMEOUT.length} attempts.`,
+                msg: `Fatal error: Unable to process '${args.network.name}' block ${hexToNumber7(block.number)} after ${ERROR_TIMEOUT.length} attempts.`,
                 error
               });
               args.onFatalError(error);
@@ -10426,13 +10468,13 @@ var createRealtimeSync = (args) => {
           });
           args.common.logger.debug({
             service: "realtime",
-            msg: `Received latest '${args.network.name}' block ${hexToNumber6(block.number)}`
+            msg: `Received latest '${args.network.name}' block ${hexToNumber7(block.number)}`
           });
           const latestBlock = getLatestUnfinalizedBlock();
           if (latestBlock.hash === block.hash) {
             args.common.logger.trace({
               service: "realtime",
-              msg: `Skipped processing '${args.network.name}' block ${hexToNumber6(block.number)}, already synced`
+              msg: `Skipped processing '${args.network.name}' block ${hexToNumber7(block.number)}, already synced`
             });
             return;
           }
@@ -10601,7 +10643,7 @@ var zipperMany = (arrays, compare) => {
 };
 
 // src/sync/index.ts
-import { hexToBigInt as hexToBigInt7, hexToNumber as hexToNumber7, toHex as toHex2 } from "viem";
+import { hexToBigInt as hexToBigInt7, hexToNumber as hexToNumber8, toHex as toHex2 } from "viem";
 var syncBlockToLightBlock = ({
   hash,
   parentHash,
@@ -10616,7 +10658,7 @@ var syncBlockToLightBlock = ({
 var blockToCheckpoint = (block, chainId, rounding) => {
   return {
     ...rounding === "up" ? MAX_CHECKPOINT : ZERO_CHECKPOINT,
-    blockTimestamp: hexToNumber7(block.timestamp),
+    blockTimestamp: hexToNumber8(block.timestamp),
     chainId: BigInt(chainId),
     blockNumber: hexToBigInt7(block.number)
   };
@@ -10625,16 +10667,16 @@ var isSyncEnd = (syncProgress) => {
   if (syncProgress.end === void 0 || syncProgress.current === void 0) {
     return false;
   }
-  return hexToNumber7(syncProgress.current.number) >= hexToNumber7(syncProgress.end.number);
+  return hexToNumber8(syncProgress.current.number) >= hexToNumber8(syncProgress.end.number);
 };
 var isSyncFinalized = (syncProgress) => {
   if (syncProgress.current === void 0) {
     return false;
   }
-  return hexToNumber7(syncProgress.current.number) >= hexToNumber7(syncProgress.finalized.number);
+  return hexToNumber8(syncProgress.current.number) >= hexToNumber8(syncProgress.finalized.number);
 };
 var getHistoricalLast = (syncProgress) => {
-  return syncProgress.end === void 0 ? syncProgress.finalized : hexToNumber7(syncProgress.end.number) > hexToNumber7(syncProgress.finalized.number) ? syncProgress.finalized : syncProgress.end;
+  return syncProgress.end === void 0 ? syncProgress.finalized : hexToNumber8(syncProgress.end.number) > hexToNumber8(syncProgress.finalized.number) ? syncProgress.finalized : syncProgress.end;
 };
 var splitEvents = (events) => {
   let hash;
@@ -10735,8 +10777,8 @@ var createSync = async (params) => {
     );
     if (localBlock !== void 0) {
       status[network.name].block = {
-        timestamp: hexToNumber7(localBlock.timestamp),
-        number: hexToNumber7(localBlock.number)
+        timestamp: hexToNumber8(localBlock.timestamp),
+        number: hexToNumber8(localBlock.number)
       };
     }
   };
@@ -10820,7 +10862,7 @@ var createSync = async (params) => {
         });
         params.common.logger.debug({
           service: "sync",
-          msg: `Extracted ${events.length} '${network.name}' events for block ${hexToNumber7(event.block.number)}`
+          msg: `Extracted ${events.length} '${network.name}' events for block ${hexToNumber8(event.block.number)}`
         });
         if (params.ordering === "multichain") {
           const checkpoint = getMultichainCheckpoint({
@@ -10828,15 +10870,15 @@ var createSync = async (params) => {
             network
           });
           status[network.name].block = {
-            timestamp: hexToNumber7(event.block.timestamp),
-            number: hexToNumber7(event.block.number)
+            timestamp: hexToNumber8(event.block.timestamp),
+            number: hexToNumber8(event.block.number)
           };
           const readyEvents = events.concat(pendingEvents);
           pendingEvents = [];
           executedEvents = executedEvents.concat(readyEvents);
           params.common.logger.debug({
             service: "sync",
-            msg: `Sequenced ${readyEvents.length} '${network.name}' events for block ${hexToNumber7(event.block.number)}`
+            msg: `Sequenced ${readyEvents.length} '${network.name}' events for block ${hexToNumber8(event.block.number)}`
           });
           params.onRealtimeEvent({
             type: "block",
@@ -10930,7 +10972,7 @@ var createSync = async (params) => {
       case "reorg": {
         let reorgedEvents = 0;
         const isReorgedEvent = ({ chainId, block }) => {
-          if (chainId === network.chainId && Number(block.number) > hexToNumber7(event.block.number)) {
+          if (chainId === network.chainId && Number(block.number) > hexToNumber8(event.block.number)) {
             reorgedEvents++;
             return true;
           }
@@ -11041,7 +11083,7 @@ var createSync = async (params) => {
               );
               params.common.logger.info({
                 service: "sync",
-                msg: `Killing '${network.name}' live indexing because the end block ${hexToNumber7(syncProgress.end.number)} has been finalized`
+                msg: `Killing '${network.name}' live indexing because the end block ${hexToNumber8(syncProgress.end.number)} has been finalized`
               });
               realtimeSync.kill();
             }
@@ -11119,8 +11161,8 @@ var createSync = async (params) => {
         const { syncProgress, realtimeSync } = perNetworkSync.get(network);
         const filters = params.indexingBuild.sources.filter(({ filter }) => filter.chainId === network.chainId).map(({ filter }) => filter);
         status[network.name].block = {
-          number: hexToNumber7(syncProgress.current.number),
-          timestamp: hexToNumber7(syncProgress.current.timestamp)
+          number: hexToNumber8(syncProgress.current.number),
+          timestamp: hexToNumber8(syncProgress.current.timestamp)
         };
         status[network.name].ready = true;
         const from = getOmnichainCheckpoint({ tag: "finalized" });
@@ -11223,30 +11265,30 @@ var getPerChainOnRealtimeSyncEvent = ({
         syncProgress.current = event.block;
         common.logger.debug({
           service: "sync",
-          msg: `Updated '${network.name}' current block to ${hexToNumber7(event.block.number)}`
+          msg: `Updated '${network.name}' current block to ${hexToNumber8(event.block.number)}`
         });
         common.metrics.ponder_sync_block.set(
           { network: network.name },
-          hexToNumber7(syncProgress.current.number)
+          hexToNumber8(syncProgress.current.number)
         );
         unfinalizedBlocks.push(event);
         return event;
       }
       case "finalize": {
         const finalizedInterval = [
-          hexToNumber7(syncProgress.finalized.number),
-          hexToNumber7(event.block.number)
+          hexToNumber8(syncProgress.finalized.number),
+          hexToNumber8(event.block.number)
         ];
         syncProgress.finalized = event.block;
         common.logger.debug({
           service: "sync",
-          msg: `Updated '${network.name}' finalized block to ${hexToNumber7(event.block.number)}`
+          msg: `Updated '${network.name}' finalized block to ${hexToNumber8(event.block.number)}`
         });
         const finalizedBlocks = unfinalizedBlocks.filter(
-          ({ block }) => hexToNumber7(block.number) <= hexToNumber7(event.block.number)
+          ({ block }) => hexToNumber8(block.number) <= hexToNumber8(event.block.number)
         );
         unfinalizedBlocks = unfinalizedBlocks.filter(
-          ({ block }) => hexToNumber7(block.number) > hexToNumber7(event.block.number)
+          ({ block }) => hexToNumber8(block.number) > hexToNumber8(event.block.number)
         );
         await Promise.all([
           syncStore.insertBlocks({
@@ -11322,14 +11364,14 @@ var getPerChainOnRealtimeSyncEvent = ({
         syncProgress.current = event.block;
         common.logger.debug({
           service: "sync",
-          msg: `Updated '${network.name}' current block to ${hexToNumber7(event.block.number)}`
+          msg: `Updated '${network.name}' current block to ${hexToNumber8(event.block.number)}`
         });
         common.metrics.ponder_sync_block.set(
           { network: network.name },
-          hexToNumber7(syncProgress.current.number)
+          hexToNumber8(syncProgress.current.number)
         );
         unfinalizedBlocks = unfinalizedBlocks.filter(
-          ({ block }) => hexToNumber7(block.number) <= hexToNumber7(event.block.number)
+          ({ block }) => hexToNumber8(block.number) <= hexToNumber8(event.block.number)
         );
         await syncStore.pruneRpcRequestResult({
           chainId: network.chainId,
@@ -11414,10 +11456,10 @@ async function* getLocalSyncGenerator({
   historicalSync
 }) {
   const label = { network: network.name };
-  let cursor = hexToNumber7(syncProgress.start.number);
+  let cursor = hexToNumber8(syncProgress.start.number);
   const last = getHistoricalLast(syncProgress);
   let estimateRange = 25;
-  if (hexToNumber7(syncProgress.start.number) > hexToNumber7(syncProgress.finalized.number)) {
+  if (hexToNumber8(syncProgress.start.number) > hexToNumber8(syncProgress.finalized.number)) {
     syncProgress.current = syncProgress.finalized;
     common.logger.warn({
       service: "sync",
@@ -11425,15 +11467,15 @@ async function* getLocalSyncGenerator({
     });
     common.metrics.ponder_sync_block.set(
       label,
-      hexToNumber7(syncProgress.current.number)
+      hexToNumber8(syncProgress.current.number)
     );
     common.metrics.ponder_historical_total_blocks.set(label, 0);
     common.metrics.ponder_historical_cached_blocks.set(label, 0);
     return;
   }
   const totalInterval = [
-    hexToNumber7(syncProgress.start.number),
-    hexToNumber7(last.number)
+    hexToNumber8(syncProgress.start.number),
+    hexToNumber8(last.number)
   ];
   common.logger.debug({
     service: "sync",
@@ -11464,12 +11506,12 @@ async function* getLocalSyncGenerator({
   if (syncProgress.current !== void 0) {
     common.metrics.ponder_sync_block.set(
       label,
-      hexToNumber7(syncProgress.current.number)
+      hexToNumber8(syncProgress.current.number)
     );
     yield encodeCheckpoint(
       blockToCheckpoint(syncProgress.current, network.chainId, "up")
     );
-    if (hexToNumber7(syncProgress.current.number) === hexToNumber7(last.number)) {
+    if (hexToNumber8(syncProgress.current.number) === hexToNumber8(last.number)) {
       common.logger.info({
         service: "sync",
         msg: `Skipped '${network.name}' historical sync because all blocks are cached`
@@ -11483,7 +11525,7 @@ async function* getLocalSyncGenerator({
         )} cached`
       });
     }
-    cursor = hexToNumber7(syncProgress.current.number) + 1;
+    cursor = hexToNumber8(syncProgress.current.number) + 1;
   } else {
     common.logger.info({
       service: "historical",
@@ -11492,8 +11534,8 @@ async function* getLocalSyncGenerator({
   }
   while (true) {
     const interval = [
-      Math.min(cursor, hexToNumber7(last.number)),
-      Math.min(cursor + estimateRange, hexToNumber7(last.number))
+      Math.min(cursor, hexToNumber8(last.number)),
+      Math.min(cursor + estimateRange, hexToNumber8(last.number))
     ];
     const endClock = startClock();
     const synced = await historicalSync.sync(interval);
@@ -11503,13 +11545,13 @@ async function* getLocalSyncGenerator({
     });
     cursor = interval[1] + 1;
     if (synced === void 0) {
-      if (interval[1] === hexToNumber7(last.number)) {
+      if (interval[1] === hexToNumber8(last.number)) {
         syncProgress.current = last;
       } else {
         continue;
       }
     } else {
-      if (interval[1] === hexToNumber7(last.number)) {
+      if (interval[1] === hexToNumber8(last.number)) {
         syncProgress.current = last;
       } else {
         syncProgress.current = synced;
@@ -11517,7 +11559,7 @@ async function* getLocalSyncGenerator({
       const duration = endClock();
       common.metrics.ponder_sync_block.set(
         label,
-        hexToNumber7(syncProgress.current.number)
+        hexToNumber8(syncProgress.current.number)
       );
       common.metrics.ponder_historical_duration.observe(label, duration);
       common.metrics.ponder_historical_completed_blocks.inc(
@@ -11574,7 +11616,7 @@ var getLocalSyncProgress = async ({
   );
   const finalized = Math.max(
     0,
-    hexToNumber7(diagnostics[1].number) - network.finalityBlockCount
+    hexToNumber8(diagnostics[1].number) - network.finalityBlockCount
   );
   syncProgress.finalized = await _eth_getBlockByNumber(requestQueue, {
     blockNumber: finalized
@@ -11583,7 +11625,7 @@ var getLocalSyncProgress = async ({
   if (diagnostics.length === 4) {
     syncProgress.current = diagnostics[3];
   }
-  if (hexToNumber7(diagnostics[0]) !== network.chainId) {
+  if (hexToNumber8(diagnostics[0]) !== network.chainId) {
     common.logger.warn({
       service: "sync",
       msg: `Remote chain ID (${diagnostics[0]}) does not match configured chain ID (${network.chainId}) for network "${network.name}"`
@@ -11593,7 +11635,7 @@ var getLocalSyncProgress = async ({
     return syncProgress;
   }
   const end = Math.max(...filters.map((filter) => filter.toBlock));
-  if (end > hexToNumber7(diagnostics[1].number)) {
+  if (end > hexToNumber8(diagnostics[1].number)) {
     syncProgress.end = {
       number: toHex2(end),
       hash: "0x",