@aztec/aztec 0.0.1-commit.f504929 → 0.0.1-commit.f81dbcf

package/src/cli/util.ts

@@ -1,17 +1,18 @@
 import type { AztecNodeConfig } from '@aztec/aztec-node';
 import type { AccountManager } from '@aztec/aztec.js/wallet';
+import { getNetworkConfig } from '@aztec/cli/config';
+import { RegistryContract } from '@aztec/ethereum/contracts';
 import type { ViemClient } from '@aztec/ethereum/types';
-import type { ConfigMappingsType } from '@aztec/foundation/config';
-import { EthAddress } from '@aztec/foundation/eth-address';
+import type { ConfigMappingsType, NetworkNames } from '@aztec/foundation/config';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { type LogFn, createLogger } from '@aztec/foundation/log';
-import type { SharedNodeConfig } from '@aztec/node-lib/config';
 import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
-import { getTelemetryClient } from '@aztec/telemetry-client/start';
+import { type VersionCheck, getPackageVersion } from '@aztec/stdlib/update-checker';
 import type { EmbeddedWallet } from '@aztec/wallets/embedded';
 
 import chalk from 'chalk';
 import type { Command } from 'commander';
+import type { Hex } from 'viem';
 
 import { type AztecStartOption, aztecStartOptions } from './aztec_start_options.js';
 
@@ -271,7 +272,7 @@ export async function preloadCrsDataForVerifying(
 ): Promise<void> {
   if (realProofs) {
     const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
-    await Promise.all([Crs.new(2 ** 1, undefined, log), GrumpkinCrs.new(2 ** 16, undefined, log)]);
+    await Promise.all([Crs.new(2 ** 1, undefined, log), GrumpkinCrs.new(2 ** 16 + 1, undefined, log)]);
   }
 }
 
@@ -286,96 +287,62 @@ export async function preloadCrsDataForServerSideProving(
 ): Promise<void> {
   if (realProofs) {
     const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
-    await Promise.all([Crs.new(2 ** 25, undefined, log), GrumpkinCrs.new(2 ** 18, undefined, log)]);
+    await Promise.all([Crs.new(2 ** 25 + 1, undefined, log), GrumpkinCrs.new(2 ** 18 + 1, undefined, log)]);
   }
 }
 
