@aztec/aztec 3.0.3 → 4.0.0-devnet.1-patch.0

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

@@ -1,10 +1,10 @@
 #!/usr/bin/env -S node --no-warnings
-import { getInitialTestAccountsData } from '@aztec/accounts/testing/lazy';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { AztecNodeService } from '@aztec/aztec-node';
 import { getConfigEnvVars } from '@aztec/aztec-node/config';
 import { Fr } from '@aztec/aztec.js/fields';
 import { createLogger } from '@aztec/aztec.js/log';
-import { createBlobSinkClient } from '@aztec/blob-sink/client';
+import { createBlobClient } from '@aztec/blob-client/client';
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import { createEthereumChain } from '@aztec/ethereum/chain';
 import { waitForPublicClient } from '@aztec/ethereum/client';
@@ -26,6 +26,7 @@ import { foundry } from 'viem/chains';
 import { createAccountLogs } from '../cli/util.js';
 import { DefaultMnemonic } from '../mnemonic.js';
 import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
+import { EpochTestSettler } from '../testing/epoch_test_settler.js';
 import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
 import { getSponsoredFPCAddress } from './sponsored_fpc.js';
 const logger = createLogger('local-network');
@@ -101,14 +102,15 @@ const localAnvil = foundry;
         sponsoredFPC
     ] : [];
     const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
-    let watcher = undefined;
     const dateProvider = new TestDateProvider();
+    let cheatcodes;
+    let rollupAddress;
+    let watcher;
     if (!aztecNodeConfig.p2pEnabled) {
-        const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
-            assumeProvenThroughBlockNumber: Number.MAX_SAFE_INTEGER,
+        ({ rollupAddress } = await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
             genesisArchiveRoot,
             feeJuicePortalInitialBalance: fundingNeeded
-        });
+        }));
         const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain([
             l1RpcUrl
         ], aztecNodeConfig.l1ChainId) : {
@@ -120,29 +122,38 @@ const localAnvil = foundry;
                 httpViemTransport(l1RpcUrl)
             ])
         });
-        watcher = new AnvilTestWatcher(new EthCheatCodes([
+        cheatcodes = new EthCheatCodes([
             l1RpcUrl
-        ], dateProvider), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
+        ], dateProvider);
+        watcher = new AnvilTestWatcher(cheatcodes, rollupAddress, publicClient, dateProvider);
         watcher.setisLocalNetwork(true);
+        watcher.setIsMarkingAsProven(false); // Do not mark as proven in the watcher. It's marked in the epochTestSettler after the out hash is set.
         await watcher.start();
     }
     const telemetry = await initTelemetryClient(getTelemetryClientConfig());
-    // Create a local blob sink client inside the local network, no http connectivity
-    const blobSinkClient = createBlobSinkClient();
+    // Create a local blob client client inside the local network, no http connectivity
+    const blobClient = createBlobClient();
     const node = await createAztecNode(aztecNodeConfig, {
         telemetry,
-        blobSinkClient,
+        blobClient,
         dateProvider
     }, {
         prefilledPublicData
     });
