@aztec/aztec 0.0.1-commit.179ed20 → 0.0.1-commit.181e2d196

package/dest/cli/util.js

@@ -1,3 +1,4 @@
+import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { getTelemetryClient } from '@aztec/telemetry-client/start';
 import chalk from 'chalk';
@@ -63,19 +64,20 @@ export const installSignalHandlers = (logFn, cb)=>{
 /**
  * Creates logs for the initial accounts
  * @param accounts - The initial accounts
- * @param wallet - A TestWallet instance to get the registered accounts
+ * @param wallet - A EmbeddedWallet instance to get the registered accounts
  * @returns A string array containing the initial accounts details
- */ export async function createAccountLogs(accountsWithSecretKeys, wallet) {
+ */ export async function createAccountLogs(accountManagers, wallet) {
     const registeredAccounts = await wallet.getAccounts();
     const accountLogStrings = [
         `Initial Accounts:\n\n`
     ];
-    for (const accountWithSecretKey of accountsWithSecretKeys){
-        const completeAddress = await accountWithSecretKey.account.getCompleteAddress();
+    for (const accountManager of accountManagers){
+        const account = await accountManager.getAccount();
+        const completeAddress = account.getCompleteAddress();
         if (registeredAccounts.find((a)=>a.item.equals(completeAddress.address))) {
             accountLogStrings.push(` Address: ${completeAddress.address.toString()}\n`);
             accountLogStrings.push(` Partial Address: ${completeAddress.partialAddress.toString()}\n`);
-            accountLogStrings.push(` Secret Key: ${accountWithSecretKey.secretKey.toString()}\n`);
+            accountLogStrings.push(` Secret Key: ${account.getSecretKey().toString()}\n`);
             accountLogStrings.push(` Master nullifier public key: ${completeAddress.publicKeys.masterNullifierPublicKey.toString()}\n`);
             accountLogStrings.push(` Master incoming viewing public key: ${completeAddress.publicKeys.masterIncomingViewingPublicKey.toString()}\n\n`);
             accountLogStrings.push(` Master outgoing viewing public key: ${completeAddress.publicKeys.masterOutgoingViewingPublicKey.toString()}\n\n`);
@@ -218,7 +220,7 @@ export const printAztecStartHelpText = ()=>{
         const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
         await Promise.all([
             Crs.new(2 ** 1, undefined, log),
-            GrumpkinCrs.new(2 ** 16 + 1, undefined, log)
+            GrumpkinCrs.new(2 ** 16, undefined, log)
         ]);
     }
 }
@@ -230,8 +232,8 @@ export const printAztecStartHelpText = ()=>{
     if (realProofs) {
         const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
         await Promise.all([
-            Crs.new(2 ** 25 + 1, undefined, log),
-            GrumpkinCrs.new(2 ** 18 + 1, undefined, log)
+            Crs.new(2 ** 25, undefined, log),
+            GrumpkinCrs.new(2 ** 18, undefined, log)
         ]);
     }
 }
@@ -322,3 +324,6 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
     });
     checker.start();
 }
+export function stringifyConfig(config) {
+    return Object.entries(config).map(([key, value])=>`${key}=${jsonStringify(value)}`).join(' ');
+}

package/dest/examples/token.js

@@ -2,7 +2,7 @@ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { createLogger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { TestWallet } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
 const logger = createLogger('example:token');
 const nodeUrl = 'http://localhost:8080';
 const node = createAztecNodeClient(nodeUrl);
@@ -12,7 +12,7 @@ const TRANSFER_AMOUNT = 33n;
  * Main function.
  */ async function main() {
     logger.info('Running token contract test on HTTP interface.');
-    const wallet = await TestWallet.create(node);
+    const wallet = await EmbeddedWallet.create(node);
     // During local network setup we deploy a few accounts. Below we add them to our wallet.
     const [aliceInitialAccountData, bobInitialAccountData] = await getInitialTestAccountsData();
     await wallet.createSchnorrAccount(aliceInitialAccountData.secret, aliceInitialAccountData.salt);

package/dest/local-network/local-network.d.ts

@@ -6,6 +6,7 @@ import { type BlobClientInterface } from '@aztec/blob-client/client';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
+import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type Hex } from 'viem';
@@ -38,7 +39,7 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, pr
     dateGatedRelayerAddress?: EthAddress | undefined;
 } & {
     rollupAddress: EthAddress;
-} & {
+} & Pick<import("@aztec/ethereum/l1-contract-addresses").L1ContractAddresses, "rollupAddress"> & {
     rollupAddress: EthAddress;
 }>;
 /** Local network settings. */
@@ -65,7 +66,8 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
     telemetry?: TelemetryClient;
     blobClient?: BlobClientInterface;
     dateProvider?: DateProvider;
+    proverBroker?: ProvingJobBroker;
 }, options?: {
     prefilledPublicData?: PublicDataTreeLeaf[];
 }): Promise<AztecNodeService>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQVN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUd6RSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlELE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFHckIsTUFBTSx5QkFBeUIsQ0FBQztBQUlqQyxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQTJELE1BQU0sTUFBTSxDQUFDO0FBZXpGOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFVBQVUsRUFBRSxHQUFHLEVBQ2YsSUFBSSxHQUFFO0lBQ0osa0JBQWtCLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDeEIsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JQO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxlQUFlLEdBQUc7SUFDakQsMERBQTBEO0lBQzFELFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsNkRBQTZEO0lBQzdELFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSx5Q0FBa0MsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBaUloRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQ25DLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLElBQUksR0FBRTtJQUFFLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUFDLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixDQUFDO0lBQUMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFBO0NBQU8sRUFDekcsT0FBTyxHQUFFO0lBQUUsbUJBQW1CLENBQUMsRUFBRSxrQkFBa0IsRUFBRSxDQUFBO0NBQU8sNkJBVzdEIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQVN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUt6RSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDOUQsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUdyQixNQUFNLHlCQUF5QixDQUFDO0FBS2pDLE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBMkQsTUFBTSxNQUFNLENBQUM7QUFlekY7Ozs7R0FJRztBQUNILHdCQUFzQixtQkFBbUIsQ0FDdkMsZUFBZSxFQUFFLGVBQWUsRUFDaEMsVUFBVSxFQUFFLEdBQUcsRUFDZixJQUFJLEdBQUU7SUFDSixrQkFBa0IsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUN4Qiw0QkFBNEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FvQlA7QUFFRCw4QkFBOEI7QUFDOUIsTUFBTSxNQUFNLGtCQUFrQixHQUFHLGVBQWUsR0FBRztJQUNqRCwwREFBMEQ7SUFDMUQsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQiw2REFBNkQ7SUFDN0QsWUFBWSxFQUFFLE9BQU8sQ0FBQztDQUN2QixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFzQixrQkFBa0IsQ0FBQyxNQUFNLHlDQUFrQyxFQUFFLE9BQU8sRUFBRSxLQUFLOzs7R0FtSmhHO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxHQUFFLE9BQU8sQ0FBQyxlQUFlLENBQU0sRUFDckMsSUFBSSxHQUFFO0lBQ0osU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0lBQzVCLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixDQUFDO0lBQ2pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUM1QixZQUFZLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztDQUM1QixFQUNOLE9BQU8sR0FBRTtJQUFFLG1CQUFtQixDQUFDLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQTtDQUFPLDZCQWU3RCJ9

