@aztec/aztec 4.0.2 → 4.0.3

package/dest/cli/cmds/start_node.d.ts

@@ -4,4 +4,4 @@ import type { LogFn } from '@aztec/foundation/log';
 export declare function startNode(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, adminServices: NamespacedApiHandlers, userLog: LogFn): Promise<{
     config: AztecNodeConfig;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE2QyxNQUFNLG1CQUFtQixDQUFDO0FBTXBHLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUF3Qm5ELHdCQUFzQixTQUFTLENBQzdCLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLGFBQWEsRUFBRSxxQkFBcUIsRUFDcEMsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFBO0NBQUUsQ0FBQyxDQThKdEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE2QyxNQUFNLG1CQUFtQixDQUFDO0FBUXBHLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFHL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUE2Rm5ELHdCQUFzQixTQUFTLENBQzdCLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLGFBQWEsRUFBRSxxQkFBcUIsRUFDcEMsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFBO0NBQUUsQ0FBQyxDQTRLdEMifQ==

package/dest/cli/cmds/start_node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAMpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAwBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CA8JtC"}
+{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAQpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAG/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA6FnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CA4KtC"}

package/dest/cli/cmds/start_node.js

@@ -4,8 +4,11 @@ import { Fr } from '@aztec/aztec.js/fields';
 import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { getL1Config } from '@aztec/cli/config';
 import { getPublicClient } from '@aztec/ethereum/client';
+import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
 import { SecretValue } from '@aztec/foundation/config';
+import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
+import { sleep } from '@aztec/foundation/sleep';
 import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
 import { allPxeConfigMappings } from '@aztec/pxe/config';
 import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
@@ -13,10 +16,58 @@ import { P2PApiSchema, ProverNodeApiSchema } from '@aztec/stdlib/interfaces/serv
 import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { EmbeddedWallet } from '@aztec/wallets/embedded';
 import { getGenesisValues } from '@aztec/world-state/testing';
+import Koa from 'koa';
 import { createAztecNode } from '../../local-network/index.js';
 import { extractNamespacedOptions, extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.js';
 import { getVersions } from '../versioning.js';
 import { startProverBroker } from './start_prover_broker.js';
+const ROLLUP_POLL_INTERVAL_MS = 600_000;
+/**
+ * Waits until the canonical rollup's genesis archive root matches the expected local genesis root.
+ * If the rollup is not yet compatible (e.g. during L1 contract upgrades), enters standby mode:
+ * starts a lightweight HTTP server for K8s liveness probes and polls until a compatible rollup appears.
+ */ async function waitForCompatibleRollup(publicClient, registryAddress, rollupVersion, expectedGenesisRoot, port, userLog) {
+    const registry = new RegistryContract(publicClient, registryAddress);
+    const rollupAddress = await registry.getRollupAddress(rollupVersion);
+    const rollup = new RollupContract(publicClient, rollupAddress.toString());
+    let l1GenesisRoot;
+    try {
+        l1GenesisRoot = await rollup.getGenesisArchiveTreeRoot();
+    } catch (err) {
+        throw new Error(`Could not retrieve genesis archive root from canonical rollup at ${rollupAddress}: ${err.message}`);
+    }
+    if (l1GenesisRoot.equals(expectedGenesisRoot)) {
+        return;
+    }
+    userLog(`Genesis root mismatch: expected ${expectedGenesisRoot}, got ${l1GenesisRoot} from rollup at ${rollupAddress}. ` + `Entering standby mode. Will poll every ${ROLLUP_POLL_INTERVAL_MS / 1000}s for a compatible rollup...`);
+    const standbyServer = await startHttpRpcServer({
+        getApp: ()=>new Koa(),
+        isHealthy: ()=>true
+    }, {
+        port
+    });
+    userLog(`Standby status server listening on port ${standbyServer.port}`);
+    try {
+        while(true){
+            await sleep(ROLLUP_POLL_INTERVAL_MS);
+            const currentRollupAddress = await registry.getRollupAddress(rollupVersion);
+            const currentRollup = new RollupContract(publicClient, currentRollupAddress.toString());
+            try {
+                l1GenesisRoot = await currentRollup.getGenesisArchiveTreeRoot();
+            } catch  {
+                userLog(`Failed to fetch genesis root from rollup at ${currentRollupAddress}. Retrying...`);
+                continue;
+            }
+            if (l1GenesisRoot.equals(expectedGenesisRoot)) {
+                userLog(`Compatible rollup found at ${currentRollupAddress}. Exiting standby mode.`);
+                return;
+            }
+            userLog(`Still waiting. Rollup at ${currentRollupAddress} has genesis root ${l1GenesisRoot}.`);
+        }
+    } finally{
+        await new Promise((resolve, reject)=>standbyServer.close((err)=>err ? reject(err) : resolve()));
+    }
+}
 export async function startNode(options, signalHandlers, services, adminServices, userLog) {
     // All options set from environment variables
     const configFromEnvVars = getConfigEnvVars();
@@ -75,6 +126,11 @@ export async function startNode(options, signalHandlers, services, adminServices
     if (!nodeConfig.l1Contracts.registryAddress || nodeConfig.l1Contracts.registryAddress.isZero()) {
         throw new Error('L1 registry address is required to start Aztec Node');
     }
+    // Wait for a compatible rollup before proceeding with full L1 config fetch.
+    // This prevents crashes when the canonical rollup hasn't been upgraded yet.
+    const publicClient = getPublicClient(nodeConfig);
+    const rollupVersion = nodeConfig.rollupVersion ?? 'canonical';
+    await waitForCompatibleRollup(publicClient, nodeConfig.l1Contracts.registryAddress, rollupVersion, genesisArchiveRoot, options.port, userLog);
     const { addresses, config } = await getL1Config(nodeConfig.l1Contracts.registryAddress, nodeConfig.l1RpcUrls, nodeConfig.l1ChainId, nodeConfig.rollupVersion);
     process.env.ROLLUP_CONTRACT_ADDRESS ??= addresses.rollupAddress.toString();
     if (!Fr.fromHexString(config.genesisArchiveTreeRoot).equals(genesisArchiveRoot)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,39 +28,39 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "4.0.2",
-    "@aztec/archiver": "4.0.2",
-    "@aztec/aztec-faucet": "4.0.2",
-    "@aztec/aztec-node": "4.0.2",
-    "@aztec/aztec.js": "4.0.2",
-    "@aztec/bb-prover": "4.0.2",
-    "@aztec/bb.js": "4.0.2",
-    "@aztec/blob-client": "4.0.2",
-    "@aztec/bot": "4.0.2",
-    "@aztec/builder": "4.0.2",
-    "@aztec/cli": "4.0.2",
-    "@aztec/constants": "4.0.2",
-    "@aztec/entrypoints": "4.0.2",
-    "@aztec/ethereum": "4.0.2",
-    "@aztec/foundation": "4.0.2",
-    "@aztec/kv-store": "4.0.2",
-    "@aztec/l1-artifacts": "4.0.2",
-    "@aztec/node-lib": "4.0.2",
-    "@aztec/noir-contracts.js": "4.0.2",
-    "@aztec/noir-protocol-circuits-types": "4.0.2",
-    "@aztec/p2p": "4.0.2",
-    "@aztec/p2p-bootstrap": "4.0.2",
-    "@aztec/protocol-contracts": "4.0.2",
-    "@aztec/prover-client": "4.0.2",
-    "@aztec/prover-node": "4.0.2",
-    "@aztec/pxe": "4.0.2",
-    "@aztec/sequencer-client": "4.0.2",
-    "@aztec/stdlib": "4.0.2",
-    "@aztec/telemetry-client": "4.0.2",
-    "@aztec/txe": "4.0.2",
-    "@aztec/validator-ha-signer": "4.0.2",
-    "@aztec/wallets": "4.0.2",
-    "@aztec/world-state": "4.0.2",
+    "@aztec/accounts": "4.0.3",
+    "@aztec/archiver": "4.0.3",
+    "@aztec/aztec-faucet": "4.0.3",
+    "@aztec/aztec-node": "4.0.3",
+    "@aztec/aztec.js": "4.0.3",
+    "@aztec/bb-prover": "4.0.3",
+    "@aztec/bb.js": "4.0.3",
+    "@aztec/blob-client": "4.0.3",
+    "@aztec/bot": "4.0.3",
+    "@aztec/builder": "4.0.3",
+    "@aztec/cli": "4.0.3",
+    "@aztec/constants": "4.0.3",
+    "@aztec/entrypoints": "4.0.3",
+    "@aztec/ethereum": "4.0.3",
+    "@aztec/foundation": "4.0.3",
+    "@aztec/kv-store": "4.0.3",
+    "@aztec/l1-artifacts": "4.0.3",
+    "@aztec/node-lib": "4.0.3",
+    "@aztec/noir-contracts.js": "4.0.3",
+    "@aztec/noir-protocol-circuits-types": "4.0.3",
+    "@aztec/p2p": "4.0.3",
+    "@aztec/p2p-bootstrap": "4.0.3",
+    "@aztec/protocol-contracts": "4.0.3",
+    "@aztec/prover-client": "4.0.3",
+    "@aztec/prover-node": "4.0.3",
+    "@aztec/pxe": "4.0.3",
+    "@aztec/sequencer-client": "4.0.3",
+    "@aztec/stdlib": "4.0.3",
+    "@aztec/telemetry-client": "4.0.3",
+    "@aztec/txe": "4.0.3",
+    "@aztec/validator-ha-signer": "4.0.3",
+    "@aztec/wallets": "4.0.3",
+    "@aztec/world-state": "4.0.3",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",

package/src/cli/cmds/start_node.ts

@@ -4,10 +4,14 @@ import { Fr } from '@aztec/aztec.js/fields';
 import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { getL1Config } from '@aztec/cli/config';
 import { getPublicClient } from '@aztec/ethereum/client';
+import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
 import { SecretValue } from '@aztec/foundation/config';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
+import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
 import type { LogFn } from '@aztec/foundation/log';
+import { sleep } from '@aztec/foundation/sleep';
 import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
 import { type CliPXEOptions, type PXEConfig, allPxeConfigMappings } from '@aztec/pxe/config';
 import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
@@ -21,6 +25,8 @@ import {
 import { EmbeddedWallet } from '@aztec/wallets/embedded';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
+import Koa from 'koa';
+
 import { createAztecNode } from '../../local-network/index.js';
 import {
   extractNamespacedOptions,
@@ -31,6 +37,72 @@ import {
 import { getVersions } from '../versioning.js';
 import { startProverBroker } from './start_prover_broker.js';
 
+const ROLLUP_POLL_INTERVAL_MS = 600_000;
+
+/**
+ * Waits until the canonical rollup's genesis archive root matches the expected local genesis root.
+ * If the rollup is not yet compatible (e.g. during L1 contract upgrades), enters standby mode:
+ * starts a lightweight HTTP server for K8s liveness probes and polls until a compatible rollup appears.
+ */
+async function waitForCompatibleRollup(
+  publicClient: ReturnType<typeof getPublicClient>,
+  registryAddress: EthAddress,
+  rollupVersion: number | 'canonical',
+  expectedGenesisRoot: Fr,
+  port: number | undefined,
+  userLog: LogFn,
+): Promise<void> {
+  const registry = new RegistryContract(publicClient, registryAddress);
+  const rollupAddress = await registry.getRollupAddress(rollupVersion);
+  const rollup = new RollupContract(publicClient, rollupAddress.toString());
+
+  let l1GenesisRoot: Fr;
+  try {
+    l1GenesisRoot = await rollup.getGenesisArchiveTreeRoot();
+  } catch (err: any) {
+    throw new Error(
+      `Could not retrieve genesis archive root from canonical rollup at ${rollupAddress}: ${err.message}`,
+    );
+  }
+
+  if (l1GenesisRoot.equals(expectedGenesisRoot)) {
+    return;
+  }
+
+  userLog(
+    `Genesis root mismatch: expected ${expectedGenesisRoot}, got ${l1GenesisRoot} from rollup at ${rollupAddress}. ` +
+      `Entering standby mode. Will poll every ${ROLLUP_POLL_INTERVAL_MS / 1000}s for a compatible rollup...`,
+  );
+
+  const standbyServer = await startHttpRpcServer({ getApp: () => new Koa(), isHealthy: () => true }, { port });
+  userLog(`Standby status server listening on port ${standbyServer.port}`);
+
+  try {
+    while (true) {
+      await sleep(ROLLUP_POLL_INTERVAL_MS);
+
+      const currentRollupAddress = await registry.getRollupAddress(rollupVersion);
+      const currentRollup = new RollupContract(publicClient, currentRollupAddress.toString());
+
+      try {
+        l1GenesisRoot = await currentRollup.getGenesisArchiveTreeRoot();
+      } catch {
+        userLog(`Failed to fetch genesis root from rollup at ${currentRollupAddress}. Retrying...`);
+        continue;
+      }
+
+      if (l1GenesisRoot.equals(expectedGenesisRoot)) {
+        userLog(`Compatible rollup found at ${currentRollupAddress}. Exiting standby mode.`);
+        return;
+      }
+
+      userLog(`Still waiting. Rollup at ${currentRollupAddress} has genesis root ${l1GenesisRoot}.`);
+    }
+  } finally {
+    await new Promise<void>((resolve, reject) => standbyServer.close(err => (err ? reject(err) : resolve())));
+  }
+}
+
 export async function startNode(
   options: any,
   signalHandlers: (() => Promise<void>)[],
@@ -96,6 +168,20 @@ export async function startNode(
   if (!nodeConfig.l1Contracts.registryAddress || nodeConfig.l1Contracts.registryAddress.isZero()) {
     throw new Error('L1 registry address is required to start Aztec Node');
   }
+
+  // Wait for a compatible rollup before proceeding with full L1 config fetch.
+  // This prevents crashes when the canonical rollup hasn't been upgraded yet.
+  const publicClient = getPublicClient(nodeConfig);
+  const rollupVersion: number | 'canonical' = nodeConfig.rollupVersion ?? 'canonical';
+  await waitForCompatibleRollup(
+    publicClient,
+    nodeConfig.l1Contracts.registryAddress,
+    rollupVersion,
+    genesisArchiveRoot,
+    options.port,
+    userLog,
+  );
+
   const { addresses, config } = await getL1Config(
     nodeConfig.l1Contracts.registryAddress,
     nodeConfig.l1RpcUrls,