@aztec/end-to-end 3.0.0-nightly.20251212 → 3.0.0-nightly.20251214

package/dest/fixtures/utils.js

@@ -4,24 +4,21 @@ import { createArchiver } from '@aztec/archiver';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import { BatchCall } from '@aztec/aztec.js/contracts';
 import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
+import { Fr } from '@aztec/aztec.js/fields';
 import { createLogger } from '@aztec/aztec.js/log';
 import { createAztecNodeClient, waitForNode } from '@aztec/aztec.js/node';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { createBlobSinkServer } from '@aztec/blob-sink/server';
-import { GENESIS_ARCHIVE_ROOT, SPONSORED_FPC_SALT } from '@aztec/constants';
+import { SPONSORED_FPC_SALT } from '@aztec/constants';
 import { isAnvilTestChain } from '@aztec/ethereum/chain';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { NULL_KEY } from '@aztec/ethereum/constants';
-import { RollupContract, deployMulticall3 } from '@aztec/ethereum/contracts';
-import { deployL1Contracts } from '@aztec/ethereum/deploy-l1-contracts';
-import { FeeAssetArtifact } from '@aztec/ethereum/l1-artifacts';
+import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { DelayedTxUtils, EthCheatCodes, EthCheatCodesWithState, createDelayedL1TxUtilsFromViemWallet, startAnvil } from '@aztec/ethereum/test';
 import { EpochNumber } from '@aztec/foundation/branded-types';
 import { SecretValue } from '@aztec/foundation/config';
-import { randomBytes } from '@aztec/foundation/crypto/random';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { withLogNameSuffix } from '@aztec/foundation/log';
@@ -40,11 +37,11 @@ import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@az
 import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
 import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
+import { randomBytes } from 'crypto';
 import fs from 'fs/promises';
 import getPort from 'get-port';
 import { tmpdir } from 'os';
 import * as path from 'path';