package/dest/local-network/local-network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;AASvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,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,GAAG,EAA2D,MAAM,MAAM,CAAC;AAezF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAoBP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAiIhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACzG,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}
+{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;AASvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAKzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,KAAK,GAAG,EAA2D,MAAM,MAAM,CAAC;AAezF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAoBP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAmJhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,gBAAgB,CAAC;CAC5B,EACN,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAe7D"}

package/dest/local-network/local-network.js

@@ -17,8 +17,11 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { SequencerState } from '@aztec/sequencer-client';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
+import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { createPublicClient, fallback, http as httpViemTransport } from 'viem';
 import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
@@ -70,9 +73,9 @@ const localAnvil = foundry;
         ...config
     };
     const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
-    if (aztecNodeConfig.publisherPrivateKeys == undefined || !aztecNodeConfig.publisherPrivateKeys.length || aztecNodeConfig.publisherPrivateKeys[0].getValue() === NULL_KEY) {
+    if (aztecNodeConfig.sequencerPublisherPrivateKeys == undefined || !aztecNodeConfig.sequencerPublisherPrivateKeys.length || aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY) {
         const privKey = hdAccount.getHdKey().privateKey;
-        aztecNodeConfig.publisherPrivateKeys = [
+        aztecNodeConfig.sequencerPublisherPrivateKeys = [
             new SecretValue(`0x${Buffer.from(privKey).toString('hex')}`)
         ];
     }
@@ -96,11 +99,15 @@ const localAnvil = foundry;
     })();
     const bananaFPC = await getBananaFPCAddress(initialAccounts);
     const sponsoredFPC = await getSponsoredFPCAddress();
