@aztec/end-to-end 0.86.0 → 0.87.0

package/dest/e2e_fees/fees_test.js

@@ -7,11 +7,11 @@ import { ChainMonitor } from '@aztec/ethereum/test';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
 import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
-import { CounterContract } from '@aztec/noir-contracts.js/Counter';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token';
+import { CounterContract } from '@aztec/noir-test-contracts.js/Counter';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { GasSettings } from '@aztec/stdlib/gas';
@@ -223,15 +223,22 @@ const { E2E_DATA_PATH: dataPath } = process.env;
                 return await rollup.getSequencerRewards(this.coinbase);
             };
             this.getProverFee = async (blockNumber)=>{
+                const block = await this.pxe.getBlock(blockNumber);
                 const publicClient = getPublicClient({
                     l1RpcUrls: context.aztecNodeConfig.l1RpcUrls,
                     l1ChainId: context.aztecNodeConfig.l1ChainId
                 });
                 const rollup = new RollupContract(publicClient, data.rollupAddress);
-                const provingCostPerMana = await rollup.getProvingCostPerManaInFeeAsset();
-                const block = await this.pxe.getBlock(blockNumber);
+                // @todo @lherskind As we deal with #13601
+                // Right now the value is from `FeeLib.sol`
+                const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
+                // We round up
+                const mulDiv = (a, b, c)=>a * b / c + (a * b % c > 0n ? 1n : 0n);
+                const { baseFee } = await rollup.getL1FeesAt(block.header.globalVariables.timestamp.toBigInt());
+                const proverCost = mulDiv(mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await rollup.getEpochDuration()), 1n, await rollup.getManaTarget()) + await rollup.getProvingCostPerMana();
+                const price = await rollup.getFeeAssetPerEth();
                 const mana = block.header.totalManaUsed.toBigInt();
-                return mana * provingCostPerMana;
+                return mulDiv(mana * proverCost, price, 10n ** 9n);
             };
         });
     }
