@aztec/end-to-end 0.81.0 → 0.82.0

package/dest/simulators/lending_simulator.js

@@ -76,23 +76,15 @@ const computeMultiplier = (rate, dt)=>{
     }
     async prepare() {
         this.accumulator = BASE;
-        const slot = await this.rollup.read.getSlotAt([
-            BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration)
-        ]);
-        this.time = Number(await this.rollup.read.getTimestampForSlot([
-            slot
-        ]));
+        const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration));
+        this.time = Number(await this.rollup.getTimestampForSlot(slot));
     }
     async progressSlots(diff, dateProvider) {
         if (diff <= 1) {
             return;
         }
-        const slot = await this.rollup.read.getSlotAt([
-            BigInt(await this.cc.eth.timestamp())
-        ]);
-        const ts = Number(await this.rollup.read.getTimestampForSlot([
-            slot + BigInt(diff)
-        ]));
+        const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()));
+        const ts = Number(await this.rollup.getTimestampForSlot(slot + BigInt(diff)));
         const timeDiff = ts - this.time;
         this.time = ts;
         // Mine ethereum blocks such that the next block will be in a new slot
@@ -100,7 +92,7 @@ const computeMultiplier = (rate, dt)=>{
         if (dateProvider) {
             dateProvider.setTime(this.time * 1000);
         }
-        await this.cc.rollup.markAsProven(await this.rollup.read.getPendingBlockNumber());
+        await this.cc.rollup.markAsProven(await this.rollup.getBlockNumber());
         this.accumulator = muldivDown(this.accumulator, computeMultiplier(this.rate, BigInt(timeDiff)), BASE);
     }
     depositPrivate(from, onBehalfOf, amount) {

package/dest/spartan/setup_test_wallets.d.ts

@@ -10,7 +10,7 @@ export interface TestWallets {
     tokenAddress: AztecAddress;
 }
 export declare function setupTestWalletsWithTokens(pxeUrl: string, mintAmount: bigint, logger: Logger): Promise<TestWallets>;
-export declare function deployTestWalletWithTokens(pxeUrl: string, nodeUrl: string, l1RpcUrls: string[], mnemonicOrPrivateKey: string, mintAmount: bigint, logger: Logger, numberOfFundedWallets?: number, initialFeeJuice?: bigint): Promise<TestWallets>;
+export declare function deployTestWalletWithTokens(pxeUrl: string, nodeUrl: string, l1RpcUrls: string[], mnemonicOrPrivateKey: string, mintAmount: bigint, logger: Logger, numberOfFundedWallets?: number): Promise<TestWallets>;
 export declare function performTransfers({ testWallets, rounds, transferAmount, logger, }: {
     testWallets: TestWallets;
     rounds: number;

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;AAE/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,EACzB,eAAe,SAAa,GAC3B,OAAO,CAAC,WAAW,CAAC,CAsCtB;AA2DD,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,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"}

package/dest/spartan/setup_test_wallets.js

@@ -22,13 +22,13 @@ export async function setupTestWalletsWithTokens(pxeUrl, mintAmount, logger) {
         recipientWallet
     };
 }
-export async function deployTestWalletWithTokens(pxeUrl, nodeUrl, l1RpcUrls, mnemonicOrPrivateKey, mintAmount, logger, numberOfFundedWallets = 1, initialFeeJuice = 10n ** 22n) {
+export async function deployTestWalletWithTokens(pxeUrl, nodeUrl, l1RpcUrls, mnemonicOrPrivateKey, mintAmount, logger, numberOfFundedWallets = 1) {
     const pxe = await createCompatibleClient(pxeUrl, logger);
     const node = createAztecNodeClient(nodeUrl);
     const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
     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(), initialFeeJuice, logger)));
+    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.
     await advanceL2Block(node);
     await advanceL2Block(node);
@@ -59,16 +59,18 @@ async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, recipient,
     const { l1ChainId } = await pxe.getNodeInfo();
     const chain = createEthereumChain(l1RpcUrls, l1ChainId);
     const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
+    // docs:start:bridge_fee_juice
     const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, log);
     const claim = await portal.bridgeTokensPublic(recipient, amount, true);