-import { getContract } from 'viem';
 import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 import { MNEMONIC, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
@@ -78,22 +75,6 @@ export const getPrivateKeyFromIndex = (index)=>{
     const privKeyRaw = hdAccount.getHdKey().privateKey;
     return privKeyRaw === null ? null : Buffer.from(privKeyRaw);
 };
-export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, chain = foundry)=>{
-    const l1Data = await deployL1Contracts(l1RpcUrls, account, chain, logger, {
-        vkTreeRoot: getVKTreeRoot(),
-        protocolContractsHash,
-        genesisArchiveRoot: args.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
-        salt: args.salt,
-        initialValidators: args.initialValidators,
-        ...getL1ContractsConfigEnvVars(),
-        realVerifier: false,
-        ...args
-    }, {
-        priorityFeeBumpPercentage: 0,
-        priorityFeeRetryBumpPercentage: 0
-    });
-    return l1Data;
-};
 /**
  * Sets up Private eXecution Environment (PXE) and returns the corresponding test wallet.
  * @param aztecNode - An instance of Aztec Node.
@@ -245,12 +226,14 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
                 resetBlockInterval: true
             });
         }
-        let publisherPrivKey = undefined;
+        let publisherPrivKeyHex = undefined;
         let publisherHdAccount = undefined;
         if (opts.l1PublisherKey && opts.l1PublisherKey.getValue() && opts.l1PublisherKey.getValue() != NULL_KEY) {
-            publisherHdAccount = privateKeyToAccount(opts.l1PublisherKey.getValue());
+            publisherPrivKeyHex = opts.l1PublisherKey.getValue();
+            publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
         } else if (config.publisherPrivateKeys && config.publisherPrivateKeys.length > 0 && config.publisherPrivateKeys[0].getValue() != NULL_KEY) {
-            publisherHdAccount = privateKeyToAccount(config.publisherPrivateKeys[0].getValue());
+            publisherPrivKeyHex = config.publisherPrivateKeys[0].getValue();
+            publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
         } else if (!MNEMONIC) {
             throw new Error(`Mnemonic not provided and no publisher private key`);
         } else {
@@ -258,9 +241,10 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
                 addressIndex: 0
             });
             const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
-            publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
+            const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
+            publisherPrivKeyHex = `0x${publisherPrivKey.toString('hex')}`;
             config.publisherPrivateKeys = [
-                new SecretValue(`0x${publisherPrivKey.toString('hex')}`)
+                new SecretValue(publisherPrivKeyHex)
             ];
         }
         if (config.coinbase === undefined) {
@@ -278,34 +262,18 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             await ethCheatCodes.setAutomine(true);
         }
         const l1Client = createExtendedL1Client(config.l1RpcUrls, publisherHdAccount, chain);
-        await deployMulticall3(l1Client, logger);
-        const deployL1ContractsValues = opts.deployL1ContractsValues ?? await setupL1Contracts(config.l1RpcUrls, publisherHdAccount, logger, {
+        const deployL1ContractsValues = await deployAztecL1Contracts(config.l1RpcUrls[0], publisherPrivKeyHex, chain.id, {
+            ...getL1ContractsConfigEnvVars(),
             ...opts,
+            vkTreeRoot: getVKTreeRoot(),
+            protocolContractsHash,
             genesisArchiveRoot,
+            initialValidators: opts.initialValidators,
             feeJuicePortalInitialBalance: fundingNeeded,
-            initialValidators: opts.initialValidators
-        }, chain);
+            realVerifier: false
+        });
         config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
         config.rollupVersion = deployL1ContractsValues.rollupVersion;
-        if (opts.fundRewardDistributor) {
-            // Mints block rewards for 10000 blocks to the rewardDistributor contract
-            const rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
-            const blockReward = await rollup.getCheckpointReward();
-            const mintAmount = 10_000n * blockReward;
-            const feeJuice = getContract({
-                address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
-                abi: FeeAssetArtifact.contractAbi,
-                client: deployL1ContractsValues.l1Client
-            });
-            const rewardDistributorMintTxHash = await feeJuice.write.mint([
-                deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
-                mintAmount
-            ], {});
-            await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
-                hash: rewardDistributorMintTxHash
-            });
-            logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
-        }
         if (enableAutomine) {
             await ethCheatCodes.setAutomine(false);
             await ethCheatCodes.setIntervalMining(config.ethereumSlotDuration);

package/dest/shared/cross_chain_test_harness.js

@@ -1,7 +1,7 @@
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import { L1TokenPortalManager } from '@aztec/aztec.js/ethereum';
 import { Fr } from '@aztec/aztec.js/fields';
-import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contracts';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import { retryUntil } from '@aztec/foundation/retry';
 import { TestERC20Abi, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';

package/dest/shared/uniswap_l1_l2.d.ts

@@ -2,7 +2,7 @@ import { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { Logger } from '@aztec/aztec.js/log';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { CheatCodes } from '@aztec/aztec/testing';
-import { type DeployL1ContractsReturnType } from '@aztec/ethereum/deploy-l1-contracts';
+import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import type { TestWallet } from '@aztec/test-wallet/server';
 /** Objects to be returned by the uniswap setup function */
