@aztec/end-to-end 0.0.1-commit.9b94fc1 → 0.0.1-commit.c7c42ec

package/dest/fixtures/snapshot_manager.js

@@ -6,16 +6,21 @@ import { getContractClassFromArtifact } from '@aztec/aztec.js/contracts';
 import { BatchCall, waitForProven } from '@aztec/aztec.js/contracts';
 import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
-import { createBlobSinkServer } from '@aztec/blob-sink/server';
-import { createExtendedL1Client, deployMulticall3, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
+import { deployMulticall3 } from '@aztec/ethereum/contracts';
+import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
 import { asyncMap } from '@aztec/foundation/async-map';
 import { SecretValue } from '@aztec/foundation/config';
-import { randomBytes } from '@aztec/foundation/crypto';
+import { randomBytes } from '@aztec/foundation/crypto/random';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
 import { resolver, reviver } from '@aztec/foundation/serialize';
 import { TestDateProvider } from '@aztec/foundation/timer';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { getPXEConfig } from '@aztec/pxe/server';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
@@ -24,16 +29,14 @@ import { getGenesisValues } from '@aztec/world-state/testing';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { copySync, removeSync } from 'fs-extra/esm';
 import fs from 'fs/promises';
-import getPort from 'get-port';
 import { tmpdir } from 'os';
 import path, { join } from 'path';
 import { mnemonicToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
-import { MNEMONIC, TEST_MAX_TX_POOL_SIZE, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
+import { MNEMONIC, TEST_MAX_PENDING_TX_POOL_COUNT, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
 import { getACVMConfig } from './get_acvm_config.js';
 import { getBBConfig } from './get_bb_config.js';
-import { setupL1Contracts } from './setup_l1_contracts.js';
-import { createAndSyncProverNode, getLogger, getPrivateKeyFromIndex, getSponsoredFPCAddress } from './utils.js';
+import { createAndSyncProverNode, getLogger, getPrivateKeyFromIndex, getSponsoredFPCAddress, setupSharedBlobStorage } from './utils.js';
 import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js';
 export function createSnapshotManager(testName, dataPath, config = {}, deployL1ContractsArgs = {
     initialValidators: []
@@ -192,7 +195,6 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         await context.bbConfig?.cleanup();
         await tryStop(context.anvil);
         await tryStop(context.watcher);
-        await tryStop(context.blobSink);
         await tryRmDir(context.directoryToCleanup, logger);
     } catch (err) {
         logger.error('Error during teardown', err);
@@ -206,7 +208,6 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     initialValidators: []
 }) {
     logger.verbose(`Initializing state...`);
-    const blobSinkPort = await getPort();
     // Default to no slashing
     opts.slasherFlavor ??= 'none';
     deployL1ContractsArgs.slasherFlavor ??= opts.slasherFlavor;
@@ -217,7 +218,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         ...opts
     };
     aztecNodeConfig.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
-    aztecNodeConfig.maxTxPoolSize = opts.maxTxPoolSize ?? TEST_MAX_TX_POOL_SIZE;
+    aztecNodeConfig.maxPendingTxCount = opts.maxPendingTxCount ?? TEST_MAX_PENDING_TX_POOL_COUNT;
     // Only enable proving if specifically requested.
     aztecNodeConfig.realProofs = !!opts.realProofs;
     // Only enforce the time table if requested
@@ -236,19 +237,20 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     } else {
         aztecNodeConfig.dataDirectory = statePath;
     }
-    aztecNodeConfig.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
+    await setupSharedBlobStorage(aztecNodeConfig);
     const hdAccount = mnemonicToAccount(MNEMONIC, {
         addressIndex: 0
     });
     const publisherPrivKeyRaw = hdAccount.getHdKey().privateKey;
     const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
+    const publisherPrivKeyHex = `0x${publisherPrivKey.toString('hex')}`;
     const l1Client = createExtendedL1Client([
         aztecNodeConfig.l1RpcUrls[0]
     ], hdAccount, foundry);
     const validatorPrivKey = getPrivateKeyFromIndex(0);
     const proverNodePrivateKey = getPrivateKeyFromIndex(0);
     aztecNodeConfig.publisherPrivateKeys = [
-        new SecretValue(`0x${publisherPrivKey.toString('hex')}`)
+        new SecretValue(publisherPrivKeyHex)
     ];
     aztecNodeConfig.validatorPrivateKeys = new SecretValue([
         `0x${validatorPrivKey.toString('hex')}`
@@ -267,7 +269,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const dateProvider = new TestDateProvider();
     const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls, dateProvider);
     // Deploy our L1 contracts.
-    logger.verbose('Deploying L1 contracts...');
+    logger.verbose('Deploying Aztec L1 contracts...');
     if (opts.l1StartTime) {
         await ethCheatCodes.warp(opts.l1StartTime, {
             resetBlockInterval: true
@@ -276,15 +278,20 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const initialFundedAccounts = await generateSchnorrAccounts(numberOfInitialFundedAccounts);
     const sponsoredFPCAddress = await getSponsoredFPCAddress();
     const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress), opts.initialAccountFeeJuice);
+    const vkTreeRoot = getVKTreeRoot();
     await deployMulticall3(l1Client, logger);
-    const deployL1ContractsValues = await setupL1Contracts(aztecNodeConfig.l1RpcUrls[0], hdAccount, logger, {
+    // Define args, defaulted to our environment variables.
+    const args = {
         ...getL1ContractsConfigEnvVars(),
+        ...deployL1ContractsArgs,
+        vkTreeRoot,
         genesisArchiveRoot,
+        protocolContractsHash,
+        initialValidators: opts.initialValidators,
         feeJuicePortalInitialBalance: fundingNeeded,
-        salt: opts.salt,
-        ...deployL1ContractsArgs,
-        initialValidators: opts.initialValidators
-    });
+        realVerifier: false
+    };
+    const deployL1ContractsValues = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], publisherPrivKeyHex, foundry.id, args);
     aztecNodeConfig.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
     aztecNodeConfig.rollupVersion = deployL1ContractsValues.rollupVersion;
     const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls, dateProvider), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
@@ -299,21 +306,13 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         aztecNodeConfig.bbBinaryPath = bbConfig.bbBinaryPath;
         aztecNodeConfig.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
     }
-    const telemetry = getEndToEndTestTelemetryClient(opts.metricsPort);
-    // Setup blob sink service
-    const blobSink = await createBlobSinkServer({
-        l1ChainId: aztecNodeConfig.l1ChainId,
-        l1RpcUrls: aztecNodeConfig.l1RpcUrls,
-        l1Contracts: aztecNodeConfig.l1Contracts,
-        port: blobSinkPort,
-        dataDirectory: aztecNodeConfig.dataDirectory,
-        dataStoreMapSizeKb: aztecNodeConfig.dataStoreMapSizeKb
-    }, telemetry);
-    await blobSink.start();
+    const telemetry = await getEndToEndTestTelemetryClient(opts.metricsPort);
+    const blobClient = await createBlobClientWithFileStores(aztecNodeConfig, createLogger('node:blob-client:client'));
     logger.info('Creating and synching an aztec node...');
     const aztecNode = await AztecNodeService.createAndSync(aztecNodeConfig, {
         telemetry,
-        dateProvider
+        dateProvider,
+        blobClient
     }, {
         prefilledPublicData
     });
@@ -350,7 +349,6 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         watcher,
         cheatCodes,
         dateProvider,
-        blobSink,
         initialFundedAccounts,
         directoryToCleanup
     };