+    let epochTestSettler;
+    if (!aztecNodeConfig.p2pEnabled) {
+        epochTestSettler = new EpochTestSettler(cheatcodes, rollupAddress, node.getBlockSource(), logger.createChild('epoch-settler'), {
+            pollingIntervalMs: 200
+        });
+        await epochTestSettler.start();
+    }
     if (initialAccounts.length) {
         const PXEConfig = {
             proverEnabled: aztecNodeConfig.realProofs
         };
         const wallet = await TestWallet.create(node, PXEConfig);
         userLog('Setting up funded test accounts...');
-        const accountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccounts);
+        const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
         const accountsWithSecrets = accountManagers.map((manager, i)=>({
                 account: manager,
                 secretKey: initialAccounts[i].secret
@@ -157,6 +168,7 @@ const localAnvil = foundry;
     const stop = async ()=>{
         await node.stop();
         await watcher?.stop();
+        await epochTestSettler?.stop();
     };
     return {
         node,

package/dest/testing/cheat_codes.d.ts

@@ -9,7 +9,9 @@ import type { AztecNode } from '@aztec/stdlib/interfaces/client';
  * 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 the Aztec Rollup contract on L1. */
     rollup: RollupCheatCodes;
     constructor(
     /** Cheat codes for L1.*/
@@ -38,4 +40,4 @@ export declare class CheatCodes {
      */
     warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFHWixHQUFHLEVBQUUsYUFBYTtJQUVsQixNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFFbkIseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==

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":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGvE,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;IAGZ,GAAG,EAAE,aAAa;IAElB,MAAM,EAAE,gBAAgB;IAJjC;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB,EAC7B;IAEJ,OAAa,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAOvG;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,iBAuB5G;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAIrG;CACF"}
+{"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;AAGvE,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;IAJjC;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB,EAC7B;IAEJ,OAAa,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAOvG;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,iBAuB5G;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAIrG;CACF"}

package/dest/testing/epoch_test_settler.d.ts

@@ -0,0 +1,19 @@
+import { type EthCheatCodes } from '@aztec/ethereum/test';
+import { type EpochNumber } from '@aztec/foundation/branded-types';
+import type { Logger } from '@aztec/foundation/log';
+import type { EthAddress, L2BlockSource } from '@aztec/stdlib/block';
+export declare class EpochTestSettler {
+    private l2BlockSource;
+    private log;
+    private options;
+    private rollupCheatCodes;
+    private epochMonitor?;
+    constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l2BlockSource: L2BlockSource, log: Logger, options: {
+        pollingIntervalMs: number;
+        provingDelayMs?: number;
+    });
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    handleEpochReadyToProve(epoch: EpochNumber): Promise<boolean>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXFDbEU7Q0FDRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"epoch_test_settler.d.ts","sourceRoot":"","sources":["../../src/testing/epoch_test_settler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGrE,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IARjB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,YACE,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAGxE;IAEK,KAAK,kBAIV;IAEK,IAAI,kBAET;IAEK,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAqClE;CACF"}

package/dest/testing/epoch_test_settler.js

@@ -0,0 +1,62 @@
+import { RollupCheatCodes } from '@aztec/ethereum/test';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { EpochMonitor } from '@aztec/prover-node';
+import { computeL2ToL1MembershipWitnessFromMessagesInEpoch } from '@aztec/stdlib/messaging';
+export class EpochTestSettler {
+    l2BlockSource;
+    log;
+    options;
+    rollupCheatCodes;
+    epochMonitor;
+    constructor(cheatcodes, rollupAddress, l2BlockSource, log, options){
+        this.l2BlockSource = l2BlockSource;
+        this.log = log;
+        this.options = options;
+        this.rollupCheatCodes = new RollupCheatCodes(cheatcodes, {
+            rollupAddress
+        });
+    }
+    async start() {
+        const { epochDuration } = await this.rollupCheatCodes.getConfig();
+        this.epochMonitor = new EpochMonitor(this.l2BlockSource, {
+            epochDuration: Number(epochDuration)
+        }, this.options);
+        this.epochMonitor.start(this);
+    }
+    async stop() {
+        await this.epochMonitor?.stop();
+    }
+    async handleEpochReadyToProve(epoch) {
+        const checkpointedBlocks = await this.l2BlockSource.getCheckpointedBlocksForEpoch(epoch);
+        const blocks = checkpointedBlocks.map((b)=>b.block);
+        this.log.info(`Settling epoch ${epoch} with blocks ${blocks[0]?.header.getBlockNumber()} to ${blocks.at(-1)?.header.getBlockNumber()}`, {
+            blocks: blocks.map((b)=>b.toBlockInfo())
+        });
+        const messagesInEpoch = [];
+        let previousSlotNumber = SlotNumber.ZERO;
+        let checkpointIndex = -1;
+        for (const block of blocks){
+            const slotNumber = block.header.globalVariables.slotNumber;
+            if (slotNumber !== previousSlotNumber) {
+                checkpointIndex++;
+                messagesInEpoch[checkpointIndex] = [];
+                previousSlotNumber = slotNumber;
+            }
+            messagesInEpoch[checkpointIndex].push(block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs));
+        }
+        const [firstMessage] = messagesInEpoch.flat(3);
+        if (firstMessage) {
+            const { root: outHash } = computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, firstMessage);
+            await this.rollupCheatCodes.insertOutbox(epoch, outHash.toBigInt());
+        } else {
+            this.log.info(`No L2 to L1 messages in epoch ${epoch}`);
+        }
+        const lastCheckpoint = checkpointedBlocks.at(-1)?.checkpointNumber;
+        if (lastCheckpoint !== undefined) {
+            await this.rollupCheatCodes.markAsProven(lastCheckpoint);
+        } else {
+            this.log.warn(`No checkpoint found for epoch ${epoch}`);
+        }
+        return true;
+    }
+}

package/dest/testing/index.d.ts

@@ -1,4 +1,5 @@
 export { AnvilTestWatcher } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 export { CheatCodes } from './cheat_codes.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUMifQ==
+export { EpochTestSettler } from './epoch_test_settler.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUMifQ==

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,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;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC"}

package/dest/testing/index.js

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

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@aztec/aztec",
-  "version": "3.0.3",
+  "version": "4.0.0-devnet.1-patch.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
     "./testing": "./dest/testing/index.js"
   },
-  "bin": "./dest/bin/index.js",
+  "bin": "./scripts/aztec.sh",
   "typedocOptions": {
     "entryPoints": [
       "./src/index.ts"
@@ -28,38 +28,39 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "3.0.3",
-    "@aztec/archiver": "3.0.3",
-    "@aztec/aztec-faucet": "3.0.3",
-    "@aztec/aztec-node": "3.0.3",
-    "@aztec/aztec.js": "3.0.3",
-    "@aztec/bb-prover": "3.0.3",
-    "@aztec/bb.js": "3.0.3",
-    "@aztec/blob-sink": "3.0.3",
-    "@aztec/bot": "3.0.3",
-    "@aztec/builder": "3.0.3",
-    "@aztec/cli": "3.0.3",
-    "@aztec/constants": "3.0.3",
-    "@aztec/entrypoints": "3.0.3",
-    "@aztec/ethereum": "3.0.3",
-    "@aztec/foundation": "3.0.3",
-    "@aztec/kv-store": "3.0.3",
-    "@aztec/l1-artifacts": "3.0.3",
-    "@aztec/node-lib": "3.0.3",
-    "@aztec/noir-contracts.js": "3.0.3",
-    "@aztec/noir-protocol-circuits-types": "3.0.3",
-    "@aztec/p2p": "3.0.3",
-    "@aztec/p2p-bootstrap": "3.0.3",
-    "@aztec/protocol-contracts": "3.0.3",
-    "@aztec/prover-client": "3.0.3",
-    "@aztec/prover-node": "3.0.3",
-    "@aztec/pxe": "3.0.3",
-    "@aztec/sequencer-client": "3.0.3",
-    "@aztec/stdlib": "3.0.3",
-    "@aztec/telemetry-client": "3.0.3",
-    "@aztec/test-wallet": "3.0.3",
-    "@aztec/txe": "3.0.3",
-    "@aztec/world-state": "3.0.3",
+    "@aztec/accounts": "4.0.0-devnet.1-patch.0",
+    "@aztec/archiver": "4.0.0-devnet.1-patch.0",
+    "@aztec/aztec-faucet": "4.0.0-devnet.1-patch.0",
+    "@aztec/aztec-node": "4.0.0-devnet.1-patch.0",
+    "@aztec/aztec.js": "4.0.0-devnet.1-patch.0",
+    "@aztec/bb-prover": "4.0.0-devnet.1-patch.0",
+    "@aztec/bb.js": "4.0.0-devnet.1-patch.0",
+    "@aztec/blob-client": "4.0.0-devnet.1-patch.0",
+    "@aztec/bot": "4.0.0-devnet.1-patch.0",
+    "@aztec/builder": "4.0.0-devnet.1-patch.0",
+    "@aztec/cli": "4.0.0-devnet.1-patch.0",
+    "@aztec/constants": "4.0.0-devnet.1-patch.0",
+    "@aztec/entrypoints": "4.0.0-devnet.1-patch.0",
+    "@aztec/ethereum": "4.0.0-devnet.1-patch.0",
+    "@aztec/foundation": "4.0.0-devnet.1-patch.0",
+    "@aztec/kv-store": "4.0.0-devnet.1-patch.0",
+    "@aztec/l1-artifacts": "4.0.0-devnet.1-patch.0",
+    "@aztec/node-lib": "4.0.0-devnet.1-patch.0",
+    "@aztec/noir-contracts.js": "4.0.0-devnet.1-patch.0",
+    "@aztec/noir-protocol-circuits-types": "4.0.0-devnet.1-patch.0",
+    "@aztec/p2p": "4.0.0-devnet.1-patch.0",
+    "@aztec/p2p-bootstrap": "4.0.0-devnet.1-patch.0",
+    "@aztec/protocol-contracts": "4.0.0-devnet.1-patch.0",
+    "@aztec/prover-client": "4.0.0-devnet.1-patch.0",
+    "@aztec/prover-node": "4.0.0-devnet.1-patch.0",
+    "@aztec/pxe": "4.0.0-devnet.1-patch.0",
+    "@aztec/sequencer-client": "4.0.0-devnet.1-patch.0",
+    "@aztec/stdlib": "4.0.0-devnet.1-patch.0",
+    "@aztec/telemetry-client": "4.0.0-devnet.1-patch.0",
+    "@aztec/test-wallet": "4.0.0-devnet.1-patch.0",
+    "@aztec/txe": "4.0.0-devnet.1-patch.0",
+    "@aztec/validator-ha-signer": "4.0.0-devnet.1-patch.0",
+    "@aztec/world-state": "4.0.0-devnet.1-patch.0",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",
@@ -70,6 +71,7 @@
   },
   "files": [
     "dest",
+    "scripts",
     "src",
     "!*.test.*"
   ],
@@ -78,7 +80,7 @@
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/koa": "^2.15.0",
-    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3"

package/scripts/aztec.sh

@@ -0,0 +1,63 @@
+#!/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
+  env_setup=$(aztec-up env)
+  eval "$env_setup"
+  AZTEC_VERSIONED=1 exec aztec "$@"
+fi
+
+cmd=${1:-}
+[ -n "$cmd" ] && shift
+
+script_dir="$(dirname "$(realpath "$0")")"
+
+function aztec {
+  export AZTEC_SHELL_WRAPPER=1
+  exec node --no-warnings $script_dir/../dest/bin/index.js "$@"
+}
+
+case $cmd in
+  test)
+    export LOG_LEVEL="${LOG_LEVEL:-error}"
+    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 "$@"
+    ;;
+  start)
+    if [ "${1:-}" == "--local-network" ]; then
+      # TODO: Can these just be set in TS?
+      export ARCHIVER_POLLING_INTERVAL_MS=500
+      export P2P_BLOCK_CHECK_INTERVAL_MS=500
+      export SEQ_TX_POLLING_INTERVAL_MS=500
+      export WS_BLOCK_CHECK_INTERVAL_MS=500
+      export ARCHIVER_VIEM_POLLING_INTERVAL_MS=500
+      export TEST_ACCOUNTS=${TEST_ACCOUNTS:-true}
+      export LOG_LEVEL=${LOG_LEVEL:-info;silent:sequencer;verbose:debug_log}
+      export DEPLOY_AZTEC_CONTRACTS_SALT=${DEPLOY_AZTEC_CONTRACTS_SALT:-$RANDOM}
+
+      ANVIL_PORT=${ANVIL_PORT:-8545}
+
+      export L1_CHAIN_ID=${L1_CHAIN_ID:-31337}
+      export ETHEREUM_HOSTS=${ETHEREUM_HOSTS:-"http://127.0.0.1:${ANVIL_PORT}"}
+
+      anvil --version
+      anvil --silent &
+      anvil_pid=$!
+      trap 'kill $anvil_pid &>/dev/null' EXIT
+    fi
+
+    aztec start "$@"
+    ;;
+  compile|new|init|flamegraph)
+    $script_dir/${cmd}.sh "$@"
+    ;;
+  *)
+    aztec $cmd "$@"
+    ;;
+esac