@@ -20,9 +20,9 @@ export type UniswapSetupContext = {
     /** The sponsor wallet. */
     sponsorAddress: AztecAddress;
     /**  */
-    deployL1ContractsValues: DeployL1ContractsReturnType;
+    deployL1ContractsValues: DeployAztecL1ContractsReturnType;
     /** Cheat codes instance. */
     cheatCodes: CheatCodes;
 };
 export declare const uniswapL1L2TestSuite: (setup: () => Promise<UniswapSetupContext>, cleanup: () => Promise<void>, expectedForkBlockNumber?: number) => void;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5pc3dhcF9sMV9sMi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NoYXJlZC91bmlzd2FwX2wxX2wyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQWMsTUFBTSwyQkFBMkIsQ0FBQztBQUlyRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbEQsT0FBTyxFQUFFLEtBQUssMkJBQTJCLEVBQW9CLE1BQU0scUNBQXFDLENBQUM7QUFDekcsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQU90RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQWlCNUQsMkRBQTJEO0FBQzNELE1BQU0sTUFBTSxtQkFBbUIsR0FBRztJQUNoQywwQkFBMEI7SUFDMUIsU0FBUyxFQUFFLFNBQVMsQ0FBQztJQUNyQixpREFBaUQ7SUFDakQsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLDBEQUEwRDtJQUMxRCxRQUFRLEVBQUUsd0JBQXdCLENBQUM7SUFDbkMsa0JBQWtCO0lBQ2xCLE1BQU0sRUFBRSxVQUFVLENBQUM7SUFDbkIseUJBQXlCO0lBQ3pCLFlBQVksRUFBRSxZQUFZLENBQUM7SUFDM0IsMEJBQTBCO0lBQzFCLGNBQWMsRUFBRSxZQUFZLENBQUM7SUFDN0IsT0FBTztJQUNQLHVCQUF1QixFQUFFLDJCQUEyQixDQUFDO0lBQ3JELDRCQUE0QjtJQUM1QixVQUFVLEVBQUUsVUFBVSxDQUFDO0NBQ3hCLENBQUM7QUFFRixlQUFPLE1BQU0sb0JBQW9CLHFIQW0rQmhDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5pc3dhcF9sMV9sMi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NoYXJlZC91bmlzd2FwX2wxX2wyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQWMsTUFBTSwyQkFBMkIsQ0FBQztBQUlyRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbEQsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUVsRyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBT3RFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBaUI1RCwyREFBMkQ7QUFDM0QsTUFBTSxNQUFNLG1CQUFtQixHQUFHO0lBQ2hDLDBCQUEwQjtJQUMxQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLGlEQUFpRDtJQUNqRCxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsMERBQTBEO0lBQzFELFFBQVEsRUFBRSx3QkFBd0IsQ0FBQztJQUNuQyxrQkFBa0I7SUFDbEIsTUFBTSxFQUFFLFVBQVUsQ0FBQztJQUNuQix5QkFBeUI7SUFDekIsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQiwwQkFBMEI7SUFDMUIsY0FBYyxFQUFFLFlBQVksQ0FBQztJQUM3QixPQUFPO0lBQ1AsdUJBQXVCLEVBQUUsZ0NBQWdDLENBQUM7SUFDMUQsNEJBQTRCO0lBQzVCLFVBQVUsRUFBRSxVQUFVLENBQUM7Q0FDeEIsQ0FBQztBQUVGLGVBQU8sTUFBTSxvQkFBb0IscUhBbStCaEMsQ0FBQyJ9

