@aztec/end-to-end 0.84.0-nightly.20250408 → 0.84.0-nightly.20250410

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts

@@ -1,5 +1,5 @@
 import { type AccountWallet, AztecAddress, type CompleteAddress, Fr, type Logger, type PXE, type TxHash } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
@@ -26,7 +26,7 @@ export declare class BlacklistTokenContractTest {
     accounts: CompleteAddress[];
     asset: TokenBlacklistContract;
     tokenSim: TokenSimulator;
-    badAccount: DocsExampleContract;
+    badAccount: InvalidAccountContract;
     admin: AccountWallet;
     other: AccountWallet;
     blacklisted: AccountWallet;

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,YAAY,EACZ,KAAK,eAAe,EACpB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAIjF,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS;IAKT,UAAU;IAKV,eAAe;IAKf,YAAY;;;;;CAKb;AAED,qBAAa,0BAA0B;;IAGrC,MAAM,CAAC,KAAK,SAAK;IAEjB,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,mBAAmB,CAAC;IAEjC,KAAK,EAAG,aAAa,CAAC;IACtB,KAAK,EAAG,aAAa,CAAC;IACtB,WAAW,EAAG,aAAa,CAAC;gBAEhB,QAAQ,EAAE,MAAM;IAKtB,UAAU,CAAC,MAAM,GAAE,MAAyC;IAMlE;;;;OAIG;IACG,kBAAkB;IA2DlB,KAAK;IAIX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAQR,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM;IAgBV,iBAAiB;CAmExB"}
+{"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,YAAY,EACZ,KAAK,eAAe,EACpB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAIjF,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS;IAKT,UAAU;IAKV,eAAe;IAKf,YAAY;;;;;CAKb;AAED,qBAAa,0BAA0B;;IAGrC,MAAM,CAAC,KAAK,SAAK;IAEjB,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IAEpC,KAAK,EAAG,aAAa,CAAC;IACtB,KAAK,EAAG,aAAa,CAAC;IACtB,WAAW,EAAG,aAAa,CAAC;gBAEhB,QAAQ,EAAE,MAAM;IAKtB,UAAU,CAAC,MAAM,GAAE,MAAyC;IAMlE;;;;OAIG;IACG,kBAAkB;IA2DlB,KAAK;IAIX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAQR,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM;IAgBV,iBAAiB;CAmExB"}

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js

@@ -1,7 +1,7 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { Fr, computeSecretHash, createLogger } from '@aztec/aztec.js';
 import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
 import { jest } from '@jest/globals';
 import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
@@ -81,7 +81,7 @@ export class BlacklistTokenContractTest {
             this.asset = await TokenBlacklistContract.deploy(this.admin, this.admin.getAddress()).send().deployed();
             this.logger.verbose(`Token deployed to ${this.asset.address}`);
             this.logger.verbose(`Deploying bad account...`);
-            this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
+            this.badAccount = await InvalidAccountContract.deploy(this.wallets[0]).send().deployed();
             this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
             await this.mineBlocks();
             return {
@@ -93,7 +93,7 @@ export class BlacklistTokenContractTest {
             this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallets[0]);
             this.logger.verbose(`Token contract address: ${this.asset.address}`);
             this.tokenSim = new TokenSimulator(this.asset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
-            this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
+            this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
             this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
             expect(await this.asset.methods.get_roles(this.admin.getAddress()).simulate()).toEqual(new Role().withAdmin().toNoirStruct());
         });

package/dest/e2e_p2p/shared.d.ts

@@ -1,10 +1,16 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeService } from '@aztec/aztec-node';
-import { type Logger, type SentTx } from '@aztec/aztec.js';
+import { type Logger, ProvenTx, type SentTx } from '@aztec/aztec.js';
 import type { SpamContract } from '@aztec/noir-contracts.js/Spam';
+import { PXEService } from '@aztec/pxe/server';
 import type { NodeContext } from '../fixtures/setup_p2p_test.js';
 export declare const submitComplexTxsTo: (logger: Logger, spamContract: SpamContract, numTxs: number, opts?: {
     callPublic?: boolean;
 }) => Promise<SentTx[]>;
 export declare const createPXEServiceAndSubmitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<NodeContext>;
+export declare function createPXEServiceAndPrepareTransactions(logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData): Promise<{
+    pxeService: PXEService;
+    txs: ProvenTx[];
+    node: AztecNodeService;
+}>;
 //# sourceMappingURL=shared.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGlE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,WACrB,MAAM,gBACA,YAAY,UAClB,MAAM,SACR;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,sBAwB/B,CAAC;AAGF,eAAO,MAAM,qCAAqC,WACxC,MAAM,QACR,gBAAgB,UACd,MAAM,iBACC,kBAAkB,KAChC,QAAQ,WAAW,CAoBrB,CAAC"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAM,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,MAAM,EAAiD,MAAM,iBAAiB,CAAC;AAExH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,UAAU,EAAyD,MAAM,mBAAmB,CAAC;AAEtG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,WACrB,MAAM,gBACA,YAAY,UAClB,MAAM,SACR;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,sBAwB/B,CAAC;AAGF,eAAO,MAAM,qCAAqC,WACxC,MAAM,QACR,gBAAgB,UACd,MAAM,iBACC,kBAAkB,KAChC,QAAQ,WAAW,CAgBrB,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,QAAQ,EAAE,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAqB9E"}

package/dest/e2e_p2p/shared.js

@@ -1,5 +1,7 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { TxStatus } from '@aztec/aztec.js';
+import { Fr, TxStatus, getContractInstanceFromDeployParams } from '@aztec/aztec.js';
+import { timesAsync } from '@aztec/foundation/collection';
+import { TestContract, TestContractArtifact } from '@aztec/noir-contracts.js/Test';
 import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
 import { submitTxsTo } from '../shared/submit-transactions.js';
 // submits a set of transactions to the provided Private eXecution Environment (PXE)
@@ -38,3 +40,30 @@ export const createPXEServiceAndSubmitTransactions = async (logger, node, numTxs
         node
     };
 };
