Merge cafcad2 into 7a1ed69

AztecProtocol · Sep 2, 2024 · 184bcfb · 184bcfb
2 parents 7a1ed69 + cafcad2
commit 184bcfb
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/yarn-project/aztec/src/cli/cli.ts b/yarn-project/aztec/src/cli/cli.ts
@@ -76,6 +76,9 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
       if (options.node) {
         const { startNode } = await import('./cmds/start_node.js');
         services = await startNode(options, signalHandlers, userLog);
+      } else if (options.proofVerifier) {
+        const { startProofVerifier } = await import('./cmds/start_proof_verifier.js');
+        services = await startProofVerifier(options, signalHandlers, userLog);
       } else if (options.bot) {
         const { startBot } = await import('./cmds/start_bot.js');
         services = await startBot(options, signalHandlers, userLog);
@@ -101,7 +104,7 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
         userLog(`Cannot run a standalone sequencer without a node`);
         process.exit(1);
       } else {
-        userLog(`No module specified to start ${JSON.stringify(options, null, 2)}`);
+        userLog(`No module specified to start`);
         process.exit(1);
       }
     }

diff --git a/yarn-project/aztec/terraform/proof-verifier/variables.tf b/yarn-project/aztec/terraform/proof-verifier/variables.tf
@@ -29,5 +29,5 @@ variable "ROLLUP_CONTRACT_ADDRESS" {
 
 variable "PROOF_VERIFIER_POLL_INTERVAL_MS" {
   type    = "number"
-  default = 10000
+  default = 60000
 }
diff --git a/yarn-project/proof-verifier/src/config.ts b/yarn-project/proof-verifier/src/config.ts
@@ -13,7 +13,7 @@ export type ProofVerifierConfig = {
   /** The L1 chain ID */
   l1ChainId: number;
   /** Start block number */
-  l1StartBlock: bigint;
+  l1StartBlock: number;
   /** The address of the Rollup contract */
   rollupAddress: EthAddress;
   /** How often to poll L1 for proof submission */
@@ -40,9 +40,8 @@ export const proofVerifierConfigMappings: ConfigMappingsType<ProofVerifierConfig
   },
   l1StartBlock: {
     env: 'PROOF_VERIFIER_L1_START_BLOCK',
-    parseEnv: (val: string) => BigInt(val),
     description: 'Start block number',
-    defaultValue: 1n,
+    ...numberConfigHelper(1),
   },
   rollupAddress: {
     env: 'ROLLUP_CONTRACT_ADDRESS',
@@ -52,7 +51,7 @@ export const proofVerifierConfigMappings: ConfigMappingsType<ProofVerifierConfig
   pollIntervalMs: {
     env: 'PROOF_VERIFIER_POLL_INTERVAL_MS',
     description: 'How often to poll L1 for proof submission',
-    ...numberConfigHelper(10_000),
+    ...numberConfigHelper(60_000),
   },
   bbBinaryPath: {
     env: 'BB_BINARY_PATH',

diff --git a/yarn-project/proof-verifier/src/proof_verifier.ts b/yarn-project/proof-verifier/src/proof_verifier.ts
@@ -9,6 +9,8 @@ import { type PublicClient, createPublicClient, http } from 'viem';
 
 import { type ProofVerifierConfig } from './config.js';
 
+const EXPECTED_PROOF_SIZE = 13988;
+
 export class ProofVerifier {
   private runningPromise: RunningPromise;
   private synchedToL1Block = 0n;
@@ -27,7 +29,7 @@ export class ProofVerifier {
       valueType: ValueType.INT,
       description: 'The number of proofs verified by the block verifier bot',
     });
-    this.synchedToL1Block = config.l1StartBlock - 1n;
+    this.synchedToL1Block = BigInt(config.l1StartBlock - 1);
   }
 
   static async new(config: ProofVerifierConfig, telemetryClient: TelemetryClient): Promise<ProofVerifier> {
@@ -42,6 +44,7 @@ export class ProofVerifier {
   }
 
   start() {
+    this.logger.info(`Starting proof verifier monitoring rollup=${this.config.rollupAddress}`);
     this.runningPromise.start();
   }
 
@@ -58,24 +61,49 @@ export class ProofVerifier {
       startBlock,
     );
 
+    if (retrievedData.length === 0) {
+      this.logger.debug(`No proofs found since L1 block ${startBlock}`);
+      return;
+    } else {
+      this.logger.debug(`Fetched ${retrievedData.length} proofs since L1 block ${startBlock}`);
+    }
+
     for (const { l2BlockNumber, txHash, proof, proverId } of retrievedData) {
+      this.logger.debug(
+        `Proof size ${proof.buffer.length} for L2 block proverId=${proverId} l2Block=${l2BlockNumber} l1Tx=${txHash}`,
+      );
+
+      const invalidProofFormat = proof.buffer.length < EXPECTED_PROOF_SIZE;
+      if (invalidProofFormat) {
+        this.logger.warn(
+          `Invalid proof format detected: proof length=${proof.buffer.length}bytes proverId=${proverId} l2Block=${l2BlockNumber} l1Tx=${txHash}`,
+        );
+      }
+
       try {
         await this.verifier.verifyProofForCircuit('RootRollupArtifact', proof);
         this.logger.info(`Verified proof for L2 block proverId=${proverId} l2Block=${l2BlockNumber} l1Tx=${txHash}`);
 
         this.proofVerified.add(1, {
           [Attributes.ROLLUP_PROVER_ID]: proverId.toString(),
-          [Attributes.OK]: true,
+          [Attributes.STATUS]: 'valid',
         });
       } catch (err) {
         this.logger.warn(
           `Failed to verify proof for L2 block proverId=${proverId} l2Block=${l2BlockNumber} l1Tx=${txHash}`,
         );
 
-        this.proofVerified.add(1, {
-          [Attributes.ROLLUP_PROVER_ID]: proverId.toString(),
-          [Attributes.OK]: false,
-        });
+        if (invalidProofFormat) {
+          this.proofVerified.add(1, {
+            [Attributes.ROLLUP_PROVER_ID]: proverId.toString(),
+            [Attributes.STATUS]: 'invalid_proof_format',
+          });
+        } else {
+          this.proofVerified.add(1, {
+            [Attributes.ROLLUP_PROVER_ID]: proverId.toString(),
+            [Attributes.STATUS]: 'invalid',
+          });
+        }
       }
     }