starting to get there

Author: FilipHarald

k8s/local/aztec-listener/sp_testnet/deployment.yaml

@@ -54,7 +54,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: global
-                  key: SP_TESTNET_OBSCURA_L2_RPC_1
+                  #key: SP_TESTNET_OBSCURA_L2_RPC_1
                   #key: SP_TESTNET_OBSCURA_L2_RPC_2
-                  #key: SP_TESTNET_AZTEC_L2_BOOTNODE_RPC
+                  key: SP_TESTNET_AZTEC_L2_BOOTNODE_RPC
 status: {}

k8s/local/ethereum-listener/remote_devnet/deployment.yaml

@@ -20,7 +20,7 @@ spec:
         - image: ethereum-listener:latest
           resources:
             limits:
-              memory: 150Mi
+              memory: 300Mi
               cpu: 500m
           name: ethereum-listener
           env:

k8s/local/ethereum-listener/sandbox/deployment.yaml

@@ -32,7 +32,7 @@ spec:
         - image: ethereum-listener:latest
           resources:
             limits:
-              memory: 150Mi
+              memory: 300Mi
               cpu: 500m
           name: ethereum-listener
           envFrom:

k8s/local/ethereum-listener/sp_testnet/deployment.yaml

@@ -32,7 +32,7 @@ spec:
         - image: ethereum-listener:latest
           resources:
             limits:
-              memory: 150Mi
+              memory: 300Mi
               cpu: 500m
           name: ethereum-listener
           envFrom:

k8s/production/ethereum-listener/devnet/deployment.yaml

@@ -23,7 +23,7 @@ spec:
           name: ethereum-listener
           resources:
             limits:
-              memory: 150Mi
+              memory: 300Mi
               cpu: 500m
           env:
             - name: NODE_ENV

k8s/production/ethereum-listener/sp_testnet/deployment.yaml

@@ -23,7 +23,7 @@ spec:
           name: ethereum-listener
           resources:
             limits:
-              memory: 150Mi
+              memory: 300Mi
               cpu: 500m
           env:
             - name: NODE_ENV

services/ethereum-listener/src/network-client/client.ts

@@ -6,7 +6,13 @@ import {
   chicmozL1L2ValidatorSchema,
   getL1NetworkId,
 } from "@chicmoz-pkg/types";
-import { PublicClient, createPublicClient, defineChain, webSocket } from "viem";
+import {
+  PublicClient,
+  createPublicClient,
+  defineChain,
+  http,
+  webSocket,
+} from "viem";
 import { foundry, mainnet, sepolia } from "viem/chains";
 import {
   ETHEREUM_HTTP_RPC_URL,
@@ -18,11 +24,21 @@ import { logger } from "../logger.js";
 import { getL1Contracts } from "./contracts/index.js";
 export { startContractWatchers as watchContractsEvents } from "./contracts/index.js";
 
-let publicClient: PublicClient | undefined = undefined;
+let publicWsClient: PublicClient | undefined = undefined;
+let publicHttpClient: PublicClient | undefined = undefined;
 
-export const getPublicClient = () => {
-  if (!publicClient) throw new Error("Client not initialized");
-  return publicClient;
+export const getPublicWsClient = () => {
+  if (!publicWsClient) {
+    throw new Error("Client not initialized");
+  }
+  return publicWsClient;
+};
+
+export const getPublicHttpClient = () => {
+  if (!publicHttpClient) {
+    throw new Error("Client not initialized");
+  }
+  return publicHttpClient;
 };
 
 export const initClient = () => {
@@ -46,18 +62,19 @@ export const initClient = () => {
       },
     },
   });
