@aztec/aztec 2.1.0-rc.9 → 3.0.0-devnet.2

package/dest/sandbox/sandbox.d.ts

@@ -1,12 +1,10 @@
 #!/usr/bin/env -S node --no-warnings
 import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import { EthAddress } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
 import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import { Fr } from '@aztec/foundation/fields';
 import { type LogFn } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { type PXEServiceConfig } from '@aztec/pxe/server';
-import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type HDAccount, type PrivateKeyAccount } from 'viem';
@@ -15,7 +13,7 @@ import { type HDAccount, type PrivateKeyAccount } from 'viem';
  * @param aztecNodeConfig - The Aztec Node Config
  * @param hdAccount - Account for publishing L1 contracts
  */
-export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hdAccount: HDAccount | PrivateKeyAccount, contractDeployLogger?: import("@aztec/aztec.js").Logger, opts?: {
+export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hdAccount: HDAccount | PrivateKeyAccount, contractDeployLogger?: import("@aztec/foundation/log").Logger, opts?: {
     assumeProvenThroughBlockNumber?: number;
     salt?: number;
     genesisArchiveRoot?: Fr;
@@ -50,8 +48,6 @@ export type SandboxConfig = AztecNodeConfig & {
     l1Mnemonic: string;
     /** Salt used to deploy L1 contracts.*/
     deployAztecContractsSalt: string;
-    /** Whether to expose PXE service on sandbox start.*/
-    noPXE: boolean;
     /** Whether to deploy test accounts on sandbox start.*/
     testAccounts: boolean;
 };
@@ -62,7 +58,6 @@ export type SandboxConfig = AztecNodeConfig & {
  */
 export declare function createSandbox(config: Partial<SandboxConfig> | undefined, userLog: LogFn): Promise<{
     node: AztecNodeService;
-    pxe: import("@aztec/pxe/server").PXEService;
     stop: () => Promise<void>;
 }>;
 /**
@@ -76,9 +71,4 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
 }, options?: {
     prefilledPublicData?: PublicDataTreeLeaf[];
 }): Promise<AztecNodeService>;
-/**
- * Create and start a new Aztec PXE HTTP Server
- * @param config - Optional PXE settings.
- */
-export declare function createAztecPXE(node: AztecNode, config?: Partial<PXEServiceConfig>): Promise<import("@aztec/pxe/server").PXEService>;
 //# sourceMappingURL=sandbox.d.ts.map

package/dest/sandbox/sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAa7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAcvH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,mCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAkCP;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,wBAAwB,EAAE,MAAM,CAAC;IACjC,qDAAqD;IACrD,KAAK,EAAE,OAAO,CAAC;IACf,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,YAAK,EAAE,OAAO,EAAE,KAAK;;;;GA4GtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM,mDAI3F"}
+{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAY7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAcvH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,yCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAkCP;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,wBAAwB,EAAE,MAAM,CAAC;IACjC,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,YAAK,EAAE,OAAO,EAAE,KAAK;;;GAgHtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}

package/dest/sandbox/sandbox.js

@@ -1,10 +1,8 @@
 #!/usr/bin/env -S node --no-warnings
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { EthAddress } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
-import { setupSponsoredFPC } from '@aztec/cli/cli-utils';
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import { NULL_KEY, createEthereumChain, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, waitForPublicClient } from '@aztec/ethereum';
 import { EthCheatCodes } from '@aztec/ethereum/test';
@@ -13,9 +11,9 @@ import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
-import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
+import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { createPublicClient, fallback, http as httpViemTransport } from 'viem';
 import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
@@ -40,7 +38,7 @@ const localAnvil = foundry;
         ...getL1ContractsConfigEnvVars(),
         ...aztecNodeConfig,
         vkTreeRoot: getVKTreeRoot(),
-        protocolContractTreeRoot,
+        protocolContractsHash,
         genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
         salt: opts.salt,
         feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
@@ -90,7 +88,7 @@ const localAnvil = foundry;
                 userLog(`Not setting up test accounts as we are connecting to a network`);
             } else {
                 userLog(`Setting up test accounts`);
-                return await getInitialTestAccounts();
+                return await getInitialTestAccountsData();
             }
         }
         return [];
@@ -125,7 +123,7 @@ const localAnvil = foundry;
         });
         watcher = new AnvilTestWatcher(new EthCheatCodes([
             l1RpcUrl
-        ]), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
+        ], dateProvider), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
         watcher.setIsSandbox(true);
         await watcher.start();
     }