package/scripts/compile.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+NARGO=${NARGO:-nargo}
+BB=${BB:-bb}
+
+# If help is requested, show Aztec-specific info then run nargo compile help and then exit in order to not trigger
+# transpilation
+for arg in "$@"; do
+  if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
+    cat << 'EOF'
+Aztec Compile - Compile Aztec Noir contracts
+
+This command compiles Aztec Noir contracts using nargo and then automatically
+postprocesses them to generate Aztec specific artifacts including:
+- Transpiled contract artifacts
+- Verification keys
+
+The compiled contracts will be placed in the target/ directory by default.
+
+---
+Underlying nargo compile options:
+
+EOF
+    nargo compile --help
+    exit 0
+  fi
+done
+
+# Run nargo compile.
+$NARGO compile "$@"
+
+echo "Postprocessing contract..."
+$BB aztec_process
+
+# Strip internal prefixes from all compiled contract JSONs in target directory
+# TODO: This should be part of bb aztec_process!
+for json in target/*.json; do
+  temp_file="${json}.tmp"
+  jq '.functions |= map(.name |= sub("^__aztec_nr_internals__"; ""))' "$json" > "$temp_file"
+  mv "$temp_file" "$json"
+done
+
+echo "Compilation complete!"

package/scripts/extract_function.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+import fs from 'fs/promises';
+import path from 'path';
+
+// Simple script to extract a contract function as a separate Noir artifact.
+// We need to use this since the transpiling that we do on public functions make the contract artifacts
+// unreadable by noir tooling, since they are no longer following the noir artifact format.
+async function main() {
+  let [contractArtifactPath, functionName] = process.argv.slice(2);
+  if (!contractArtifactPath || !functionName) {
+    console.log('Usage: node extractFunctionAsNoirArtifact.js <contractArtifactPath> <functionName>');
+    return;
+  }
+
+  const contractArtifact = JSON.parse(await fs.readFile(contractArtifactPath, 'utf8'));
+  const func = contractArtifact.functions.find(f => f.name === functionName);
+  if (!func) {
+    console.error(`Function ${functionName} not found in ${contractArtifactPath}`);
+    return;
+  }
+
+  const artifact = {
+    noir_version: contractArtifact.noir_version,
+    hash: 0,
+    abi: func.abi,
+    bytecode: func.bytecode,
+    debug_symbols: func.debug_symbols,
+    file_map: contractArtifact.file_map,
+    expression_width: {
+      Bounded: {
+        width: 4,
+      },
+    },
+  };
+
+  const outputDir = path.dirname(contractArtifactPath);
+  const outputName = path.basename(contractArtifactPath, '.json') + `-${functionName}.json`;
+
+  const outPath = path.join(outputDir, outputName);
+
+  await fs.writeFile(outPath, JSON.stringify(artifact, null, 2));
+}
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

package/scripts/flamegraph.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+set -eu
+
+# If first arg is -h or --help, print usage.
+if [ $# -lt 2 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+    cat << 'EOF'
+Aztec Flamegraph - Generate a gate count flamegraph for an aztec contract function.
+
+Usage: aztec flamegraph <contract_artifact> <function>
+
+Options:
+  -h, --help     Print help
+
+Will output an svg at <artifact_path>/<contract>-<function>-flamegraph.svg.
+You can open it in your browser to view it.
+
+EOF
+    exit 0
+fi
+
+cleanup() {
+  set +e
+  if [ -f "$function_artifact" ]; then
+    rm -f "$function_artifact"
+  fi
+}
+
+trap cleanup EXIT
+
+# Get the directory of the script
+script_dir=$(realpath $(dirname $0))
+
+PROFILER=${PROFILER_PATH:-noir-profiler}
+BB=${BB:-bb}
+
+# first console arg is contract name in camel case or path to contract artifact
+contract=$1
+
+# second console arg is the contract function
+function=$2
+
+if [ ! -f "$contract" ]; then
+  echo "Error: Contract artifact not found at: $contract"
+  exit 1
+fi
+artifact_path=$contract
+function_artifact="${artifact_path%%.json}-${function}.json"
+output_dir=$(dirname "$artifact_path")
+
+# Extract artifact for the specific function.
+node $script_dir/extract_function.js "$artifact_path" $function
+
+# Generate the flamegraph
+$PROFILER gates --artifact-path "$function_artifact" --backend-path "$BB" --backend-gates-command "gates" --output "$output_dir" --scheme chonk --include_gates_per_opcode
+
+# Save as $artifact_name-$function-flamegraph.svg
+output_file="${function_artifact%%.json}-flamegraph.svg"
+mv "$output_dir/__aztec_nr_internals__${function}_gates.svg" "$output_file"
+echo "Flamegraph generated at: $output_file"

package/scripts/init.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+NARGO=${NARGO:-nargo}
+script_path=$(realpath $(dirname "$0"))
+
+for arg in "$@"; do
+  if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
+    cat << 'EOF'
+Aztec Init - Create a new Aztec Noir project in the current directory
+
+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.
+
+EOF
+    exit 0
+  fi
+  if [ "$arg" == "--lib" ]; then
+    is_contract=0
+  fi
+done
+
+echo "Initializing Noir project..."
+$NARGO init "$@"
+
+if [ "${is_contract:-1}" -eq 1 ]; then
+  $script_path/setup_project.sh
+fi

package/scripts/new.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+NARGO=${NARGO:-nargo}
+script_path=$(realpath $(dirname "$0"))
+
+type_arg="--contract"
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --help|-h)
+      cat << 'EOF'
+Aztec New - Create a new Aztec Noir project in a new directory
+
+Usage: aztec new [OPTIONS] <PATH>
+
+Arguments:
+  <PATH>  The path to save the new project
+
+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.
+EOF
+      exit 0
+      ;;
+    --lib)
+      type_arg="--lib"
+      shift
+      ;;
+    --name)
+      name_arg="--name $2"
+      shift 2
+      ;;
+    *)
+      project_path=$1
+      shift
+      break
+      ;;
+  esac
+done
+
+if [ -z "$project_path" ]; then
+  echo "Error: PATH argument is required"
+  echo "Usage: aztec new [OPTIONS] <PATH>"
+  echo "Run 'aztec new --help' for more information"
+  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
+fi