@aztec/aztec 0.0.1-commit.cd76b27 → 0.0.1-commit.ce4f8c4f2

package/src/testing/anvil_test_watcher.ts

@@ -31,6 +31,15 @@ export class AnvilTestWatcher {
 
   private isMarkingAsProven = true;
 
+  // Optional callback to check if there are pending txs in the mempool.
+  private getPendingTxCount?: () => Promise<number>;
+
+  // Optional callback to check if the sequencer is actively building a block.
+  private isSequencerBuilding?: () => boolean;
+
+  // Tracks when we first observed the current unfilled slot with pending txs (real wall time).
+  private unfilledSlotFirstSeen?: { slot: number; realTime: number };
+
   constructor(
     private cheatcodes: EthCheatCodes,
     rollupAddress: EthAddress,
@@ -59,6 +68,16 @@ export class AnvilTestWatcher {
     this.isLocalNetwork = isLocalNetwork;
   }
 
+  /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */
+  setGetPendingTxCount(fn: () => Promise<number>) {
+    this.getPendingTxCount = fn;
+  }
+
+  /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */
+  setIsSequencerBuilding(fn: () => boolean) {
+    this.isSequencerBuilding = fn;
+  }
+
   async start() {
     if (this.filledRunningPromise) {
       throw new Error('Watcher already watching for filled slot');
@@ -111,7 +130,7 @@ export class AnvilTestWatcher {
       return;
     }
 
-    const l1Time = (await this.cheatcodes.timestamp()) * 1000;
+    const l1Time = (await this.cheatcodes.lastBlockTimestamp()) * 1000;
     const wallTime = this.dateProvider.now();
     if (l1Time > wallTime) {
       this.logger.warn(`L1 is ahead of wall time. Syncing wall time to L1 time`);
@@ -131,15 +150,8 @@ export class AnvilTestWatcher {
       const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([BigInt(nextSlot)]));
 
       if (BigInt(currentSlot) === checkpointLog.slotNumber) {
-        // We should jump to the next slot
-        try {
-          await this.cheatcodes.warp(nextSlotTimestamp, {
-            resetBlockInterval: true,
-          });
-        } catch (e) {
-          this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
-        }
-
+        // The current slot has been filled, we should jump to the next slot.
+        await this.warpToTimestamp(nextSlotTimestamp);
         this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
         return;
       }
@@ -149,18 +161,50 @@ export class AnvilTestWatcher {
         return;
       }
 
-      const currentTimestamp = this.dateProvider?.now() ?? Date.now();
-      if (currentTimestamp > nextSlotTimestamp * 1000) {
-        try {
-          await this.cheatcodes.warp(nextSlotTimestamp, { resetBlockInterval: true });
-        } catch (e) {
-          this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
+      // If there are pending txs and the sequencer missed them, warp quickly (after a 2s real-time debounce) so the
+      // sequencer can retry in the next slot. Without this, we'd have to wait a full real-time slot duration (~36s) for
+      // the dateProvider to catch up to the next slot timestamp. We skip the warp if the sequencer is actively building
+      // to avoid invalidating its in-progress work.
+      if (this.getPendingTxCount) {
+        const pendingTxs = await this.getPendingTxCount();
+        if (pendingTxs > 0) {
+          if (this.isSequencerBuilding?.()) {
+            this.unfilledSlotFirstSeen = undefined;
+            return;
+          }
+
+          const realNow = Date.now();
+          if (!this.unfilledSlotFirstSeen || this.unfilledSlotFirstSeen.slot !== currentSlot) {
+            this.unfilledSlotFirstSeen = { slot: currentSlot, realTime: realNow };
+            return;
+          }
+
+          if (realNow - this.unfilledSlotFirstSeen.realTime > 2000) {
+            await this.warpToTimestamp(nextSlotTimestamp);
+            this.unfilledSlotFirstSeen = undefined;
+            this.logger.info(`Slot ${currentSlot} was missed with pending txs, jumped to next slot`);
+          }
+
+          return;
         }
+      }
 
+      // Fallback: warp when the dateProvider time has passed the next slot timestamp.
+      const currentTimestamp = this.dateProvider?.now() ?? Date.now();
+      if (currentTimestamp > nextSlotTimestamp * 1000) {
+        await this.warpToTimestamp(nextSlotTimestamp);
         this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
       }
     } catch {
       this.logger.error('mineIfSlotFilled failed');
     }
   }
+
+  private async warpToTimestamp(timestamp: number) {
+    try {
+      await this.cheatcodes.warp(timestamp, { resetBlockInterval: true });
+    } catch (e) {
+      this.logger.error(`Failed to warp to timestamp ${timestamp}: ${e}`);
+    }
+  }
 }

package/src/testing/cheat_codes.ts

@@ -72,7 +72,7 @@ export class CheatCodes {
    * @param duration - The duration to advance time by (in seconds)
    */
   async warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number) {
-    const currentTimestamp = await this.eth.timestamp();
+    const currentTimestamp = await this.eth.lastBlockTimestamp();
     const targetTimestamp = BigInt(currentTimestamp) + BigInt(duration);
     await this.warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp);
   }

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/compile.sh

@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-NARGO=${NARGO:-nargo}
-BB=${BB:-bb}
-
-# If help is requested, show Aztec-specific info then run nargo compile help and then exit in order to not trigger
-# transpilation
-for arg in "$@"; do
-  if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
-    cat << 'EOF'
-Aztec Compile - Compile Aztec Noir contracts
-
-This command compiles Aztec Noir contracts using nargo and then automatically
-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.
-
----
-Underlying nargo compile options:
-
-EOF
-    nargo compile --help
-    exit 0
-  fi
-done
-
-# Run nargo compile.
-$NARGO compile "$@"
-
-echo "Postprocessing contract..."
-$BB aztec_process
-
-# Strip internal prefixes from all compiled contract JSONs in target directory
-# TODO: This should be part of bb aztec_process!
-for json in target/*.json; do
-  temp_file="${json}.tmp"
-  jq '.functions |= map(.name |= sub("^__aztec_nr_internals__"; ""))' "$json" > "$temp_file"
-  mv "$temp_file" "$json"
-done
-
-echo "Compilation complete!"

package/scripts/extract_function.js

@@ -1,47 +0,0 @@
-#!/usr/bin/env node
-import fs from 'fs/promises';
-import path from 'path';
-
-// Simple script to extract a contract function as a separate Noir artifact.
-// We need to use this since the transpiling that we do on public functions make the contract artifacts
-// unreadable by noir tooling, since they are no longer following the noir artifact format.
-async function main() {
-  let [contractArtifactPath, functionName] = process.argv.slice(2);
-  if (!contractArtifactPath || !functionName) {
-    console.log('Usage: node extractFunctionAsNoirArtifact.js <contractArtifactPath> <functionName>');
-    return;
-  }
-
-  const contractArtifact = JSON.parse(await fs.readFile(contractArtifactPath, 'utf8'));
-  const func = contractArtifact.functions.find(f => f.name === functionName);
-  if (!func) {
-    console.error(`Function ${functionName} not found in ${contractArtifactPath}`);
-    return;
-  }
-
-  const artifact = {
-    noir_version: contractArtifact.noir_version,
-    hash: 0,
-    abi: func.abi,
-    bytecode: func.bytecode,
-    debug_symbols: func.debug_symbols,
-    file_map: contractArtifact.file_map,
-    expression_width: {
-      Bounded: {
-        width: 4,
-      },
-    },
-  };
-
-  const outputDir = path.dirname(contractArtifactPath);
-  const outputName = path.basename(contractArtifactPath, '.json') + `-${functionName}.json`;
-
-  const outPath = path.join(outputDir, outputName);
-
-  await fs.writeFile(outPath, JSON.stringify(artifact, null, 2));
-}
-
-main().catch(err => {
-  console.error(err);
-  process.exit(1);
-});

package/scripts/flamegraph.sh

@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-# If first arg is -h or --help, print usage.
-if [ $# -lt 2 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
-    cat << 'EOF'
-Aztec Flamegraph - Generate a gate count flamegraph for an aztec contract function.
-
-Usage: aztec flamegraph <contract_artifact> <function>
-
-Options:
-  -h, --help     Print help
-
-Will output an svg at <artifact_path>/<contract>-<function>-flamegraph.svg.
-You can open it in your browser to view it.
-
-EOF
-    exit 0
-fi
-
-cleanup() {
-  set +e
-  if [ -f "$function_artifact" ]; then
-    rm -f "$function_artifact"
-  fi
-}
-
-trap cleanup EXIT
-
-# Get the directory of the script
-script_dir=$(realpath $(dirname $0))
-
-PROFILER=${PROFILER_PATH:-noir-profiler}
-BB=${BB:-bb}
-
-# first console arg is contract name in camel case or path to contract artifact
-contract=$1
-
-# second console arg is the contract function
-function=$2
-
-if [ ! -f "$contract" ]; then
-  echo "Error: Contract artifact not found at: $contract"
-  exit 1
-fi
-artifact_path=$contract
-function_artifact="${artifact_path%%.json}-${function}.json"
-output_dir=$(dirname "$artifact_path")
-
-# Extract artifact for the specific function.
-node $script_dir/extract_function.js "$artifact_path" $function
-
-# Generate the flamegraph
-$PROFILER gates --artifact-path "$function_artifact" --backend-path "$BB" --backend-gates-command "gates" --output "$output_dir" --scheme chonk --include_gates_per_opcode
-
-# Save as $artifact_name-$function-flamegraph.svg
-output_file="${function_artifact%%.json}-flamegraph.svg"
-mv "$output_dir/__aztec_nr_internals__${function}_gates.svg" "$output_file"
-echo "Flamegraph generated at: $output_file"

package/scripts/setup_project.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Get the actual aztec version for the git tag.
-AZTEC_VERSION=$(jq -r '.version' $(dirname $0)/../package.json)
-NARGO_TOML_PATH="Nargo.toml"
-MAIN_NR_PATH="src/main.nr"
-
-if [ ! -f "$NARGO_TOML_PATH" ]; then
-  >&2 echo "Warning: Could not find Nargo.toml at $NARGO_TOML_PATH to add aztec dependency"
-  exit 1
-fi
-
-if [ ! -f "$MAIN_NR_PATH" ]; then
-  >&2 echo "Warning: Could not find main.nr at $MAIN_NR_PATH"
-  exit 1
-fi
-
-# Add aztec dependency to Nargo.toml
-echo "" >> "$NARGO_TOML_PATH"
-echo "aztec = { git=\"https://github.com/AztecProtocol/aztec-nr\", tag=\"v${AZTEC_VERSION}\", directory=\"aztec\" }" >> "$NARGO_TOML_PATH"
-echo "Added aztec dependency (v${AZTEC_VERSION}) to Nargo.toml"
-
-# Replace the contents of main.nr with the Aztec contract template
-cat > "$MAIN_NR_PATH" << 'EOF'
-use aztec::macros::aztec;
-
-#[aztec]
-contract Main {}
-EOF
-echo "Created main.nr with Aztec contract template"

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;
-};