-    const fundedAddresses = initialAccounts.length ? [
+    const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map((a)=>AztecAddress.fromString(a));
+    const fundedAddresses = [
         ...initialAccounts.map((a)=>a.address),
-        bananaFPC,
-        sponsoredFPC
-    ] : [];
+        ...initialAccounts.length ? [
+            bananaFPC,
+            sponsoredFPC
+        ] : [],
+        ...prefundAddresses
+    ];
     const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
     const dateProvider = new TestDateProvider();
     let cheatcodes;
@@ -140,6 +147,20 @@ const localAnvil = foundry;
     }, {
         prefilledPublicData
     });
+    // Now that the node is up, let the watcher check for pending txs so it can skip unfilled slots faster when
+    // transactions are waiting in the mempool. Also let it check if the sequencer is actively building, to avoid
+    // warping time out from under an in-progress block.
+    watcher?.setGetPendingTxCount(()=>node.getPendingTxCount());
+    const sequencer = node.getSequencer()?.getSequencer();
+    if (sequencer) {
+        const idleStates = new Set([
+            SequencerState.STOPPED,
+            SequencerState.STOPPING,
+            SequencerState.IDLE,
+            SequencerState.SYNCHRONIZING
+        ]);
+        watcher?.setIsSequencerBuilding(()=>!idleStates.has(sequencer.getState()));
+    }
     let epochTestSettler;
     if (!aztecNodeConfig.p2pEnabled) {
         epochTestSettler = new EpochTestSettler(cheatcodes, rollupAddress, node.getBlockSource(), logger.createChild('epoch-settler'), {
@@ -148,17 +169,15 @@ const localAnvil = foundry;
         await epochTestSettler.start();
     }
     if (initialAccounts.length) {
-        const PXEConfig = {
-            proverEnabled: aztecNodeConfig.realProofs
-        };
-        const wallet = await TestWallet.create(node, PXEConfig);
+        const wallet = await EmbeddedWallet.create(node, {
+            pxeConfig: {
+                proverEnabled: aztecNodeConfig.realProofs
+            },
+            ephemeral: true
+        });
         userLog('Setting up funded test accounts...');
         const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
-        const accountsWithSecrets = accountManagers.map((manager, i)=>({
-                account: manager,
-                secretKey: initialAccounts[i].secret
-            }));
-        const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
+        const accLogs = await createAccountLogs(accountManagers, wallet);
         userLog(accLogs.join(''));
         await setupBananaFPC(initialAccounts, wallet, userLog);
         userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
@@ -189,6 +208,11 @@ const localAnvil = foundry;
             ...config.l1Contracts
         }
     };
-    const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
+    const node = await AztecNodeService.createAndSync(aztecNodeConfig, {
+        ...deps,
+        proverNodeDeps: {
+            broker: deps.proverBroker
+        }
+    }, options);
     return node;
 }

package/dest/testing/anvil_test_watcher.d.ts

@@ -21,14 +21,22 @@ export declare class AnvilTestWatcher {
     private markingAsProvenRunningPromise?;
     private logger;
     private isMarkingAsProven;
+    private getPendingTxCount?;
+    private isSequencerBuilding?;
+    private unfilledSlotFirstSeen?;
     constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined);
     setIsMarkingAsProven(isMarkingAsProven: boolean): void;
     setisLocalNetwork(isLocalNetwork: boolean): void;
+    /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */
+    setGetPendingTxCount(fn: () => Promise<number>): void;
+    /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */
+    setIsSequencerBuilding(fn: () => boolean): void;
     start(): Promise<void>;
     stop(): Promise<void>;
     trigger(): Promise<void>;
     markAsProven(): Promise<void>;
     syncDateProviderToL1IfBehind(): Promise<void>;
     warpTimeIfNeeded(): Promise<void>;