-  publicClient = createPublicClient({
+  publicWsClient = createPublicClient({
     chain,
     transport: webSocket(),
   });
+  publicHttpClient = createPublicClient({ chain, transport: http() });
 };
 
 export const getLatestHeight = async () => {
-  return await getPublicClient().getBlockNumber();
+  return await getPublicHttpClient().getBlockNumber();
 };
 
 export const getBlock = async (blockNumber: number) => {
-  return await getPublicClient().getBlock({
+  return await getPublicHttpClient().getBlock({
     blockNumber: BigInt(blockNumber),
   });
 };
@@ -67,21 +84,23 @@ const json = (param: unknown): string => {
     param,
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     (_key, value) => (typeof value === "bigint" ? value.toString() : value),
-    2
+    2,
   );
 };
 
 export const emitRandomizedChangeWithinRandomizedTime = async (
   depth: number,
-  oldValues: ChicmozL1L2Validator
+  oldValues: ChicmozL1L2Validator,
 ) => {
-  if (depth === 0) return;
+  if (depth === 0) {
+    return;
+  }
   const rand = Math.random();
   const sleepTime = 30000;
   logger.info(
     `ATTESTER ${oldValues.attester} - DEPTH ${depth} - SLEEP ${
       sleepTime / 1000
-    }s`
+    }s`,
   );
   await new Promise((resolve) => setTimeout(resolve, sleepTime));
   let newValues = oldValues;
@@ -129,8 +148,10 @@ export const emitRandomizedChangeWithinRandomizedTime = async (
 export const queryStakingStateAndEmitUpdates = async () => {
   // TODO: this entire function should be replaced with a watch on the contract (and some initial state query)
   const l1Contracts = await getL1Contracts();
-  if (!l1Contracts) throw new Error("Contracts not initialized");
-  const attesterCount = await getPublicClient().readContract({
+  if (!l1Contracts) {
+    throw new Error("Contracts not initialized");
+  }
+  const attesterCount = await getPublicHttpClient().readContract({
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
     address: l1Contracts.rollup.address as `0x${string}`,
     abi: RollupAbi,
@@ -139,14 +160,14 @@ export const queryStakingStateAndEmitUpdates = async () => {
   logger.info(`Active attester count: ${attesterCount.toString()}`);
   if (attesterCount > 0) {
     for (let i = 0; i < attesterCount; i++) {
-      const attester = await getPublicClient().readContract({
+      const attester = await getPublicHttpClient().readContract({
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         address: l1Contracts.rollup.address as `0x${string}`,
         abi: RollupAbi,
         functionName: "getAttesterAtIndex",
         args: [BigInt(i)],
       });
-      const attesterInfo = await getPublicClient().readContract({
+      const attesterInfo = await getPublicHttpClient().readContract({
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         address: l1Contracts.rollup.address as `0x${string}`,
         abi: RollupAbi,
@@ -158,7 +179,7 @@ export const queryStakingStateAndEmitUpdates = async () => {
         chicmozL1L2ValidatorSchema.parse({
           ...attesterInfo,
           attester,
-        })
+        }),
       );
     }
   } else {
@@ -186,16 +207,16 @@ export const queryStakingStateAndEmitUpdates = async () => {
           chicmozL1L2ValidatorSchema.parse({
             ...attesterInfo,
             attester: attesterInfo.attester,
-          })
+          }),
         );
       }
       for (const attesterInfo of mockedAttesters) {
         await emitRandomizedChangeWithinRandomizedTime(
           100,
-          chicmozL1L2ValidatorSchema.parse(attesterInfo)
+          chicmozL1L2ValidatorSchema.parse(attesterInfo),
         ).catch((e) => {
           logger.error(
-            `Randomized change emission failed: ${(e as Error).stack}`
+            `Randomized change emission failed: ${(e as Error).stack}`,
           );
         });
       }

services/ethereum-listener/src/network-client/contracts/get-events.ts

@@ -1,6 +1,6 @@
 import { PublicClient } from "viem";
 import { controllers as dbControllers } from "../../svcs/database/index.js";
-import { getPublicClient } from "../client.js";
+import { getPublicHttpClient } from "../client.js";
 import {
   l2BlockProposedEventCallbacks,
   l2ProofVerifiedEventCallbacks,
@@ -13,20 +13,23 @@ const getRollupL2BlockProposedLogs = async ({
   client,
   contracts,
   toBlock,
+  latestHeight,
 }: {
   client: PublicClient;
   contracts: AztecContracts;
   toBlock: "finalized";
+  latestHeight: bigint;
 }) => {
   const { fromBlock, updateHeight, storeHeight } =
     await dbControllers.inMemoryHeightTracker({
       contractName: "rollup",
       contractAddress: contracts.rollup.address,
       eventName: "L2BlockProposed",
       isFinalized: GET_EVENETS_DEFAULT_IS_FINALIZED,
+      latestHeight,
     });
   const rollupL2BlockProposedLogs = await client.getContractEvents({
-    fromBlock,
+    fromBlock: fromBlock === 1n ? "finalized" : fromBlock,
     toBlock,
     eventName: "L2BlockProposed",
     address: contracts.rollup.address,
@@ -43,20 +46,23 @@ const getRollupL2ProofVerifiedLogs = async ({
   client,
   contracts,
   toBlock,
+  latestHeight,
 }: {
   client: PublicClient;
   contracts: AztecContracts;
   toBlock: "finalized";
+  latestHeight: bigint;
 }) => {
   const { fromBlock, updateHeight, storeHeight } =
     await dbControllers.inMemoryHeightTracker({
       contractName: "rollup",
       contractAddress: contracts.rollup.address,
       eventName: "L2ProofVerified",
       isFinalized: GET_EVENETS_DEFAULT_IS_FINALIZED,
+      latestHeight,
     });
   const rollupL2ProofVerifiedLogs = await client.getContractEvents({
-    fromBlock,
+    fromBlock: fromBlock === 1n ? "finalized" : fromBlock,
     toBlock,
     eventName: "L2ProofVerified",
     address: contracts.rollup.address,
@@ -72,11 +78,24 @@ const getRollupL2ProofVerifiedLogs = async ({
 export const getAllContractsEvents = async ({
   contracts,
   toBlock,
+  latestHeight,
 }: {
   contracts: AztecContracts;
   toBlock: "finalized";
+  latestHeight: bigint;
 }) => {
-  const client = getPublicClient();
-  await getRollupL2BlockProposedLogs({ client, contracts, toBlock });
-  await getRollupL2ProofVerifiedLogs({ client, contracts, toBlock });
+  const client = getPublicHttpClient();
+  // TODO: batch-query if genesis-catcup
+  await getRollupL2BlockProposedLogs({
+    client,
+    contracts,
+    toBlock,
+    latestHeight,
+  });
+  await getRollupL2ProofVerifiedLogs({
+    client,
+    contracts,
+    toBlock,
+    latestHeight,
+  });
 };

services/ethereum-listener/src/network-client/contracts/index.ts

@@ -6,49 +6,55 @@ import {
   RollupAbi,
 } from "@aztec/l1-artifacts";
 import { controllers as dbControllers } from "../../svcs/database/index.js";
-import { getPublicClient } from "../client.js";
+import { getLatestHeight, getPublicHttpClient } from "../client.js";
 import { getAllContractsEvents } from "./get-events.js";
 import { AztecContracts, UnwatchCallback, getTypedContract } from "./utils.js";
 import { watchAllContractsEvents } from "./watch-events.js";
 
 export const getL1Contracts = async (): Promise<AztecContracts> => {
   const dbContracts = await dbControllers.getL1Contracts();
-  const publicClient = getPublicClient();
+  const publicClient = getPublicHttpClient();
   return {
     rollup: getTypedContract(
       RollupAbi,
       dbContracts.rollupAddress as `0x${string}`,
-      publicClient
+      publicClient,
     ),
     registry: getTypedContract(
       RegistryAbi,
       dbContracts.registryAddress as `0x${string}`,
-      publicClient
+      publicClient,
     ),
     inbox: getTypedContract(
       InboxAbi,
       dbContracts.inboxAddress as `0x${string}`,
-      publicClient
+      publicClient,
     ),
     outbox: getTypedContract(
       OutboxAbi,
       dbContracts.outboxAddress as `0x${string}`,
-      publicClient
+      publicClient,
     ),
     feeJuicePortal: getTypedContract(
       FeeJuicePortalAbi,
       dbContracts.feeJuiceAddress as `0x${string}`,
-      publicClient
+      publicClient,
     ),
   };
 };
 
 export const startContractWatchers = async (): Promise<UnwatchCallback> => {
   const contracts = await getL1Contracts();
-  return watchAllContractsEvents({ contracts });
+  const latestHeight = await getLatestHeight();
+  return watchAllContractsEvents({ contracts, latestHeight });
 };
 
 export const getFinalizedContractEvents = async () => {
   const contracts = await getL1Contracts();
-  return getAllContractsEvents({ contracts, toBlock: "finalized" });
+  const latestHeight = await getLatestHeight();
+  return getAllContractsEvents({
+    contracts,
+    latestHeight,
+    toBlock: "finalized",
+  });
 };