From e76e2d4190399ccc917852be7873fffd2f0acf9a Mon Sep 17 00:00:00 2001
From: Santiago Palladino <santiago@aztecprotocol.com>
Date: Wed, 22 Nov 2023 18:09:03 -0300
Subject: [PATCH] chore: Fix intermittent failures for block-building e2e test
 (#3404)

Fixes #3358
---
 .../aztec-node/src/aztec-node/server.ts        |  6 ++++++
 .../end-to-end/src/e2e_block_building.test.ts  |  8 ++++++++
 yarn-project/end-to-end/src/fixtures/utils.ts  |  4 ++--
 .../sequencer-client/src/sequencer/config.ts   | 18 +-----------------
 .../types/src/interfaces/aztec-node.ts         |  7 +++++++
 yarn-project/types/src/interfaces/configs.ts   | 17 +++++++++++++++++
 yarn-project/types/src/interfaces/index.ts     |  1 +
 7 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 yarn-project/types/src/interfaces/configs.ts

diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
index cd0908cdc9f..b528a699343 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -34,6 +34,7 @@ import {
   LogFilter,
   LogType,
   MerkleTreeId,
+  SequencerConfig,
   SiblingPath,
   Tx,
   TxHash,
@@ -434,6 +435,11 @@ export class AztecNodeService implements AztecNode {
     this.log.info(`Simulated tx ${await tx.getTxHash()} succeeds`);
   }
 
+  public setConfig(config: Partial<SequencerConfig>): Promise<void> {
+    this.sequencer?.updateSequencerConfig(config);
+    return Promise.resolve();
+  }
+
   /**
    * Returns an instance of MerkleTreeOperations having first ensured the world state is fully synched
    * @returns An instance of a committed MerkleTreeOperations
diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts
index 63f4bd19d1c..9dd4e9beb79 100644
--- a/yarn-project/end-to-end/src/e2e_block_building.test.ts
+++ b/yarn-project/end-to-end/src/e2e_block_building.test.ts
@@ -1,4 +1,5 @@
 import {
+  AztecNode,
   BatchCall,
   ContractDeployer,
   ContractFunctionInteraction,
@@ -22,6 +23,7 @@ describe('e2e_block_building', () => {
   let logger: DebugLogger;
   let owner: Wallet;
   let minter: Wallet;
+  let aztecNode: AztecNode;
   let teardown: () => Promise<void>;
 
   describe('multi-txs block', () => {
@@ -32,16 +34,19 @@ describe('e2e_block_building', () => {
         teardown,
         pxe,
         logger,
+        aztecNode,
         wallets: [owner, minter],
       } = await setup(2));
     }, 100_000);
 
+    afterEach(() => aztecNode.setConfig({ minTxsPerBlock: 1 }));
     afterAll(() => teardown());
 
     it('assembles a block with multiple txs', async () => {
       // Assemble N contract deployment txs
       // We need to create them sequentially since we cannot have parallel calls to a circuit
       const TX_COUNT = 8;
+      await aztecNode.setConfig({ minTxsPerBlock: TX_COUNT });
       const deployer = new ContractDeployer(artifact, owner);
       const methods = times(TX_COUNT, () => deployer.deploy());
 
@@ -68,6 +73,9 @@ describe('e2e_block_building', () => {
     }, 60_000);
 
     it('can call public function from different tx in same block', async () => {
+      // Ensure both txs will land on the same block
+      await aztecNode.setConfig({ minTxsPerBlock: 2 });
+
       // Deploy a contract in the first transaction
       // In the same block, call a public method on the contract
       const deployer = TokenContract.deploy(owner, owner.getCompleteAddress());
diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts
index 3ebea90d383..978147ab5e0 100644
--- a/yarn-project/end-to-end/src/fixtures/utils.ts
+++ b/yarn-project/end-to-end/src/fixtures/utils.ts
@@ -232,8 +232,8 @@ type SetupOptions = { /** State load */ stateLoad?: string } & Partial<AztecNode
 /** Context for an end-to-end test as returned by the `setup` function */
 export type EndToEndContext = {
   /** The Aztec Node service or client a connected to it. */
-  aztecNode: AztecNode | undefined;
-  /** A client to the sequencer service */
+  aztecNode: AztecNode;
+  /** A client to the sequencer service (undefined if connected to remote sandbox) */
   sequencer: SequencerClient | undefined;
   /** The Private eXecution Environment (PXE). */
   pxe: PXE;
diff --git a/yarn-project/sequencer-client/src/sequencer/config.ts b/yarn-project/sequencer-client/src/sequencer/config.ts
index 82c6e10db16..43585a9bcba 100644
--- a/yarn-project/sequencer-client/src/sequencer/config.ts
+++ b/yarn-project/sequencer-client/src/sequencer/config.ts
@@ -1,17 +1 @@
-/**
- * The sequencer configuration.
- */
-export interface SequencerConfig {
-  /**
-   * The number of ms to wait between polling for pending txs.
-   */
-  transactionPollingIntervalMS?: number;
-  /**
-   * The maximum number of txs to include in a block.
-   */
-  maxTxsPerBlock?: number;
-  /**
-   * The minimum number of txs to include in a block.
-   */
-  minTxsPerBlock?: number;
-}
+export { SequencerConfig } from '@aztec/types';
diff --git a/yarn-project/types/src/interfaces/aztec-node.ts b/yarn-project/types/src/interfaces/aztec-node.ts
index 0c00dd480bf..a366e7332d5 100644
--- a/yarn-project/types/src/interfaces/aztec-node.ts
+++ b/yarn-project/types/src/interfaces/aztec-node.ts
@@ -13,6 +13,7 @@ import {
   LogFilter,
   LogType,
   MerkleTreeId,
+  SequencerConfig,
   StateInfoProvider,
   Tx,
   TxHash,
@@ -156,4 +157,10 @@ export interface AztecNode extends StateInfoProvider {
    * @param tx - The transaction to simulate.
    **/
   simulatePublicCalls(tx: Tx): Promise<void>;
+
+  /**
+   * Updates the configuration of this node.
+   * @param config - Updated configuration to be merged with the current one.
+   */
+  setConfig(config: Partial<SequencerConfig>): Promise<void>;
 }
diff --git a/yarn-project/types/src/interfaces/configs.ts b/yarn-project/types/src/interfaces/configs.ts
new file mode 100644
index 00000000000..82c6e10db16
--- /dev/null
+++ b/yarn-project/types/src/interfaces/configs.ts
@@ -0,0 +1,17 @@
+/**
+ * The sequencer configuration.
+ */
+export interface SequencerConfig {
+  /**
+   * The number of ms to wait between polling for pending txs.
+   */
+  transactionPollingIntervalMS?: number;
+  /**
+   * The maximum number of txs to include in a block.
+   */
+  maxTxsPerBlock?: number;
+  /**
+   * The minimum number of txs to include in a block.
+   */
+  minTxsPerBlock?: number;
+}
diff --git a/yarn-project/types/src/interfaces/index.ts b/yarn-project/types/src/interfaces/index.ts
index 390f25be66b..ddef4f6b1f8 100644
--- a/yarn-project/types/src/interfaces/index.ts
+++ b/yarn-project/types/src/interfaces/index.ts
@@ -5,3 +5,4 @@ export * from './pxe.js';
 export * from './deployed-contract.js';
 export * from './node-info.js';
 export * from './sync-status.js';
+export * from './configs.js';