feat: storing l2 contract data

k8s/local/aztec-devnet-node/deployment.yaml

@@ -38,7 +38,10 @@ spec:
             - name: DEBUG
               value: "aztec:*"
             - name: ETHEREUM_HOST
-              value: "https://devnet-mainnet-fork.aztec.network:8545/$(CHICMOZ_AZTEC_API_KEY)" # TODO: WARNING! We need to have this as env-var
+              valueFrom:
+                secretKeyRef:
+                  name: global
+                  key: CHICMOZ_AZTEC_ETHEREUM_HOST
             - name: L1_CHAIN_ID
               value: "677692"
             - name: ARCHIVER_POLLING_INTERVAL_MS
@@ -58,7 +61,10 @@ spec:
             - name: AZTEC_PORT
               value: "8080"
             - name: FAUCET_ENDPOINT
-              value: "https://api.aztec.network/devnet/aztec-faucet/$(CHICMOZ_AZTEC_API_KEY)"
+              valueFrom:
+                secretKeyRef:
+                  name: global
+                  key: CHICMOZ_AZTEC_FAUCET_ENDPOINT
             - name: PRIVATE_KEY
               valueFrom:
                 secretKeyRef:

k8s/local/aztec-listener/deployment.yaml

@@ -44,7 +44,7 @@ spec:
             - name: NODE_ENV
               value: "development"
             - name: BLOCK_INTERVAL_MS
-              value: "2000"
+              value: "5000"
             - name: BATCH_SIZE
               value: "50"
             - name: CHAIN_NAME
@@ -72,6 +72,10 @@ spec:
             - name: DISABLE_AZTEC
               value: "false"
             - name: AZTEC_RPC
-              # value: "http://aztec-devnet-node:8080" # DEVNET
-              value: "http://aztec-sandbox-node:8081" # SANDBOX
+              #value: "http://aztec-devnet-node:8080" # DEVNET
+              #value: "http://aztec-sandbox-node:8081" # SANDBOX
+              valueFrom:
+                secretKeyRef:
+                  name: global
+                  key: CHICMOZ_AZTEC_RPC
 status: {}

k8s/local/explorer-api/deployment.yaml

@@ -61,8 +61,6 @@ spec:
               value: "admin"
             - name: POSTGRES_PASSWORD
               value: "secret-local-password"
-            - name: BLOCK_INTERVAL_MS
-              value: "2000"
             - name: BLOCK_DB_VALIDATION_ENABLED
               value: "false"
             - name: BLOCK_DB_VALIDATION_INTERVAL

k8s/local/skaffold.local.yaml

@@ -49,17 +49,17 @@ build:
 manifests:
   rawYaml:
     - k8s/local/common/namespace.yaml
-    # - k8s/local/explorer-ui/ingress.yaml
-    # - k8s/local/explorer-ui/deployment.yaml
-    # - k8s/local/explorer-ui/service.yaml
+    #- k8s/local/explorer-ui/ingress.yaml
+    #- k8s/local/explorer-ui/deployment.yaml
+    #- k8s/local/explorer-ui/service.yaml
     - k8s/local/explorer-api/ingress.yaml
     - k8s/local/explorer-api/deployment.yaml
     - k8s/local/explorer-api/service.yaml
     - k8s/local/auth/deployment.yaml
     - k8s/local/auth/service.yaml
-    - k8s/local/dummy-node/ingress.yaml
-    - k8s/local/dummy-node/deployment.yaml
-    - k8s/local/dummy-node/service.yaml
+    # - k8s/local/dummy-node/ingress.yaml
+    # - k8s/local/dummy-node/deployment.yaml
+    # - k8s/local/dummy-node/service.yaml
     - k8s/local/aztec-listener/deployment.yaml
     #- k8s/local/aztec-devnet-node/deployment.yaml # DEVNET
     #- k8s/local/aztec-devnet-node/service.yaml # DEVNET
@@ -70,9 +70,9 @@ manifests:
     - k8s/local/anvil-ethereum-node/ingress.yaml # SANDBOX
     - k8s/local/anvil-ethereum-node/deployment.yaml # SANDBOX
     - k8s/local/anvil-ethereum-node/service.yaml # SANDBOX
-    - k8s/local/kafka-ui/configmap.yaml
-    - k8s/local/kafka-ui/configmap-env.yaml
-    - k8s/local/kafka-ui/ingress.yaml
+    # - k8s/local/kafka-ui/configmap.yaml
+    # - k8s/local/kafka-ui/configmap-env.yaml
+    # - k8s/local/kafka-ui/ingress.yaml
   helm:
     releases:
       - name: ingress-nginx
@@ -137,17 +137,17 @@ manifests:
         skipBuildDependencies: false
         useHelmSecrets: false
         wait: false