+export async function createPXEServiceAndPrepareTransactions(logger, node, numTxs, fundedAccount) {
+    const rpcConfig = getRpcConfig();
+    rpcConfig.proverEnabled = false;
+    const pxe = await createPXEService(node, rpcConfig, true);
+    const account = await getSchnorrAccount(pxe, fundedAccount.secret, fundedAccount.signingKey, fundedAccount.salt);
+    await account.register();
+    const wallet = await account.getWallet();
+    const testContractInstance = await getContractInstanceFromDeployParams(TestContractArtifact, {});
+    await wallet.registerContract({
+        instance: testContractInstance,
+        artifact: TestContractArtifact
+    });
+    const contract = await TestContract.at(testContractInstance.address, wallet);
+    const txs = await timesAsync(numTxs, async ()=>{
+        const tx = await contract.methods.emit_nullifier(Fr.random()).prove({
+            skipPublicSimulation: true
+        });
+        const txHash = await tx.getTxHash();
+        logger.info(`Tx prepared with hash ${txHash}`);
+        return tx;
+    });
+    return {
+        txs,
+        pxeService: pxe,
+        node
+    };
+}

package/dest/e2e_token_contract/token_contract_test.d.ts

@@ -1,5 +1,5 @@
 import { type AccountWallet, type AztecNode, type CompleteAddress, type Logger } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