+    private warpToTimestamp;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQWdCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQWxCdkIsT0FBTyxDQUFDLGNBQWMsQ0FBa0I7SUFFeEMsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRS9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUTtJQUVqQyxZQUNVLFVBQVUsRUFBRSxhQUFhLEVBQ2pDLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLFFBQVEsRUFBRSxVQUFVLEVBQ1osWUFBWSxDQUFDLDhCQUFrQixFQWF4QztJQUVELG9CQUFvQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sUUFHOUM7SUFFRCxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsT0FBTyxRQUV4QztJQUVLLEtBQUssa0JBeUJWO0lBRUssSUFBSSxrQkFJVDtJQUVLLE9BQU8sa0JBSVo7SUFFSyxZQUFZLGtCQUtqQjtJQUVLLDRCQUE0QixrQkFlakM7SUFFSyxnQkFBZ0Isa0JBd0NyQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQXlCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQTNCdkIsT0FBTyxDQUFDLGNBQWMsQ0FBa0I7SUFFeEMsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRS9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUTtJQUdqQyxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBd0I7SUFHbEQsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQWdCO0lBRzVDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFxQztJQUVuRSxZQUNVLFVBQVUsRUFBRSxhQUFhLEVBQ2pDLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLFFBQVEsRUFBRSxVQUFVLEVBQ1osWUFBWSxDQUFDLDhCQUFrQixFQWF4QztJQUVELG9CQUFvQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sUUFHOUM7SUFFRCxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsT0FBTyxRQUV4QztJQUVELHlHQUF5RztJQUN6RyxvQkFBb0IsQ0FBQyxFQUFFLEVBQUUsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLFFBRTdDO0lBRUQsdUdBQXVHO0lBQ3ZHLHNCQUFzQixDQUFDLEVBQUUsRUFBRSxNQUFNLE9BQU8sUUFFdkM7SUFFSyxLQUFLLGtCQXlCVjtJQUVLLElBQUksa0JBSVQ7SUFFSyxPQUFPLGtCQUlaO0lBRUssWUFBWSxrQkFLakI7SUFFSyw0QkFBNEIsa0JBZWpDO0lBRUssZ0JBQWdCLGtCQXlEckI7WUFFYSxlQUFlO0NBTzlCIn0=

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,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,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,cAAc,CAAkB;IAExC,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;IAEjC,YACU,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB,EAaxC;IAED,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,QAG9C;IAED,iBAAiB,CAAC,cAAc,EAAE,OAAO,QAExC;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAejC;IAEK,gBAAgB,kBAwCrB;CACF"}
+{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAyBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IA3BvB,OAAO,CAAC,cAAc,CAAkB;IAExC,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;IAGjC,OAAO,CAAC,iBAAiB,CAAC,CAAwB;IAGlD,OAAO,CAAC,mBAAmB,CAAC,CAAgB;IAG5C,OAAO,CAAC,qBAAqB,CAAC,CAAqC;IAEnE,YACU,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB,EAaxC;IAED,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,QAG9C;IAED,iBAAiB,CAAC,cAAc,EAAE,OAAO,QAExC;IAED,yGAAyG;IACzG,oBAAoB,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAE7C;IAED,uGAAuG;IACvG,sBAAsB,CAAC,EAAE,EAAE,MAAM,OAAO,QAEvC;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAejC;IAEK,gBAAgB,kBAyDrB;YAEa,eAAe;CAO9B"}

package/dest/testing/anvil_test_watcher.js

@@ -22,6 +22,12 @@ import { getAddress, getContract } from 'viem';
     markingAsProvenRunningPromise;
     logger;
     isMarkingAsProven;
+    // Optional callback to check if there are pending txs in the mempool.
+    getPendingTxCount;
+    // Optional callback to check if the sequencer is actively building a block.
+    isSequencerBuilding;
+    // Tracks when we first observed the current unfilled slot with pending txs (real wall time).
+    unfilledSlotFirstSeen;
     constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
         this.cheatcodes = cheatcodes;
         this.dateProvider = dateProvider;
@@ -45,6 +51,12 @@ import { getAddress, getContract } from 'viem';
     setisLocalNetwork(isLocalNetwork) {
         this.isLocalNetwork = isLocalNetwork;
     }
+    /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */ setGetPendingTxCount(fn) {
+        this.getPendingTxCount = fn;
+    }
+    /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */ setIsSequencerBuilding(fn) {
+        this.isSequencerBuilding = fn;
+    }
     async start() {
         if (this.filledRunningPromise) {
             throw new Error('Watcher already watching for filled slot');
@@ -111,14 +123,8 @@ import { getAddress, getContract } from 'viem';
                 BigInt(nextSlot)
             ]));
             if (BigInt(currentSlot) === checkpointLog.slotNumber) {
-                // We should jump to the next slot
-                try {
-                    await this.cheatcodes.warp(nextSlotTimestamp, {
-                        resetBlockInterval: true
-                    });
-                } catch (e) {
-                    this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
-                }
+                // The current slot has been filled, we should jump to the next slot.
+                await this.warpToTimestamp(nextSlotTimestamp);
                 this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
                 return;
             }