-export async function setupUpdateMonitor(
-  autoUpdateMode: SharedNodeConfig['autoUpdate'],
-  updatesLocation: URL,
+export async function setupVersionChecker(
+  network: NetworkNames,
   followsCanonicalRollup: boolean,
   publicClient: ViemClient,
-  registryContractAddress: EthAddress,
   signalHandlers: Array<() => Promise<void>>,
-  updateNodeConfig?: (config: object) => Promise<void>,
-) {
-  const logger = createLogger('update-check');
-  const { UpdateChecker } = await import('@aztec/stdlib/update-checker');
-  const checker = await UpdateChecker.new({
-    baseURL: updatesLocation,
-    publicClient,
-    registryContractAddress,
-  });
+  cacheDir?: string,
+): Promise<void> {
+  const networkConfig = await getNetworkConfig(network, cacheDir);
+  if (!networkConfig) {
+    return;
+  }
 
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  checker.on('newRollupVersion', async ({ latestVersion, currentVersion }) => {
-    if (isShuttingDown()) {
-      return;
-    }
+  const { VersionChecker } = await import('@aztec/stdlib/update-checker');
 
-    // if node follows canonical rollup then this is equivalent to a config update
-    if (!followsCanonicalRollup) {
-      return;
-    }
+  const logger = createLogger('version_check');
+  const registry = new RegistryContract(publicClient, networkConfig.registryAddress as Hex);
 
-    if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
-      logger.info(`New rollup version detected. Please restart the node`, { latestVersion, currentVersion });
-      await shutdown(logger.info, ExitCode.ROLLUP_UPGRADE, signalHandlers);
-    } else if (autoUpdateMode === 'notify') {
-      logger.warn(`New rollup detected. Please restart the node`, { latestVersion, currentVersion });
-    }
+  const checks: Array<VersionCheck> = [];
+  checks.push({
+    name: 'node',
+    currentVersion: getPackageVersion() ?? 'unknown',
+    getLatestVersion: async () => {
+      const cfg = await getNetworkConfig(network, cacheDir);
+      return cfg?.nodeVersion;
+    },
   });
 
-  // 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, ExitCode.VERSION_UPGRADE, signalHandlers);
-    } else if (autoUpdateMode === 'notify') {
-      logger.info(`New node version detected. Please update and restart the node`, { latestVersion, currentVersion });
+  if (followsCanonicalRollup) {
+    const getLatestVersion = async () => {
+      const version = (await registry.getRollupVersions()).at(-1);
+      return version !== undefined ? String(version) : undefined;
+    };
+    const currentVersion = await getLatestVersion();
+    if (currentVersion !== undefined) {
+      checks.push({
+        name: 'rollup',
+        currentVersion,
+        getLatestVersion,
+      });
     }
-  });
+  }
 
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  checker.on('updateNodeConfig', async config => {
+  const checker = new VersionChecker(checks, 600_000, logger);
+  checker.on('newVersion', ({ name, latestVersion, currentVersion }) => {
     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: unknown = (config as any).publicIncludeMetrics;
-        if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every(m => typeof m === 'string')) {
-          getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
-        }
-        const publicMetricsCollectFrom: unknown = (config as any).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
+    logger.warn(`New ${name} version available`, { latestVersion, currentVersion });
   });
-
   checker.start();
+  signalHandlers.push(() => checker.stop());
 }
 
 export function stringifyConfig(config: object): string {

package/src/local-network/local-network.ts

@@ -39,6 +39,7 @@ import { createAccountLogs } from '../cli/util.js';
 import { DefaultMnemonic } from '../mnemonic.js';
 import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
 import { EpochTestSettler } from '../testing/epoch_test_settler.js';
+import { getTokenAllowedSetupFunctions } from '../testing/token_allowed_setup.js';
 import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
 import { getSponsoredFPCAddress } from './sponsored_fpc.js';
 
@@ -102,9 +103,14 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
     logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
   }
 
+  // The local network deploys a banana FPC with Token contracts, so include Token entries
+  // in the setup allowlist so FPC-based fee payments work out of the box.
+  const tokenAllowList = await getTokenAllowedSetupFunctions();
+
   const aztecNodeConfig: AztecNodeConfig = {
     ...getConfigEnvVars(),
     ...config,
+    txPublicSetupAllowListExtend: [...tokenAllowList, ...(config.txPublicSetupAllowListExtend ?? [])],
   };
   const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
   if (

package/src/testing/epoch_test_settler.ts

@@ -4,7 +4,7 @@ import { type EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { Logger } from '@aztec/foundation/log';
 import { EpochMonitor } from '@aztec/prover-node';
 import type { EthAddress, L2BlockSource } from '@aztec/stdlib/block';
-import { computeL2ToL1MembershipWitnessFromMessagesInEpoch } from '@aztec/stdlib/messaging';
+import { computeEpochOutHash } from '@aztec/stdlib/messaging';
 
 export class EpochTestSettler {
   private rollupCheatCodes: RollupCheatCodes;
@@ -51,9 +51,8 @@ export class EpochTestSettler {
       messagesInEpoch[checkpointIndex].push(block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs));
     }
 
-    const [firstMessage] = messagesInEpoch.flat(3);
-    if (firstMessage) {
-      const { root: outHash } = computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, firstMessage);
+    const outHash = computeEpochOutHash(messagesInEpoch);
+    if (!outHash.isZero()) {
       await this.rollupCheatCodes.insertOutbox(epoch, outHash.toBigInt());
     } else {
       this.log.info(`No L2 to L1 messages in epoch ${epoch}`);

package/src/testing/index.ts

@@ -2,3 +2,4 @@ export { AnvilTestWatcher } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 export { CheatCodes } from './cheat_codes.js';
 export { EpochTestSettler } from './epoch_test_settler.js';
+export { getTokenAllowedSetupFunctions } from './token_allowed_setup.js';

package/src/testing/token_allowed_setup.ts

@@ -0,0 +1,19 @@
+import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
+import { buildAllowedElement } from '@aztec/p2p/msg_validators';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
+
+/**
+ * Returns Token-specific allowlist entries needed for FPC-based fee payments.
+ * These are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
+ */
+export async function getTokenAllowedSetupFunctions(): Promise<AllowedElement[]> {
+  const tokenClassId = (await getContractClassFromArtifact(TokenContractArtifact)).id;
+  const target = { classId: tokenClassId };
+  return Promise.all([
+    // Token: needed for private transfers via FPC (transfer_to_public enqueues this)
+    buildAllowedElement(TokenContractArtifact, target, '_increase_public_balance', { onlySelf: true }),
+    // Token: needed for public transfers via FPC (fee_entrypoint_public enqueues this)
+    buildAllowedElement(TokenContractArtifact, target, 'transfer_in_public'),
+  ]);
+}

package/dest/cli/release_version.d.ts

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

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

@@ -1 +0,0 @@
-{"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

@@ -1,14 +0,0 @@
-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/scripts/add_crate.sh

@@ -1,102 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Creates a contract+test crate pair and adds them to an existing workspace.
-# Usage: add_crate.sh <crate_name>
-# Must be called from a workspace root that already has Nargo.toml with [workspace].
-
-crate_name=$1
-
-if [ -z "$crate_name" ]; then
-  echo "Error: crate name is required"
-  exit 1
-fi
-
-if [[ "$crate_name" == *"/"* ]] || [[ "$crate_name" == *"\\"* ]]; then
-  echo "Error: crate name must not contain path separators"
-  exit 1
-fi
-
-contract_dir="${crate_name}_contract"
-test_dir="${crate_name}_test"
-
-if [ -d "$contract_dir" ]; then
-  echo "Error: directory '$contract_dir' already exists"
-  exit 1
-fi
-if [ -d "$test_dir" ]; then
-  echo "Error: directory '$test_dir' already exists"
-  exit 1
-fi
-
-# Get the actual aztec version for the git tag.
-AZTEC_VERSION=$(jq -r '.version' $(dirname $0)/../package.json)
-
-# Create contract crate
-mkdir -p "$contract_dir/src"
-cat > "$contract_dir/Nargo.toml" << CEOF
-[package]
-name = "${crate_name}_contract"
-type = "contract"
-
-[dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v${AZTEC_VERSION}", directory="aztec" }
-CEOF
-
-cat > "$contract_dir/src/main.nr" << 'EOF'
-use aztec::macros::aztec;
-
-#[aztec]
-pub contract Main {
-    use aztec::macros::functions::{external, initializer};
-
-    #[initializer]
-    #[external("private")]
-    fn constructor() {}
-}
-EOF
-
-# Create test crate
-mkdir -p "$test_dir/src"
-cat > "$test_dir/Nargo.toml" << TEOF
-[package]
-name = "${crate_name}_test"
-type = "lib"
-
-[dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v${AZTEC_VERSION}", directory="aztec" }
-${crate_name}_contract = { path = "../${contract_dir}" }
-TEOF
-
-cat > "$test_dir/src/lib.nr" << 'NOIR'
-use aztec::test::helpers::test_environment::TestEnvironment;
-use __CRATE_NAME___contract::Main;
-
-#[test]
-unconstrained fn test_constructor() {
-    let mut env = TestEnvironment::new();
-    let deployer = env.create_light_account();
-
-    // Deploy the contract with the default constructor:
-    let contract_address = env.deploy("@__CRATE_NAME___contract/Main").with_private_initializer(
-        deployer,
-        Main::interface().constructor(),
-    );
-
-    // Deploy without an initializer:
-    let contract_address = env.deploy("@__CRATE_NAME___contract/Main").without_initializer();
-}
-NOIR
-
-sed -i "s/__CRATE_NAME__/${crate_name}/g" "$test_dir/src/lib.nr"
-
-# Add members to workspace Nargo.toml
-if grep -q 'members\s*=\s*\[\s*\]' Nargo.toml; then
-  # Empty array: members = []
-  sed -i "s|members\s*=\s*\[\s*\]|members = [\"${contract_dir}\", \"${test_dir}\"]|" Nargo.toml
-else
-  # Non-empty array: add before closing ]
-  sed -i "s|\(members\s*=\s*\[.*\)\]|\1, \"${contract_dir}\", \"${test_dir}\"]|" Nargo.toml
-fi
-
-echo "Created crates '${contract_dir}' and '${test_dir}'"

package/scripts/setup_workspace.sh

@@ -1,68 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Creates an Aztec contract workspace with a contract crate and a test crate.
-# Usage: setup_workspace.sh <package_name>
-# Must be called from the workspace root directory.
-
-package_name=$1
-script_path=$(realpath $(dirname "$0"))
-
-if [ -z "$package_name" ]; then
-  echo "Error: package name is required"
-  exit 1
-fi
-
-if [ -f "Nargo.toml" ]; then
-  echo "Error: Nargo.toml already exists in the current directory."
-  echo "To add another contract crate to this workspace, use 'aztec new <name>' instead."
-  exit 1
-fi
-
-# Create workspace root Nargo.toml with empty members (add_crate.sh will populate)
-cat > Nargo.toml << 'EOF'
-[workspace]
-members = []
-EOF
-
-# Create the first crate pair
-$script_path/add_crate.sh "$package_name"
-
-# Create README
-cat > README.md << REOF
-# ${package_name}
-
-An Aztec Noir contract project.
-
-## Compile
-
-\`\`\`bash
-aztec compile
-\`\`\`
-
-This compiles all contract crates and outputs artifacts to \`target/\`.
-
-## Test
-
-\`\`\`bash
-aztec test
-\`\`\`
-
-This runs all tests in the workspace.
-
-## Generate TypeScript bindings
-
-\`\`\`bash
-aztec codegen target -o src/artifacts
-\`\`\`
-
-This generates TypeScript contract artifacts from the compiled output in \`target/\` into \`src/artifacts/\`.
-REOF
-
-# Create .gitignore
-cat > .gitignore << 'GEOF'
-target/
-codegenCache.json
-GEOF
-
-echo "Created Aztec contract workspace with crates '${package_name}_contract' and '${package_name}_test'"

package/src/cli/release_version.ts

@@ -1,21 +0,0 @@
-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: string = 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;
-};