Merge branch 'next' into merge-train/barretenberg

Author: AztecBot

.github/workflows/nightly-spartan-bench.yml

@@ -2,8 +2,7 @@ name: Nightly Spartan Benchmarks
 
 on:
   schedule:
-    # Run every night at 3:00 AM UTC (1 hour after nightly release tag at 2:00 AM)
-    - cron: "0 3 * * *"
+    - cron: "0 4 * * *"
   workflow_dispatch:
     inputs:
       nightly_tag:

spartan/scripts/install_deps.sh

@@ -1,20 +1,25 @@
 #!/usr/bin/env bash
-echo "Installing dependencies..."
 source $(git rev-parse --show-toplevel)/ci3/source
-echo "Source loaded"
+
+log() { echo "[INFO]  $(date -Is) - $*"; }
+err() { echo "[ERROR] $(date -Is) - $*" >&2; }
+die() { err "$*"; exit 1; }
+require_cmd() { command -v "$1" >/dev/null 2>&1 || die "Required command not found: $1"; }
+
+log "Installing dependencies..."
 
 # if kubectl is not installed, install it
 if ! command -v kubectl &> /dev/null; then
-  echo "Installing kubectl..."
-  curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/$(os)/$(arch)/kubectl"
+  log "Installing kubectl..."
+  curl -sLO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/$(os)/$(arch)/kubectl"
   chmod +x kubectl
   sudo mv kubectl /usr/local/bin/kubectl
 fi
 
 # Install kind if it is not installed
 if ! command -v kind &> /dev/null; then
-  echo "Installing kind..."
-  curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/v0.23.0/kind-$(os)-$(arch)
+  log "Installing kind..."
+  curl -sLo ./kind https://github.com/kubernetes-sigs/kind/releases/download/v0.23.0/kind-$(os)-$(arch)
   chmod +x ./kind
   sudo mv ./kind /usr/local/bin/kind
 fi