@@ -126,19 +132,50 @@ import { getAddress, getContract } from 'viem';
             if (!this.isLocalNetwork) {
                 return;
             }
+            // If there are pending txs and the sequencer missed them, warp quickly (after a 2s real-time debounce) so the
+            // sequencer can retry in the next slot. Without this, we'd have to wait a full real-time slot duration (~36s) for
+            // the dateProvider to catch up to the next slot timestamp. We skip the warp if the sequencer is actively building
+            // to avoid invalidating its in-progress work.
+            if (this.getPendingTxCount) {
+                const pendingTxs = await this.getPendingTxCount();
+                if (pendingTxs > 0) {
+                    if (this.isSequencerBuilding?.()) {
+                        this.unfilledSlotFirstSeen = undefined;
+                        return;
+                    }
+                    const realNow = Date.now();
+                    if (!this.unfilledSlotFirstSeen || this.unfilledSlotFirstSeen.slot !== currentSlot) {
+                        this.unfilledSlotFirstSeen = {
+                            slot: currentSlot,
+                            realTime: realNow
+                        };
+                        return;
+                    }
+                    if (realNow - this.unfilledSlotFirstSeen.realTime > 2000) {
+                        await this.warpToTimestamp(nextSlotTimestamp);
+                        this.unfilledSlotFirstSeen = undefined;
+                        this.logger.info(`Slot ${currentSlot} was missed with pending txs, jumped to next slot`);
+                    }
+                    return;
+                }
+            }
+            // Fallback: warp when the dateProvider time has passed the next slot timestamp.
             const currentTimestamp = this.dateProvider?.now() ?? Date.now();
             if (currentTimestamp > nextSlotTimestamp * 1000) {
-                try {
-                    await this.cheatcodes.warp(nextSlotTimestamp, {
-                        resetBlockInterval: true
-                    });
-                } catch (e) {
-                    this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
-                }
+                await this.warpToTimestamp(nextSlotTimestamp);
                 this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
             }
         } catch  {
             this.logger.error('mineIfSlotFilled failed');
         }
     }
