chore: improved stats-cards with long content

README.md

@@ -11,7 +11,7 @@ Requirements:
 **terminal 1:**
 
 ```sh
-minikube start --kubernetes-version=v1.25.3 --cpus max --memory max && skaffold run
+minikube start --kubernetes-version=v1.25.3 --cpus max --memory max && skaffold run -f k8s/local/skaffold.default.yaml
 ```
 
 **terminal 2:**
@@ -25,35 +25,40 @@ minikube start --kubernetes-version=v1.25.3 --cpus max --memory max && skaffold
 ./scripts/miscallaneous.sh
 ```
 
-### with Sandbox
+Now you can access the explorer at http://explorer-ui.localhost and also...
 
-Default settings is to run against the Devnet, if you want to run against the Sandbox you need to do one of the following:
+- API: http://explorer-api.localhost
+- index of API: http://explorer-api.localhost/v1/d1e2083a-660c-4314-a6f2-1d42f4b944f4/l2/index
+
+### Different Aztec-setups
 
-#### Option 1 - your own existing sandbox running on your machine
+#### Option 1 - default
 
-Update the `CHICMOZ_AZTEC_RPC` in the `.chicmoz-local.env` to your sandbox rpc url.
+Default settings is to set up a sandbox in the local cluster.
 
-#### Option 2 - run the sandbox in the local cluster
+#### Option 0 - connect to your already running sandbox or to public devnet
 
-Update to the commented out config in both...
+Update the `CHICMOZ_AZTEC_RPC` in the `.chicmoz-local.env` to desired endpoint and then run
 
-- `k8s/local/skaffold.local.yaml`
-- `k8s/local/aztec-listener/deployment.yaml`
+```sh
+skaffold run -f k8s/local/skaffold.remote_aztec.yaml
+```
 
 ## Pro tip
 
+### 1
+
 after the first time you have deployed the app you can run the following command to have faster deployments:
 
 ```sh