@@ -28,7 +33,7 @@ function get_helm_from_cache {
     elif [ -f ./usr/local/bin/helm ]; then
       sudo mv ./usr/local/bin/helm /usr/local/bin/helm
     else 
-      echo "Could not extract helm from cache"
+      err "Could not extract helm from cache"
       return 1
     fi
     sudo chmod +x /usr/local/bin/helm
@@ -38,16 +43,16 @@ function get_helm_from_cache {
 
 # Install helm if it is not installed
 if ! command -v helm &> /dev/null; then
-  echo "Installing helm..."
+  log "Installing helm..."
 
   # Determine the helm artifact name based on OS and architecture
   helm_artifact="helm-$(os)-$(arch).tar.gz"
   helm_release_url="https://github.com/helm/helm/releases/tag/v3.19.0"
 
   if get_helm_from_cache "$helm_artifact" >/dev/null; then
-    echo "Using cached Helm binary"
+    log "Using cached Helm binary"
   else
-    echo "Downloading Helm from get.helm.sh..."
+    log "Downloading Helm from get.helm.sh..."
     # Download and run the official Helm installer script
     curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
     chmod +x get_helm.sh
@@ -63,9 +68,9 @@ if ! command -v helm &> /dev/null; then
 fi
 
 if ! command -v stern &> /dev/null; then
-  echo "Installing stern..."
+  log "Installing stern..."
   # Download Stern
-  curl -Lo stern.tar.gz https://github.com/stern/stern/releases/download/v1.31.0/stern_1.31.0_$(os)_$(arch).tar.gz
+  curl -sLo stern.tar.gz https://github.com/stern/stern/releases/download/v1.31.0/stern_1.31.0_$(os)_$(arch).tar.gz
 
   # Extract the binary
   tar -xzf stern.tar.gz
@@ -82,8 +87,8 @@ if ! command -v stern &> /dev/null; then
 fi
 
 if ! command -v gcloud &> /dev/null; then
-  echo "Installing gcloud..."
-  curl -Lo google-cloud-cli.tar.gz https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-$os-$(arch).tar.gz
+  log "Installing gcloud..."
+  curl -sLo google-cloud-cli.tar.gz https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-$os-$(arch).tar.gz
   tar -xzf google-cloud-cli.tar.gz
   rm google-cloud-cli.tar.gz
 
@@ -105,20 +110,17 @@ if command -v gcloud &> /dev/null; then
     if dpkg -l google-cloud-cli-gke-gcloud-auth-plugin 2>/dev/null | grep -q "^ii"; then
       : # do nothing
     else
-      echo "Installing GKE auth plugin for kubectl via apt..."
+      log "Installing GKE auth plugin for kubectl via apt..."
       sudo apt-get update
       sudo apt-get install -y google-cloud-cli-gke-gcloud-auth-plugin
     fi
   else
-    echo "Installing GKE auth plugin for kubectl via gcloud components..."
+    log "Installing GKE auth plugin for kubectl via gcloud components..."
     gcloud components install gke-gcloud-auth-plugin
   fi
 fi
 
 
-# Sanity check commands
-require_cmd() { command -v "$1" >/dev/null 2>&1 || die "Required command not found: $1"; }
-
 require_cmd git
 require_cmd kubectl
 require_cmd terraform

yarn-project/archiver/src/archiver/archiver_store_test_suite.ts

@@ -28,7 +28,7 @@ import {
   SerializableContractInstance,
   computePublicBytecodeCommitment,
 } from '@aztec/stdlib/contract';
-import { LogId, PrivateLog, PublicLog } from '@aztec/stdlib/logs';
+import { ContractClassLog, LogId, PrivateLog, PublicLog } from '@aztec/stdlib/logs';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
 import {
   makeContractClassPublic,
@@ -905,13 +905,15 @@ export function describeArchiverDataStore(
           [
             expect.objectContaining({
               blockNumber: 2,
+              blockHash: L2BlockHash.fromField(await blocks[2 - 1].block.hash()),
               log: makePrivateLog(tags[0]),
               isFromPublic: false,
             }),
           ],
           [
             expect.objectContaining({
               blockNumber: 1,
+              blockHash: L2BlockHash.fromField(await blocks[1 - 1].block.hash()),
               log: makePrivateLog(tags[1]),
               isFromPublic: false,
             }),
@@ -929,11 +931,13 @@ export function describeArchiverDataStore(
           [
             expect.objectContaining({
               blockNumber: 1,
+              blockHash: L2BlockHash.fromField(await blocks[1 - 1].block.hash()),
               log: makePrivateLog(tags[0]),
               isFromPublic: false,
             }),
             expect.objectContaining({
               blockNumber: 1,
+              blockHash: L2BlockHash.fromField(await blocks[1 - 1].block.hash()),
               log: makePublicLog(tags[0]),
               isFromPublic: true,
             }),
@@ -959,11 +963,13 @@ export function describeArchiverDataStore(
           [
             expect.objectContaining({
               blockNumber: 1,
+              blockHash: L2BlockHash.fromField(await blocks[1 - 1].block.hash()),
               log: makePrivateLog(tags[0]),
               isFromPublic: false,
             }),
             expect.objectContaining({
               blockNumber: newBlockNumber,
+              blockHash: L2BlockHash.fromField(await blocks[newBlockNumber - 1].block.hash()),
               log: newLog,
               isFromPublic: false,
             }),
@@ -983,6 +989,7 @@ export function describeArchiverDataStore(
           [
             expect.objectContaining({
               blockNumber: 1,
+              blockHash: L2BlockHash.fromField(await blocks[1 - 1].block.hash()),
               log: makePrivateLog(tags[1]),
               isFromPublic: false,
             }),
@@ -1050,6 +1057,17 @@ export function describeArchiverDataStore(
         }
       });
 
+      it('returns block hash on public log ids', async () => {
+        const targetBlock = blocks[0].block;
+        const expectedBlockHash = L2BlockHash.fromField(await targetBlock.hash());
+
+        const logs = (await store.getPublicLogs({ fromBlock: targetBlock.number, toBlock: targetBlock.number + 1 }))
+          .logs;
+
+        expect(logs.length).toBeGreaterThan(0);
+        expect(logs.every(log => log.id.blockHash.equals(expectedBlockHash))).toBe(true);
+      });
+
       it('"fromBlock" and "toBlock" filter params are respected', async () => {
         // Set "fromBlock" and "toBlock"
         const fromBlock = 3;
@@ -1092,8 +1110,14 @@ export function describeArchiverDataStore(
         const targetBlockIndex = randomInt(numBlocks);
         const targetTxIndex = randomInt(txsPerBlock);
         const targetLogIndex = randomInt(numPublicLogs);
+        const targetBlockHash = L2BlockHash.fromField(await blocks[targetBlockIndex].block.hash());
 
-        const afterLog = new LogId(BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM), targetTxIndex, targetLogIndex);
+        const afterLog = new LogId(
+          BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM),
+          targetBlockHash,
+          targetTxIndex,
+          targetLogIndex,
+        );
 
         const response = await store.getPublicLogs({ afterLog });
         const logs = response.logs;
@@ -1115,7 +1139,7 @@ export function describeArchiverDataStore(
       it('"txHash" filter param is ignored when "afterLog" is set', async () => {
         // Get random txHash
         const txHash = TxHash.random();
-        const afterLog = new LogId(BlockNumber(1), 0, 0);
+        const afterLog = new LogId(BlockNumber(1), L2BlockHash.random(), 0, 0);
 
         const response = await store.getPublicLogs({ txHash, afterLog });
         expect(response.logs.length).toBeGreaterThan(1);
@@ -1147,20 +1171,25 @@ export function describeArchiverDataStore(
           await store.getPublicLogs({
             fromBlock: BlockNumber(2),
             toBlock: BlockNumber(5),
-            afterLog: new LogId(BlockNumber(4), 0, 0),
+            afterLog: new LogId(BlockNumber(4), L2BlockHash.random(), 0, 0),
           })
         ).logs;
         blockNumbers = new Set(logs.map(log => log.id.blockNumber));
         expect(blockNumbers).toEqual(new Set([4]));
 
-        logs = (await store.getPublicLogs({ toBlock: BlockNumber(5), afterLog: new LogId(BlockNumber(5), 1, 0) })).logs;
+        logs = (
+          await store.getPublicLogs({
+            toBlock: BlockNumber(5),
+            afterLog: new LogId(BlockNumber(5), L2BlockHash.random(), 1, 0),
+          })
+        ).logs;
         expect(logs.length).toBe(0);
 
         logs = (
           await store.getPublicLogs({
             fromBlock: BlockNumber(2),
             toBlock: BlockNumber(5),
-            afterLog: new LogId(BlockNumber(100), 0, 0),
+            afterLog: new LogId(BlockNumber(100), L2BlockHash.random(), 0, 0),
           })
         ).logs;
         expect(logs.length).toBe(0);
@@ -1171,8 +1200,14 @@ export function describeArchiverDataStore(
         const targetBlockIndex = randomInt(numBlocks);
         const targetTxIndex = randomInt(txsPerBlock);
         const targetLogIndex = randomInt(numPublicLogs);
+        const targetBlockHash = L2BlockHash.fromField(await blocks[targetBlockIndex].block.hash());
 
-        const afterLog = new LogId(BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM), targetTxIndex, targetLogIndex);
+        const afterLog = new LogId(
+          BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM),
+          targetBlockHash,
+          targetTxIndex,
+          targetLogIndex,
+        );
 
         const response = await store.getPublicLogs({ afterLog, fromBlock: afterLog.blockNumber });
         const logs = response.logs;
@@ -1192,6 +1227,40 @@ export function describeArchiverDataStore(
       });
     });
 
+    describe('getContractClassLogs', () => {
+      let targetBlock: L2Block;
+      let expectedContractClassLog: ContractClassLog;
+
+      beforeEach(async () => {
+        await store.addBlocks(blocks);
+
+        targetBlock = blocks[0].block;
+        expectedContractClassLog = await ContractClassLog.random();
+        targetBlock.body.txEffects.forEach((txEffect, index) => {
+          txEffect.contractClassLogs = index === 0 ? [expectedContractClassLog] : [];
+        });
+
+        await store.addLogs([targetBlock]);
+      });
+
+      it('returns block hash on contract class log ids', async () => {
+        const result = await store.getContractClassLogs({
+          fromBlock: targetBlock.number,
+          toBlock: targetBlock.number + 1,
+        });
+
+        expect(result.maxLogsHit).toBeFalsy();
+        expect(result.logs).toHaveLength(1);
+
+        const [{ id, log }] = result.logs;
+        const expectedBlockHash = L2BlockHash.fromField(await targetBlock.hash());
+
+        expect(id.blockHash.equals(expectedBlockHash)).toBe(true);
+        expect(id.blockNumber).toEqual(targetBlock.number);
+        expect(log).toEqual(expectedContractClassLog);
+      });
+    });
+
     describe('pendingChainValidationStatus', () => {
       it('should return undefined when no status is set', async () => {
         const status = await store.getPendingChainValidationStatus();

yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts

@@ -31,7 +31,7 @@ import { ContractInstanceStore } from './contract_instance_store.js';
 import { LogStore } from './log_store.js';
 import { MessageStore } from './message_store.js';
 
-export const ARCHIVER_DB_VERSION = 4;
+export const ARCHIVER_DB_VERSION = 5;
 export const MAX_FUNCTION_SIGNATURES = 1000;
 export const MAX_FUNCTION_NAME_LEN = 256;