+    // docs:end:bridge_fee_juice
     const isSynced = async ()=>await pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
     await retryUntil(isSynced, `message ${claim.messageHash} sync`, 24, 0.5);
     log.info(`Created a claim for ${amount} L1 fee juice to ${recipient}.`, claim);
     return claim;
 }
-async function advanceL2Block(node) {
+async function advanceL2Block(node, nodeAdmin) {
     const initialBlockNumber = await node.getBlockNumber();
-    await node.flushTxs();
+    await nodeAdmin?.flushTxs();
     await retryUntil(async ()=>await node.getBlockNumber() >= initialBlockNumber + 1);
 }
 async function deployTokenAndMint(wallets, admin, mintAmount, logger) {

package/dest/spartan/utils.d.ts

@@ -13,6 +13,7 @@ declare const k8sLocalConfigSchema: z.ZodObject<{
     INSTANCE_NAME: z.ZodString;
     NAMESPACE: z.ZodString;
     CONTAINER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
+    CONTAINER_NODE_ADMIN_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_SEQUENCER_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_PROVER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_PXE_PORT: z.ZodDefault<z.ZodNumber>;
@@ -33,6 +34,7 @@ declare const k8sLocalConfigSchema: z.ZodObject<{
     INSTANCE_NAME: string;
     NAMESPACE: string;
     CONTAINER_NODE_PORT: number;
+    CONTAINER_NODE_ADMIN_PORT: number;
     CONTAINER_SEQUENCER_PORT: number;
     CONTAINER_PROVER_NODE_PORT: number;
     CONTAINER_PXE_PORT: number;
@@ -56,6 +58,7 @@ declare const k8sLocalConfigSchema: z.ZodObject<{
     K8S: "local";
     ETHEREUM_HOSTS?: string | undefined;
     CONTAINER_NODE_PORT?: number | undefined;
+    CONTAINER_NODE_ADMIN_PORT?: number | undefined;
     CONTAINER_SEQUENCER_PORT?: number | undefined;
     CONTAINER_PROVER_NODE_PORT?: number | undefined;
     CONTAINER_PXE_PORT?: number | undefined;
@@ -74,6 +77,7 @@ declare const k8sGCloudConfigSchema: z.ZodObject<z.objectUtil.extendShape<{
     INSTANCE_NAME: z.ZodString;
     NAMESPACE: z.ZodString;
     CONTAINER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
+    CONTAINER_NODE_ADMIN_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_SEQUENCER_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_PROVER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_PXE_PORT: z.ZodDefault<z.ZodNumber>;
@@ -98,6 +102,7 @@ declare const k8sGCloudConfigSchema: z.ZodObject<z.objectUtil.extendShape<{
     INSTANCE_NAME: string;
     NAMESPACE: string;
     CONTAINER_NODE_PORT: number;
+    CONTAINER_NODE_ADMIN_PORT: number;
     CONTAINER_SEQUENCER_PORT: number;
     CONTAINER_PROVER_NODE_PORT: number;
     CONTAINER_PXE_PORT: number;
@@ -125,6 +130,7 @@ declare const k8sGCloudConfigSchema: z.ZodObject<z.objectUtil.extendShape<{
     REGION: string;
     ETHEREUM_HOSTS?: string | undefined;
     CONTAINER_NODE_PORT?: number | undefined;
+    CONTAINER_NODE_ADMIN_PORT?: number | undefined;
     CONTAINER_SEQUENCER_PORT?: number | undefined;
     CONTAINER_PROVER_NODE_PORT?: number | undefined;
     CONTAINER_PXE_PORT?: number | undefined;
@@ -138,6 +144,7 @@ declare const k8sGCloudConfigSchema: z.ZodObject<z.objectUtil.extendShape<{
 declare const directConfigSchema: z.ZodObject<{
     PXE_URL: z.ZodString;
     NODE_URL: z.ZodString;
+    NODE_ADMIN_URL: z.ZodString;
     ETHEREUM_HOSTS: z.ZodEffects<z.ZodString, string, string>;
     K8S: z.ZodLiteral<"false">;
 }, "strip", z.ZodTypeAny, {
@@ -145,11 +152,13 @@ declare const directConfigSchema: z.ZodObject<{
     ETHEREUM_HOSTS: string;
     K8S: "false";
     NODE_URL: string;
+    NODE_ADMIN_URL: string;
 }, {
     PXE_URL: string;
     ETHEREUM_HOSTS: string;
     K8S: "false";
     NODE_URL: string;
+    NODE_ADMIN_URL: string;
 }>;
 declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     ETHEREUM_SLOT_DURATION: z.ZodNumber;
@@ -159,6 +168,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     INSTANCE_NAME: z.ZodString;
     NAMESPACE: z.ZodString;
     CONTAINER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
+    CONTAINER_NODE_ADMIN_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_SEQUENCER_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_PROVER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_PXE_PORT: z.ZodDefault<z.ZodNumber>;
@@ -179,6 +189,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     INSTANCE_NAME: string;
     NAMESPACE: string;
     CONTAINER_NODE_PORT: number;
+    CONTAINER_NODE_ADMIN_PORT: number;
     CONTAINER_SEQUENCER_PORT: number;
     CONTAINER_PROVER_NODE_PORT: number;
     CONTAINER_PXE_PORT: number;
@@ -202,6 +213,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     K8S: "local";
     ETHEREUM_HOSTS?: string | undefined;
     CONTAINER_NODE_PORT?: number | undefined;
+    CONTAINER_NODE_ADMIN_PORT?: number | undefined;
     CONTAINER_SEQUENCER_PORT?: number | undefined;
     CONTAINER_PROVER_NODE_PORT?: number | undefined;
     CONTAINER_PXE_PORT?: number | undefined;
@@ -219,6 +231,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     INSTANCE_NAME: z.ZodString;
     NAMESPACE: z.ZodString;
     CONTAINER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
+    CONTAINER_NODE_ADMIN_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_SEQUENCER_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_PROVER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
     CONTAINER_PXE_PORT: z.ZodDefault<z.ZodNumber>;
@@ -243,6 +256,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     INSTANCE_NAME: string;
     NAMESPACE: string;
     CONTAINER_NODE_PORT: number;
+    CONTAINER_NODE_ADMIN_PORT: number;
     CONTAINER_SEQUENCER_PORT: number;
     CONTAINER_PROVER_NODE_PORT: number;
     CONTAINER_PXE_PORT: number;
@@ -270,6 +284,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     REGION: string;
     ETHEREUM_HOSTS?: string | undefined;
     CONTAINER_NODE_PORT?: number | undefined;
+    CONTAINER_NODE_ADMIN_PORT?: number | undefined;
     CONTAINER_SEQUENCER_PORT?: number | undefined;
     CONTAINER_PROVER_NODE_PORT?: number | undefined;
     CONTAINER_PXE_PORT?: number | undefined;
@@ -282,6 +297,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
 }>, z.ZodObject<{
     PXE_URL: z.ZodString;
     NODE_URL: z.ZodString;
+    NODE_ADMIN_URL: z.ZodString;
     ETHEREUM_HOSTS: z.ZodEffects<z.ZodString, string, string>;
     K8S: z.ZodLiteral<"false">;
 }, "strip", z.ZodTypeAny, {
@@ -289,11 +305,13 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     ETHEREUM_HOSTS: string;
     K8S: "false";
     NODE_URL: string;
+    NODE_ADMIN_URL: string;
 }, {
     PXE_URL: string;
     ETHEREUM_HOSTS: string;
     K8S: "false";
     NODE_URL: string;
+    NODE_ADMIN_URL: string;
 }>]>;
 export type K8sLocalConfig = z.infer<typeof k8sLocalConfigSchema>;
 export type K8sGCloudConfig = z.infer<typeof k8sGCloudConfigSchema>;
@@ -407,11 +425,6 @@ export declare function enableValidatorDynamicBootNode(instanceName: string, nam
 export declare function runAlertCheck(config: EnvConfig, alerts: AlertConfig[], logger: Logger): Promise<void>;
 export declare function updateSequencerConfig(url: string, config: Partial<SequencerConfig>): Promise<void>;
 export declare function getSequencers(namespace: string): Promise<string[]>;
-export declare function updateK8sSequencersConfig(args: {
-    containerPort: number;
-    namespace: string;
-    config: Partial<SequencerConfig>;
-}): Promise<void>;
 export declare function updateSequencersConfig(env: EnvConfig, config: Partial<SequencerConfig>): Promise<void>;
 /**
  * Rolls the Aztec pods in the given namespace.

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"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"}

package/dest/spartan/utils.js

@@ -1,5 +1,6 @@
-import { createAztecNodeClient, createLogger, sleep } from '@aztec/aztec.js';
+import { createLogger, sleep } from '@aztec/aztec.js';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
+import { createAztecNodeAdminClient } from '@aztec/stdlib/interfaces/client';
 import { exec, execSync, spawn } from 'child_process';
 import path from 'path';
 import { promisify } from 'util';
@@ -23,6 +24,7 @@ const k8sLocalConfigSchema = z.object({
     INSTANCE_NAME: z.string().min(1, 'INSTANCE_NAME env variable must be set'),
     NAMESPACE: z.string().min(1, 'NAMESPACE env variable must be set'),
     CONTAINER_NODE_PORT: z.coerce.number().default(8080),
+    CONTAINER_NODE_ADMIN_PORT: z.coerce.number().default(8880),
     CONTAINER_SEQUENCER_PORT: z.coerce.number().default(8080),
     CONTAINER_PROVER_NODE_PORT: z.coerce.number().default(8080),
     CONTAINER_PXE_PORT: z.coerce.number().default(8080),
@@ -44,6 +46,7 @@ const k8sGCloudConfigSchema = k8sLocalConfigSchema.extend({
 const directConfigSchema = z.object({
     PXE_URL: z.string().url('PXE_URL must be a valid URL'),
     NODE_URL: z.string().url('NODE_URL must be a valid URL'),
+    NODE_ADMIN_URL: z.string().url('NODE_ADMIN_URL must be a valid URL'),
     ETHEREUM_HOSTS: ethereumHostsSchema,
     K8S: z.literal('false')
 });
@@ -388,7 +391,7 @@ export async function runAlertCheck(config, alerts, logger) {
     }
 }
 export async function updateSequencerConfig(url, config) {
-    const node = createAztecNodeClient(url);
+    const node = createAztecNodeAdminClient(url);
     // Retry incase the port forward is not ready yet
     await retry(()=>node.setConfig(config), 'Update sequencer config', makeBackoff([
         1,
@@ -401,7 +404,7 @@ export async function getSequencers(namespace) {
     const { stdout } = await execAsync(command);
     return stdout.split(' ');
 }
-export async function updateK8sSequencersConfig(args) {
+async function updateK8sSequencersConfig(args) {
     const { containerPort, namespace, config } = args;
     const sequencers = await getSequencers(namespace);
     for (const sequencer of sequencers){
@@ -418,12 +421,12 @@ export async function updateK8sSequencersConfig(args) {
 export async function updateSequencersConfig(env, config) {
     if (isK8sConfig(env)) {
         await updateK8sSequencersConfig({
-            containerPort: env.CONTAINER_NODE_PORT,
+            containerPort: env.CONTAINER_NODE_ADMIN_PORT,
             namespace: env.NAMESPACE,
             config
         });
     } else {
-        await updateSequencerConfig(env.NODE_URL, config);
+        await updateSequencerConfig(env.NODE_ADMIN_URL, config);
     }
 }
 /**

package/package.json

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

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -1,9 +1,11 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import {
   type AccountWallet,
+  AztecAddress,
   type CompleteAddress,
   Fr,
   type Logger,
+  type PXE,
   type TxHash,
   computeSecretHash,
   createLogger,
@@ -61,6 +63,7 @@ export class BlacklistTokenContractTest {
   private snapshotManager: ISnapshotManager;
   logger: Logger;
   wallets: AccountWallet[] = [];
+  pxe!: PXE;
   accounts: CompleteAddress[] = [];
   asset!: TokenBlacklistContract;
   tokenSim!: TokenSimulator;
@@ -94,6 +97,7 @@ export class BlacklistTokenContractTest {
       '3_accounts',
       deployAccounts(3, this.logger),
       async ({ deployedAccounts }, { pxe }) => {
+        this.pxe = pxe;
         this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
         this.admin = this.wallets[0];
         this.other = this.wallets[1];
@@ -164,12 +168,12 @@ export class BlacklistTokenContractTest {
 
   async addPendingShieldNoteToPXE(
     contract: TokenBlacklistContract,
-    wallet: AccountWallet,
+    recipient: AztecAddress,
     amount: bigint,
     secretHash: Fr,
     txHash: TxHash,
   ) {
-    const txEffects = await wallet.getTxEffect(txHash);
+    const txEffects = await this.pxe.getTxEffect(txHash);
     await contract.methods
       .deliver_transparent_note(
         contract.address,
@@ -178,7 +182,7 @@ export class BlacklistTokenContractTest {
         txHash.hash,
         this.#toBoundedVec(txEffects!.data.noteHashes, MAX_NOTE_HASHES_PER_TX),
         txEffects!.data.nullifiers[0],
-        wallet.getAddress(),
+        recipient,
       )
       .simulate();
   }
@@ -218,9 +222,9 @@ export class BlacklistTokenContractTest {
         const secretHash = await computeSecretHash(secret);
         const receipt = await asset.methods.mint_private(amount, secretHash).send().wait();
 
-        await this.addPendingShieldNoteToPXE(asset, wallets[0], amount, secretHash, receipt.txHash);
+        await this.addPendingShieldNoteToPXE(asset, wallets[0].getAddress(), amount, secretHash, receipt.txHash);
         const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
-        await txClaim.wait({ debug: true });
+        await txClaim.wait();
         this.logger.verbose(`Minting complete.`);
 
         return { amount };

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -12,7 +12,7 @@ import {
 } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
 import { type ViemPublicClient, createL1Clients, deployL1Contract } from '@aztec/ethereum';
-import { InboxAbi, OutboxAbi, RollupAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
+import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 
@@ -49,7 +49,6 @@ export class CrossChainMessagingTest {
   l2Token!: TokenContract;
   l2Bridge!: TokenBridgeContract;
 
-  rollup!: any; // GetContractReturnType<typeof RollupAbi> | undefined;
   inbox!: any; // GetContractReturnType<typeof InboxAbi> | undefined;
   outbox!: any; // GetContractReturnType<typeof OutboxAbi> | undefined;
   cheatcodes!: CheatCodes;
@@ -60,7 +59,7 @@ export class CrossChainMessagingTest {
   }
 
   async assumeProven() {
-    await this.cheatcodes.rollup.markAsProven(await this.rollup.read.getPendingBlockNumber());
+    await this.cheatcodes.rollup.markAsProven();
   }
 
   async setup() {
@@ -88,17 +87,11 @@ export class CrossChainMessagingTest {
     await this.snapshotManager.snapshot(
       '3_accounts',
       deployAccounts(3, this.logger),
-      async ({ deployedAccounts }, { pxe, aztecNodeConfig, aztecNode, deployL1ContractsValues }) => {
+      async ({ deployedAccounts }, { pxe, aztecNodeConfig, aztecNode }) => {
         this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
         this.accounts = this.wallets.map(w => w.getCompleteAddress());
         this.wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
 
-        this.rollup = getContract({
-          address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
-          abi: RollupAbi,
-          client: deployL1ContractsValues.walletClient,
-        });
-
         this.user1Wallet = this.wallets[0];
         this.user2Wallet = this.wallets[1];
 
@@ -126,15 +119,6 @@ export class CrossChainMessagingTest {
           ['Underlying', 'UND', walletClient.account.address],
         ).then(({ address }) => address);
 
-        const underlyingERC20 = getContract({
-          address: underlyingERC20Address!.toString(),
-          abi: TestERC20Abi,
-          client: walletClient,
-        });
-
-        // allow anyone to mint
-        await underlyingERC20.write.setFreeForAll([true], {} as any);
-
         this.logger.verbose(`Setting up cross chain harness...`);
         this.crossChainTestHarness = await CrossChainTestHarness.new(
           this.aztecNode,

package/src/e2e_deploy_contract/deploy_test.ts

@@ -14,6 +14,7 @@ import {
   getContractInstanceFromDeployParams,
 } from '@aztec/aztec.js';
 import type { StatefulTestContract } from '@aztec/noir-contracts.js/StatefulTest';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 
 import { type ISnapshotManager, createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 
@@ -27,6 +28,7 @@ export class DeployTest {
   public pxe!: PXE;
   public wallet!: AccountWallet;
   public aztecNode!: AztecNode;
+  public aztecNodeAdmin!: AztecNodeAdmin;
 
   constructor(testName: string) {
     this.logger = createLogger(`e2e:e2e_deploy_contract:${testName}`);
@@ -37,6 +39,7 @@ export class DeployTest {
     await this.applyInitialAccountSnapshot();
     const context = await this.snapshotManager.setup();
     ({ pxe: this.pxe, aztecNode: this.aztecNode } = context);
+    this.aztecNodeAdmin = context.aztecNode;
     return this;
   }
 

package/src/e2e_epochs/epochs_test.ts

@@ -1,8 +1,7 @@
 import { AztecNodeService } from '@aztec/aztec-node';
-import { Fr, type Logger, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
+import { Fr, type Logger, MerkleTreeId, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
 import { RollupContract } from '@aztec/ethereum/contracts';
-import { ChainMonitor } from '@aztec/ethereum/test';
-import { DelayedTxUtils, type Delayer, waitUntilL1Timestamp } from '@aztec/ethereum/test';
+import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { withLogNameSuffix } from '@aztec/foundation/log';
 import { ProverNode, ProverNodePublisher } from '@aztec/prover-node';
@@ -11,7 +10,6 @@ import type { SequencerPublisher } from '@aztec/sequencer-client';
 import type { TestSequencerClient } from '@aztec/sequencer-client/test';
 import type { L2BlockNumber } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
 
 import { join } from 'path';
 import type { Hex, PublicClient } from 'viem';
@@ -208,8 +206,11 @@ export class EpochsTestContext {
 
   /** Verifies whether the given block number is found on the aztec node. */
   public async verifyHistoricBlock(blockNumber: L2BlockNumber, expectedSuccess: boolean) {
+    // We use `findLeavesIndexes` here, but could use any function that queries the world-state
+    // at a particular block, so we know whether that historic block is available or has been
+    // pruned. Note that `getBlock` would not work here, since it only hits the archiver.
     const result = await this.context.aztecNode
-      .findBlockNumbersForIndexes(blockNumber, MerkleTreeId.NULLIFIER_TREE, [0n])
+      .findLeavesIndexes(blockNumber, MerkleTreeId.NULLIFIER_TREE, [Fr.ZERO])
       .then(_ => true)
       .catch(_ => false);
     expect(result).toBe(expectedSuccess);