@@ -139,22 +137,23 @@ const localAnvil = foundry;
     }, {
         prefilledPublicData
     });
-    const pxeServiceConfig = {
-        proverEnabled: aztecNodeConfig.realProofs
-    };
-    const pxe = await createAztecPXE(node, pxeServiceConfig);
     if (initialAccounts.length) {
+        const PXEConfig = {
+            proverEnabled: aztecNodeConfig.realProofs
+        };
+        const wallet = await TestWallet.create(node, PXEConfig);
         userLog('Setting up funded test accounts...');
-        const accounts = await deployFundedSchnorrAccounts(pxe, initialAccounts);
-        const accountsWithSecrets = accounts.map((account, i)=>({
-                account,
+        const accountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccounts);
+        const accountsWithSecrets = accountManagers.map((manager, i)=>({
+                account: manager,
                 secretKey: initialAccounts[i].secret
             }));
-        const accLogs = await createAccountLogs(accountsWithSecrets, pxe);
+        const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
         userLog(accLogs.join(''));
-        const deployer = await getSchnorrWallet(pxe, initialAccounts[0].address, initialAccounts[0].signingKey);
-        await setupBananaFPC(initialAccounts, deployer, userLog);
-        await setupSponsoredFPC(pxe, userLog);
+        await setupBananaFPC(initialAccounts, wallet, userLog);
+        userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
+        // We no longer need the wallet once we've setup the accounts so we stop the underlying PXE job queue
+        await wallet.stop();
     }
     const stop = async ()=>{
         await node.stop();
@@ -162,7 +161,6 @@ const localAnvil = foundry;
     };
     return {
         node,
-        pxe,
         stop
     };
 }
@@ -183,14 +181,3 @@ const localAnvil = foundry;
     const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
     return node;
 }
-/**
- * Create and start a new Aztec PXE HTTP Server
- * @param config - Optional PXE settings.
- */ export async function createAztecPXE(node, config = {}) {
-    const pxeServiceConfig = {
-        ...getPXEServiceConfig(),
-        ...config
-    };
-    const pxe = await createPXEService(node, pxeServiceConfig);
-    return pxe;
-}

package/dest/sandbox/sponsored_fpc.d.ts

@@ -1,4 +1,4 @@
-import { type PXE } from '@aztec/aztec.js';
-export declare function getSponsoredFPCAddress(): Promise<import("@aztec/aztec.js").AztecAddress>;
-export declare function getDeployedSponsoredFPCAddress(pxe: PXE): Promise<import("@aztec/aztec.js").AztecAddress>;
+import type { Wallet } from '@aztec/aztec.js/wallet';
+export declare function getSponsoredFPCAddress(): Promise<import("@aztec/aztec.js/addresses").AztecAddress>;
+export declare function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet: Wallet): Promise<import("@aztec/aztec.js/addresses").AztecAddress>;
 //# sourceMappingURL=sponsored_fpc.d.ts.map