@@ -239,14 +246,13 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         await this.snapshotManager.snapshot('sponsored_fpc_setup', async (context)=>{
             const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
             expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPubliclyDeployed).toBe(true);
-            this.sponsoredFPC = await setupSponsoredFPC(context.pxe);
-            this.logger.info(`SponsoredFPC deployed at ${this.sponsoredFPC.address}`);
+            const sponsoredFPC = await setupSponsoredFPC(context.pxe);
+            this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
             return {
-                sponsoredFPCAddress: this.sponsoredFPC.address
+                sponsoredFPCAddress: sponsoredFPC.address
             };
         }, async (data)=>{
-            const sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.aliceWallet);
-            this.sponsoredFPC = sponsoredFPC;
+            this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.aliceWallet);
         });
     }
     async applyFundAliceWithBananas() {

package/dest/e2e_nested_contract/nested_contract_test.d.ts

@@ -1,6 +1,6 @@
 import { type AccountWallet, type CompleteAddress, type Logger, type PXE } from '@aztec/aztec.js';
-import { ChildContract } from '@aztec/noir-contracts.js/Child';
-import { ParentContract } from '@aztec/noir-contracts.js/Parent';
+import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
+import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 export declare class NestedContractTest {
     private numberOfAccounts;

package/dest/e2e_nested_contract/nested_contract_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAUC,OAAO,CAAC,gBAAgB;IATtD,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,GAAG,EAAG,GAAG,CAAC;IAEV,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;gBAElB,QAAQ,EAAE,MAAM,EAAU,gBAAgB,SAAI;IAK1D;;;;OAIG;IACG,kBAAkB;IAsBlB,KAAK;IAIL,QAAQ;IAId,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,oBAAoB;CAc3B"}
+{"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,GAAG,EAAG,GAAG,CAAC;IAEV,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;gBAG5B,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI;IAM9B;;;;OAIG;IACG,kBAAkB;IAsBlB,KAAK;IAIL,QAAQ;IAId,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,oBAAoB;CAc3B"}

package/dest/e2e_nested_contract/nested_contract_test.js

@@ -1,7 +1,7 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { createLogger } from '@aztec/aztec.js';
-import { ChildContract } from '@aztec/noir-contracts.js/Child';
-import { ParentContract } from '@aztec/noir-contracts.js/Parent';
+import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
+import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 export class NestedContractTest {

package/dest/e2e_p2p/p2p_network.d.ts

@@ -3,14 +3,15 @@ import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import type { AccountWalletWithSecretKey } from '@aztec/aztec.js';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { type Logger } from '@aztec/foundation/log';
-import { SpamContract } from '@aztec/noir-contracts.js/Spam';
+import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import type { BootstrapNode } from '@aztec/p2p/bootstrap';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 export declare const WAIT_FOR_TX_TIMEOUT: number;
-export declare const SHORTENED_BLOCK_TIME_CONFIG: {
+export declare const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES: {
     aztecSlotDuration: number;
     ethereumSlotDuration: number;
+    aztecProofSubmissionWindow: number;
 };
 export declare class P2PNetworkTest {
     bootstrapNodeEnr: string;
@@ -20,225 +21,20 @@ export declare class P2PNetworkTest {
     private snapshotManager;
     baseAccountPrivateKey: `0x${string}`;
     baseAccount: {
-        address: `0x${string}`;
+        address: import("viem").Address;
         nonceManager?: import("viem").NonceManager | undefined;
         sign: (parameters: {
-            hash: `0x${string}`;
-        }) => Promise<`0x${string}`>;
+            hash: import("viem").Hash;
+        }) => Promise<import("viem").Hex>;
         experimental_signAuthorization: (parameters: import("viem/experimental").Authorization) => Promise<import("viem/accounts").SignAuthorizationReturnType>;
         signMessage: ({ message }: {
             message: import("viem").SignableMessage;
-        }) => Promise<`0x${string}`>;
+        }) => Promise<import("viem").Hex>;
         signTransaction: <serializer extends import("viem").SerializeTransactionFn<import("viem").TransactionSerializable> = import("viem").SerializeTransactionFn<import("viem").TransactionSerializable>, transaction extends Parameters<serializer>[0] = Parameters<serializer>[0]>(transaction: transaction, options?: {
             serializer?: serializer | undefined;
-        } | undefined) => Promise<import("viem").IsNarrowable<import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>>, `0x${string}`> extends true ? import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>> : `0x${string}`>;
-        signTypedData: <const typedData extends Record<string, unknown> | {
-            [x: string]: readonly import("viem").TypedDataParameter[];
-            [x: `string[${string}]`]: undefined;
-            [x: `function[${string}]`]: undefined;
-            [x: `address[${string}]`]: undefined;
-            [x: `bool[${string}]`]: undefined;
-            [x: `bytes[${string}]`]: undefined;
-            [x: `bytes8[${string}]`]: undefined;
-            [x: `bytes18[${string}]`]: undefined;
-            [x: `bytes4[${string}]`]: undefined;
-            [x: `bytes1[${string}]`]: undefined;
-            [x: `bytes23[${string}]`]: undefined;
-            [x: `bytes32[${string}]`]: undefined;
-            [x: `bytes31[${string}]`]: undefined;
-            [x: `bytes30[${string}]`]: undefined;
-            [x: `bytes29[${string}]`]: undefined;
-            [x: `bytes28[${string}]`]: undefined;
-            [x: `bytes27[${string}]`]: undefined;
-            [x: `bytes26[${string}]`]: undefined;
-            [x: `bytes25[${string}]`]: undefined;
-            [x: `bytes24[${string}]`]: undefined;
-            [x: `bytes22[${string}]`]: undefined;
-            [x: `bytes21[${string}]`]: undefined;
-            [x: `bytes20[${string}]`]: undefined;
-            [x: `bytes2[${string}]`]: undefined;
-            [x: `bytes19[${string}]`]: undefined;
-            [x: `bytes17[${string}]`]: undefined;
-            [x: `bytes16[${string}]`]: undefined;
-            [x: `bytes15[${string}]`]: undefined;
-            [x: `bytes14[${string}]`]: undefined;
-            [x: `bytes13[${string}]`]: undefined;
-            [x: `bytes12[${string}]`]: undefined;
-            [x: `bytes11[${string}]`]: undefined;
-            [x: `bytes10[${string}]`]: undefined;
-            [x: `bytes9[${string}]`]: undefined;
-            [x: `bytes7[${string}]`]: undefined;
-            [x: `bytes6[${string}]`]: undefined;
-            [x: `bytes5[${string}]`]: undefined;
-            [x: `bytes3[${string}]`]: undefined;
-            [x: `int[${string}]`]: undefined;
-            [x: `int8[${string}]`]: undefined;
-            [x: `int40[${string}]`]: undefined;
-            [x: `int32[${string}]`]: undefined;
-            [x: `int24[${string}]`]: undefined;
-            [x: `int16[${string}]`]: undefined;
-            [x: `int48[${string}]`]: undefined;
-            [x: `int56[${string}]`]: undefined;
-            [x: `int64[${string}]`]: undefined;
-            [x: `int72[${string}]`]: undefined;
-            [x: `int80[${string}]`]: undefined;
-            [x: `int88[${string}]`]: undefined;
-            [x: `int96[${string}]`]: undefined;
-            [x: `int104[${string}]`]: undefined;
-            [x: `int112[${string}]`]: undefined;
-            [x: `int120[${string}]`]: undefined;
-            [x: `int128[${string}]`]: undefined;
-            [x: `int136[${string}]`]: undefined;
-            [x: `int144[${string}]`]: undefined;
-            [x: `int152[${string}]`]: undefined;
-            [x: `int160[${string}]`]: undefined;
-            [x: `int168[${string}]`]: undefined;
-            [x: `int176[${string}]`]: undefined;
-            [x: `int184[${string}]`]: undefined;
-            [x: `int192[${string}]`]: undefined;
-            [x: `int200[${string}]`]: undefined;
-            [x: `int208[${string}]`]: undefined;
-            [x: `int216[${string}]`]: undefined;
-            [x: `int224[${string}]`]: undefined;
-            [x: `int232[${string}]`]: undefined;
-            [x: `int240[${string}]`]: undefined;
-            [x: `int248[${string}]`]: undefined;
-            [x: `int256[${string}]`]: undefined;
-            [x: `uint[${string}]`]: undefined;
-            [x: `uint8[${string}]`]: undefined;
-            [x: `uint40[${string}]`]: undefined;
-            [x: `uint32[${string}]`]: undefined;
-            [x: `uint24[${string}]`]: undefined;
-            [x: `uint16[${string}]`]: undefined;
-            [x: `uint48[${string}]`]: undefined;
-            [x: `uint56[${string}]`]: undefined;
-            [x: `uint64[${string}]`]: undefined;
-            [x: `uint72[${string}]`]: undefined;
-            [x: `uint80[${string}]`]: undefined;
-            [x: `uint88[${string}]`]: undefined;
-            [x: `uint96[${string}]`]: undefined;
-            [x: `uint104[${string}]`]: undefined;
-            [x: `uint112[${string}]`]: undefined;
-            [x: `uint120[${string}]`]: undefined;
-            [x: `uint128[${string}]`]: undefined;
-            [x: `uint136[${string}]`]: undefined;
-            [x: `uint144[${string}]`]: undefined;
-            [x: `uint152[${string}]`]: undefined;
-            [x: `uint160[${string}]`]: undefined;
-            [x: `uint168[${string}]`]: undefined;
-            [x: `uint176[${string}]`]: undefined;
-            [x: `uint184[${string}]`]: undefined;
-            [x: `uint192[${string}]`]: undefined;
-            [x: `uint200[${string}]`]: undefined;
-            [x: `uint208[${string}]`]: undefined;
-            [x: `uint216[${string}]`]: undefined;
-            [x: `uint224[${string}]`]: undefined;
-            [x: `uint232[${string}]`]: undefined;
-            [x: `uint240[${string}]`]: undefined;
-            [x: `uint248[${string}]`]: undefined;
-            [x: `uint256[${string}]`]: undefined;
-            string?: undefined;
-            address?: undefined;
-            bool?: undefined;
-            bytes?: undefined;
-            bytes8?: undefined;
-            bytes18?: undefined;
-            bytes4?: undefined;
-            bytes1?: undefined;
-            bytes23?: undefined;
-            bytes32?: undefined;
-            bytes31?: undefined;
-            bytes30?: undefined;
-            bytes29?: undefined;
-            bytes28?: undefined;
-            bytes27?: undefined;
-            bytes26?: undefined;
-            bytes25?: undefined;
-            bytes24?: undefined;
-            bytes22?: undefined;
-            bytes21?: undefined;
-            bytes20?: undefined;
-            bytes2?: undefined;
-            bytes19?: undefined;
-            bytes17?: undefined;
-            bytes16?: undefined;
-            bytes15?: undefined;
-            bytes14?: undefined;
-            bytes13?: undefined;
-            bytes12?: undefined;
-            bytes11?: undefined;
-            bytes10?: undefined;
-            bytes9?: undefined;
-            bytes7?: undefined;
-            bytes6?: undefined;
-            bytes5?: undefined;
-            bytes3?: undefined;
-            int8?: undefined;
-            int40?: undefined;
-            int32?: undefined;
-            int24?: undefined;
-            int16?: undefined;
-            int48?: undefined;
-            int56?: undefined;
-            int64?: undefined;
-            int72?: undefined;
-            int80?: undefined;
-            int88?: undefined;
-            int96?: undefined;
-            int104?: undefined;
-            int112?: undefined;
-            int120?: undefined;
-            int128?: undefined;
-            int136?: undefined;
-            int144?: undefined;
-            int152?: undefined;
-            int160?: undefined;
-            int168?: undefined;
-            int176?: undefined;
-            int184?: undefined;
-            int192?: undefined;
-            int200?: undefined;
-            int208?: undefined;
-            int216?: undefined;
-            int224?: undefined;
-            int232?: undefined;
-            int240?: undefined;
-            int248?: undefined;
-            int256?: undefined;
-            uint8?: undefined;
-            uint40?: undefined;
-            uint32?: undefined;
-            uint24?: undefined;
-            uint16?: undefined;
-            uint48?: undefined;
-            uint56?: undefined;
-            uint64?: undefined;
-            uint72?: undefined;
-            uint80?: undefined;
-            uint88?: undefined;
-            uint96?: undefined;
-            uint104?: undefined;
-            uint112?: undefined;
-            uint120?: undefined;
-            uint128?: undefined;
-            uint136?: undefined;
-            uint144?: undefined;
-            uint152?: undefined;
-            uint160?: undefined;
-            uint168?: undefined;
-            uint176?: undefined;
-            uint184?: undefined;
-            uint192?: undefined;
-            uint200?: undefined;
-            uint208?: undefined;
-            uint216?: undefined;
-            uint224?: undefined;
-            uint232?: undefined;
-            uint240?: undefined;
-            uint248?: undefined;
-            uint256?: undefined;
-        }, primaryType extends "EIP712Domain" | keyof typedData = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<`0x${string}`>;
-        publicKey: `0x${string}`;
+        } | undefined) => Promise<import("viem").IsNarrowable<import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>>, import("viem").Hex> extends true ? import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>> : import("viem").Hex>;
+        signTypedData: <const typedData extends import("viem").TypedData | Record<string, unknown>, primaryType extends keyof typedData | "EIP712Domain" = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<import("viem").Hex>;
+        publicKey: import("viem").Hex;
         source: "privateKey";
         type: "local";
     };

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