-      - name: kafka-ui
-        version: 0.7.6
-        remoteChart: kafka-ui
-        repo: https://provectus.github.io/kafka-ui-charts
-        namespace: chicmoz
-        setValues:
-          yamlApplicationConfigConfigMap.name: kafka-ui-configmap
-          yamlApplicationConfigConfigMap.keyName: config.yml
-          existingConfigMap: kafka-ui-helm-values
-        createNamespace: false
-        recreatePods: false
-        skipBuildDependencies: false
-        useHelmSecrets: false
-        wait: false
+        #- name: kafka-ui
+        #  version: 0.7.6
+        #  remoteChart: kafka-ui
+        #  repo: https://provectus.github.io/kafka-ui-charts
+        #  namespace: chicmoz
+        #  setValues:
+        #    yamlApplicationConfigConfigMap.name: kafka-ui-configmap
+        #    yamlApplicationConfigConfigMap.keyName: config.yml
+        #    existingConfigMap: kafka-ui-helm-values
+        #  createNamespace: false
+        #  recreatePods: false
+        #  skipBuildDependencies: false
+        #  useHelmSecrets: false
+        #  wait: false

packages/message-registry/src/aztec.ts

@@ -1,7 +1,7 @@
-import { NodeInfoAlias } from '@chicmoz-pkg/types';
+import { NodeInfo } from '@chicmoz-pkg/types';
 
 export type NewBlockEvent = {
-  nodeInfo: NodeInfoAlias;
+  nodeInfo: NodeInfo;
   block?: string;
 };
 

packages/types/src/aztec/index.ts

@@ -1,13 +1,4 @@
 export * from "./l2Block.js";
+export * from "./l2Contract.js";
 
-// TODO: the import should work, but instead we're using a type alias
-// import { type NodeInfo } from "@aztec/aztec.js";
-export type NodeInfoAlias = {
-  nodeVersion: string;
-  l1ChainId: number;
-  protocolVersion: number;
-  enr: string | undefined;
-  l1ContractAddresses: object;
-  protocolContractAddresses: object;
-};
-
+export { type NodeInfo } from "@aztec/aztec.js";

packages/types/src/aztec/l2Block.ts

@@ -1,49 +1,9 @@
 import { z } from "zod";
 import { deepPartial } from "../utils.js";
+import { bufferSchema, frSchema } from "./utils.js";
 
 // TODO: separate type for transaction?
 
-type AztecFr = {
-  toString(): string;
-};
-
-type StringifiedAztecFr = {
-  type: "Fr";
-  value: string;
-};
-
-const frSchema = z.preprocess(
-  (val) => {
-    if ((val as StringifiedAztecFr).value)
-      return (val as StringifiedAztecFr).value;
-    else if ((val as AztecFr).toString) return (val as AztecFr).toString();
-    else return val;
-  },
-  z
-    .string()
-    .length(66)
-    .regex(/^0x[0-9a-fA-F]+$/)
-);
-
-type StringifiedBuffer = {
-  type: "Buffer";
-  data: number[];
-};
-
-const bufferSchema = z.preprocess(
-  (val) => {
-    if ((val as StringifiedBuffer).data)
-      return Buffer.from((val as StringifiedBuffer).data);
-    return val;
-  },
-  z.custom<Buffer>(
-    (value) => {
-      return value instanceof Buffer;
-    },
-    { message: "Expected a Buffer" }
-  )
-);
-
 export const noteEncryptedLogEntrySchema = z.object({
   data: z.string(),
 });

packages/types/src/aztec/l2Contract.ts

@@ -0,0 +1,41 @@
+import { z } from "zod";
+import { aztecAddressSchema, bufferSchema, frSchema } from "./utils.js";
+import { chicmozL2BlockSchema } from "./l2Block.js";
+
+export const chicmozL2ContractInstanceDeployedEventSchema = z.object({
+  address: aztecAddressSchema,
+  blockHash: chicmozL2BlockSchema.shape.hash,
+  version: z.number(),
+  salt: frSchema,
+  contractClassId: frSchema,
+  initializationHash: frSchema,
+  publicKeysHash: frSchema,
+  deployer: aztecAddressSchema,
+});
+
+export type ChicmozL2ContractInstanceDeployedEvent = z.infer<
+  typeof chicmozL2ContractInstanceDeployedEventSchema
+>;
+
+export const chicmozL2ContractClassRegisteredEventSchema = z.object({
+  blockHash: chicmozL2BlockSchema.shape.hash,
+  contractClassId: frSchema,
+  version: z.number(),
+  artifactHash: frSchema,
+  privateFunctionsRoot: frSchema,
+  packedPublicBytecode: bufferSchema,
+});
+
+export type ChicmozL2ContractClassRegisteredEvent = z.infer<
+  typeof chicmozL2ContractClassRegisteredEventSchema
+>;
+
+export const chicmozL2ContractInstanceDeluxeSchema = z.object({
+  ...chicmozL2ContractInstanceDeployedEventSchema.shape,
+  ...chicmozL2ContractClassRegisteredEventSchema.shape,
+});
+
+// TODO: come up with a better name for this type
+export type ChicmozL2ContractInstanceDeluxe =
+  ChicmozL2ContractInstanceDeployedEvent &
+    ChicmozL2ContractClassRegisteredEvent;