-skaffold run -f k8s/local/skaffold.local.light.yaml
+skaffold run -f k8s/local/skaffold.default_dev.yaml
 ```
 
-when developing locally you can command out the creation of the `explorer-ui` and run it locally
+### 2
+
+if you run the explorer with `skaffold run -f k8s/local/skaffold.no_ui.yaml` you can run the explorer-ui locally for even faster development:
 
 ```
 cd services/exporer-ui/
 yarn dev
 ```
-
-- API: http://explorer-api.localhost
-- index of API: http://explorer-api.localhost/v1/d1e2083a-660c-4314-a6f2-1d42f4b944f4/l2/index

k8s/local/skaffold.remote_devnet.local.yaml → k8s/local/skaffold.remote_aztec.yaml

@@ -25,7 +25,7 @@ manifests:
     - k8s/local/auth/deployment.yaml
     - k8s/local/auth/service.yaml
     - k8s/local/aztec-event-cannon/deployment.yaml
-    - k8s/local/aztec-listener/remote_devnet_deployment.yaml
+    - k8s/local/aztec-listener/remote_aztec_deployment.yaml
   helm:
     releases:
       - name: ingress-nginx

packages/types/src/aztec/l2TxEffect.ts

@@ -18,6 +18,7 @@ export const unencryptedLogEntrySchema = z.object({
 
 export const chicmozL2PendingTxSchema = z.object({
   hash: hexStringSchema,
+  birthTimestamp: z.number().optional(),
   data: z.string(),
   noteEncryptedLogs: z.string(),
   encryptedLogs: z.string(),
@@ -27,6 +28,9 @@ export const chicmozL2PendingTxSchema = z.object({
   publicTeardownFunctionCall: z.string(),
 });
 
+/**
+  * Represents effects of a transaction on the L2 state.
+  */
 export const chicmozL2TxEffectSchema = z.object({
   revertCode: z.preprocess(
     (val) => {
@@ -35,8 +39,11 @@ export const chicmozL2TxEffectSchema = z.object({
     },
     z.object({ code: z.number() }),
   ),
+  /** The hash of the transaction that caused these effects. */
   hash: hexStringSchema,
-  txHash: hexStringSchema.optional(), // TODO: remove optional
+  /** The hash of the transaction and its effects. */
+  txHash: hexStringSchema,
+  txBirthTimestamp: z.number().optional(),
   transactionFee: frNumberSchema,
   noteHashes: z.array(frSchema),
   nullifiers: z.array(frSchema),

packages/types/src/aztec/special.ts

@@ -19,6 +19,7 @@ export type ChicmozL2ContractInstanceDeluxe = z.infer<
 export const chicmozL2TxEffectDeluxeSchema = z.object({
   ...chicmozL2TxEffectSchema.shape,
   blockHeight: z.lazy(() => chicmozL2BlockSchema.shape.height),
+  txBirthTimestamp: z.number(),
   timestamp: z.lazy(
     () =>
       chicmozL2BlockSchema.shape.header.shape.globalVariables.shape.timestamp

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

@@ -1,5 +1,5 @@
 import { Tx } from "@aztec/aztec.js";
-import { BLOCK_POLL_INTERVAL_MS } from "../constants.js";
+import { TX_POLL_INTERVAL_MS } from "../constants.js";
 import { getPendingTxs } from "./network-client.js";
 import { onPendingTxs } from "../event-handler/index.js";
 
@@ -8,7 +8,7 @@ let pollInterval: NodeJS.Timeout;
 export const startPolling = () => {
   pollInterval = setInterval(() => {
     void fetchAndPublishPendingTxs();
-  }, BLOCK_POLL_INTERVAL_MS);
+  }, TX_POLL_INTERVAL_MS);
 };
 
 export const stopPolling = () => {

services/aztec-listener/src/constants.ts

@@ -1,4 +1,5 @@
-export const BLOCK_POLL_INTERVAL_MS = Number(process.env.BLOCK_INTERVAL_MS) || 2000;
+export const BLOCK_POLL_INTERVAL_MS = Number(process.env.BLOCK_INTERVAL_MS) || 3000;
+export const TX_POLL_INTERVAL_MS = Number(process.env.TX_POLL_INTERVAL_MS) || 500;
 export const MAX_BATCH_SIZE_FETCH_MISSED_BLOCKS = Number(process.env.MAX_BATCH_SIZE_FETCH_MISSED_BLOCKS) || 50;
 export const AZTEC_LISTEN_FOR_BLOCKS = process.env.AZTEC_LISTEN_FOR_BLOCKS === "true";
 export const AZTEC_LISTEN_FOR_PENDING_TXS = process.env.AZTEC_LISTEN_FOR_PENDING_TXS === "true";

services/explorer-api/migrations/0000_absurd_carlie_cooper.sql → services/explorer-api/migrations/0000_clean_post.sql

@@ -59,6 +59,8 @@ CREATE TABLE IF NOT EXISTS "public_data_write" (
 --> statement-breakpoint
 CREATE TABLE IF NOT EXISTS "tx_effect" (
 	"hash" varchar PRIMARY KEY NOT NULL,
+	"txHash" varchar NOT NULL,
+	"tx_time_of_birth" timestamp DEFAULT now() NOT NULL,
 	"index" integer NOT NULL,
 	"revert_code" smallint NOT NULL,
 	"transaction_fee" bigint NOT NULL,
@@ -160,6 +162,18 @@ CREATE TABLE IF NOT EXISTS "state" (
 	"partial_id" uuid NOT NULL
 );
 --> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "tx" (
+	"hash" varchar PRIMARY KEY NOT NULL,
+	"birth_timestamp" timestamp DEFAULT now() NOT NULL,
+	"data" text NOT NULL,
+	"note_encrypted_logs" text NOT NULL,
+	"encrypted_logs" text NOT NULL,
+	"unencrypted_logs" text NOT NULL,
+	"client_ivc_proof" text NOT NULL,
+	"enqueued_public_functions" jsonb NOT NULL,
+	"public_teardown_function_call" text NOT NULL
+);
+--> statement-breakpoint
 CREATE TABLE IF NOT EXISTS "l2_contract_class_registered" (
 	"block_hash" varchar NOT NULL,
 	"contract_class_id" varchar(66) NOT NULL,
@@ -364,3 +378,5 @@ DO $$ BEGIN
 EXCEPTION
  WHEN duplicate_object THEN null;
 END $$;
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "tx_hash_index" ON "tx_effect" USING btree ("txHash");

services/explorer-api/migrations/meta/0000_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "6ea46951-3aa8-4e0c-813c-5831c4d6e2f9",
+  "id": "cfc8941b-919b-4bbe-9e32-fa2c7eb733bb",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -359,6 +359,19 @@
           "primaryKey": true,
           "notNull": true
         },
+        "txHash": {
+          "name": "txHash",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tx_time_of_birth": {
+          "name": "tx_time_of_birth",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
         "index": {
           "name": "index",
           "type": "integer",
@@ -414,7 +427,23 @@
           "notNull": true
         }
       },
-      "indexes": {},
+      "indexes": {
+        "tx_hash_index": {
+          "name": "tx_hash_index",
+          "columns": [
+            {
+              "expression": "txHash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
@@ -1007,6 +1036,71 @@
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
     },
+    "public.tx": {
+      "name": "tx",
+      "schema": "",
+      "columns": {
+        "hash": {
+          "name": "hash",
+          "type": "varchar",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "birth_timestamp": {
+          "name": "birth_timestamp",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "data": {
+          "name": "data",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "note_encrypted_logs": {
+          "name": "note_encrypted_logs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "encrypted_logs": {
+          "name": "encrypted_logs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unencrypted_logs": {
+          "name": "unencrypted_logs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_ivc_proof": {
+          "name": "client_ivc_proof",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enqueued_public_functions": {
+          "name": "enqueued_public_functions",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "public_teardown_function_call": {
+          "name": "public_teardown_function_call",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "public.l2_contract_class_registered": {
       "name": "l2_contract_class_registered",
       "schema": "",

services/explorer-api/migrations/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1730468944923,
-      "tag": "0000_absurd_carlie_cooper",
+      "when": 1730817509967,
+      "tag": "0000_clean_post",
       "breakpoints": true
     }
   ]

services/explorer-api/src/database/controllers/index.ts

@@ -1,6 +1,7 @@
 export * as l2Block from "./l2block/index.js";
 export * as l2Contract from "./l2contract/index.js";
 export * as l2TxEffect from "./l2TxEffect/index.js";
+export * as l2Tx from "./l2Tx/index.js";
 export * as l2 from "./l2/index.js";
 export * as signOfLife from "./sign-of-life.js";
 export * as aztecChainConnection from "./aztec-chain-connection.js";

services/explorer-api/src/database/controllers/l2Tx/get-tx.ts

@@ -0,0 +1,24 @@
+import {
+  chicmozL2PendingTxSchema,
+  type ChicmozL2PendingTx,
+} from "@chicmoz-pkg/types";
+import { asc, getTableColumns } from "drizzle-orm";
+import { z } from "zod";
+import { getDb as db } from "../../../database/index.js";
+import { l2Tx } from "../../../database/schema/l2tx/index.js";
+
+export const getTxs = async (): Promise<ChicmozL2PendingTx[]> => {
+  const res = await db()
+    .select({
+      ...getTableColumns(l2Tx),
+    })
+    .from(l2Tx)
+    .orderBy(asc(l2Tx.birthTimestamp));
+  if (!res) return [];
+  return z.array(chicmozL2PendingTxSchema).parse(
+    res.map((tx) => ({
+      ...tx,
+      birthTimestamp: tx.birthTimestamp.getTime(),
+    }))
+  );
+};

services/explorer-api/src/database/controllers/l2Tx/index.ts

@@ -0,0 +1,3 @@
+export * from "./get-tx.js";
+export * from "./replace-txs-with-tx-effects.js";
+export * from "./store.js";

services/explorer-api/src/database/controllers/l2Tx/replace-txs-with-tx-effects.ts

@@ -0,0 +1,28 @@
+import { type ChicmozL2TxEffect } from "@chicmoz-pkg/types";
+import { eq } from "drizzle-orm";
+import { getDb as db } from "../../../database/index.js";
+import { l2Tx } from "../../../database/schema/l2tx/index.js";
+import { logger } from "../../../logger.js";
+
+export const replaceTxsWithTxEffects = async (
+  txEffects: ChicmozL2TxEffect[]
+): Promise<void> => {
+  return await db().transaction(async (dbTx) => {
+    for (const txEffect of Object.values(txEffects)) {
+      const tx = await dbTx
+        .delete(l2Tx)
+        .where(eq(l2Tx.hash, txEffect.txHash))
+        .returning();
+      if (!tx) continue;
+      logger.info(`🕐🔥 Replacing tx with txEffect: ${txEffect.txHash}`);
+      if (tx[0]?.birthTimestamp) {
+        await dbTx
+          .update(l2Tx)
+          .set({
+            birthTimestamp: tx[0].birthTimestamp,
+          })
+          .where(eq(l2Tx.hash, txEffect.txHash));
+      }
+    }
+  });
+};

services/explorer-api/src/database/controllers/l2Tx/store.ts

@@ -0,0 +1,13 @@
+import { type ChicmozL2PendingTx } from "@chicmoz-pkg/types";
+import { getDb as db } from "../../../database/index.js";
+import { l2Tx } from "../../schema/l2tx/index.js";
+
+export const storeL2Tx = async (tx: ChicmozL2PendingTx): Promise<void> => {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { birthTimestamp, ...rest } = tx;
+  await db()
+    .insert(l2Tx)
+    .values({
+      ...rest,
+    });
+};