package/dest/shared/uniswap_l1_l2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,2BAA2B,CAAC;AAIrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,KAAK,2BAA2B,EAAoB,MAAM,qCAAqC,CAAC;AACzG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAOtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAiB5D,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,QAAQ,EAAE,wBAAwB,CAAC;IACnC,kBAAkB;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,yBAAyB;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,0BAA0B;IAC1B,cAAc,EAAE,YAAY,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,oBAAoB,qHAm+BhC,CAAC"}
+{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,2BAA2B,CAAC;AAIrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAElG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAOtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAiB5D,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,QAAQ,EAAE,wBAAwB,CAAC;IACnC,kBAAkB;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,yBAAyB;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,0BAA0B;IAC1B,cAAc,EAAE,YAAY,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,gCAAgC,CAAC;IAC1D,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,oBAAoB,qHAm+BhC,CAAC"}

package/dest/shared/uniswap_l1_l2.js

@@ -3,7 +3,7 @@ import { computeAuthWitMessageHash } from '@aztec/aztec.js/authorization';
 import { generateClaimSecret } from '@aztec/aztec.js/ethereum';
 import { Fr } from '@aztec/aztec.js/fields';
 import { RollupContract } from '@aztec/ethereum/contracts';
-import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contracts';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import { extractEvent } from '@aztec/ethereum/utils';
 import { sha256ToField } from '@aztec/foundation/crypto/sha256';
 import { InboxAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "3.0.0-nightly.20251212",
+  "version": "3.0.0-nightly.20251214",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,43 +25,43 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20251212",
-    "@aztec/archiver": "3.0.0-nightly.20251212",
-    "@aztec/aztec": "3.0.0-nightly.20251212",
-    "@aztec/aztec-node": "3.0.0-nightly.20251212",
-    "@aztec/aztec.js": "3.0.0-nightly.20251212",
-    "@aztec/bb-prover": "3.0.0-nightly.20251212",
-    "@aztec/bb.js": "3.0.0-nightly.20251212",
-    "@aztec/blob-lib": "3.0.0-nightly.20251212",
-    "@aztec/blob-sink": "3.0.0-nightly.20251212",
-    "@aztec/bot": "3.0.0-nightly.20251212",
-    "@aztec/cli": "3.0.0-nightly.20251212",
-    "@aztec/constants": "3.0.0-nightly.20251212",
-    "@aztec/entrypoints": "3.0.0-nightly.20251212",
-    "@aztec/epoch-cache": "3.0.0-nightly.20251212",
-    "@aztec/ethereum": "3.0.0-nightly.20251212",
-    "@aztec/foundation": "3.0.0-nightly.20251212",
-    "@aztec/kv-store": "3.0.0-nightly.20251212",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251212",
-    "@aztec/merkle-tree": "3.0.0-nightly.20251212",
-    "@aztec/node-keystore": "3.0.0-nightly.20251212",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20251212",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251212",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251212",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251212",
-    "@aztec/p2p": "3.0.0-nightly.20251212",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251212",
-    "@aztec/prover-client": "3.0.0-nightly.20251212",
-    "@aztec/prover-node": "3.0.0-nightly.20251212",
-    "@aztec/pxe": "3.0.0-nightly.20251212",
-    "@aztec/sequencer-client": "3.0.0-nightly.20251212",
-    "@aztec/simulator": "3.0.0-nightly.20251212",
-    "@aztec/slasher": "3.0.0-nightly.20251212",
-    "@aztec/stdlib": "3.0.0-nightly.20251212",
-    "@aztec/telemetry-client": "3.0.0-nightly.20251212",
-    "@aztec/test-wallet": "3.0.0-nightly.20251212",
-    "@aztec/validator-client": "3.0.0-nightly.20251212",
-    "@aztec/world-state": "3.0.0-nightly.20251212",
+    "@aztec/accounts": "3.0.0-nightly.20251214",
+    "@aztec/archiver": "3.0.0-nightly.20251214",
+    "@aztec/aztec": "3.0.0-nightly.20251214",
+    "@aztec/aztec-node": "3.0.0-nightly.20251214",
+    "@aztec/aztec.js": "3.0.0-nightly.20251214",
+    "@aztec/bb-prover": "3.0.0-nightly.20251214",
+    "@aztec/bb.js": "3.0.0-nightly.20251214",
+    "@aztec/blob-lib": "3.0.0-nightly.20251214",
+    "@aztec/blob-sink": "3.0.0-nightly.20251214",
+    "@aztec/bot": "3.0.0-nightly.20251214",
+    "@aztec/cli": "3.0.0-nightly.20251214",
+    "@aztec/constants": "3.0.0-nightly.20251214",
+    "@aztec/entrypoints": "3.0.0-nightly.20251214",
+    "@aztec/epoch-cache": "3.0.0-nightly.20251214",
+    "@aztec/ethereum": "3.0.0-nightly.20251214",
+    "@aztec/foundation": "3.0.0-nightly.20251214",
+    "@aztec/kv-store": "3.0.0-nightly.20251214",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251214",
+    "@aztec/merkle-tree": "3.0.0-nightly.20251214",
+    "@aztec/node-keystore": "3.0.0-nightly.20251214",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20251214",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251214",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251214",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251214",
+    "@aztec/p2p": "3.0.0-nightly.20251214",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251214",
+    "@aztec/prover-client": "3.0.0-nightly.20251214",
+    "@aztec/prover-node": "3.0.0-nightly.20251214",
+    "@aztec/pxe": "3.0.0-nightly.20251214",
+    "@aztec/sequencer-client": "3.0.0-nightly.20251214",
+    "@aztec/simulator": "3.0.0-nightly.20251214",
+    "@aztec/slasher": "3.0.0-nightly.20251214",
+    "@aztec/stdlib": "3.0.0-nightly.20251214",
+    "@aztec/telemetry-client": "3.0.0-nightly.20251214",
+    "@aztec/test-wallet": "3.0.0-nightly.20251214",
+    "@aztec/validator-client": "3.0.0-nightly.20251214",
+    "@aztec/world-state": "3.0.0-nightly.20251214",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -7,7 +7,8 @@ import type { Wallet } from '@aztec/aztec.js/wallet';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { RollupContract } from '@aztec/ethereum/contracts';
-import { type DeployL1ContractsArgs, deployL1Contract } from '@aztec/ethereum/deploy-l1-contracts';
+import type { DeployAztecL1ContractsArgs } from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto/random';
 import { Fr } from '@aztec/foundation/curves/bn254';
@@ -125,7 +126,7 @@ export class ClientFlowsBenchmark {
 
   private proxyLogger: ProxyLogger;
 
-  constructor(testName?: string, setupOptions: Partial<SetupOptions & DeployL1ContractsArgs> = {}) {
+  constructor(testName?: string, setupOptions: Partial<SetupOptions & DeployAztecL1ContractsArgs> = {}) {
     this.logger = createLogger(`bench:client_flows${testName ? `:${testName}` : ''}`);
     this.snapshotManager = createSnapshotManager(
       `bench_client_flows${testName ? `/${testName}` : ''}`,

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -4,11 +4,11 @@ import { type Logger, createLogger } from '@aztec/aztec.js/log';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
-import {
-  type DeployL1ContractsArgs,
-  type DeployL1ContractsReturnType,
-  deployL1Contract,
-} from '@aztec/ethereum/deploy-l1-contracts';
+import type {
+  DeployAztecL1ContractsArgs,
+  DeployAztecL1ContractsReturnType,
+} from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
@@ -54,9 +54,13 @@ export class CrossChainMessagingTest {
   outbox!: any; // GetContractReturnType<typeof OutboxAbi> | undefined;
   cheatCodes!: CheatCodes;
 
-  deployL1ContractsValues!: DeployL1ContractsReturnType;
+  deployL1ContractsValues!: DeployAztecL1ContractsReturnType;
 
-  constructor(testName: string, opts: SetupOptions = {}, deployL1ContractsArgs: Partial<DeployL1ContractsArgs> = {}) {
+  constructor(
+    testName: string,
+    opts: SetupOptions = {},
+    deployL1ContractsArgs: Partial<DeployAztecL1ContractsArgs> = {},
+  ) {
     this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
     this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath, opts, {
       initialValidators: [],

package/src/e2e_epochs/epochs_test.ts

@@ -114,8 +114,6 @@ export class EpochsTestContext {
       checkIntervalMs: 50,
       archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
       worldStateBlockCheckIntervalMS: WORLD_STATE_BLOCK_CHECK_INTERVAL,
-      skipProtocolContracts: true,
-      salt: 1,
       aztecEpochDuration,
       aztecSlotDuration,
       ethereumSlotDuration,

package/src/e2e_fees/fees_test.ts

@@ -4,7 +4,7 @@ import type { AztecNode } from '@aztec/aztec.js/node';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { RollupContract } from '@aztec/ethereum/contracts';
-import type { DeployL1ContractsArgs } from '@aztec/ethereum/deploy-l1-contracts';
+import type { DeployAztecL1ContractsArgs } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -97,7 +97,7 @@ export class FeesTest {
   constructor(
     testName: string,
     private numberOfAccounts = 3,
-    setupOptions: Partial<SetupOptions & DeployL1ContractsArgs> = {},
+    setupOptions: Partial<SetupOptions & DeployAztecL1ContractsArgs> = {},
   ) {
     if (!numberOfAccounts) {
       throw new Error('There must be at least 1 initial account.');

package/src/e2e_p2p/inactivity_slash_test.ts

@@ -24,7 +24,7 @@ const SLASHING_UNIT = BigInt(1e18);
 const SLASHING_AMOUNT = SLASHING_UNIT * 3n;
 
 // How many epochs it may take to set everything up, so we dont slash during this period
-const SETUP_EPOCH_DURATION = 5;
+const SETUP_EPOCH_DURATION = 8;
 
 export class P2PInactivityTest {
   public nodes!: AztecNodeService[];
@@ -151,13 +151,8 @@ export class P2PInactivityTest {
     // This prevents race conditions where validators propose blocks before the network is ready
     await this.test.waitForP2PMeshConnectivity(this.nodes, NUM_NODES);
 
-    const ethereumSlotDuration = this.test.ctx.aztecNodeConfig.ethereumSlotDuration!;
-    this.test.logger.warn(
-      `Advancing to epoch ${SETUP_EPOCH_DURATION} (slashing will start after this epoch is complete)`,
-    );
-    await this.test.ctx.cheatCodes.rollup.advanceToEpoch(EpochNumber(SETUP_EPOCH_DURATION), {
-      offset: -ethereumSlotDuration,
-    });
+    this.test.logger.warn(`Advancing to epoch ${SETUP_EPOCH_DURATION - 1} (slashing will start after it is completed)`);
+    await this.test.ctx.cheatCodes.rollup.advanceToEpoch(EpochNumber(SETUP_EPOCH_DURATION - 1));
 
     return this;
   }

package/src/e2e_p2p/p2p_network.ts

@@ -9,8 +9,8 @@ import {
   RollupContract,
   type TallySlashingProposerContract,
 } from '@aztec/ethereum/contracts';
-import type { Operator } from '@aztec/ethereum/deploy-l1-contracts';
-import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contracts';
+import type { Operator } from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import { MultiAdderArtifact } from '@aztec/ethereum/l1-artifacts';
 import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
 import { ChainMonitor } from '@aztec/ethereum/test';
@@ -93,7 +93,6 @@ export class P2PNetworkTest {
     // If set enable metrics collection
     private metricsPort?: number,
     startProverNode?: boolean,
-    mockZkPassportVerifier?: boolean,
   ) {
     this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
 
@@ -122,7 +121,6 @@ export class P2PNetworkTest {
           initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
         slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
         aztecTargetCommitteeSize: numberOfValidators,
-        salt: 420,
         metricsPort: metricsPort,
         numberOfInitialFundedAccounts: 2,
         startProverNode,
@@ -141,7 +139,6 @@ export class P2PNetworkTest {
         aztecTargetCommitteeSize: numberOfValidators,
         initialValidators: [],
         zkPassportArgs: {
-          mockZkPassportVerifier,
           zkPassportDomain: zkPassportParams.domain,
           zkPassportScope: zkPassportParams.scope,
         },
@@ -157,7 +154,6 @@ export class P2PNetworkTest {
     metricsPort,
     initialConfig,
     startProverNode,
-    mockZkPassportVerifier,
   }: {
     testName: string;
     numberOfNodes: number;
@@ -166,7 +162,6 @@ export class P2PNetworkTest {
     metricsPort?: number;
     initialConfig?: SetupOptions;
     startProverNode?: boolean;
-    mockZkPassportVerifier?: boolean;
   }) {
     const port = basePort || (await getPort());
 
@@ -187,7 +182,6 @@ export class P2PNetworkTest {
       numberOfNodes,
       metricsPort,
       startProverNode,
-      mockZkPassportVerifier,
     );
   }
 
@@ -448,7 +442,7 @@ export class P2PNetworkTest {
     slashFactory: SlashFactoryContract;
   }> {
     if (!this.ctx.deployL1ContractsValues) {
-      throw new Error('DeployL1ContractsValues not set');
+      throw new Error('DeployAztecL1ContractsValues not set');
     }
 
     const rollup = new RollupContract(

package/src/fixtures/e2e_prover_test.ts

@@ -13,7 +13,7 @@ import {
 import { BackendType, Barretenberg } from '@aztec/bb.js';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import type { BlobSinkServer } from '@aztec/blob-sink/server';
-import type { DeployL1ContractsReturnType } from '@aztec/ethereum/deploy-l1-contracts';
+import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { SecretValue } from '@aztec/foundation/config';
 import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts';
@@ -78,7 +78,7 @@ export class FullProverTest {
   private context!: SubsystemsContext;
   private proverNode!: ProverNode;
   private simulatedProverNode!: ProverNode;
-  public l1Contracts!: DeployL1ContractsReturnType;
+  public l1Contracts!: DeployAztecL1ContractsReturnType;
   public proverAddress!: EthAddress;
 
   constructor(
@@ -91,7 +91,7 @@ export class FullProverTest {
     this.snapshotManager = createSnapshotManager(
       `full_prover_integration/${testName}`,
       dataPath,
-      { startProverNode: true, fundRewardDistributor: true, coinbase },
+      { startProverNode: true, coinbase },
       {
         realVerifier: realProofs,
       },

package/src/fixtures/snapshot_manager.ts

@@ -13,7 +13,11 @@ import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/serv
 import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { deployMulticall3 } from '@aztec/ethereum/contracts';
-import type { DeployL1ContractsArgs, DeployL1ContractsReturnType } from '@aztec/ethereum/deploy-l1-contracts';
+import {
+  type DeployAztecL1ContractsArgs,
+  type DeployAztecL1ContractsReturnType,
+  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';
@@ -22,6 +26,8 @@ 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 type { ProverNode } from '@aztec/prover-node';
 import { getPXEConfig } from '@aztec/pxe/server';
 import type { SequencerClient } from '@aztec/sequencer-client';
@@ -44,7 +50,6 @@ import { foundry } from 'viem/chains';
 import { MNEMONIC, TEST_MAX_TX_POOL_SIZE, 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 {
   type SetupOptions,
   createAndSyncProverNode,
@@ -61,7 +66,7 @@ export type SubsystemsContext = {
   aztecNode: AztecNodeService;
   aztecNodeConfig: AztecNodeConfig;
   wallet: TestWallet;
-  deployL1ContractsValues: DeployL1ContractsReturnType;
+  deployL1ContractsValues: DeployAztecL1ContractsReturnType;
   proverNode?: ProverNode;
   watcher: AnvilTestWatcher;
   cheatCodes: CheatCodes;
@@ -83,7 +88,7 @@ export function createSnapshotManager(
   testName: string,
   dataPath?: string,
   config: Partial<SetupOptions> = {},
-  deployL1ContractsArgs: Partial<DeployL1ContractsArgs> = {
+  deployL1ContractsArgs: Partial<DeployAztecL1ContractsArgs> = {
     initialValidators: [],
   },
 ) {
@@ -112,7 +117,7 @@ class MockSnapshotManager implements ISnapshotManager {
   constructor(
     testName: string,
     private config: Partial<AztecNodeConfig> = {},
-    private deployL1ContractsArgs: Partial<DeployL1ContractsArgs> = {},
+    private deployL1ContractsArgs: Partial<DeployAztecL1ContractsArgs> = {},
   ) {
     this.logger = createLogger(`e2e:snapshot_manager:${testName}`);
     this.logger.warn(`No data path given, will not persist any snapshots.`);
@@ -160,7 +165,7 @@ class SnapshotManager implements ISnapshotManager {
     testName: string,
     private dataPath: string,
     private config: Partial<SetupOptions> = {},
-    private deployL1ContractsArgs: Partial<DeployL1ContractsArgs> = {},
+    private deployL1ContractsArgs: Partial<DeployAztecL1ContractsArgs> = {},
   ) {
     this.livePath = join(this.dataPath, 'live', testName);
     this.logger = createLogger(`e2e:snapshot_manager:${testName}`);
@@ -286,7 +291,7 @@ async function setupFromFresh(
   statePath: string | undefined,
   logger: Logger,
   { numberOfInitialFundedAccounts = 10, ...opts }: SetupOptions = {},
-  deployL1ContractsArgs: Partial<DeployL1ContractsArgs> = {
+  deployL1ContractsArgs: Partial<DeployAztecL1ContractsArgs> = {
     initialValidators: [],
   },
 ): Promise<SubsystemsContext> {
@@ -326,13 +331,14 @@ async function setupFromFresh(
   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')}` satisfies `0x${string}`;
 
   const l1Client = createExtendedL1Client([aztecNodeConfig.l1RpcUrls[0]], hdAccount, foundry);
 
   const validatorPrivKey = getPrivateKeyFromIndex(0);
   const proverNodePrivateKey = getPrivateKeyFromIndex(0);
 
-  aztecNodeConfig.publisherPrivateKeys = [new SecretValue<`0x${string}`>(`0x${publisherPrivKey!.toString('hex')}`)];
+  aztecNodeConfig.publisherPrivateKeys = [new SecretValue(publisherPrivKeyHex)];
   aztecNodeConfig.validatorPrivateKeys = new SecretValue([`0x${validatorPrivKey!.toString('hex')}`]);
   aztecNodeConfig.coinbase = opts.coinbase ?? EthAddress.fromString(`${hdAccount.address}`);
 
@@ -348,7 +354,7 @@ async function setupFromFresh(
   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 });
   }
@@ -360,16 +366,28 @@ async function setupFromFresh(
     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: DeployAztecL1ContractsArgs = {
     ...getL1ContractsConfigEnvVars(),
-    genesisArchiveRoot,
-    feeJuicePortalInitialBalance: fundingNeeded,
-    salt: opts.salt,
     ...deployL1ContractsArgs,
+    vkTreeRoot,
+    genesisArchiveRoot,
+    protocolContractsHash,
     initialValidators: opts.initialValidators,
-  });
+    feeJuicePortalInitialBalance: fundingNeeded,
+    realVerifier: false,
+  };
+
+  const deployL1ContractsValues = await deployAztecL1Contracts(
+    aztecNodeConfig.l1RpcUrls[0],
+    publisherPrivKeyHex,
+    foundry.id,
+    args,
+  );
+
   aztecNodeConfig.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
   aztecNodeConfig.rollupVersion = deployL1ContractsValues.rollupVersion;