Merge branch 'next' into merge-train/barretenberg

Author: AztecBot

yarn-project/ethereum/src/deploy_l1_contracts.test.ts

@@ -8,10 +8,12 @@ import { retryUntil } from '@aztec/foundation/retry';
 import { type PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts';
 
 import { createEthereumChain } from './chain.js';
+import { createExtendedL1Client } from './client.js';
 import { DefaultL1ContractsConfig } from './config.js';
 import { RollupContract } from './contracts/rollup.js';
 import { type DeployL1ContractsArgs, type Operator, deployL1Contracts } from './deploy_l1_contracts.js';
 import { startAnvil } from './test/start_anvil.js';
+import type { ExtendedViemWalletClient } from './types.js';
 
 describe('deploy_l1_contracts', () => {
   let privateKey: PrivateKeyAccount;
@@ -28,6 +30,7 @@ describe('deploy_l1_contracts', () => {
   const chainId = process.env.L1_CHAIN_ID ? parseInt(process.env.L1_CHAIN_ID, 10) : 31337;
   let rpcUrl = process.env.L1_RPC_URL;
   let stop: () => Promise<void> = () => Promise.resolve();
+  let client: ExtendedViemWalletClient;
 
   beforeAll(async () => {
     logger = createLogger('ethereum:test:deploy_l1_contracts');
@@ -45,6 +48,8 @@ describe('deploy_l1_contracts', () => {
     if (!rpcUrl) {
       ({ stop, rpcUrl } = await startAnvil());
     }
+
+    client = createExtendedL1Client([rpcUrl], privateKey, createEthereumChain([rpcUrl], chainId).chainInfo);
   });
 
   afterAll(async () => {
@@ -127,4 +132,20 @@ describe('deploy_l1_contracts', () => {
       );
     }
   });
+
+  it('deploys and adds 48 initialValidators', async () => {
+    const initialValidators = times(48, () => {
+      const addr = EthAddress.random();
+      const bn254SecretKey = new SecretValue(Fr.random().toBigInt());
+      return { attester: addr, withdrawer: addr, bn254SecretKey };
+    });
+
+    const deployment = await deploy({ initialValidators, aztecTargetCommitteeSize: initialValidators.length });
+    const rollup = new RollupContract(client, deployment.l1ContractAddresses.rollupAddress);
+
+    expect(await rollup.getActiveAttesterCount()).toEqual(BigInt(initialValidators.length));
+    expect((await rollup.getAttesters()).map(a => a.toLowerCase()).sort()).toEqual(
+      initialValidators.map(({ attester }) => attester.toString().toLowerCase()).sort(),
+    );
+  });
 });

yarn-project/ethereum/src/deploy_l1_contracts.ts

@@ -810,14 +810,19 @@ export const addMultipleValidators = async (
 
       logger.info(`Adding ${validators.length} validators to the rollup`);
 
-      await deployer.l1TxUtils.sendAndMonitorTransaction({
-        to: multiAdder.toString(),
-        data: encodeFunctionData({
-          abi: MultiAdderArtifact.contractAbi,
-          functionName: 'addValidators',
-          args: [validatorsTuples],
-        }),
-      });
+      await deployer.l1TxUtils.sendAndMonitorTransaction(
+        {
+          to: multiAdder.toString(),
+          data: encodeFunctionData({
+            abi: MultiAdderArtifact.contractAbi,
+            functionName: 'addValidators',
+            args: [validatorsTuples],
+          }),
+        },
+        {
+          gasLimit: 45_000_000n,
+        },
+      );
 
       const validatorCountAfter = await rollup.getActiveAttesterCount();
       if (validatorCountAfter < validatorCount + BigInt(validators.length)) {

yarn-project/ethereum/src/test/start_anvil.ts

@@ -34,6 +34,7 @@ export async function startAnvil(
         blockTime: opts.l1BlockTime,
         stopTimeout: 1000,
         accounts: opts.accounts ?? 20,
+        gasLimit: 45_000_000n,
       });
 
       // Listen to the anvil output to get the port.