@aztec/aztec 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/cli/cmds/start_prover_node.js

@@ -1,15 +1,15 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import { NULL_KEY } from '@aztec/ethereum';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+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';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
 import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
 import { createProverNode, getProverNodeConfigFromEnv, proverNodeConfigMappings } from '@aztec/prover-node';
-import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema, ProverNodeApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
-import { mnemonicToAccount } from 'viem/accounts';
-import { getL1Config } from '../get_l1_config.js';
-import { extractRelevantOptions } from '../util.js';
+import { extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.js';
 import { getVersions } from '../versioning.js';
 import { startProverBroker } from './start_prover_broker.js';
 export async function startProverNode(options, signalHandlers, services, userLog) {
@@ -21,48 +21,45 @@ export async function startProverNode(options, signalHandlers, services, userLog
         ...getProverNodeConfigFromEnv(),
         ...extractRelevantOptions(options, proverNodeConfigMappings, 'proverNode')
     };
-    if (!options.archiver && !proverConfig.archiverUrl) {
-        userLog('--archiver.archiverUrl is required to start a Prover Node without --archiver option');
-        process.exit(1);
-    }
-    if (!proverConfig.publisherPrivateKey || proverConfig.publisherPrivateKey === NULL_KEY) {
-        if (!options.l1Mnemonic) {
-            userLog(`--l1-mnemonic is required to start a Prover Node without --node.publisherPrivateKey`);
-            process.exit(1);
-        }
-        const hdAccount = mnemonicToAccount(options.l1Mnemonic);
-        const privKey = hdAccount.getHdKey().privateKey;
-        proverConfig.publisherPrivateKey = `0x${Buffer.from(privKey).toString('hex')}`;
-    }
-    // TODO(palla/prover-node) L1 contract addresses should not silently default to zero,
-    // they should be undefined if not set and fail loudly.
-    // Load l1 contract addresses from aztec node if not set.
-    const isRollupAddressSet = proverConfig.l1Contracts?.rollupAddress && !proverConfig.l1Contracts.rollupAddress.isZero();
-    const nodeUrl = proverConfig.nodeUrl ?? proverConfig.proverCoordinationNodeUrl;
-    if (nodeUrl && !isRollupAddressSet) {
-        userLog(`Loading L1 contract addresses from aztec node at ${nodeUrl}`);
-        proverConfig.l1Contracts = await createAztecNodeClient(nodeUrl).getL1ContractAddresses();
+    if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
+        throw new Error('L1 registry address is required to start a Prover Node');
     }
-    // If we create an archiver here, validate the L1 config
-    if (options.archiver) {
-        if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
-            throw new Error('L1 registry address is required to start a Prover Node with --archiver option');
-        }
-        const { addresses, config } = await getL1Config(proverConfig.l1Contracts.registryAddress, proverConfig.l1RpcUrls, proverConfig.l1ChainId);
-        proverConfig.l1Contracts = addresses;
-        proverConfig = {
-            ...proverConfig,
-            ...config
-        };
+    const followsCanonicalRollup = typeof proverConfig.rollupVersion !== 'number';
+    const { addresses, config } = await getL1Config(proverConfig.l1Contracts.registryAddress, proverConfig.l1RpcUrls, proverConfig.l1ChainId, proverConfig.rollupVersion);
+    process.env.ROLLUP_CONTRACT_ADDRESS ??= addresses.rollupAddress.toString();
+    proverConfig.l1Contracts = addresses;
+    proverConfig = {
+        ...proverConfig,
+        ...config
+    };
+    const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccountsData()).map((a)=>a.address) : [];
+    const sponsoredFPCAccounts = proverConfig.sponsoredFPC ? [
+        await getSponsoredFPCAddress()
+    ] : [];
+    const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
+    userLog(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
+    const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+    userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
+    if (!Fr.fromHexString(config.genesisArchiveTreeRoot).equals(genesisArchiveRoot)) {
+        throw new Error(`The computed genesis archive tree root ${genesisArchiveRoot} does not match the expected genesis archive tree root ${config.genesisArchiveTreeRoot} for the rollup deployed at ${addresses.rollupAddress}`);
     }
     const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
     let broker;
     if (proverConfig.proverBrokerUrl) {
-        // at 1TPS we'd enqueue ~1k tube proofs and ~1k AVM proofs immediately
-        // set a lower connectio  limit such that we don't overload the server
+        // at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
+        // set a lower connection limit such that we don't overload the server
+        // Keep retrying up to 30s
         const fetch = makeTracedFetch([
             1,
             2,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
             3
         ], false, makeUndiciFetch(new Agent({
             connections: 100
@@ -77,8 +74,7 @@ export async function startProverNode(options, signalHandlers, services, userLog
     if (proverConfig.proverAgentCount === 0) {
         userLog(`Running prover node without local prover agent. Connect one or more prover agents to this node or pass --proverAgent.proverAgentCount`);
     }
-    const initialFundedAccounts = proverConfig.testAccounts ? await getInitialTestAccounts() : [];
-    const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
+    await preloadCrsDataForVerifying(proverConfig, userLog);
     const proverNode = await createProverNode(proverConfig, {
         telemetry,
         broker
@@ -89,8 +85,7 @@ export async function startProverNode(options, signalHandlers, services, userLog
         proverNode,
         ProverNodeApiSchema
     ];
-    const p2p = proverNode.getP2P();
-    if (p2p) {
+    if (proverNode.getP2P()) {
         services.p2p = [
             proverNode.getP2P(),
             P2PApiSchema
@@ -103,7 +98,10 @@ export async function startProverNode(options, signalHandlers, services, userLog
         ];
     }
     signalHandlers.push(proverNode.stop.bind(proverNode));
-    proverNode.start();
+    await proverNode.start();
+    if (proverConfig.autoUpdate !== 'disabled' && proverConfig.autoUpdateUrl) {
+        await setupUpdateMonitor(proverConfig.autoUpdate, new URL(proverConfig.autoUpdateUrl), followsCanonicalRollup, getPublicClient(proverConfig), proverConfig.l1Contracts.registryAddress, signalHandlers);
+    }
     return {
         config: proverConfig
     };

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

@@ -1,3 +1,3 @@
 import type { Logger } from '@aztec/foundation/log';
 export declare function startTXE(options: any, debugLogger: Logger): Promise<void>;
-//# sourceMappingURL=start_txe.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfdHhlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfdHhlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3BELHdCQUFzQixRQUFRLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFVL0QifQ==

package/dest/cli/index.d.ts

@@ -1,2 +1,2 @@
 export * from './cli.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGkvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxVQUFVLENBQUMifQ==

package/dest/cli/preload_crs.d.ts

@@ -0,0 +1,3 @@
+import type { LogFn, Logger } from '@aztec/foundation/log';
+export declare function preloadCrs(_options: any, userLog: LogFn, _debugLogger: Logger): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlbG9hZF9jcnMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGkvcHJlbG9hZF9jcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSTNELHdCQUFzQixVQUFVLENBQUMsUUFBUSxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUVuRiJ9

package/dest/cli/preload_crs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preload_crs.d.ts","sourceRoot":"","sources":["../../src/cli/preload_crs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,wBAAsB,UAAU,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iBAEnF"}

package/dest/cli/preload_crs.js

@@ -0,0 +1,6 @@
+import { preloadCrsDataForServerSideProving } from './util.js';
+export async function preloadCrs(_options, userLog, _debugLogger) {
+    await preloadCrsDataForServerSideProving({
+        realProofs: true
+    }, userLog);
+}

package/dest/cli/release_version.d.ts

@@ -0,0 +1,2 @@
+export declare const getCliVersion: () => any;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsZWFzZV92ZXJzaW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL3JlbGVhc2VfdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxlQUFPLE1BQU0sYUFBYSxXQWV6QixDQUFDIn0=

package/dest/cli/release_version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"release_version.d.ts","sourceRoot":"","sources":["../../src/cli/release_version.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,aAAa,WAezB,CAAC"}

package/dest/cli/release_version.js

@@ -0,0 +1,14 @@
+import { fileURLToPath } from '@aztec/foundation/url';
+import { readFileSync } from 'fs';
+import { dirname, resolve } from 'path';
+export const getCliVersion = ()=>{
+    const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
+    const cliVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+    // If the version is 0.1.0, this is a placeholder version and we are in a docker container; query release please for the latest version
+    if (cliVersion === '0.1.0') {
+        const releasePleasePath = resolve(dirname(fileURLToPath(import.meta.url)), '../../../../.release-please-manifest.json');
+        const releaseVersion = JSON.parse(readFileSync(releasePleasePath).toString())['.'];
+        return releaseVersion;
+    }
+    return cliVersion;
+};

package/dest/cli/util.d.ts

@@ -1,14 +1,32 @@
-import type { AccountManager, Fr } from '@aztec/aztec.js';
+import type { AztecNodeConfig } from '@aztec/aztec-node';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import { AccountManager } from '@aztec/aztec.js/wallet';
+import type { ViemClient } from '@aztec/ethereum';
 import type { ConfigMappingsType } from '@aztec/foundation/config';
-import type { LogFn } from '@aztec/foundation/log';
-import type { PXEService } from '@aztec/pxe/server';
+import { type LogFn } from '@aztec/foundation/log';
+import type { SharedNodeConfig } from '@aztec/node-lib/config';
+import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
+import type { TestWallet } from '@aztec/test-wallet/server';
 import type { Command } from 'commander';
 import { type AztecStartOption } from './aztec_start_options.js';
-export declare const installSignalHandlers: (logFn: LogFn, cb?: Array<() => Promise<void>>) => void;
+export declare const enum ExitCode {
+    SUCCESS = 0,
+    ERROR = 1,
+    ROLLUP_UPGRADE = 78,
+    VERSION_UPGRADE = 79,
+    SIGHUP = 129,
+    SIGINT = 130,
+    SIGQUIT = 131,
+    SIGTERM = 143
+}
+export declare function shutdown(logFn: LogFn, exitCode: ExitCode, cb?: Array<() => Promise<void>>): Promise<never>;
+export declare function isShuttingDown(): boolean;
+export declare const installSignalHandlers: (logFn: LogFn, cb?: (() => Promise<void>)[] | undefined) => void;
 /**
  * Creates logs for the initial accounts
  * @param accounts - The initial accounts
- * @param pxe - A PXE instance to get the registered accounts
+ * @param wallet - A TestWallet instance to get the registered accounts
  * @returns A string array containing the initial accounts details
  */
 export declare function createAccountLogs(accountsWithSecretKeys: {
@@ -20,7 +38,7 @@ export declare function createAccountLogs(accountsWithSecretKeys: {
      * The secret key of the account
      */
     secretKey: Fr;
-}[], pxe: PXEService): Promise<string[]>;
+}[], wallet: TestWallet): Promise<string[]>;
 export declare function getMaxLengths(sections: {
     [key: string]: AztecStartOption[];
 }): [number, number];
@@ -43,4 +61,17 @@ export declare const extractNamespacedOptions: (options: Record<string, any>, na
  * @returns Key-value map of relevant options.
  */
 export declare const extractRelevantOptions: <T>(options: Record<string, any>, mappings: ConfigMappingsType<T>, namespace: string) => T;
-//# sourceMappingURL=util.d.ts.map
+/**
+ * Downloads just enough points to be able to verify Chonk proofs.
+ * @param opts - Whether proof are to be verifier
+ * @param log - Logging function
+ */
+export declare function preloadCrsDataForVerifying({ realProofs }: Pick<AztecNodeConfig, 'realProofs'>, log: LogFn): Promise<void>;
+/**
+ * Downloads enough points to be able to prove every server-side circuit
+ * @param opts - Whether real proof are to be generated
+ * @param log - Logging function
+ */
+export declare function preloadCrsDataForServerSideProving({ realProofs }: Pick<ProverConfig, 'realProofs'>, log: LogFn): Promise<void>;
+export declare function setupUpdateMonitor(autoUpdateMode: SharedNodeConfig['autoUpdate'], updatesLocation: URL, followsCanonicalRollup: boolean, publicClient: ViemClient, registryContractAddress: EthAddress, signalHandlers: Array<() => Promise<void>>, updateNodeConfig?: (config: object) => Promise<void>): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbkUsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHcEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHNUQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRXpDLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUFxQixNQUFNLDBCQUEwQixDQUFDO0FBRXBGLDBCQUFrQixRQUFRO0lBQ3hCLE9BQU8sSUFBSTtJQUNYLEtBQUssSUFBSTtJQUNULGNBQWMsS0FBSztJQUNuQixlQUFlLEtBQUs7SUFFcEIsTUFBTSxNQUFNO0lBQ1osTUFBTSxNQUFNO0lBQ1osT0FBTyxNQUFNO0lBQ2IsT0FBTyxNQUFNO0NBQ2Q7QUFHRCx3QkFBZ0IsUUFBUSxDQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsRUFBRSxLQUFLLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDLENBZ0IxRztBQUVELHdCQUFnQixjQUFjLElBQUksT0FBTyxDQUV4QztBQUVELGVBQU8sTUFBTSxxQkFBcUIsa0VBYWpDLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILHdCQUFzQixpQkFBaUIsQ0FDckMsc0JBQXNCLEVBQUU7SUFDdEI7O09BRUc7SUFDSCxPQUFPLEVBQUUsY0FBYyxDQUFDO0lBQ3hCOztPQUVHO0lBQ0gsU0FBUyxFQUFFLEVBQUUsQ0FBQztDQUNmLEVBQUUsRUFDSCxNQUFNLEVBQUUsVUFBVSxxQkF5Qm5CO0FBRUQsd0JBQWdCLGFBQWEsQ0FBQyxRQUFRLEVBQUU7SUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQTtDQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBaUIvRjtBQUVELHdCQUFnQixjQUFjLENBQzVCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsWUFBWSxFQUFFLE1BQU0sRUFDcEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxlQUFlLEVBQUUsTUFBTSxFQUN2QixnQkFBZ0IsRUFBRSxNQUFNLEdBQ3ZCLE1BQU0sQ0FLUjtBQWlDRCxlQUFPLE1BQU0sVUFBVSxxREFTdEIsQ0FBQztBQUVGLGVBQU8sTUFBTSx1QkFBdUIsY0F5Qm5DLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILGVBQU8sTUFBTSx3QkFBd0IsMEVBU3BDLENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0gsZUFBTyxNQUFNLHNCQUFzQixHQUFJLENBQUMsd0ZBa0N2QyxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFzQiwwQkFBMEIsQ0FDOUMsRUFBRSxVQUFVLEVBQUUsRUFBRSxJQUFJLENBQUMsZUFBZSxFQUFFLFlBQVksQ0FBQyxFQUNuRCxHQUFHLEVBQUUsS0FBSyxHQUNULE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLZjtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0NBQWtDLENBQ3RELEVBQUUsVUFBVSxFQUFFLEVBQUUsSUFBSSxDQUFDLFlBQVksRUFBRSxZQUFZLENBQUMsRUFDaEQsR0FBRyxFQUFFLEtBQUssR0FDVCxPQUFPLENBQUMsSUFBSSxDQUFDLENBS2Y7QUFFRCx3QkFBc0Isa0JBQWtCLENBQ3RDLGNBQWMsRUFBRSxnQkFBZ0IsQ0FBQyxZQUFZLENBQUMsRUFDOUMsZUFBZSxFQUFFLEdBQUcsRUFDcEIsc0JBQXNCLEVBQUUsT0FBTyxFQUMvQixZQUFZLEVBQUUsVUFBVSxFQUN4Qix1QkFBdUIsRUFBRSxVQUFVLEVBQ25DLGNBQWMsRUFBRSxLQUFLLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFDMUMsZ0JBQWdCLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxNQUFNLEtBQUssT0FBTyxDQUFDLElBQUksQ0FBQyxpQkE4RXJEIn0=

package/dest/cli/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,KAAK,gBAAgB,EAAqB,MAAM,0BAA0B,CAAC;AAEpF,eAAO,MAAM,qBAAqB,UAAW,KAAK,OAAO,MAAM,MAAM,QAAQ,IAAI,CAAC,CAAC,SAclF,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,sBAAsB,EAAE;IACtB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IACxB;;OAEG;IACH,SAAS,EAAE,EAAE,CAAC;CACf,EAAE,EACH,GAAG,EAAE,UAAU,qBAyBhB;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAiB/F;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAmBD,eAAO,MAAM,UAAU,QAAS,OAAO,WAAW,gBAAgB,EAAE,SASnE,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAwBnC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,YAAa,OAAO,MAAM,EAAE,GAAG,CAAC,aAAa,MAAM,wBASvF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,eACxB,OAAO,MAAM,EAAE,GAAG,CAAC,YAClB,mBAAmB,CAAC,CAAC,aACpB,MAAM,KAChB,CA8BF,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}

package/dest/cli/util.js

@@ -1,33 +1,79 @@
+import { createLogger } from '@aztec/foundation/log';
+import { UpdateChecker } from '@aztec/stdlib/update-checker';
+import { getTelemetryClient } from '@aztec/telemetry-client';
 import chalk from 'chalk';
 import { aztecStartOptions } from './aztec_start_options.js';
+export var ExitCode = /*#__PURE__*/ function(ExitCode) {
+    ExitCode[ExitCode["SUCCESS"] = 0] = "SUCCESS";
+    ExitCode[ExitCode["ERROR"] = 1] = "ERROR";
+    ExitCode[ExitCode["ROLLUP_UPGRADE"] = 78] = "ROLLUP_UPGRADE";
+    ExitCode[ExitCode["VERSION_UPGRADE"] = 79] = "VERSION_UPGRADE";
+    // 128 + int(SIGNAL)
+    ExitCode[ExitCode["SIGHUP"] = 129] = "SIGHUP";
+    ExitCode[ExitCode["SIGINT"] = 130] = "SIGINT";
+    ExitCode[ExitCode["SIGQUIT"] = 131] = "SIGQUIT";
+    ExitCode[ExitCode["SIGTERM"] = 143] = "SIGTERM";
+    return ExitCode;
+}({});
+let shutdownPromise;
+export function shutdown(logFn, exitCode, cb) {
+    if (shutdownPromise) {
+        logFn('Already shutting down.');
+        return shutdownPromise;
+    }
+    logFn('Shutting down...', {
+        exitCode
+    });
+    if (cb) {
+        shutdownPromise = Promise.allSettled(cb).then(()=>process.exit(exitCode));
+    } else {
+        // synchronously shuts down the process
+        // no need to set shutdownPromise on this branch of the if statement because no more code will be executed
+        process.exit(exitCode);
+    }
+    return shutdownPromise;
+}
+export function isShuttingDown() {
+    return shutdownPromise !== undefined;
+}
 export const installSignalHandlers = (logFn, cb)=>{
-    const shutdown = async ()=>{
-        logFn('Shutting down...');
-        if (cb) {
-            await Promise.all(cb);
-        }
-        process.exit(0);
-    };
-    process.removeAllListeners('SIGINT');
-    process.removeAllListeners('SIGTERM');
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    process.once('SIGINT', shutdown);
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    process.once('SIGTERM', shutdown);
+    const signals = [
+        [
+            'SIGINT',
+            130
+        ],
+        [
+            'SIGTERM',
+            143
+        ],
+        [
+            'SIGHUP',
+            129
+        ],
+        [
+            'SIQUIT',
+            131
+        ]
+    ];
+    for (const [signal, exitCode] of signals){
+        process.removeAllListeners(signal);
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        process.once(signal, ()=>shutdown(logFn, exitCode, cb));
+    }
 };
 /**
  * Creates logs for the initial accounts
  * @param accounts - The initial accounts
- * @param pxe - A PXE instance to get the registered accounts
+ * @param wallet - A TestWallet instance to get the registered accounts
  * @returns A string array containing the initial accounts details
- */ export async function createAccountLogs(accountsWithSecretKeys, pxe) {
-    const registeredAccounts = await pxe.getRegisteredAccounts();
+ */ export async function createAccountLogs(accountsWithSecretKeys, wallet) {
+    const registeredAccounts = await wallet.getAccounts();
     const accountLogStrings = [
         `Initial Accounts:\n\n`
     ];
     for (const accountWithSecretKey of accountsWithSecretKeys){
         const completeAddress = await accountWithSecretKey.account.getCompleteAddress();
-        if (registeredAccounts.find((a)=>a.equals(completeAddress))) {
+        if (registeredAccounts.find((a)=>a.item.equals(completeAddress.address))) {
             accountLogStrings.push(` Address: ${completeAddress.address.toString()}\n`);
             accountLogStrings.push(` Partial Address: ${completeAddress.partialAddress.toString()}\n`);
             accountLogStrings.push(` Secret Key: ${accountWithSecretKey.secretKey.toString()}\n`);
@@ -65,22 +111,34 @@ export function formatHelpLine(option, defaultValue, envVar, maxOptionLength, ma
 }
 const getDefaultOrEnvValue = (opt)=>{
     let val;
-    // if the option is set in the environment, use that & parse it
-    if (opt.envVar && process.env[opt.envVar]) {
-        val = process.env[opt.envVar];
-        if (val && opt.parseVal) {
+    // if the option is set in the environment, use that
+    if (opt.env) {
+        val = process.env[opt.env];
+    }
+    // if we have fallback env vars, check those
+    if (!val && opt.fallback && opt.fallback.length > 0) {
+        for (const fallback of opt.fallback){
+            val = process.env[fallback];
+            if (val) {
+                break;
+            }
+        }
+    }
+    // if we have a value, optionally parse it and return
+    if (val) {
+        if (opt.parseVal) {
             return opt.parseVal(val);
         }
-    // if no env variable, use the default value
-    } else if (opt.defaultValue) {
-        val = opt.defaultValue;
+        return val;
+    } else if (opt.defaultValue !== undefined) {
+        return opt.defaultValue;
     }
-    return val;
+    return undefined;
 };
 // Function to add options dynamically
 export const addOptions = (cmd, options)=>{
     options.forEach((opt)=>{
-        cmd.option(opt.flag, `${opt.description} (default: ${opt.defaultValue}) ($${opt.envVar})`, opt.parseVal ? opt.parseVal : (val)=>val, getDefaultOrEnvValue(opt));
+        cmd.option(opt.flag, `${opt.description} (default: ${opt.defaultValue}) ($${opt.env})`, opt.parseVal ? opt.parseVal : (val)=>val, getDefaultOrEnvValue(opt));
     });
 };
 export const printAztecStartHelpText = ()=>{
@@ -92,8 +150,8 @@ export const printAztecStartHelpText = ()=>{
         helpTextLines.push(chalk.bold.blue(`  ${category}`));
         helpTextLines.push('');
         aztecStartOptions[category].forEach((opt)=>{
-            const defaultValueText = opt.defaultValue ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})` : '';
-            const envVarText = opt.envVar ? `($${opt.envVar})` : '';
+            const defaultValueText = opt.defaultValue || Array.isArray(opt.defaultValue) && opt.defaultValue.length > 0 ? `(default: ${opt.printDefault ? opt.printDefault(opt.defaultValue) : opt.defaultValue})` : '';
+            const envVarText = opt.env ? `($${opt.env})` : '';
             const flagText = `${opt.flag}`;
             const paddedText = formatHelpLine(flagText, defaultValueText, envVarText, maxFlagLength, maxDefaultLength);
             helpTextLines.push(`    ${paddedText}`);
@@ -152,3 +210,115 @@ export const printAztecStartHelpText = ()=>{
     });
     return relevantOptions;
 };
+/**
+ * Downloads just enough points to be able to verify Chonk proofs.
+ * @param opts - Whether proof are to be verifier
+ * @param log - Logging function
+ */ export async function preloadCrsDataForVerifying({ realProofs }, log) {
+    if (realProofs) {
+        const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
+        await Promise.all([
+            Crs.new(2 ** 1, undefined, log),
+            GrumpkinCrs.new(2 ** 16 + 1, undefined, log)
+        ]);
+    }
+}
+/**
+ * Downloads enough points to be able to prove every server-side circuit
+ * @param opts - Whether real proof are to be generated
+ * @param log - Logging function
+ */ export async function preloadCrsDataForServerSideProving({ realProofs }, log) {
+    if (realProofs) {
+        const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
+        await Promise.all([
+            Crs.new(2 ** 25 + 1, undefined, log),
+            GrumpkinCrs.new(2 ** 18 + 1, undefined, log)
+        ]);
+    }
+}
+export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, followsCanonicalRollup, publicClient, registryContractAddress, signalHandlers, updateNodeConfig) {
+    const logger = createLogger('update-check');
+    const checker = await UpdateChecker.new({
+        baseURL: updatesLocation,
+        publicClient,
+        registryContractAddress
+    });
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    checker.on('newRollupVersion', async ({ latestVersion, currentVersion })=>{
+        if (isShuttingDown()) {
+            return;
+        }
+        // if node follows canonical rollup then this is equivalent to a config update
+        if (!followsCanonicalRollup) {
+            return;
+        }
+        if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
+            logger.info(`New rollup version detected. Please restart the node`, {
+                latestVersion,
+                currentVersion
+            });
+            await shutdown(logger.info, 78, signalHandlers);
+        } else if (autoUpdateMode === 'notify') {
+            logger.warn(`New rollup detected. Please restart the node`, {
+                latestVersion,
+                currentVersion
+            });
+        }
+    });
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    checker.on('newNodeVersion', async ({ latestVersion, currentVersion })=>{
+        if (isShuttingDown()) {
+            return;
+        }
+        if (autoUpdateMode === 'config-and-version') {
+            logger.info(`New node version detected. Please update and restart the node`, {
+                latestVersion,
+                currentVersion
+            });
+            await shutdown(logger.info, 79, signalHandlers);
+        } else if (autoUpdateMode === 'notify') {
+            logger.info(`New node version detected. Please update and restart the node`, {
+                latestVersion,
+                currentVersion
+            });
+        }
+    });
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    checker.on('updateNodeConfig', async (config)=>{
+        if (isShuttingDown()) {
+            return;
+        }
+        if ((autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') && updateNodeConfig) {
+            logger.warn(`Config change detected. Updating node`, config);
+            try {
+                await updateNodeConfig(config);
+            } catch (err) {
+                logger.warn('Failed to update config', {
+                    err
+                });
+            }
+        }
+    // don't notify on these config changes
+    });
+    checker.on('updatePublicTelemetryConfig', (config)=>{
+        if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
+            logger.warn(`Public telemetry config change detected. Updating telemetry client`, config);
+            try {
+                const publicIncludeMetrics = config.publicIncludeMetrics;
+                if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every((m)=>typeof m === 'string')) {
+                    getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
+                }
+                const publicMetricsCollectFrom = config.publicMetricsCollectFrom;
+                if (Array.isArray(publicMetricsCollectFrom) && publicMetricsCollectFrom.every((m)=>typeof m === 'string')) {
+                    getTelemetryClient().setPublicTelemetryCollectFrom(publicMetricsCollectFrom);
+                }
+            } catch (err) {
+                logger.warn('Failed to update config', {
+                    err
+                });
+            }
+        }
+    // don't notify on these config changes
+    });
+    checker.start();
+}

package/dest/cli/versioning.d.ts

@@ -1,4 +1,4 @@
 import type { ChainConfig } from '@aztec/stdlib/config';
 import { type ComponentsVersions } from '@aztec/stdlib/versioning';
 export declare function getVersions(config?: ChainConfig): Partial<ComponentsVersions>;
-//# sourceMappingURL=versioning.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbmluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS92ZXJzaW9uaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3hELE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUFtQyxNQUFNLDBCQUEwQixDQUFDO0FBRXBHLHdCQUFnQixXQUFXLENBQUMsTUFBTSxDQUFDLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQU83RSJ9

package/dest/cli/versioning.js

@@ -1,9 +1,9 @@
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 export function getVersions(config) {
-    return config ? getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot()) : {
+    return config ? getComponentsVersionsFromConfig(config, protocolContractsHash, getVKTreeRoot()) : {
         l2CircuitsVkTreeRoot: getVKTreeRoot().toString(),
-        l2ProtocolContractsTreeRoot: protocolContractTreeRoot.toString()
+        l2ProtocolContractsHash: protocolContractsHash.toString()
     };
 }

package/dest/examples/token.d.ts

@@ -1,2 +1,2 @@
 export {};
-//# sourceMappingURL=token.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9leGFtcGxlcy90b2tlbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

package/dest/examples/token.js

@@ -1,40 +1,53 @@
-import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
-import { createPXEClient } from '@aztec/aztec.js';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { createLogger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { TestWallet } from '@aztec/test-wallet/server';
 const logger = createLogger('example:token');
-const url = 'http://localhost:8080';
-const pxe = createPXEClient(url);
+const nodeUrl = 'http://localhost:8080';
+const node = createAztecNodeClient(nodeUrl);
 const ALICE_MINT_BALANCE = 333n;
 const TRANSFER_AMOUNT = 33n;
 /**
  * Main function.
  */ async function main() {
     logger.info('Running token contract test on HTTP interface.');
-    const [aliceWallet, bobWallet] = await getDeployedTestAccountsWallets(pxe);
-    const alice = aliceWallet.getCompleteAddress();
-    const bob = bobWallet.getCompleteAddress();
-    logger.info(`Fetched Alice and Bob accounts: ${alice.address.toString()}, ${bob.address.toString()}`);
+    const wallet = await TestWallet.create(node);
+    // During local network setup we deploy a few accounts. Below we add them to our wallet.
+    const [aliceInitialAccountData, bobInitialAccountData] = await getInitialTestAccountsData();
+    await wallet.createSchnorrAccount(aliceInitialAccountData.secret, aliceInitialAccountData.salt);
+    await wallet.createSchnorrAccount(bobInitialAccountData.secret, bobInitialAccountData.salt);
+    const alice = aliceInitialAccountData.address;
+    const bob = bobInitialAccountData.address;
+    logger.info(`Fetched Alice and Bob accounts: ${alice.toString()}, ${bob.toString()}`);
     logger.info('Deploying Token...');
-    const token = await TokenContract.deploy(aliceWallet, alice, 'TokenName', 'TokenSymbol', 18).send().deployed();
+    const token = await TokenContract.deploy(wallet, alice, 'TokenName', 'TokenSymbol', 18).send({
+        from: alice
+    }).deployed();
     logger.info('Token deployed');
-    // Create the contract abstraction and link it to Alice's and Bob's wallet for future signing
-    const tokenAlice = await TokenContract.at(token.address, aliceWallet);
-    const tokenBob = await TokenContract.at(token.address, bobWallet);
     // Mint tokens to Alice
     logger.info(`Minting ${ALICE_MINT_BALANCE} more coins to Alice...`);
-    const from = aliceWallet.getAddress(); // we are setting from to Alice here because we need a sender to calculate the tag
-    await tokenAlice.methods.mint_to_private(from, aliceWallet.getAddress(), ALICE_MINT_BALANCE).send().wait();
+    await token.methods.mint_to_private(alice, ALICE_MINT_BALANCE).send({
+        from: alice
+    }).wait();
     logger.info(`${ALICE_MINT_BALANCE} tokens were successfully minted by Alice and transferred to private`);
-    const balanceAfterMint = await tokenAlice.methods.balance_of_private(alice).simulate();
+    const balanceAfterMint = await token.methods.balance_of_private(alice).simulate({
+        from: alice
+    });
     logger.info(`Tokens successfully minted. New Alice's balance: ${balanceAfterMint}`);
     // We will now transfer tokens from Alice to Bob
     logger.info(`Transferring ${TRANSFER_AMOUNT} tokens from Alice to Bob...`);
-    await tokenAlice.methods.transfer(bob, TRANSFER_AMOUNT).send().wait();
+    await token.methods.transfer(bob, TRANSFER_AMOUNT).send({
+        from: alice
+    }).wait();
     // Check the new balances
-    const aliceBalance = await tokenAlice.methods.balance_of_private(alice).simulate();
+    const aliceBalance = await token.methods.balance_of_private(alice).simulate({
+        from: alice
+    });
     logger.info(`Alice's balance ${aliceBalance}`);
-    const bobBalance = await tokenBob.methods.balance_of_private(bob).simulate();
+    const bobBalance = await token.methods.balance_of_private(bob).simulate({
+        from: bob
+    });
     logger.info(`Bob's balance ${bobBalance}`);
 }
 main().then(()=>{