package/dest/sandbox/sponsored_fpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sponsored_fpc.d.ts","sourceRoot":"","sources":["../../src/sandbox/sponsored_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAAG,EAET,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,sBAAsB,oDAE3C;AAED,wBAAsB,8BAA8B,CAAC,GAAG,EAAE,GAAG,mDAO5D"}
+{"version":3,"file":"sponsored_fpc.d.ts","sourceRoot":"","sources":["../../src/sandbox/sponsored_fpc.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAUrD,wBAAsB,sBAAsB,8DAE3C;AAED,wBAAsB,iDAAiD,CAAC,MAAM,EAAE,MAAM,6DAKrF"}

package/dest/sandbox/sponsored_fpc.js

@@ -1,4 +1,5 @@
-import { Fr, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js';
+import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 async function getSponsoredFPCInstance() {
@@ -9,11 +10,9 @@ async function getSponsoredFPCInstance() {
 export async function getSponsoredFPCAddress() {
     return (await getSponsoredFPCInstance()).address;
 }
-export async function getDeployedSponsoredFPCAddress(pxe) {
-    const fpc = await getSponsoredFPCAddress();
-    const contracts = await pxe.getContracts();
-    if (!contracts.find((c)=>c.equals(fpc))) {
-        throw new Error('SponsoredFPC not deployed.');
-    }
-    return fpc;
+export async function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet) {
+    const fpc = await getSponsoredFPCInstance();
+    // The following is no-op if the contract is already registered
+    await wallet.registerContract(fpc, SponsoredFPCContract.artifact);
+    return fpc.address;
 }

package/dest/testing/anvil_test_watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAgBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAlBvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAU;IAEhC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IACjD,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;gBAGvB,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,EAAE,gBAAgB,YAAA;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAI/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IA2BL,IAAI;IAMJ,OAAO;IAMP,YAAY;IAOZ,4BAA4B;IAiB5B,gBAAgB;CA4CvB"}
+{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAgBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAlBvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAU;IAEhC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IACjD,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;gBAGvB,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,EAAE,gBAAgB,YAAA;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAK/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IA2BL,IAAI;IAMJ,OAAO;IAMP,YAAY;IAOZ,4BAA4B;IAiB5B,gBAAgB;CAwCvB"}

package/dest/testing/anvil_test_watcher.js

@@ -38,6 +38,7 @@ import { getAddress, getContract } from 'viem';
         this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
     }
     setIsMarkingAsProven(isMarkingAsProven) {
+        this.logger.warn(`Watcher is now ${isMarkingAsProven ? 'marking' : 'not marking'} blocks as proven`);
         this.isMarkingAsProven = isMarkingAsProven;
     }
     setIsSandbox(isSandbox) {
@@ -111,8 +112,7 @@ import { getAddress, getContract } from 'viem';
                 // We should jump to the next slot
                 try {
                     await this.cheatcodes.warp(nextSlotTimestamp, {
-                        resetBlockInterval: true,
-                        updateDateProvider: this.dateProvider
+                        resetBlockInterval: true
                     });
                 } catch (e) {
                     this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
@@ -128,8 +128,7 @@ import { getAddress, getContract } from 'viem';
             if (currentTimestamp > nextSlotTimestamp * 1000) {
                 try {
                     await this.cheatcodes.warp(nextSlotTimestamp, {
-                        resetBlockInterval: true,
-                        updateDateProvider: this.dateProvider
+                        resetBlockInterval: true
                     });
                 } catch (e) {
                     this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);

package/dest/testing/cheat_codes.d.ts

@@ -1,25 +1,24 @@
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import type { DateProvider } from '@aztec/foundation/timer';
 import type { SequencerClient } from '@aztec/sequencer-client';
-import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
-import { AztecCheatCodes } from './aztec_cheat_codes.js';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 /**
  * A class that provides utility functions for interacting with the chain.
+ * @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
+ * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
+ * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
  */
 export declare class CheatCodes {
     /** Cheat codes for L1.*/
     eth: EthCheatCodes;
-    /** Cheat codes for Aztec L2. */
-    aztec: AztecCheatCodes;
     /** Cheat codes for the Aztec Rollup contract on L1. */
     rollup: RollupCheatCodes;
     constructor(
     /** Cheat codes for L1.*/
     eth: EthCheatCodes, 
-    /** Cheat codes for Aztec L2. */
-    aztec: AztecCheatCodes, 
     /** Cheat codes for the Aztec Rollup contract on L1. */
     rollup: RollupCheatCodes);
-    static create(rpcUrls: string[], pxe: PXE): Promise<CheatCodes>;
+    static create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider): Promise<CheatCodes>;
     /**
      * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
      * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined

package/dest/testing/cheat_codes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;;IAL/B,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;WAGpB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAUrE;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM;IAyB7G;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;CAKvG"}
+{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAEvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;;IAH/B,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;WAGpB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;IASxG;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM;IAyB7G;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;CAKvG"}

package/dest/testing/cheat_codes.js

@@ -1,22 +1,21 @@
-import { retryUntil } from '@aztec/aztec.js';
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
-import { AztecCheatCodes } from './aztec_cheat_codes.js';
+import { retryUntil } from '@aztec/foundation/retry';
 /**
  * A class that provides utility functions for interacting with the chain.
+ * @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
+ * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
+ * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
  */ export class CheatCodes {
     eth;
-    aztec;
     rollup;
-    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for Aztec L2. */ aztec, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
+    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
         this.eth = eth;
-        this.aztec = aztec;
         this.rollup = rollup;
     }
-    static async create(rpcUrls, pxe) {
-        const ethCheatCodes = new EthCheatCodes(rpcUrls);
-        const aztecCheatCodes = new AztecCheatCodes(pxe);
-        const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await pxe.getNodeInfo().then((n)=>n.l1ContractAddresses));
-        return new CheatCodes(ethCheatCodes, aztecCheatCodes, rollupCheatCodes);
+    static async create(rpcUrls, node, dateProvider) {
+        const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
+        const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await node.getNodeInfo().then((n)=>n.l1ContractAddresses));
+        return new CheatCodes(ethCheatCodes, rollupCheatCodes);
     }
     /**
    * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least

package/dest/testing/index.d.ts

@@ -1,5 +1,4 @@
 export { AnvilTestWatcher } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
-export { AztecCheatCodes } from './aztec_cheat_codes.js';
 export { CheatCodes } from './cheat_codes.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC"}

package/dest/testing/index.js

@@ -1,4 +1,3 @@
 export { AnvilTestWatcher } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
-export { AztecCheatCodes } from './aztec_cheat_codes.js';
 export { CheatCodes } from './cheat_codes.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "2.1.0-rc.9",
+  "version": "3.0.0-devnet.2",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,44 +28,44 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "2.1.0-rc.9",
-    "@aztec/archiver": "2.1.0-rc.9",
-    "@aztec/aztec-faucet": "2.1.0-rc.9",
-    "@aztec/aztec-node": "2.1.0-rc.9",
-    "@aztec/aztec.js": "2.1.0-rc.9",
-    "@aztec/bb-prover": "2.1.0-rc.9",
-    "@aztec/bb.js": "2.1.0-rc.9",
-    "@aztec/blob-sink": "2.1.0-rc.9",
-    "@aztec/bot": "2.1.0-rc.9",
-    "@aztec/builder": "2.1.0-rc.9",
-    "@aztec/cli": "2.1.0-rc.9",
-    "@aztec/cli-wallet": "2.1.0-rc.9",
-    "@aztec/constants": "2.1.0-rc.9",
-    "@aztec/entrypoints": "2.1.0-rc.9",
-    "@aztec/ethereum": "2.1.0-rc.9",
-    "@aztec/foundation": "2.1.0-rc.9",
-    "@aztec/kv-store": "2.1.0-rc.9",
-    "@aztec/l1-artifacts": "2.1.0-rc.9",
-    "@aztec/node-lib": "2.1.0-rc.9",
-    "@aztec/noir-contracts.js": "2.1.0-rc.9",
-    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.9",
-    "@aztec/p2p": "2.1.0-rc.9",
-    "@aztec/p2p-bootstrap": "2.1.0-rc.9",
-    "@aztec/protocol-contracts": "2.1.0-rc.9",
-    "@aztec/prover-client": "2.1.0-rc.9",
-    "@aztec/prover-node": "2.1.0-rc.9",
-    "@aztec/pxe": "2.1.0-rc.9",
-    "@aztec/stdlib": "2.1.0-rc.9",
-    "@aztec/telemetry-client": "2.1.0-rc.9",
-    "@aztec/txe": "2.1.0-rc.9",
-    "@aztec/world-state": "2.1.0-rc.9",
+    "@aztec/accounts": "3.0.0-devnet.2",
+    "@aztec/archiver": "3.0.0-devnet.2",
+    "@aztec/aztec-faucet": "3.0.0-devnet.2",
+    "@aztec/aztec-node": "3.0.0-devnet.2",
+    "@aztec/aztec.js": "3.0.0-devnet.2",
+    "@aztec/bb-prover": "3.0.0-devnet.2",
+    "@aztec/bb.js": "3.0.0-devnet.2",
+    "@aztec/blob-sink": "3.0.0-devnet.2",
+    "@aztec/bot": "3.0.0-devnet.2",
+    "@aztec/builder": "3.0.0-devnet.2",
+    "@aztec/cli": "3.0.0-devnet.2",
+    "@aztec/constants": "3.0.0-devnet.2",
+    "@aztec/entrypoints": "3.0.0-devnet.2",
+    "@aztec/ethereum": "3.0.0-devnet.2",
+    "@aztec/foundation": "3.0.0-devnet.2",
+    "@aztec/kv-store": "3.0.0-devnet.2",
+    "@aztec/l1-artifacts": "3.0.0-devnet.2",
+    "@aztec/node-lib": "3.0.0-devnet.2",
+    "@aztec/noir-contracts.js": "3.0.0-devnet.2",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.2",
+    "@aztec/p2p": "3.0.0-devnet.2",
+    "@aztec/p2p-bootstrap": "3.0.0-devnet.2",
+    "@aztec/protocol-contracts": "3.0.0-devnet.2",
+    "@aztec/prover-client": "3.0.0-devnet.2",
+    "@aztec/prover-node": "3.0.0-devnet.2",
+    "@aztec/pxe": "3.0.0-devnet.2",
+    "@aztec/stdlib": "3.0.0-devnet.2",
+    "@aztec/telemetry-client": "3.0.0-devnet.2",
+    "@aztec/test-wallet": "3.0.0-devnet.2",
+    "@aztec/txe": "3.0.0-devnet.2",
+    "@aztec/world-state": "3.0.0-devnet.2",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
-    "viem": "2.23.7"
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "files": [
     "dest",

package/src/bin/index.ts

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
 //
 import { injectCommands as injectBuilderCommands } from '@aztec/builder';
-import { injectCommands as injectWalletCommands } from '@aztec/cli-wallet';
+import { injectCommands as injectAztecNodeCommands } from '@aztec/cli/aztec_node';
 import { enrichEnvironmentWithChainConfig, enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config';
 import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
 import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
 import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
 import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
-import { injectCommands as injectPXECommands } from '@aztec/cli/pxe';
 import { getActiveNetworkName } from '@aztec/foundation/config';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
 
@@ -39,8 +38,8 @@ async function main() {
   }
 
   const networkName = getActiveNetworkName(networkValue);
-  await enrichEnvironmentWithChainConfig(networkName);
   await enrichEnvironmentWithNetworkConfig(networkName);
+  enrichEnvironmentWithChainConfig(networkName);
 
   const cliVersion = getCliVersion();
   let program = new Command('aztec');
@@ -48,11 +47,10 @@ async function main() {
   program = injectAztecCommands(program, userLog, debugLogger);
   program = injectBuilderCommands(program);
   program = injectContractCommands(program, userLog, debugLogger);
-  program = injectInfrastructureCommands(program, userLog, debugLogger);
+  program = injectInfrastructureCommands(program, userLog);
   program = injectL1Commands(program, userLog, debugLogger);
-  program = injectPXECommands(program, userLog, debugLogger);
+  program = injectAztecNodeCommands(program, userLog, debugLogger);
   program = injectMiscCommands(program, userLog);
-  program = injectWalletCommands(program, userLog, debugLogger);
 
   await program.parseAsync(process.argv);
 }

package/src/cli/aztec_start_action.ts

@@ -5,7 +5,7 @@ import {
 } from '@aztec/foundation/json-rpc/server';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { ChainConfig } from '@aztec/stdlib/config';
-import { AztecNodeApiSchema, PXESchema } from '@aztec/stdlib/interfaces/client';
+import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
 import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
 
@@ -29,12 +29,11 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     userLog(`${splash}\n${github}\n\n`);
     userLog(`Setting up Aztec Sandbox ${cliVersion}, please stand by...`);
 
-    const { node, pxe, stop } = await createSandbox(
+    const { node, stop } = await createSandbox(
       {
         l1Mnemonic: sandboxOptions.l1Mnemonic,
         l1RpcUrls: options.l1RpcUrls,
         deployAztecContractsSalt: sandboxOptions.deployAztecContractsSalt,
-        noPXE: sandboxOptions.noPXE,
         testAccounts: sandboxOptions.testAccounts,
         realProofs: false,
       },
@@ -44,11 +43,6 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     // Start Node and PXE JSON-RPC server
     signalHandlers.push(stop);
     services.node = [node, AztecNodeApiSchema];
-    if (!sandboxOptions.noPXE) {
-      services.pxe = [pxe, PXESchema];
-    } else {
-      userLog(`Not exposing PXE API through JSON-RPC server`);
-    }
   } else {
     if (options.node) {
       const { startNode } = await import('./cmds/start_node.js');
@@ -62,9 +56,6 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     } else if (options.blobSink) {
       const { startBlobSink } = await import('./cmds/start_blob_sink.js');
       await startBlobSink(options, signalHandlers, userLog);
-    } else if (options.pxe) {
-      const { startPXE } = await import('./cmds/start_pxe.js');
-      ({ config } = await startPXE(options, signalHandlers, services, userLog));
     } else if (options.archiver) {
       const { startArchiver } = await import('./cmds/start_archiver.js');
       ({ config } = await startArchiver(options, signalHandlers, services));

package/src/cli/aztec_start_options.ts

@@ -115,12 +115,6 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       defaultValue: undefined,
       env: undefined,
     },
-    {
-      flag: '--sandbox.noPXE',
-      description: 'Do not expose PXE service on sandbox start',
-      env: 'NO_PXE',
-      ...booleanConfigHelper(),
-    },
     {
       flag: '--sandbox.l1Mnemonic <value>',
       description: 'Mnemonic for L1 accounts. Will be used ',
@@ -146,7 +140,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
     },
     {
       flag: '--admin-port <value>',
-      description: 'Port to run admin APIs of Aztec Services on on',
+      description: 'Port to run admin APIs of Aztec Services on',
       defaultValue: 8880,
       env: 'AZTEC_ADMIN_PORT',
       parseVal: val => parseInt(val, 10),
@@ -172,7 +166,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
   ],
   STORAGE: [
     configToFlag('--data-directory', dataConfigMappings.dataDirectory),
-    configToFlag('--data-store-map-size-kb', dataConfigMappings.dataStoreMapSizeKB),
+    configToFlag('--data-store-map-size-kb', dataConfigMappings.dataStoreMapSizeKb),
   ],
   'WORLD STATE': [
     configToFlag('--world-state-data-directory', worldStateConfigMappings.worldStateDataDirectory),

package/src/cli/cmds/start_archiver.ts

@@ -5,7 +5,7 @@ import {
   archiverConfigMappings,
   getArchiverConfigFromEnv,
 } from '@aztec/archiver';
-import { createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
 import { type BlobSinkConfig, blobSinkConfigMapping, createBlobSinkClient } from '@aztec/blob-sink/client';
 import { getL1Config } from '@aztec/cli/config';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
@@ -32,7 +32,7 @@ export async function startArchiver(
   );
 
   let archiverConfig = { ...envConfig, ...cliOptions };
-  archiverConfig.dataStoreMapSizeKB = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKB;
+  archiverConfig.dataStoreMapSizeKb = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKb;
 
   if (!archiverConfig.l1Contracts.registryAddress || archiverConfig.l1Contracts.registryAddress.isZero()) {
     throw new Error('L1 registry address is required to start an Archiver');

package/src/cli/cmds/start_bot.ts

@@ -1,13 +1,16 @@
-import { type BotConfig, BotRunner, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
+import { type BotConfig, BotRunner, BotStore, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
-import { type AztecNode, type PXE, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
+import { createStore, openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { type CliPXEOptions, type PXEConfig, allPxeConfigMappings } from '@aztec/pxe/config';
+import { type AztecNode, type AztecNodeAdmin, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 import {
   getConfigEnvVars as getTelemetryClientConfig,
   initTelemetryClient,
   makeTracedFetch,
 } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 
 import { extractRelevantOptions } from '../util.js';
 import { getVersions } from '../versioning.js';
@@ -32,28 +35,34 @@ export async function startBot(
     throw new Error('The bot requires access to a Node');
   }
 
-  const node = createAztecNodeClient(config.nodeUrl, getVersions(), fetch);
+  const aztecNode = createAztecNodeClient(config.nodeUrl, getVersions(), fetch);
 
-  // Start a PXE client that is used by the bot if required
-  let pxe: PXE | undefined;
-  if (options.pxe) {
-    const { addPXE } = await import('./start_pxe.js');
-    ({ pxe } = await addPXE(options, signalHandlers, services, userLog, { node }));
-  }
+  const pxeConfig = extractRelevantOptions<PXEConfig & CliPXEOptions>(options, allPxeConfigMappings, 'pxe');
+  const wallet = await TestWallet.create(aztecNode, pxeConfig);
 
   const telemetry = initTelemetryClient(getTelemetryClientConfig());
-  await addBot(options, signalHandlers, services, { pxe, telemetry, node });
+  await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined);
 }
 
-export function addBot(
+export async function addBot(
   options: any,
   signalHandlers: (() => Promise<void>)[],
   services: NamespacedApiHandlers,
-  deps: { pxe?: PXE; node?: AztecNode; telemetry: TelemetryClient },
+  wallet: TestWallet,
+  aztecNode: AztecNode,
+  telemetry: TelemetryClient,
+  aztecNodeAdmin?: AztecNodeAdmin,
 ) {
   const config = extractRelevantOptions<BotConfig>(options, botConfigMappings, 'bot');
 
-  const botRunner = new BotRunner(config, deps);
+  const db = await (config.dataDirectory
+    ? createStore('bot', BotStore.SCHEMA_VERSION, config)
+    : openTmpStore('bot', true, config.dataStoreMapSizeKb));
+
+  const store = new BotStore(db);
+  await store.cleanupOldClaims();
+
+  const botRunner = new BotRunner(config, wallet, aztecNode, telemetry, aztecNodeAdmin, store);
   if (!config.noStart) {
     void botRunner.start(); // Do not block since bot setup takes time
   }