@aztec/aztec 0.0.1-commit.b655e406 → 0.0.1-commit.fce3e4f

package/src/cli/aztec_start_action.ts

@@ -9,7 +9,7 @@ import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
 import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
 
-import { createSandbox } from '../sandbox/index.js';
+import { createLocalNetwork } from '../local-network/index.js';
 import { github, splash } from '../splash.js';
 import { getCliVersion } from './release_version.js';
 import { extractNamespacedOptions, installSignalHandlers } from './util.js';
@@ -22,19 +22,19 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
   const adminServices: NamespacedApiHandlers = {};
   let config: ChainConfig | undefined = undefined;
 
-  if (options.sandbox) {
+  if (options.localNetwork) {
     const cliVersion = getCliVersion();
-    const sandboxOptions = extractNamespacedOptions(options, 'sandbox');
-    sandboxOptions.testAccounts = true;
+    const localNetwork = extractNamespacedOptions(options, 'local-network');
+    localNetwork.testAccounts = true;
     userLog(`${splash}\n${github}\n\n`);
-    userLog(`Setting up Aztec Sandbox ${cliVersion}, please stand by...`);
+    userLog(`Setting up Aztec local network ${cliVersion}, please stand by...`);
 
-    const { node, stop } = await createSandbox(
+    const { node, stop } = await createLocalNetwork(
       {
-        l1Mnemonic: sandboxOptions.l1Mnemonic,
+        l1Mnemonic: localNetwork.l1Mnemonic,
         l1RpcUrls: options.l1RpcUrls,
-        deployAztecContractsSalt: sandboxOptions.deployAztecContractsSalt,
-        testAccounts: sandboxOptions.testAccounts,
+        deployAztecContractsSalt: localNetwork.deployAztecContractsSalt,
+        testAccounts: localNetwork.testAccounts,
         realProofs: false,
       },
       userLog,

package/src/cli/aztec_start_options.ts

@@ -82,6 +82,7 @@ export const universalOptions = [
   'l1ConsensusHostApiKeys',
   'l1ConsensusHostApiKeyHeaders',
   'p2pEnabled',
+  'fishermanMode',
   ...getKeys(chainConfigMappings),
   ...getKeys(l1ContractsConfigMappings),
   ...getKeys(l1ContractAddressesMapping),
@@ -107,24 +108,26 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
 
     configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
     configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
+
+    configToFlag('--fisherman-mode', sharedNodeConfigMappings.fishermanMode),
   ],
-  SANDBOX: [
+  LOCAL_NETWORK: [
     {
-      flag: '--sandbox',
-      description: 'Starts Aztec Sandbox',
+      flag: '--local-network',
+      description: 'Starts Aztec Local Network',
       defaultValue: undefined,
       env: undefined,
     },
     {
-      flag: '--sandbox.l1Mnemonic <value>',
+      flag: '--local-network.l1Mnemonic <value>',
       description: 'Mnemonic for L1 accounts. Will be used ',
       defaultValue: DefaultMnemonic,
       env: 'MNEMONIC',
     },
     {
-      flag: '--sandbox.deployAztecContractsSalt <value>',
+      flag: '--local-network.deployAztecContractsSalt <value>',
       description:
-        'Numeric salt for deploying L1 Aztec contracts before starting the sandbox. Needs mnemonic or private key to be set.',
+        'Numeric salt for deploying L1 Aztec contracts before starting the local network. Needs mnemonic or private key to be set.',
       env: 'DEPLOY_AZTEC_CONTRACTS_SALT',
       defaultValue: undefined,
       parseVal: (val: string) => (val ? parseInt(val) : undefined),

package/src/cli/cli.ts

@@ -31,18 +31,51 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
 
   program.configureHelp({ sortSubcommands: true });
 
-  program.addHelpText(
-    'after',
-    `
+  if (process.env.AZTEC_SHELL_WRAPPER) {
+    program.addHelpText(
+      'after',
+      `
 
   Additional commands:
 
+    init [folder] [options]: creates a new Noir project
+      Options:
+        --name <name>       Name of the package
+        --contract          Use a contract template (default)
+        --lib               Use a library template
+        --bin               Use a binary template
+      Examples:
+        $ aztec init                    # creates a contract project in current directory
+        $ aztec init --lib              # creates a library project
+
+    new <path> [options]: creates a new Noir project in a new directory
+      Options:
+        --name <name>       Name of the package
+        --contract          Use a contract template (default)
+        --lib               Use a library template
+        --bin               Use a binary template
+      Examples:
+        $ aztec new my-project          # creates a contract project in ./my-project
+        $ aztec new my-lib --lib        # creates a library project in ./my-lib
+
+    compile [options]: compiles Aztec Noir contracts
+      Compiles contracts with nargo compile and then postprocesses them to generate Aztec-specific artifacts including:
+        - Transpiled contract artifacts
+        - Verification keys
+      The compiled contracts will be placed in the target/ directory by default.
+      Supports standard nargo compile options.
+
     test [options]: starts a dockerized TXE node via
       $ aztec start --txe
     then runs
-      $ aztec-nargo test --silence-warnings --oracle-resolver=<TXE_ADDRESS> [options]
+      $ aztec test --silence-warnings --oracle-resolver=<TXE_ADDRESS> [options]
+
+    preload-crs: Downloads and caches the Common Reference String (CRS) data required for zero-knowledge proofs.
+      Example:
+        $ aztec preload-crs             # preloads CRS data
     `,
-  );
+    );
+  }
 
   program
     .command('preload-crs')

package/src/cli/cmds/start_node.ts

@@ -18,7 +18,7 @@ import {
 import { TestWallet } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
-import { createAztecNode } from '../../sandbox/index.js';
+import { createAztecNode } from '../../local-network/index.js';
 import {
   extractNamespacedOptions,
   extractRelevantOptions,
@@ -93,7 +93,7 @@ export async function startNode(
     ...config,
   };
 
-  if (!options.sequencer) {
+  if (!options.sequencer && !nodeConfig.fishermanMode) {
     nodeConfig.disableValidator = true;
   } else {
     const sequencerConfig = {

package/src/examples/token.ts

@@ -21,7 +21,7 @@ async function main() {
 
   const wallet = await TestWallet.create(node);
 
-  // During sandbox setup we deploy a few accounts. Below we add them to our wallet.
+  // 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);

package/src/index.ts

@@ -1,6 +1,6 @@
 export {
-  createSandbox,
+  createLocalNetwork,
   registerDeployedBananaCoinInWalletAndGetAddress,
   registerDeployedBananaFPCInWalletAndGetAddress,
   registerDeployedSponsoredFPCInWalletAndGetAddress,
-} from './sandbox/index.js';
+} from './local-network/index.js';

package/src/{sandbox → local-network}/index.ts

@@ -1,4 +1,4 @@
-export * from './sandbox.js';
+export * from './local-network.js';
 
 export {
   registerDeployedBananaCoinInWalletAndGetAddress,

package/src/{sandbox/sandbox.ts → local-network/local-network.ts}

@@ -38,12 +38,12 @@ import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
 import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
 import { getSponsoredFPCAddress } from './sponsored_fpc.js';
 
-const logger = createLogger('sandbox');
+const logger = createLogger('local-network');
 
 const localAnvil = foundry;
 
 /**
- * Function to deploy our L1 contracts to the sandbox L1
+ * Function to deploy our L1 contracts to the local network L1
  * @param aztecNodeConfig - The Aztec Node Config
  * @param hdAccount - Account for publishing L1 contracts
  */
@@ -78,8 +78,8 @@ export async function deployContractsToL1(
       genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
       salt: opts.salt,
       feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
-      aztecTargetCommitteeSize: 0, // no committee in sandbox
-      slasherFlavor: 'none', // no slashing in sandbox
+      aztecTargetCommitteeSize: 0, // no committee in local network
+      slasherFlavor: 'none', // no slashing in local network
       realVerifier: false,
     },
   );
@@ -92,29 +92,29 @@ export async function deployContractsToL1(
   return aztecNodeConfig.l1Contracts;
 }
 
-/** Sandbox settings. */
-export type SandboxConfig = AztecNodeConfig & {
+/** Local network settings. */
+export type LocalNetworkConfig = AztecNodeConfig & {
   /** Mnemonic used to derive the L1 deployer private key.*/
   l1Mnemonic: string;
   /** Salt used to deploy L1 contracts.*/
   deployAztecContractsSalt: string;
-  /** Whether to deploy test accounts on sandbox start.*/
+  /** Whether to deploy test accounts on local network start.*/
   testAccounts: boolean;
 };
 
 /**
  * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
  * Does not start any HTTP services nor populate any initial accounts.
- * @param config - Optional Sandbox settings.
+ * @param config - Optional local network settings.
  */
-export async function createSandbox(config: Partial<SandboxConfig> = {}, userLog: LogFn) {
-  // sandbox is meant for test envs. We should only need one l1RpcUrl
+export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {}, userLog: LogFn) {
+  // local network is meant for test envs. We should only need one l1RpcUrl
   const l1RpcUrl = config.l1RpcUrls?.[0];
   if (!l1RpcUrl) {
     throw new Error('An L1 RPC URL is required');
   }
   if ((config.l1RpcUrls?.length || 0) > 1) {
-    logger.warn(`Multiple L1 RPC URLs provided. Sandbox will only use the first one: ${l1RpcUrl}`);
+    logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
   }
   const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars(), ...config };
   const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
@@ -179,12 +179,12 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}, userLog
       publicClient,
       dateProvider,
     );
-    watcher.setIsSandbox(true);
+    watcher.setisLocalNetwork(true);
     await watcher.start();
   }
 
   const telemetry = initTelemetryClient(getTelemetryClientConfig());
-  // Create a local blob sink client inside the sandbox, no http connectivity
+  // Create a local blob sink client inside the local network, no http connectivity
   const blobSinkClient = createBlobSinkClient();
   const node = await createAztecNode(
     aztecNodeConfig,

package/src/{sandbox → local-network}/sponsored_fpc.ts

@@ -1,3 +1,4 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import {
   type ContractInstanceWithAddress,
   getContractInstanceFromInstantiationParams,
@@ -13,11 +14,11 @@ async function getSponsoredFPCInstance(): Promise<ContractInstanceWithAddress> {
   });
 }
 
-export async function getSponsoredFPCAddress() {
+export async function getSponsoredFPCAddress(): Promise<AztecAddress> {
   return (await getSponsoredFPCInstance()).address;
 }
 
-export async function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet: Wallet) {
+export async function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress> {
   const fpc = await getSponsoredFPCInstance();
   // The following is no-op if the contract is already registered
   await wallet.registerContract(fpc, SponsoredFPCContract.artifact);

package/src/testing/anvil_test_watcher.ts

@@ -1,5 +1,6 @@
 import type { ViemClient } from '@aztec/ethereum';
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -16,11 +17,11 @@ import { type GetContractReturnType, getAddress, getContract } from 'viem';
  * block within the slot. And if so, it will time travel into the next slot.
  */
 export class AnvilTestWatcher {
-  private isSandbox: boolean = false;
+  private isLocalNetwork: boolean = false;
 
   private rollup: GetContractReturnType<typeof RollupAbi, ViemClient>;
   private rollupCheatCodes: RollupCheatCodes;
-  private l2SlotDuration!: bigint;
+  private l2SlotDuration!: number;
 
   private filledRunningPromise?: RunningPromise;
   private syncDateProviderPromise?: RunningPromise;
@@ -54,8 +55,8 @@ export class AnvilTestWatcher {
     this.isMarkingAsProven = isMarkingAsProven;
   }
 
-  setIsSandbox(isSandbox: boolean) {
-    this.isSandbox = isSandbox;
+  setisLocalNetwork(isLocalNetwork: boolean) {
+    this.isLocalNetwork = isLocalNetwork;
   }
 
   async start() {
@@ -68,7 +69,7 @@ export class AnvilTestWatcher {
 
     // If auto mining is not supported (e.g., we are on a real network), then we
     // will simple do nothing. But if on an anvil or the like, this make sure that
-    // the sandbox and tests don't break because time is frozen and we never get to
+    // the local network and tests don't break because time is frozen and we never get to
     // the next slot.
     const isAutoMining = await this.cheatcodes.isAutoMining();
 
@@ -105,7 +106,7 @@ export class AnvilTestWatcher {
   }
 
   async syncDateProviderToL1IfBehind() {
-    // this doesn't apply to the sandbox, because we don't have a date provider in the sandbox
+    // this doesn't apply to the local network, because we don't have a date provider in the local network
     if (!this.dateProvider) {
       return;
     }
@@ -123,12 +124,13 @@ export class AnvilTestWatcher {
 
   async warpTimeIfNeeded() {
     try {
-      const currentSlot = await this.rollup.read.getCurrentSlot();
-      const pendingBlockNumber = BigInt(await this.rollup.read.getPendingBlockNumber());
-      const blockLog = await this.rollup.read.getBlock([pendingBlockNumber]);
-      const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([currentSlot + 1n]));
+      const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
+      const pendingCheckpointNumber = BigInt(await this.rollup.read.getPendingCheckpointNumber());
+      const checkpointLog = await this.rollup.read.getCheckpoint([pendingCheckpointNumber]);
+      const nextSlot = SlotNumber(currentSlot + 1);
+      const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([BigInt(nextSlot)]));
 
-      if (currentSlot === blockLog.slotNumber) {
+      if (BigInt(currentSlot) === checkpointLog.slotNumber) {
         // We should jump to the next slot
         try {
           await this.cheatcodes.warp(nextSlotTimestamp, {
@@ -142,8 +144,8 @@ export class AnvilTestWatcher {
         return;
       }
 
-      // If we are not in sandbox, we don't need to warp time
-      if (!this.isSandbox) {
+      // If we are not in local network, we don't need to warp time
+      if (!this.isLocalNetwork) {
         return;
       }
 

package/dest/sandbox/banana_fpc.d.ts

@@ -1,10 +0,0 @@
-import { type InitialAccountData } from '@aztec/accounts/testing';
-import type { Wallet } from '@aztec/aztec.js/wallet';
-import type { LogFn } from '@aztec/foundation/log';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-export declare function getBananaCoinAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
-export declare function getBananaFPCAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
-export declare function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn): Promise<void>;
-export declare function registerDeployedBananaCoinInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
-export declare function registerDeployedBananaFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
-//# sourceMappingURL=banana_fpc.d.ts.map

package/dest/sandbox/banana_fpc.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/sandbox/banana_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAwB3D,wBAAsB,oBAAoB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE/E;AAWD,wBAAsB,mBAAmB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE9E;AAED,wBAAsB,cAAc,CAAC,eAAe,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAcrG;AAED,wBAAsB,+CAA+C,CAAC,MAAM,EAAE,MAAM,yBAMnF;AAED,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,MAAM,yBAMlF"}

package/dest/sandbox/index.d.ts

@@ -1,4 +0,0 @@
-export * from './sandbox.js';
-export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, } from './banana_fpc.js';
-export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';
-//# sourceMappingURL=index.d.ts.map

package/dest/sandbox/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sandbox/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAE7B,OAAO,EACL,+CAA+C,EAC/C,8CAA8C,GAC/C,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iDAAiD,EAAE,MAAM,oBAAoB,CAAC"}

package/dest/sandbox/sandbox.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAY7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAcvH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,yCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAkCP;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,wBAAwB,EAAE,MAAM,CAAC;IACjC,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,YAAK,EAAE,OAAO,EAAE,KAAK;;;GAgHtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}

package/dest/sandbox/sponsored_fpc.d.ts

@@ -1,4 +0,0 @@
-import type { Wallet } from '@aztec/aztec.js/wallet';
-export declare function getSponsoredFPCAddress(): Promise<import("@aztec/aztec.js/addresses").AztecAddress>;
-export declare function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet: Wallet): Promise<import("@aztec/aztec.js/addresses").AztecAddress>;
-//# sourceMappingURL=sponsored_fpc.d.ts.map

package/dest/sandbox/sponsored_fpc.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sponsored_fpc.d.ts","sourceRoot":"","sources":["../../src/sandbox/sponsored_fpc.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAUrD,wBAAsB,sBAAsB,8DAE3C;AAED,wBAAsB,iDAAiD,CAAC,MAAM,EAAE,MAAM,6DAKrF"}