@@ -1 +1 @@
-{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAUlE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAa9D,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,iCAAiC,CAAC;AAOzC,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E,eAAO,MAAM,qCAAqC;;;;CAIjD,CAAC;AAEF,qBAAa,cAAc;IA0BhB,gBAAgB,EAAE,MAAM;IACxB,YAAY,EAAE,MAAM;IAC3B,OAAO,CAAC,aAAa;IAGrB,OAAO,CAAC,WAAW,CAAC;IA9BtB,OAAO,CAAC,eAAe,CAAmB;IACnC,qBAAqB,EAAE,KAAK,MAAM,EAAE,CAAC;IACrC,WAAW;;;;;;;;;;wTAd4C,CAAC;sBAAsB,CAAC;;;;;;MAcnE;IAEZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,YAAY,CAAC;IAEvB,GAAG,EAAG,iBAAiB,CAAC;IACxB,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAClC,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,iBAAiB,EAAE,MAAM,EAAE,CAAM;IACjC,UAAU,EAAE;QAAE,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,UAAU,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAC/G;IAEE,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,mBAAmB,EAAE,kBAAkB,EAAE,CAAM;IAE/C,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,aAAa,CAAC;gBAGnC,QAAQ,EAAE,MAAM,EACT,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAC7B,sBAAsB,EAAE,eAAe,EAE/B,WAAW,CAAC,EAAE,MAAM,YAAA;WAqCjB,MAAM,CAAC,EAClB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;KAC1C;IAcD,IAAI,aAAa,uBAKhB;IAEK,gBAAgB;IActB,aAAa;;;;;;;;;IA0BP,kBAAkB;IA0DlB,YAAY;IAYZ,kBAAkB;IAoBlB,iBAAiB;IAgBjB,WAAW;;;;YAIH,YAAY;IAQpB,KAAK;IAaL,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE;IAanC,QAAQ;CAKf"}

package/dest/e2e_p2p/p2p_network.js

@@ -1,9 +1,9 @@
 import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
-import { L1TxUtils, RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
-import { ChainMonitor, EthCheatCodesWithState } from '@aztec/ethereum/test';
+import { L1TxUtils, RollupContract, deployL1Contract, getExpectedAddress, getL1ContractsConfigEnvVars, l1Artifacts } from '@aztec/ethereum';
+import { ChainMonitor } from '@aztec/ethereum/test';
 import { createLogger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
-import { SpamContract } from '@aztec/noir-contracts.js/Spam';
+import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import getPort from 'get-port';
@@ -17,9 +17,10 @@ import { getEndToEndTestTelemetryClient } from '../fixtures/with_telemetry_utils
 const BOOTSTRAP_NODE_PRIVATE_KEY = '080212208f988fc0899e4a73a5aee4d271a5f20670603a756ad8d84f2c94263a6427c591';
 const l1ContractsConfig = getL1ContractsConfigEnvVars();
 export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
-export const SHORTENED_BLOCK_TIME_CONFIG = {
+export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
     aztecSlotDuration: 12,
-    ethereumSlotDuration: 4
+    ethereumSlotDuration: 4,
+    aztecProofSubmissionWindow: 640
 };
 export class P2PNetworkTest {
     bootstrapNodeEnr;
@@ -58,7 +59,7 @@ export class P2PNetworkTest {
         this.prefilledPublicData = [];
         this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
         // Set up the base account and node private keys for the initial network deployment
-        this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(0).toString('hex')}`;
+        this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(1).toString('hex')}`;
         this.baseAccount = privateKeyToAccount(this.baseAccountPrivateKey);
         this.proposerPrivateKeys = generatePrivateKeys(PROPOSER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
         this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
@@ -127,7 +128,7 @@ export class P2PNetworkTest {
     }
     async applyBaseSnapshots() {
         await this.addBootstrapNode();
-        await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, aztecNodeConfig, dateProvider })=>{
+        await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, dateProvider, cheatCodes })=>{
             const rollup = getContract({
                 address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
                 abi: RollupAbi,
@@ -139,14 +140,19 @@ export class P2PNetworkTest {
                 abi: TestERC20Abi,
                 client: deployL1ContractsValues.l1Client
             });
+            const { address: multiAdderAddress } = await deployL1Contract(deployL1ContractsValues.l1Client, l1Artifacts.multiAdder.contractAbi, l1Artifacts.multiAdder.contractBytecode, [
+                rollup.address,
+                deployL1ContractsValues.l1Client.account.address
+            ]);
+            const multiAdder = getContract({
+                address: multiAdderAddress.toString(),
+                abi: l1Artifacts.multiAdder.contractAbi,
+                client: deployL1ContractsValues.l1Client
+            });
             const stakeNeeded = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
             await Promise.all([
                 await stakingAsset.write.mint([
-                    deployL1ContractsValues.l1Client.account.address,
-                    stakeNeeded
-                ], {}),
-                await stakingAsset.write.approve([
-                    deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
+                    multiAdder.address,
                     stakeNeeded
                 ], {})
             ].map((txHash)=>deployL1ContractsValues.l1Client.waitForTransactionReceipt({
@@ -155,20 +161,11 @@ export class P2PNetworkTest {
             const { validators } = this.getValidators();
             this.validators = validators;
             await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
-                hash: await rollup.write.cheat__InitialiseValidatorSet([
+                hash: await multiAdder.write.addValidators([
                     this.validators
                 ])
             });
-            const slotsInEpoch = await rollup.read.getEpochDuration();
-            const timestamp = await rollup.read.getTimestampForSlot([
-                slotsInEpoch
-            ]);
-            const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
-            try {
-                await cheatCodes.warp(Number(timestamp));
-            } catch (err) {
-                this.logger.debug('Warp failed, time already satisfied');
-            }
+            const timestamp = await cheatCodes.rollup.advanceToEpoch(2n);
             // Send and await a tx to make sure we mine a block for the warp to correctly progress.
             await this._sendDummyTx(deployL1ContractsValues.l1Client);
             // Set the system time in the node, only after we have warped the time and waited for a block

package/dest/e2e_p2p/shared.d.ts

@@ -1,7 +1,7 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeService } from '@aztec/aztec-node';
 import { type Logger, ProvenTx, type SentTx } from '@aztec/aztec.js';
-import type { SpamContract } from '@aztec/noir-contracts.js/Spam';
+import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { PXEService } from '@aztec/pxe/server';
 import type { NodeContext } from '../fixtures/setup_p2p_test.js';
 export declare const submitComplexTxsTo: (logger: Logger, spamContract: SpamContract, numTxs: number, opts?: {

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

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

package/dest/e2e_p2p/shared.js

@@ -1,7 +1,7 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { Fr, TxStatus, getContractInstanceFromDeployParams } from '@aztec/aztec.js';
 import { timesAsync } from '@aztec/foundation/collection';
-import { TestContract, TestContractArtifact } from '@aztec/noir-contracts.js/Test';
+import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
 import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
 import { submitTxsTo } from '../shared/submit-transactions.js';
 // submits a set of transactions to the provided Private eXecution Environment (PXE)
@@ -10,9 +10,7 @@ export const submitComplexTxsTo = async (logger, spamContract, numTxs, opts = {}
     const seed = 1234n;
     const spamCount = 15;
     for(let i = 0; i < numTxs; i++){
-        const tx = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic).send({
-            skipPublicSimulation: true
-        });
+        const tx = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic).send();
         const txHash = await tx.getTxHash();
         logger.info(`Tx sent with hash ${txHash}`);
         const receipt = await tx.getReceipt();
@@ -54,9 +52,7 @@ export async function createPXEServiceAndPrepareTransactions(logger, node, numTx
     });
     const contract = await TestContract.at(testContractInstance.address, wallet);
     const txs = await timesAsync(numTxs, async ()=>{
-        const tx = await contract.methods.emit_nullifier(Fr.random()).prove({
-            skipPublicSimulation: true
-        });
+        const tx = await contract.methods.emit_nullifier(Fr.random()).prove();
         const txHash = await tx.getTxHash();
         logger.info(`Tx prepared with hash ${txHash}`);
         return tx;

package/dest/e2e_prover/e2e_prover_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/e2e_prover/e2e_prover_test.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAqB,KAAK,6BAA6B,EAAuB,MAAM,kBAAkB,CAAC;AAE9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,2BAA2B,EAAoB,MAAM,iBAAiB,CAAC;AAGrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AASlE;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,OAAO,EAAE,0BAA0B,EAAE,CAAM;IAC3C,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,eAAe,EAAG,aAAa,CAAC;IAChC,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,UAAU,CAAC;IACjB,UAAU,EAAG,UAAU,CAAC;IACxB,QAAQ,EAAG,cAAc,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,aAAa,EAAE,CAAM;IACnC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,2BAA2B,CAAC;IAC1C,aAAa,EAAG,UAAU,CAAC;gBAGhC,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO;IAW3B;;;;OAIG;IACG,kBAAkB;IAqDlB,KAAK;YA8JG,WAAW;IAQzB,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAeR,iBAAiB;IA+CjB,cAAc;CAuBrB"}
+{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/e2e_prover/e2e_prover_test.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAqB,KAAK,6BAA6B,EAAuB,MAAM,kBAAkB,CAAC;AAE9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,2BAA2B,EAAoB,MAAM,iBAAiB,CAAC;AAGrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AASlE;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,OAAO,EAAE,0BAA0B,EAAE,CAAM;IAC3C,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,eAAe,EAAG,aAAa,CAAC;IAChC,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,UAAU,CAAC;IACjB,UAAU,EAAG,UAAU,CAAC;IACxB,QAAQ,EAAG,cAAc,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,aAAa,EAAE,CAAM;IACnC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,2BAA2B,CAAC;IAC1C,aAAa,EAAG,UAAU,CAAC;gBAGhC,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO;IAW3B;;;;OAIG;IACG,kBAAkB;IAqDlB,KAAK;YA+JG,WAAW;IAQzB,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAeR,iBAAiB;IA+CjB,cAAc;CAuBrB"}

package/dest/e2e_prover/e2e_prover_test.js

@@ -197,7 +197,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             proverNodePollingIntervalMs: 100,
             txGatheringIntervalMs: 1000,
             txGatheringBatchSize: 10,
-            txGatheringMaxParallelRequestsPerNode: 100
+            txGatheringMaxParallelRequestsPerNode: 100,
+            proverNodeFailedEpochStore: undefined
         };
         const sponsoredFPCAddress = await getSponsoredFPCAddress();
         const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress));

package/dest/e2e_token_contract/token_contract_test.d.ts

@@ -1,6 +1,6 @@
 import { type AccountWallet, type AztecNode, type CompleteAddress, type Logger } from '@aztec/aztec.js';
-import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 export declare class TokenContractTest {

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

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

package/dest/e2e_token_contract/token_contract_test.js

@@ -1,7 +1,7 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { createLogger } from '@aztec/aztec.js';
-import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import { jest } from '@jest/globals';
 import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';

package/dest/fixtures/fixtures.d.ts

@@ -1,13 +1,11 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 export declare const METRICS_PORT = 4318;
 export declare const shouldCollectMetrics: () => 4318 | undefined;
 export declare const TEST_PEER_CHECK_INTERVAL_MS = 1000;
 export declare const MNEMONIC = "test test test test test test test test test test test junk";
-export declare const privateKey: Buffer;
-export declare const privateKey2: Buffer;
-export declare const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow 'self - other'";
-export declare const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'self + other'";
+export declare const privateKey: Buffer<ArrayBuffer>;
+export declare const privateKey2: Buffer<ArrayBuffer>;
+export declare const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow";
+export declare const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow";
 export declare const BITSIZE_TOO_BIG_ERROR = "Assertion failed: call to assert_max_bit_size 'self.__assert_max_bit_size'";
 export declare const DUPLICATE_NULLIFIER_ERROR: RegExp;
 export declare const NO_L1_TO_L2_MSG_ERROR: RegExp;

package/dest/fixtures/fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":";;AAAA,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAEhD,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AACtF,eAAO,MAAM,UAAU,QAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,QAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,uEAAuE,CAAC;AACzG,eAAO,MAAM,mBAAmB,kEAAkE,CAAC;AACnG,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAAgC,CAAC;AACvE,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAC+B,CAAC;AACjF,eAAO,MAAM,8BAA8B,QAAkE,CAAC;AAE9G,eAAO,MAAM,sBAAsB,SAAS,CAAC"}
+{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAEhD,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AACtF,eAAO,MAAM,UAAU,qBAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,qBAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,wDAAwD,CAAC;AAC1F,eAAO,MAAM,mBAAmB,mDAAmD,CAAC;AACpF,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAAgC,CAAC;AACvE,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAC+B,CAAC;AACjF,eAAO,MAAM,8BAA8B,QAAkE,CAAC;AAE9G,eAAO,MAAM,sBAAsB,SAAS,CAAC"}

package/dest/fixtures/fixtures.js

@@ -10,8 +10,8 @@ export const MNEMONIC = 'test test test test test test test test test test test
 export const privateKey = Buffer.from('ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex');
 export const privateKey2 = Buffer.from('59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d', 'hex');
 /// Common errors
-export const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow 'self - other'";
-export const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'self + other'";
+export const U128_UNDERFLOW_ERROR = 'Assertion failed: attempt to subtract with overflow';
+export const U128_OVERFLOW_ERROR = 'Assertion failed: attempt to add with overflow';
 export const BITSIZE_TOO_BIG_ERROR = "Assertion failed: call to assert_max_bit_size 'self.__assert_max_bit_size'";
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/5818): Make these a fixed error after transition.
 export const DUPLICATE_NULLIFIER_ERROR = /dropped|nullifier|reverted/i;

package/dest/fixtures/get_bb_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_bb_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_bb_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAcjD,eAAO,MAAM,WAAW,WACd,MAAM,KACb,QAAQ,CAAC,QAAQ,GAAG;IAAE,OAAO,EAAE,MAAM,QAAQ,IAAI,CAAC,CAAA;CAAE,CAAC,GAAG,SAAS,CAoCnE,CAAC"}
+{"version":3,"file":"get_bb_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_bb_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAcjD,eAAO,MAAM,WAAW,GACtB,QAAQ,MAAM,KACb,OAAO,CAAC,CAAC,QAAQ,GAAG;IAAE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,GAAG,SAAS,CAoCnE,CAAC"}

package/dest/fixtures/l1_to_l2_messaging.d.ts

@@ -8,5 +8,9 @@ export declare function sendL1ToL2Message(message: {
 }, ctx: {
     l1Client: ExtendedViemWalletClient;
     l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress' | 'rollupAddress'>;
-}): Promise<Fr[]>;
+}): Promise<{
+    msgHash: Fr;
+    globalLeafIndex: Fr;
+    txReceipt: import("viem").TransactionReceipt;
+}>;
 //# sourceMappingURL=l1_to_l2_messaging.d.ts.map

package/dest/fixtures/l1_to_l2_messaging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_to_l2_messaging.d.ts","sourceRoot":"","sources":["../../src/fixtures/l1_to_l2_messaging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,mBAAmB,EAAkB,MAAM,iBAAiB,CAAC;AAC1G,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,SAAS,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAA;CAAE,EACjE,GAAG,EAAE;IACH,QAAQ,EAAE,wBAAwB,CAAC;IACnC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,GAAG,eAAe,CAAC,CAAC;CAClF,iBAoCF"}
+{"version":3,"file":"l1_to_l2_messaging.d.ts","sourceRoot":"","sources":["../../src/fixtures/l1_to_l2_messaging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,mBAAmB,EAAkB,MAAM,iBAAiB,CAAC;AAC1G,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,SAAS,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAA;CAAE,EACjE,GAAG,EAAE;IACH,QAAQ,EAAE,wBAAwB,CAAC;IACnC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,GAAG,eAAe,CAAC,CAAC;CAClF;;;;GAoCF"}

package/dest/fixtures/l1_to_l2_messaging.js

@@ -35,8 +35,9 @@ export async function sendL1ToL2Message(message, ctx) {
     });
     const receivedMsgHash = topics.args.hash;
     const receivedGlobalLeafIndex = topics.args.index;
-    return [
-        Fr.fromHexString(receivedMsgHash),
-        new Fr(receivedGlobalLeafIndex)
-    ];
+    return {
+        msgHash: Fr.fromHexString(receivedMsgHash),
+        globalLeafIndex: new Fr(receivedGlobalLeafIndex),
+        txReceipt
+    };
 }