+    async warpToTimestamp(timestamp) {
+        try {
+            await this.cheatcodes.warp(timestamp, {
+                resetBlockInterval: true
+            });
+        } catch (e) {
+            this.logger.error(`Failed to warp to timestamp ${timestamp}: ${e}`);
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.0.1-commit.179ed20",
+  "version": "0.0.1-commit.181e2d196",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,39 +28,39 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.179ed20",
-    "@aztec/archiver": "0.0.1-commit.179ed20",
-    "@aztec/aztec-faucet": "0.0.1-commit.179ed20",
-    "@aztec/aztec-node": "0.0.1-commit.179ed20",
-    "@aztec/aztec.js": "0.0.1-commit.179ed20",
-    "@aztec/bb-prover": "0.0.1-commit.179ed20",
-    "@aztec/bb.js": "0.0.1-commit.179ed20",
-    "@aztec/blob-client": "0.0.1-commit.179ed20",
-    "@aztec/bot": "0.0.1-commit.179ed20",
-    "@aztec/builder": "0.0.1-commit.179ed20",
-    "@aztec/cli": "0.0.1-commit.179ed20",
-    "@aztec/constants": "0.0.1-commit.179ed20",
-    "@aztec/entrypoints": "0.0.1-commit.179ed20",
-    "@aztec/ethereum": "0.0.1-commit.179ed20",
-    "@aztec/foundation": "0.0.1-commit.179ed20",
-    "@aztec/kv-store": "0.0.1-commit.179ed20",
-    "@aztec/l1-artifacts": "0.0.1-commit.179ed20",
-    "@aztec/node-lib": "0.0.1-commit.179ed20",
-    "@aztec/noir-contracts.js": "0.0.1-commit.179ed20",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.179ed20",
-    "@aztec/p2p": "0.0.1-commit.179ed20",
-    "@aztec/p2p-bootstrap": "0.0.1-commit.179ed20",
-    "@aztec/protocol-contracts": "0.0.1-commit.179ed20",
-    "@aztec/prover-client": "0.0.1-commit.179ed20",
-    "@aztec/prover-node": "0.0.1-commit.179ed20",
-    "@aztec/pxe": "0.0.1-commit.179ed20",
-    "@aztec/sequencer-client": "0.0.1-commit.179ed20",
-    "@aztec/stdlib": "0.0.1-commit.179ed20",
-    "@aztec/telemetry-client": "0.0.1-commit.179ed20",
-    "@aztec/test-wallet": "0.0.1-commit.179ed20",
-    "@aztec/txe": "0.0.1-commit.179ed20",
-    "@aztec/validator-ha-signer": "0.0.1-commit.179ed20",
-    "@aztec/world-state": "0.0.1-commit.179ed20",
+    "@aztec/accounts": "0.0.1-commit.181e2d196",
+    "@aztec/archiver": "0.0.1-commit.181e2d196",
+    "@aztec/aztec-faucet": "0.0.1-commit.181e2d196",
+    "@aztec/aztec-node": "0.0.1-commit.181e2d196",
+    "@aztec/aztec.js": "0.0.1-commit.181e2d196",
+    "@aztec/bb-prover": "0.0.1-commit.181e2d196",
+    "@aztec/bb.js": "0.0.1-commit.181e2d196",
+    "@aztec/blob-client": "0.0.1-commit.181e2d196",
+    "@aztec/bot": "0.0.1-commit.181e2d196",
+    "@aztec/builder": "0.0.1-commit.181e2d196",
+    "@aztec/cli": "0.0.1-commit.181e2d196",
+    "@aztec/constants": "0.0.1-commit.181e2d196",
+    "@aztec/entrypoints": "0.0.1-commit.181e2d196",
+    "@aztec/ethereum": "0.0.1-commit.181e2d196",
+    "@aztec/foundation": "0.0.1-commit.181e2d196",
+    "@aztec/kv-store": "0.0.1-commit.181e2d196",
+    "@aztec/l1-artifacts": "0.0.1-commit.181e2d196",
+    "@aztec/node-lib": "0.0.1-commit.181e2d196",
+    "@aztec/noir-contracts.js": "0.0.1-commit.181e2d196",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.181e2d196",
+    "@aztec/p2p": "0.0.1-commit.181e2d196",
+    "@aztec/p2p-bootstrap": "0.0.1-commit.181e2d196",
+    "@aztec/protocol-contracts": "0.0.1-commit.181e2d196",
+    "@aztec/prover-client": "0.0.1-commit.181e2d196",
+    "@aztec/prover-node": "0.0.1-commit.181e2d196",
+    "@aztec/pxe": "0.0.1-commit.181e2d196",
+    "@aztec/sequencer-client": "0.0.1-commit.181e2d196",
+    "@aztec/stdlib": "0.0.1-commit.181e2d196",
+    "@aztec/telemetry-client": "0.0.1-commit.181e2d196",
+    "@aztec/txe": "0.0.1-commit.181e2d196",
+    "@aztec/validator-ha-signer": "0.0.1-commit.181e2d196",
+    "@aztec/wallets": "0.0.1-commit.181e2d196",
+    "@aztec/world-state": "0.0.1-commit.181e2d196",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",

package/scripts/aztec.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-shopt -s inherit_errexit
 
 # Re-execute using correct version if we have an .aztecrc file.
 if [ "${AZTEC_VERSIONED:-0}" -eq 0 ] && [ -f .aztecrc ] && command -v aztec-up &>/dev/null; then
@@ -21,13 +20,13 @@ function aztec {
 
 case $cmd in
   test)
-    export LOG_LEVEL="${LOG_LEVEL:-error}"
+    export LOG_LEVEL="${LOG_LEVEL:-"error;trace:contract_log"}"
     aztec start --txe --port 8081 &
     server_pid=$!
     trap 'kill $server_pid &>/dev/null || true' EXIT
     while ! nc -z 127.0.0.1 8081 &>/dev/null; do sleep 0.2; done
     export NARGO_FOREIGN_CALL_TIMEOUT=300000
-    nargo test --silence-warnings  --oracle-resolver http://127.0.0.1:8081 "$@"
+    nargo test --silence-warnings --oracle-resolver http://127.0.0.1:8081 --test-threads 16 "$@"
     ;;
   start)
     if [ "${1:-}" == "--local-network" ]; then
@@ -47,16 +46,20 @@ case $cmd in
       export ETHEREUM_HOSTS=${ETHEREUM_HOSTS:-"http://127.0.0.1:${ANVIL_PORT}"}
 
       anvil --version
-      anvil --silent &
+      anvil --silent --port "$ANVIL_PORT" &
       anvil_pid=$!
       trap 'kill $anvil_pid &>/dev/null' EXIT
     fi
 
     aztec start "$@"
     ;;
-  compile|new|init|flamegraph)
+  new|init)
     $script_dir/${cmd}.sh "$@"
     ;;