packages/types/src/aztec/utils.ts

@@ -0,0 +1,54 @@
+import { z } from "zod";
+
+export type AztecFr = {
+  toString(): string;
+};
+
+export type AztecAddress = {
+  toString(): string;
+};
+
+export type StringifiedAztecFr = {
+  type: "Fr";
+  value: `0x${string}`;
+};
+
+export type StringifiedAztecAddress = {
+  type: "AztecAddress";
+  value: `0x${string}`;
+};
+
+export const frSchema = z.preprocess(
+  (val) => {
+    if ((val as StringifiedAztecFr).value)
+      return (val as StringifiedAztecFr).value;
+    else if ((val as AztecFr).toString) return (val as AztecFr).toString();
+    else return val;
+  },
+  z
+    .string()
+    .length(66)
+    .regex(/^0x[0-9a-fA-F]+$/)
+);
+
+// NOTE: it's technically not the same as Fr but practically it is
+export const aztecAddressSchema = frSchema;
+
+export type StringifiedBuffer = {
+  type: "Buffer";
+  data: number[];
+};
+
+export const bufferSchema = z.preprocess(
+  (val) => {
+    if ((val as StringifiedBuffer).data)
+      return Buffer.from((val as StringifiedBuffer).data);
+    return val;
+  },
+  z.custom<Buffer>(
+    (value) => {
+      return value instanceof Buffer;
+    },
+    { message: "Expected a Buffer" }
+  )
+);

packages/types/src/general.ts

@@ -0,0 +1,10 @@
+import { z } from "zod";
+
+export const hexStringSchema = z.custom<`0x${string}`>(
+  (value) => {
+    return (value as string).startsWith("0x");
+  },
+  { message: "Expected a hex string" }
+);
+
+export type HexString = z.infer<typeof hexStringSchema>;

packages/types/src/index.ts

@@ -1,2 +1,3 @@
 export * from "./events.js";
 export * from "./aztec/index.js";
+export * from "./general.js";

packages/types/tsconfig.json

@@ -59,8 +59,8 @@
     // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
     /* Modules */
-    "module": "ESNext" /* Specify what module code is generated. */,
-    "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
+    "module": "NodeNext" /* Specify what module code is generated. */,
+    "moduleResolution": "NodeNext" /* Specify how TypeScript looks up a file from a given module specifier. */,
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
     "outDir": "./build" /* Specify an output folder for all emitted files. */,
     "rootDir": "./src" /* Specify the root folder within your source files. */,

services/aztec-listener/package.json

@@ -5,6 +5,7 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@aztec/aztec.js": "0.53.0",
+    "@aztec/circuits.js": "0.53.0",
     "@chicmoz-pkg/logger-server": "workspace:^",
     "@chicmoz-pkg/message-bus": "workspace:^",
     "@chicmoz-pkg/message-registry": "workspace:^",

services/aztec-listener/scripts/migrate.ts

@@ -29,14 +29,17 @@ async function runMigrations() {
         console.log(`Retrying attempt ${attemptNumber} of ${retries}...`);
         return true;
       }
-      console.error(e.stack);
+      console.error(e);
       return false;
     },
   });
 
-  console.log("🤩 Migrations complete!");
-
   await pool.end();
+  console.log("🤩 Migrations complete!");
 }
 
-runMigrations().catch(console.error);
+runMigrations().catch(async (e) => {
+  console.error(e);
+  await pool.end();
+  process.exit(1);
+});

services/aztec-listener/src/aztec/index.ts

@@ -1,5 +1,5 @@
 import { IBackOffOptions, backOff } from "exponential-backoff";
-import { NodeInfoAlias } from "@chicmoz-pkg/types";
+import { NodeInfo } from "@chicmoz-pkg/types";
 import { logger } from "../logger.js";
 import {
   getLatestHeight,
@@ -16,11 +16,7 @@ const backOffOptions: Partial<IBackOffOptions> = {
   numOfAttempts: 10,
   maxDelay: 10000,
   retry: (e, attemptNumber: number) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    if (e.cause)
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      logger.warn(e.cause);
-    else logger.warn(e);
+    logger.warn(e);
 
     logger.info(
       `🤡 We'll allow some errors during start-up, retrying attempt ${attemptNumber}...`
@@ -29,7 +25,7 @@ const backOffOptions: Partial<IBackOffOptions> = {
   },
 };
 
-let nodeInfo: NodeInfoAlias;
+let nodeInfo: NodeInfo;
 
 export const init = async () => {
   if (DISABLE_AZTEC) {
@@ -51,7 +47,7 @@ export const init = async () => {
   // startCatchup({ untilHeight: currentHeight });
   // Should it be blocking?
 
-  if (LISTEN_FOR_BLOCKS) await startPolling({ fromHeight: currentHeight });
+  if (LISTEN_FOR_BLOCKS) startPolling({ fromHeight: currentHeight });
 
   return {
     shutdownAztec: () => {