Merge branch 'next' into merge-train/avm

Author: AztecBot

.github/workflows/deploy-staging-networks.yml

@@ -124,6 +124,7 @@ jobs:
           BOT_SWAPS_FOLLOW_CHAIN=PENDING
           BOT_SWAPS_TX_INTERVAL_SECONDS=350
 
+          FLUSH_ENTRY_QUEUE=false
           EOF
           echo "NAMESPACE=$NAMESPACE" >> $GITHUB_ENV
 
@@ -174,11 +175,12 @@ jobs:
           OTEL_COLLECTOR_ENDPOINT=${{ secrets.OTEL_COLLECTOR_URL }}
           VERIFY_CONTRACTS=true
           ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }}
-
           STORE_SNAPSHOT_URL="${{ secrets.GCS_TESTNET_SNAPSHOT_URL }}/staging-ignition/"
           DEPLOY_INTERNAL_BOOTNODE=false
           BOT_TRANSFERS_REPLICAS=0
           BOT_SWAPS_REPLICAS=0
+          DEPLOY_INTERNAL_BOOTNODE=false
+          FLUSH_ENTRY_QUEUE=false
           EOF
           echo "NAMESPACE=$NAMESPACE" >> $GITHUB_ENV
 
@@ -233,6 +235,7 @@ jobs:
           DEPLOY_INTERNAL_BOOTNODE=false
           BOT_TRANSFERS_REPLICAS=0
           BOT_SWAPS_REPLICAS=0
+          FLUSH_ENTRY_QUEUE=false
           EOF
           echo "NAMESPACE=$NAMESPACE" >> $GITHUB_ENV
 

spartan/aztec-network/files/config/deploy-l1-contracts.sh

@@ -67,9 +67,11 @@ if [ "$REAL_VERIFIER" = "true" ]; then
   REAL_VERIFIER_ARG="--real-verifier"
 fi
 
+FLUSH_ENTRY_QUEUE_ARG="--flush-entry-queue"
+
 for attempt in $(seq 1 $MAX_RETRIES); do
   # Construct base command
-  base_cmd="LOG_LEVEL=debug node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts $TEST_ACCOUNTS_ARG $ACCELERATED_TEST_DEPLOYMENTS_ARG $SPONSORED_FPC_ARG $REAL_VERIFIER_ARG"
+  base_cmd="LOG_LEVEL=debug node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts $TEST_ACCOUNTS_ARG $ACCELERATED_TEST_DEPLOYMENTS_ARG $SPONSORED_FPC_ARG $REAL_VERIFIER_ARG $FLUSH_ENTRY_QUEUE"
 
   # Add account - use private key if set, otherwise use mnemonic
   if [ -n "${L1_DEPLOYMENT_PRIVATE_KEY:-}" ]; then

spartan/scripts/deploy_network.sh

@@ -75,6 +75,8 @@ BOT_SWAPS_TX_INTERVAL_SECONDS=${BOT_SWAPS_TX_INTERVAL_SECONDS:-60}
 BOT_TRANSFERS_FOLLOW_CHAIN=${BOT_TRANSFERS_FOLLOW_CHAIN:-NONE}
 BOT_SWAPS_FOLLOW_CHAIN=${BOT_SWAPS_FOLLOW_CHAIN:-NONE}
 
+FLUSH_ENTRY_QUEUE=${FLUSH_ENTRY_QUEUE:-true}
+
 ########################
 # CHAOS MESH VARIABLES
 ########################
@@ -217,6 +219,7 @@ NETWORK = "${NETWORK:-null}"
 JOB_NAME = "deploy-rollup-contracts"
 JOB_BACKOFF_LIMIT = 3
 JOB_TTL_SECONDS_AFTER_FINISHED = 3600
+FLUSH_ENTRY_QUEUE = ${FLUSH_ENTRY_QUEUE}
 EOF
 
 tf_run "${DEPLOY_ROLLUP_CONTRACTS_DIR}" "${DESTROY_ROLLUP_CONTRACTS}" "${CREATE_ROLLUP_CONTRACTS}"

spartan/terraform/deploy-rollup-contracts/main.tf

@@ -29,7 +29,8 @@ locals {
     ["--create-verification-json", "/tmp/l1-verify"],
     var.SALT != null ? ["--salt", tostring(var.SALT)] : [],
     var.SPONSORED_FPC ? ["--sponsored-fpc"] : [],
-    var.REAL_VERIFIER ? ["--real-verifier"] : []
+    var.REAL_VERIFIER ? ["--real-verifier"] : [],
+    var.FLUSH_ENTRY_QUEUE ? ["--flush-entry-queue"] : []
   )
 
 

spartan/terraform/deploy-rollup-contracts/variables.tf

@@ -210,3 +210,9 @@ variable "NETWORK" {
   type        = string
   nullable    = true
 }
+
+variable "FLUSH_ENTRY_QUEUE" {
+  description = "Flush the entry queue after adding initial validators"
+  type        = bool
+  default     = true
+}

yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts

@@ -22,6 +22,7 @@ export async function deployL1Contracts(
   createVerificationJson: string | false,
   initialValidators: EthAddress[],
   realVerifier: boolean,
+  flushEntryQueue: boolean,
   log: LogFn,
   debugLogger: Logger,
 ) {
@@ -52,6 +53,7 @@ export async function deployL1Contracts(
     config,
     realVerifier,
     createVerificationJson,
+    flushEntryQueue,
     debugLogger,
   );
 

yarn-project/cli/src/cmds/l1/index.ts

@@ -48,6 +48,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract')
     .option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false)
     .option('--real-verifier', 'Deploy the real verifier', false)
+    .option('--flush-entry-queue', 'Whether to flush the entry queue after adding initial validators', false)
     .option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false)
     .action(async options => {
       const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
@@ -68,6 +69,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options.createVerificationJson,
         initialValidators,
         options.realVerifier,
+        options.flushEntryQueue,
         log,
         debugLogger,
       );

yarn-project/cli/src/utils/aztec.ts

@@ -59,6 +59,7 @@ export async function deployAztecContracts(
   config: L1ContractsConfig,
   realVerifier: boolean,
   createVerificationJson: string | false,
+  flushEntryQueue: boolean,
   debugLogger: Logger,
 ): Promise<DeployL1ContractsReturnType> {
   const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
@@ -89,6 +90,7 @@ export async function deployAztecContracts(
     },
     config,
     createVerificationJson,
+    flushEntryQueue,
   );
 
   return result;

yarn-project/ethereum/src/contracts/registry.test.ts

@@ -136,6 +136,7 @@ describe('Registry', () => {
         realVerifier: false,
       },
       deployedAddresses,
+      true,
       logger,
     );
 

yarn-project/ethereum/src/contracts/rollup.ts

@@ -441,6 +441,10 @@ export class RollupContract {
     return this.rollup.read.getEntryQueueLength();
   }
 
+  getNextFlushableEpoch() {
+    return this.rollup.read.getNextFlushableEpoch();
+  }
+
   async getEpochNumber(blockNumber?: bigint) {
     blockNumber ??= await this.getBlockNumber();
     return this.rollup.read.getEpochForBlock([BigInt(blockNumber)]);