@@ -13,7 +13,7 @@ export declare class TokenContractTest {
     accounts: CompleteAddress[];
     asset: TokenContract;
     tokenSim: TokenSimulator;
-    badAccount: DocsExampleContract;
+    badAccount: InvalidAccountContract;
     node: AztecNode;
     constructor(testName: string);
     /**

package/dest/e2e_token_contract/token_contract_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACtH,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,mBAAmB,CAAC;IACjC,IAAI,EAAG,SAAS,CAAC;gBAEL,QAAQ,EAAE,MAAM;IAO5B;;;;OAIG;IACG,kBAAkB;IAiElB,KAAK;IAIX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,iBAAiB;CAyCxB"}
+{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACtH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IACpC,IAAI,EAAG,SAAS,CAAC;gBAEL,QAAQ,EAAE,MAAM;IAO5B;;;;OAIG;IACG,kBAAkB;IAiElB,KAAK;IAIX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,iBAAiB;CAyCxB"}

package/dest/e2e_token_contract/token_contract_test.js

@@ -1,6 +1,6 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { createLogger } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { jest } from '@jest/globals';
 import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
@@ -46,7 +46,7 @@ export class TokenContractTest {
             const asset = await TokenContract.deploy(this.wallets[0], this.accounts[0], TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send().deployed();
             this.logger.verbose(`Token deployed to ${asset.address}`);
             this.logger.verbose(`Deploying bad account...`);
-            this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
+            this.badAccount = await InvalidAccountContract.deploy(this.wallets[0]).send().deployed();
             this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
             return {
                 tokenContractAddress: asset.address,
@@ -57,7 +57,7 @@ export class TokenContractTest {
             this.asset = await TokenContract.at(tokenContractAddress, this.wallets[0]);
             this.logger.verbose(`Token contract address: ${this.asset.address}`);
             this.tokenSim = new TokenSimulator(this.asset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
-            this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
+            this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
             this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
             expect(await this.asset.methods.get_admin().simulate()).toBe(this.accounts[0].address.toBigInt());
         });

package/dest/fixtures/snapshot_manager.js

@@ -311,7 +311,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const blobSink = await createBlobSinkServer({
         l1ChainId: aztecNodeConfig.l1ChainId,
         l1RpcUrls: aztecNodeConfig.l1RpcUrls,
-        rollupAddress: aztecNodeConfig.l1Contracts.rollupAddress,
+        l1Contracts: aztecNodeConfig.l1Contracts,
         port: blobSinkPort,
         dataDirectory: aztecNodeConfig.dataDirectory,
         dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB
@@ -404,7 +404,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const blobSink = await createBlobSinkServer({
         l1ChainId: aztecNodeConfig.l1ChainId,
         l1RpcUrls: aztecNodeConfig.l1RpcUrls,
-        rollupAddress: aztecNodeConfig.l1Contracts.rollupAddress,
+        l1Contracts: aztecNodeConfig.l1Contracts,
         port: blobSinkPort,
         dataDirectory: statePath,
         dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB

package/dest/fixtures/utils.js

@@ -300,7 +300,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         const blobSink = await createBlobSinkServer({
             l1ChainId: config.l1ChainId,
             l1RpcUrls: config.l1RpcUrls,
-            rollupAddress: config.l1Contracts.rollupAddress,
+            l1Contracts: config.l1Contracts,
             port: blobSinkPort,
             dataDirectory: config.dataDirectory,
             dataStoreMapSizeKB: config.dataStoreMapSizeKB

package/dest/spartan/setup_test_wallets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EAKjB,KAAK,GAAG,EAIT,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACtC,gBAAgB,EAAE,aAAa,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,0BAA0B,CAAC;IAC5C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAMD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CAYtB;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,WAAW,CAAC,CAoCtB;AA6DD,wBAAsB,gBAAgB,CAAC,EACrC,WAAW,EACX,MAAM,EACN,cAAc,EACd,MAAM,GACP,EAAE;IACD,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,iBAkBA"}
+{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EAKjB,KAAK,GAAG,EAIT,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACtC,gBAAgB,EAAE,aAAa,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,0BAA0B,CAAC;IAC5C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAMD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CAYtB;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,WAAW,CAAC,CAqCtB;AA6DD,wBAAsB,gBAAgB,CAAC,EACrC,WAAW,EACX,MAAM,EACN,cAAc,EACd,MAAM,GACP,EAAE;IACD,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,iBAkBA"}

package/dest/spartan/setup_test_wallets.js

@@ -29,7 +29,8 @@ export async function deployTestWalletWithTokens(pxeUrl, nodeUrl, l1RpcUrls, mne
     const recipientWallet = await getSchnorrWalletWithSecretKey(pxe, recipient.secret, recipient.signingKey, recipient.salt);
     const fundedAccounts = await Promise.all(funded.map((a)=>getSchnorrAccount(pxe, a.secret, a.signingKey, a.salt)));
     const claims = await Promise.all(fundedAccounts.map((a)=>bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), undefined, logger)));
-    // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
+    // Progress by 3 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
+    await advanceL2Block(node);
     await advanceL2Block(node);
     await advanceL2Block(node);
     const wallets = await Promise.all(fundedAccounts.map(async (a, i)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.84.0-nightly.20250408",
+  "version": "0.84.0-nightly.20250410",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -26,37 +26,37 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.84.0-nightly.20250408",
-    "@aztec/archiver": "0.84.0-nightly.20250408",
-    "@aztec/aztec": "0.84.0-nightly.20250408",
-    "@aztec/aztec-node": "0.84.0-nightly.20250408",
-    "@aztec/aztec.js": "0.84.0-nightly.20250408",
-    "@aztec/bb-prover": "0.84.0-nightly.20250408",
-    "@aztec/blob-lib": "0.84.0-nightly.20250408",
-    "@aztec/blob-sink": "0.84.0-nightly.20250408",
-    "@aztec/bot": "0.84.0-nightly.20250408",
-    "@aztec/constants": "0.84.0-nightly.20250408",
-    "@aztec/entrypoints": "0.84.0-nightly.20250408",
-    "@aztec/epoch-cache": "0.84.0-nightly.20250408",
-    "@aztec/ethereum": "0.84.0-nightly.20250408",
-    "@aztec/foundation": "0.84.0-nightly.20250408",
-    "@aztec/kv-store": "0.84.0-nightly.20250408",
-    "@aztec/l1-artifacts": "0.84.0-nightly.20250408",
-    "@aztec/merkle-tree": "0.84.0-nightly.20250408",
-    "@aztec/noir-contracts.js": "0.84.0-nightly.20250408",
-    "@aztec/noir-noirc_abi": "0.84.0-nightly.20250408",
-    "@aztec/noir-protocol-circuits-types": "0.84.0-nightly.20250408",
-    "@aztec/p2p": "0.84.0-nightly.20250408",
-    "@aztec/protocol-contracts": "0.84.0-nightly.20250408",
-    "@aztec/prover-client": "0.84.0-nightly.20250408",
-    "@aztec/prover-node": "0.84.0-nightly.20250408",
-    "@aztec/pxe": "0.84.0-nightly.20250408",
-    "@aztec/sequencer-client": "0.84.0-nightly.20250408",
-    "@aztec/simulator": "0.84.0-nightly.20250408",
-    "@aztec/stdlib": "0.84.0-nightly.20250408",
-    "@aztec/telemetry-client": "0.84.0-nightly.20250408",
-    "@aztec/validator-client": "0.84.0-nightly.20250408",
-    "@aztec/world-state": "0.84.0-nightly.20250408",
+    "@aztec/accounts": "0.84.0-nightly.20250410",
+    "@aztec/archiver": "0.84.0-nightly.20250410",
+    "@aztec/aztec": "0.84.0-nightly.20250410",
+    "@aztec/aztec-node": "0.84.0-nightly.20250410",
+    "@aztec/aztec.js": "0.84.0-nightly.20250410",
+    "@aztec/bb-prover": "0.84.0-nightly.20250410",
+    "@aztec/blob-lib": "0.84.0-nightly.20250410",
+    "@aztec/blob-sink": "0.84.0-nightly.20250410",
+    "@aztec/bot": "0.84.0-nightly.20250410",
+    "@aztec/constants": "0.84.0-nightly.20250410",
+    "@aztec/entrypoints": "0.84.0-nightly.20250410",
+    "@aztec/epoch-cache": "0.84.0-nightly.20250410",
+    "@aztec/ethereum": "0.84.0-nightly.20250410",
+    "@aztec/foundation": "0.84.0-nightly.20250410",
+    "@aztec/kv-store": "0.84.0-nightly.20250410",
+    "@aztec/l1-artifacts": "0.84.0-nightly.20250410",
+    "@aztec/merkle-tree": "0.84.0-nightly.20250410",
+    "@aztec/noir-contracts.js": "0.84.0-nightly.20250410",
+    "@aztec/noir-noirc_abi": "0.84.0-nightly.20250410",
+    "@aztec/noir-protocol-circuits-types": "0.84.0-nightly.20250410",
+    "@aztec/p2p": "0.84.0-nightly.20250410",
+    "@aztec/protocol-contracts": "0.84.0-nightly.20250410",
+    "@aztec/prover-client": "0.84.0-nightly.20250410",
+    "@aztec/prover-node": "0.84.0-nightly.20250410",
+    "@aztec/pxe": "0.84.0-nightly.20250410",
+    "@aztec/sequencer-client": "0.84.0-nightly.20250410",
+    "@aztec/simulator": "0.84.0-nightly.20250410",
+    "@aztec/stdlib": "0.84.0-nightly.20250410",
+    "@aztec/telemetry-client": "0.84.0-nightly.20250410",
+    "@aztec/validator-client": "0.84.0-nightly.20250410",
+    "@aztec/world-state": "0.84.0-nightly.20250410",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^29.5.0",
     "@msgpack/msgpack": "^3.0.0-beta2",

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -11,7 +11,7 @@ import {
   createLogger,
 } from '@aztec/aztec.js';
 import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
 
@@ -67,7 +67,7 @@ export class BlacklistTokenContractTest {
   accounts: CompleteAddress[] = [];
   asset!: TokenBlacklistContract;
   tokenSim!: TokenSimulator;
-  badAccount!: DocsExampleContract;
+  badAccount!: InvalidAccountContract;
 
   admin!: AccountWallet;
   other!: AccountWallet;
@@ -119,7 +119,7 @@ export class BlacklistTokenContractTest {
         this.logger.verbose(`Token deployed to ${this.asset.address}`);
 
         this.logger.verbose(`Deploying bad account...`);
-        this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
+        this.badAccount = await InvalidAccountContract.deploy(this.wallets[0]).send().deployed();
         this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
 
         await this.mineBlocks();
@@ -138,7 +138,7 @@ export class BlacklistTokenContractTest {
           this.accounts.map(a => a.address),
         );
 
-        this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
+        this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
         this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
 
         expect(await this.asset.methods.get_roles(this.admin.getAddress()).simulate()).toEqual(

package/src/e2e_p2p/shared.ts

@@ -1,9 +1,11 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeService } from '@aztec/aztec-node';
-import { type Logger, type SentTx, TxStatus } from '@aztec/aztec.js';
+import { Fr, type Logger, ProvenTx, type SentTx, TxStatus, getContractInstanceFromDeployParams } from '@aztec/aztec.js';
+import { timesAsync } from '@aztec/foundation/collection';
 import type { SpamContract } from '@aztec/noir-contracts.js/Spam';
-import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
+import { TestContract, TestContractArtifact } from '@aztec/noir-contracts.js/Test';
+import { PXEService, createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
 
 import type { NodeContext } from '../fixtures/setup_p2p_test.js';
 import { submitTxsTo } from '../shared/submit-transactions.js';
@@ -60,9 +62,33 @@ export const createPXEServiceAndSubmitTransactions = async (
   const wallet = await account.getWallet();
 
   const txs = await submitTxsTo(pxeService, numTxs, wallet, logger);
-  return {
-    txs,
-    pxeService,
-    node,
-  };
+  return { txs, pxeService, node };
 };
+
+export async function createPXEServiceAndPrepareTransactions(
+  logger: Logger,
+  node: AztecNodeService,
+  numTxs: number,
+  fundedAccount: InitialAccountData,
+): Promise<{ pxeService: PXEService; txs: ProvenTx[]; node: AztecNodeService }> {
+  const rpcConfig = getRpcConfig();
+  rpcConfig.proverEnabled = false;
+  const pxe = await createPXEService(node, rpcConfig, true);
+
+  const account = await getSchnorrAccount(pxe, fundedAccount.secret, fundedAccount.signingKey, fundedAccount.salt);
+  await account.register();
+  const wallet = await account.getWallet();
+
+  const testContractInstance = await getContractInstanceFromDeployParams(TestContractArtifact, {});
+  await wallet.registerContract({ instance: testContractInstance, artifact: TestContractArtifact });
+  const contract = await TestContract.at(testContractInstance.address, wallet);
+
+  const txs = await timesAsync(numTxs, async () => {
+    const tx = await contract.methods.emit_nullifier(Fr.random()).prove({ skipPublicSimulation: true });
+    const txHash = await tx.getTxHash();
+    logger.info(`Tx prepared with hash ${txHash}`);
+    return tx;
+  });
+
+  return { txs, pxeService: pxe, node };
+}

package/src/e2e_token_contract/token_contract_test.ts

@@ -1,6 +1,6 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { type AccountWallet, type AztecNode, type CompleteAddress, type Logger, createLogger } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 
 import { jest } from '@jest/globals';
@@ -27,7 +27,7 @@ export class TokenContractTest {
   accounts: CompleteAddress[] = [];
   asset!: TokenContract;
   tokenSim!: TokenSimulator;
-  badAccount!: DocsExampleContract;
+  badAccount!: InvalidAccountContract;
   node!: AztecNode;
 
   constructor(testName: string) {
@@ -77,7 +77,7 @@ export class TokenContractTest {
         this.logger.verbose(`Token deployed to ${asset.address}`);
 
         this.logger.verbose(`Deploying bad account...`);
-        this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
+        this.badAccount = await InvalidAccountContract.deploy(this.wallets[0]).send().deployed();
         this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
 
         return { tokenContractAddress: asset.address, badAccountAddress: this.badAccount.address };
@@ -94,7 +94,7 @@ export class TokenContractTest {
           this.accounts.map(a => a.address),
         );
 
-        this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
+        this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
         this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
 
         expect(await this.asset.methods.get_admin().simulate()).toBe(this.accounts[0].address.toBigInt());

package/src/fixtures/snapshot_manager.ts

@@ -414,7 +414,7 @@ async function setupFromFresh(
     {
       l1ChainId: aztecNodeConfig.l1ChainId,
       l1RpcUrls: aztecNodeConfig.l1RpcUrls,
-      rollupAddress: aztecNodeConfig.l1Contracts.rollupAddress,
+      l1Contracts: aztecNodeConfig.l1Contracts,
       port: blobSinkPort,
       dataDirectory: aztecNodeConfig.dataDirectory,
       dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
@@ -537,7 +537,7 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
     {
       l1ChainId: aztecNodeConfig.l1ChainId,
       l1RpcUrls: aztecNodeConfig.l1RpcUrls,
-      rollupAddress: aztecNodeConfig.l1Contracts.rollupAddress,
+      l1Contracts: aztecNodeConfig.l1Contracts,
       port: blobSinkPort,
       dataDirectory: statePath,
       dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,

package/src/fixtures/utils.ts

@@ -491,7 +491,7 @@ export async function setup(
       {
         l1ChainId: config.l1ChainId,
         l1RpcUrls: config.l1RpcUrls,
-        rollupAddress: config.l1Contracts.rollupAddress,
+        l1Contracts: config.l1Contracts,
         port: blobSinkPort,
         dataDirectory: config.dataDirectory,
         dataStoreMapSizeKB: config.dataStoreMapSizeKB,

package/src/spartan/setup_test_wallets.ts

@@ -73,7 +73,8 @@ export async function deployTestWalletWithTokens(
     fundedAccounts.map(a => bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), undefined, logger)),
   );
 
-  // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
+  // Progress by 3 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
+  await advanceL2Block(node);
   await advanceL2Block(node);
   await advanceL2Block(node);