+  flamegraph)
+    echo "Warning: 'aztec flamegraph' is deprecated. Use 'aztec profile flamegraph' instead." >&2
+    aztec profile flamegraph "$@"
+    ;;
   *)
     aztec $cmd "$@"
     ;;

package/scripts/init.sh

@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-NARGO=${NARGO:-nargo}
 script_path=$(realpath $(dirname "$0"))
 
+name_arg=""
+
+# Check for help first
 for arg in "$@"; do
   if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
     cat << 'EOF'
@@ -13,23 +15,31 @@ Usage: aztec init [OPTIONS]
 
 Options:
   --name <NAME>  Name of the package [default: current directory name]
-  --lib          Use a library template
   -h, --help     Print help
 
-This command creates a new Aztec Noir project in the current directory using nargo
-and automatically adds the Aztec.nr dependency to your Nargo.toml file.
-
+This command creates a new Aztec Noir project in the current directory with
+a workspace containing a contract crate and a test crate, and automatically
+adds the Aztec.nr dependency to both.
 EOF
     exit 0
   fi
-  if [ "$arg" == "--lib" ]; then
-    is_contract=0
-  fi
 done
 
-echo "Initializing Noir project..."
-$NARGO init "$@"
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --name)
+      name_arg="$2"
+      shift 2
+      ;;
+    *)
+      shift
+      ;;
+  esac
+done
+
+# Derive package name: use --name if provided, otherwise use current directory name
+package_name="${name_arg:-$(basename $(pwd))}"
 
-if [ "${is_contract:-1}" -eq 1 ]; then
-  $script_path/setup_project.sh
-fi
+echo "Initializing Aztec contract project..."
+$script_path/setup_workspace.sh "$package_name"

package/scripts/new.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-NARGO=${NARGO:-nargo}
 script_path=$(realpath $(dirname "$0"))
 
-type_arg="--contract"
+name_arg=""
+project_path=""
 
 while [[ $# -gt 0 ]]; do
   case $1 in
@@ -19,20 +19,16 @@ Arguments:
 
 Options:
   --name <NAME>  Name of the package [default: package directory name]
-  --lib          Create a library template instead of a contract
   -h, --help     Print help
 
-This command creates a new Aztec Noir project using nargo and automatically
-adds the Aztec.nr dependency to your Nargo.toml file.
+This command creates a new Aztec Noir project with a workspace containing
+a contract crate and a test crate, and automatically adds the Aztec.nr
+dependency to both.
 EOF
       exit 0
       ;;
-    --lib)
-      type_arg="--lib"
-      shift
-      ;;
     --name)
-      name_arg="--name $2"
+      name_arg="$2"
       shift 2
       ;;
     *)
@@ -50,10 +46,15 @@ if [ -z "$project_path" ]; then
   exit 1
 fi
 
-echo "Creating new Noir project at $project_path..."
-$NARGO new $type_arg ${name_arg:-} $project_path
-
-if [ "$type_arg" == "--contract" ]; then
-  cd $project_path
-  $script_path/setup_project.sh
+if [ -d "$project_path" ] && [ "$(ls -A $project_path 2>/dev/null)" ]; then
+  echo "Error: $project_path already exists and is not empty"
+  exit 1
 fi
+
+# Derive package name: use --name if provided, otherwise use directory basename
+package_name="${name_arg:-$(basename $project_path)}"
+
+echo "Creating new Aztec contract project at $project_path..."
+mkdir -p "$project_path"
+cd "$project_path"
+$script_path/setup_workspace.sh "$package_name"