@@ -363,13 +361,11 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     await fs.mkdir(directoryToCleanup, {
         recursive: true
     });
-    // Run the blob sink on a random port
-    const blobSinkPort = await getPort();
     // TODO: For some reason this is currently the union of a bunch of subsystems. That needs fixing.
     const aztecNodeConfig = JSON.parse(readFileSync(`${statePath}/aztec_node_config.json`, 'utf-8'), reviver);
     aztecNodeConfig.dataDirectory = statePath;
-    aztecNodeConfig.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
     aztecNodeConfig.listenAddress = '127.0.0.1';
+    await setupSharedBlobStorage(aztecNodeConfig);
     const initialFundedAccounts = JSON.parse(readFileSync(`${statePath}/accounts.json`, 'utf-8'), reviver) || [];
     const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
     // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
@@ -397,20 +393,13 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, mnemonicToAccount(MNEMONIC));
     const watcher = new AnvilTestWatcher(ethCheatCodes, aztecNodeConfig.l1Contracts.rollupAddress, l1Client, dateProvider);
     await watcher.start();
-    const telemetry = initTelemetryClient(getTelemetryConfig());
-    const blobSink = await createBlobSinkServer({
-        l1ChainId: aztecNodeConfig.l1ChainId,
-        l1RpcUrls: aztecNodeConfig.l1RpcUrls,
-        l1Contracts: aztecNodeConfig.l1Contracts,
-        port: blobSinkPort,
-        dataDirectory: statePath,
-        dataStoreMapSizeKb: aztecNodeConfig.dataStoreMapSizeKb
-    }, telemetry);
-    await blobSink.start();
+    const telemetry = await initTelemetryClient(getTelemetryConfig());
+    const blobClient = await createBlobClientWithFileStores(aztecNodeConfig, createLogger('node:blob-client:client'));
     logger.verbose('Creating aztec node...');
     const aztecNode = await AztecNodeService.createAndSync(aztecNodeConfig, {
         telemetry,
-        dateProvider
+        dateProvider,
+        blobClient
     }, {
         prefilledPublicData
     });
@@ -447,7 +436,6 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         watcher,
         cheatCodes,
         dateProvider,
-        blobSink,
         initialFundedAccounts,
         directoryToCleanup
     };