@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/e2e_l1_publisher/write_json.js

@@ -0,0 +1,56 @@
+import { getEthBlobEvaluationInputs, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
+import { writeFile } from 'fs/promises';
+const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
+/**
+ * Creates a json object that can be used to test the solidity contract.
+ * The json object must be put into
+ */ export async function writeJson(fileName, checkpointHeader, block, l1ToL2Content, blobs, batchedBlob, recipientAddress, deployerAddress) {
+    if (!AZTEC_GENERATE_TEST_DATA) {
+        return;
+    }
+    // Path relative to the package.json in the end-to-end folder
+    const path = `../../l1-contracts/test/fixtures/${fileName}.json`;
+    const asHex = (value, size = 64)=>{
+        const buffer = Buffer.isBuffer(value) ? value : value.toBuffer();
+        return `0x${buffer.toString('hex').padStart(size, '0')}`;
+    };
+    const jsonObject = {
+        populate: {
+            l1ToL2Content: l1ToL2Content.map((value)=>asHex(value)),
+            recipient: asHex(recipientAddress.toField()),
+            sender: deployerAddress
+        },
+        messages: {
+            l2ToL1Messages: block.body.txEffects.flatMap((txEffect)=>txEffect.l2ToL1Msgs).map((value)=>asHex(value))
+        },
+        checkpoint: {
+            // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
+            // This should not be a problem for testing as long as the values are not larger than u32.
+            archive: asHex(block.archive.root),
+            blobCommitments: getPrefixedEthBlobCommitments(blobs),
+            batchedBlobInputs: getEthBlobEvaluationInputs(batchedBlob),
+            checkpointNumber: block.number,
+            body: `0x${block.body.toBuffer().toString('hex')}`,
+            header: {
+                lastArchiveRoot: asHex(checkpointHeader.lastArchiveRoot),
+                blockHeadersHash: asHex(checkpointHeader.blockHeadersHash),
+                blobsHash: asHex(checkpointHeader.blobsHash),
+                inHash: asHex(checkpointHeader.inHash),
+                outHash: asHex(checkpointHeader.epochOutHash),
+                slotNumber: Number(checkpointHeader.slotNumber),
+                timestamp: Number(checkpointHeader.timestamp),
+                coinbase: asHex(checkpointHeader.coinbase, 40),
+                feeRecipient: asHex(checkpointHeader.feeRecipient),
+                gasFees: {
+                    feePerDaGas: Number(checkpointHeader.gasFees.feePerDaGas),
+                    feePerL2Gas: Number(checkpointHeader.gasFees.feePerL2Gas)
+                },
+                totalManaUsed: checkpointHeader.totalManaUsed.toNumber()
+            },
+            headerHash: asHex(checkpointHeader.hash()),
+            numTxs: block.body.txEffects.length
+        }
+    };
+    const output = JSON.stringify(jsonObject, null, 2);
+    await writeFile(path, output, 'utf8');
+}

package/dest/e2e_multi_validator/utils.d.ts

@@ -0,0 +1,12 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { EthPrivateKey } from '@aztec/node-keystore';
+export declare function createJSONRPCSigner(keyLookup: Map<string, EthPrivateKey>, stats: Map<string, number>): import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
+export declare function createKeyFile1(fileName: string, mnemonic: string, validatorIndex: number, publisher1Key: EthPrivateKey, publisher2Key: EthPrivateKey, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
+export declare function createKeyFile2(fileName: string, validatorKey: EthPrivateKey, publisherMnemonic: string, publisher1Index: number, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
+export declare function createKeyFile3(fileName: string, validatorAddress: EthAddress, publisher1Key: EthPrivateKey, publisher2Key: EthPrivateKey, coinbase: EthAddress, remoteSignerUrl: string, feeRecipient: AztecAddress): Promise<void>;
+export declare function createKeyFile4(fileName: string, validator1Address: EthAddress, validator2Address: EthAddress, publisher1Index: number, publisher2Key: EthPrivateKey, mnemonic: string, publisher3Key: EthPrivateKey, coinbase1: EthAddress, coinbase2: EthAddress, remoteSignerUrl: string, feeRecipient1: AztecAddress, feeRecipient2: AztecAddress): Promise<void>;
+export declare function createKeyFile5(fileName: string, proverAddress: EthAddress, remoteSignerUrl: string): Promise<void>;
+export declare function createKeyFile6(fileName: string, mnemonic: string, validator1Index: number, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
+export declare function addressForPrivateKey(privateKey: EthPrivateKey): EthAddress;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfbXVsdGlfdmFsaWRhdG9yL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFXMUQsd0JBQWdCLG1CQUFtQixDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxzR0EwRXBHO0FBR0Qsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBbUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFlBQVksRUFBRSxhQUFhLEVBQzNCLGlCQUFpQixFQUFFLE1BQU0sRUFDekIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBbUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsWUFBWSxFQUFFLFlBQVksaUJBaUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGlCQUFpQixFQUFFLFVBQVUsRUFDN0IsaUJBQWlCLEVBQUUsVUFBVSxFQUM3QixlQUFlLEVBQUUsTUFBTSxFQUN2QixhQUFhLEVBQUUsYUFBYSxFQUM1QixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsYUFBYSxFQUM1QixTQUFTLEVBQUUsVUFBVSxFQUNyQixTQUFTLEVBQUUsVUFBVSxFQUNyQixlQUFlLEVBQUUsTUFBTSxFQUN2QixhQUFhLEVBQUUsWUFBWSxFQUMzQixhQUFhLEVBQUUsWUFBWSxpQkE0QjVCO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFLE1BQU0saUJBY3hHO0FBRUQsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBa0IzQjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsYUFBYSxHQUFHLFVBQVUsQ0FFMUUifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/e2e_multi_validator/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAW1D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,sGA0EpG;AAGD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,iBAiB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,UAAU,EAC7B,iBAAiB,EAAE,UAAU,EAC7B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,YAAY,EAC3B,aAAa,EAAE,YAAY,iBA4B5B;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,iBAcxG;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAkB3B;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,aAAa,GAAG,UAAU,CAE1E"}

package/dest/e2e_multi_validator/utils.js

@@ -0,0 +1,214 @@
+import { getAddressFromPrivateKey } from '@aztec/ethereum/account';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { writeFile } from 'fs/promises';
+import { createServer } from 'http';
+import { signMessage, signTypedData } from 'viem/accounts';
+// Create a mock JSON RPC signer
+// Only supports signing messages and type data
+const SUPPORTED_METHODS = [
+    'eth_sign',
+    'eth_signTypedData_v4'
+];
+export function createJSONRPCSigner(keyLookup, stats) {
+    return createServer((req, res)=>{
+        if (req.method === 'POST') {
+            let body = '';
+            req.on('data', (chunk)=>{
+                body += chunk.toString();
+            });
+            req.on('end', ()=>{
+                try {
+                    const jsonRequest = JSON.parse(body);
+                    res.writeHead(200, {
+                        'Content-Type': 'application/json'
+                    });
+                    if (!SUPPORTED_METHODS.includes(jsonRequest.method)) {
+                        res.end(JSON.stringify({
+                            jsonrpc: '2.0',
+                            id: jsonRequest.id,
+                            error: {
+                                code: -32601,
+                                message: 'Method not supported'
+                            }
+                        }));
+                        return;
+                    }
+                    // Get the address sending the transaction
+                    const [address, data] = jsonRequest.params;
+                    const lowerCaseAddress = address.toLowerCase();
+                    stats.set(lowerCaseAddress, (stats.get(lowerCaseAddress) ?? 0) + 1);
+                    // Find the private key for the address
+                    const privateKey = keyLookup.get(address.toLowerCase());
+                    if (!privateKey) {
+                        res.end(JSON.stringify({
+                            jsonrpc: '2.0',
+                            id: jsonRequest.id,
+                            error: {
+                                code: -32602,
+                                message: `No private key found for address ${address}`
+                            }
+                        }));
+                        return;
+                    }
+                    const promise = jsonRequest.method === 'eth_sign' ? signMessage({
+                        message: {
+                            raw: data
+                        },
+                        privateKey
+                    }) : signTypedData({
+                        privateKey,
+                        ...data
+                    });
+                    void promise.then((signature)=>{
+                        res.end(JSON.stringify({
+                            jsonrpc: '2.0',
+                            id: jsonRequest.id,
+                            result: signature
+                        }));
+                    });
+                } catch (err) {
+                    res.end(JSON.stringify({
+                        jsonrpc: '2.0',
+                        id: 1,
+                        error: {
+                            code: -32603,
+                            message: `${err}`
+                        }
+                    }));
+                }
+            });
+        } else {
+            res.writeHead(405);
+            res.end('Method not allowed');
+        }
+    });
+}
+// Functions for creating file based key stores for the e2e_multi_validator_node_key_store test
+export async function createKeyFile1(fileName, mnemonic, validatorIndex, publisher1Key, publisher2Key, coinbase, feeRecipient) {
+    const obj = {
+        schemaVersion: 1,
+        validators: [
+            {
+                attester: {
+                    mnemonic: mnemonic,
+                    accountIndex: 0,
+                    addressIndex: validatorIndex,
+                    addressCount: 1
+                },
+                coinbase: coinbase.toChecksumString(),
+                publisher: [
+                    publisher1Key,
+                    publisher2Key
+                ],
+                feeRecipient: feeRecipient.toString()
+            }
+        ]
+    };
+    await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+export async function createKeyFile2(fileName, validatorKey, publisherMnemonic, publisher1Index, coinbase, feeRecipient) {
+    const obj = {
+        schemaVersion: 1,
+        validators: [
+            {
+                attester: validatorKey,
+                coinbase: coinbase.toChecksumString(),
+                publisher: {
+                    mnemonic: publisherMnemonic,
+                    accountIndex: 0,
+                    addressIndex: publisher1Index,
+                    addressCount: 2
+                },
+                feeRecipient: feeRecipient.toString()
+            }
+        ]
+    };
+    await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+export async function createKeyFile3(fileName, validatorAddress, publisher1Key, publisher2Key, coinbase, remoteSignerUrl, feeRecipient) {
+    const obj = {
+        schemaVersion: 1,
+        validators: [
+            {
+                attester: validatorAddress.toChecksumString(),
+                coinbase: coinbase.toChecksumString(),
+                publisher: [
+                    publisher1Key,
+                    publisher2Key
+                ],
+                feeRecipient: feeRecipient.toString(),
+                remoteSigner: {
+                    remoteSignerUrl: remoteSignerUrl
+                }
+            }
+        ]
+    };
+    await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+export async function createKeyFile4(fileName, validator1Address, validator2Address, publisher1Index, publisher2Key, mnemonic, publisher3Key, coinbase1, coinbase2, remoteSignerUrl, feeRecipient1, feeRecipient2) {
+    const obj = {
+        schemaVersion: 1,
+        remoteSigner: {
+            remoteSignerUrl: remoteSignerUrl
+        },
+        validators: [
+            {
+                attester: validator1Address.toChecksumString(),
+                coinbase: coinbase1.toChecksumString(),
+                publisher: {
+                    mnemonic: mnemonic,
+                    accountIndex: 0,
+                    addressIndex: publisher1Index,
+                    addressCount: 2
+                },
+                feeRecipient: feeRecipient1.toString()
+            },
+            {
+                attester: validator2Address.toChecksumString(),
+                coinbase: coinbase2.toChecksumString(),
+                publisher: [
+                    publisher2Key,
+                    publisher3Key
+                ],
+                feeRecipient: feeRecipient2.toString()
+            }
+        ]
+    };
+    await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+export async function createKeyFile5(fileName, proverAddress, remoteSignerUrl) {
+    const obj = {
+        schemaVersion: 1,
+        prover: {
+            id: '0x1234567890123456789012345678901234567890',
+            publisher: [
+                {
+                    address: proverAddress.toChecksumString(),
+                    remoteSignerUrl: remoteSignerUrl
+                }
+            ]
+        }
+    };
+    await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+export async function createKeyFile6(fileName, mnemonic, validator1Index, coinbase, feeRecipient) {
+    const obj = {
+        schemaVersion: 1,
+        validators: [
+            {
+                attester: {
+                    mnemonic: mnemonic,
+                    accountIndex: 0,
+                    addressIndex: validator1Index,
+                    addressCount: 2
+                },
+                coinbase: coinbase.toChecksumString(),
+                feeRecipient: feeRecipient.toString()
+            }
+        ]
+    };
+    await writeFile(fileName, JSON.stringify(obj, null, 2));
+}
+export function addressForPrivateKey(privateKey) {
+    return EthAddress.fromString(getAddressFromPrivateKey(privateKey));
+}

package/dest/e2e_nested_contract/nested_contract_test.d.ts

@@ -1,26 +1,26 @@
-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 { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
+import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
+import { type EndToEndContext, type SetupOptions } from '../fixtures/setup.js';
 export declare class NestedContractTest {
     private numberOfAccounts;
-    private snapshotManager;
+    context: EndToEndContext;
     logger: Logger;
-    wallets: AccountWallet[];
-    accounts: CompleteAddress[];
-    pxe: PXE;
+    wallet: Wallet;
+    defaultAccountAddress: AztecAddress;
+    aztecNode: AztecNode;
     parentContract: ParentContract;
     childContract: ChildContract;
     constructor(testName: string, numberOfAccounts?: number);
     /**
-     * Adds two state shifts to snapshot manager.
-     * 1. Add 3 accounts.
-     * 2. Publicly deploy accounts
+     * Applies base setup by deploying accounts and publicly deploying them.
      */
-    applyBaseSnapshots(): Promise<void>;
-    setup(): Promise<void>;
+    applyBaseSetup(): Promise<void>;
+    setup(opts?: Partial<SetupOptions>): Promise<void>;
     teardown(): Promise<void>;
-    snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
-    applyManualSnapshots(): Promise<void>;
+    applyManual(): Promise<void>;
 }
-//# sourceMappingURL=nested_contract_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmVzdGVkX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfbmVzdGVkX2NvbnRyYWN0L25lc3RlZF9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3BFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUV0RSxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBQ3BCLEtBQUssWUFBWSxFQUtsQixNQUFNLHNCQUFzQixDQUFDO0FBRTlCLHFCQUFhLGtCQUFrQjtJQVkzQixPQUFPLENBQUMsZ0JBQWdCO0lBWDFCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRyxNQUFNLENBQUM7SUFDaEIscUJBQXFCLEVBQUcsWUFBWSxDQUFDO0lBQ3JDLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFFdEIsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUNoQyxhQUFhLEVBQUcsYUFBYSxDQUFDO0lBRTlCLFlBQ0UsUUFBUSxFQUFFLE1BQU0sRUFDUixnQkFBZ0IsU0FBSSxFQUc3QjtJQUVEOztPQUVHO0lBQ0csY0FBYyxrQkFlbkI7SUFFSyxLQUFLLENBQUMsSUFBSSxHQUFFLE9BQU8sQ0FBQyxZQUFZLENBQU0saUJBUTNDO0lBRUssUUFBUSxrQkFFYjtJQUVLLFdBQVcsa0JBUWhCO0NBQ0YifQ==

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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAKlB,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,MAAM,CAAC;IAChB,qBAAqB,EAAG,YAAY,CAAC;IACrC,SAAS,EAAG,SAAS,CAAC;IAEtB,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;IAE9B,YACE,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI,EAG7B;IAED;;OAEG;IACG,cAAc,kBAenB;IAEK,KAAK,CAAC,IAAI,GAAE,OAAO,CAAC,YAAY,CAAM,iBAQ3C;IAEK,QAAQ,kBAEb;IAEK,WAAW,kBAQhB;CACF"}

package/dest/e2e_nested_contract/nested_contract_test.js

@@ -1,60 +1,55 @@
-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 { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
-const { E2E_DATA_PATH: dataPath } = process.env;
+import { createLogger } from '@aztec/aztec.js/log';
+import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
+import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
+import { deployAccounts, publicDeployAccounts, setup, teardown as teardownSubsystems } from '../fixtures/setup.js';
 export class NestedContractTest {
     numberOfAccounts;
-    snapshotManager;
+    context;
     logger;
-    wallets;
-    accounts;
-    pxe;
+    wallet;
+    defaultAccountAddress;
+    aztecNode;
     parentContract;
     childContract;
     constructor(testName, numberOfAccounts = 1){
         this.numberOfAccounts = numberOfAccounts;
-        this.wallets = [];
-        this.accounts = [];
-        this.snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
         this.logger = createLogger(`e2e:e2e_nested_contract:${testName}`);
-        this.snapshotManager = createSnapshotManager(`e2e_nested_contract/${testName}-${numberOfAccounts}`, dataPath);
     }
     /**
-   * Adds two state shifts to snapshot manager.
-   * 1. Add 3 accounts.
-   * 2. Publicly deploy accounts
-   */ async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { pxe })=>{
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.accounts = await pxe.getRegisteredAccounts();
-            this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-            this.pxe = pxe;
-        });
-        await this.snapshotManager.snapshot('public_deploy', async ()=>{}, async ()=>{
-            this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 2));
+   * Applies base setup by deploying accounts and publicly deploying them.
+   */ async applyBaseSetup() {
+        this.logger.info('Deploying accounts');
+        const { deployedAccounts } = await deployAccounts(this.numberOfAccounts, this.logger)({
+            wallet: this.context.wallet,
+            initialFundedAccounts: this.context.initialFundedAccounts
         });
+        this.wallet = this.context.wallet;
+        [{ address: this.defaultAccountAddress }] = deployedAccounts;
+        this.aztecNode = this.context.aztecNodeService;
+        this.logger.info('Public deploy accounts');
+        await publicDeployAccounts(this.wallet, [
+            this.defaultAccountAddress
+        ]);
     }
-    async setup() {
-        await this.snapshotManager.setup();
+    async setup(opts = {}) {
+        this.logger.info('Setting up fresh subsystems');
+        this.context = await setup(0, {
+            ...opts,
+            fundSponsoredFPC: true,
+            skipAccountDeployment: true
+        });
+        await this.applyBaseSetup();
     }
     async teardown() {
-        await this.snapshotManager.teardown();
+        await teardownSubsystems(this.context);
     }
-    snapshot;
-    async applyManualSnapshots() {
-        await this.snapshotManager.snapshot('manual', async ()=>{
-            const parentContract = await ParentContract.deploy(this.wallets[0]).send().deployed();
-            const childContract = await ChildContract.deploy(this.wallets[0]).send().deployed();
-            return {
-                parentContractAddress: parentContract.address,
-                childContractAddress: childContract.address
-            };
-        }, async ({ parentContractAddress, childContractAddress })=>{
-            this.parentContract = await ParentContract.at(parentContractAddress, this.wallets[0]);
-            this.childContract = await ChildContract.at(childContractAddress, this.wallets[0]);
-        });
+    async applyManual() {
+        this.logger.info('Deploying parent and child contracts');
+        ({ contract: this.parentContract } = await ParentContract.deploy(this.wallet).send({
+            from: this.defaultAccountAddress
+        }));
+        ({ contract: this.childContract } = await ChildContract.deploy(this.wallet).send({
+            from: this.defaultAccountAddress
+        }));
     }
 }

package/dest/e2e_p2p/inactivity_slash_test.d.ts

@@ -0,0 +1,31 @@
+import type { AztecNodeService } from '@aztec/aztec-node';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import 'jest-extended';
+import { P2PNetworkTest } from './p2p_network.js';
+export declare class P2PInactivityTest {
+    readonly test: P2PNetworkTest;
+    nodes: AztecNodeService[];
+    activeNodes: AztecNodeService[];
+    inactiveNodes: AztecNodeService[];
+    rollup: RollupContract;
+    offlineValidators: EthAddress[];
+    private dataDir;
+    private inactiveNodeCount;
+    private keepInitialNode;
+    constructor(test: P2PNetworkTest, opts: {
+        inactiveNodeCount: number;
+        keepInitialNode?: boolean;
+    });
+    static create(testName: string, opts: {
+        slashInactivityConsecutiveEpochThreshold: number;
+        inactiveNodeCount: number;
+        keepInitialNode?: boolean;
+    }): Promise<P2PInactivityTest>;
+    setup(): Promise<this>;
+    teardown(): Promise<void>;
+    get ctx(): import("../fixtures/setup.js").EndToEndContext;
+    get logger(): import("@aztec/foundation/log").Logger;
+    get slashingAmount(): bigint;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5hY3Rpdml0eV9zbGFzaF90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9pbmFjdGl2aXR5X3NsYXNoX3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTNELE9BQU8sZUFBZSxDQUFDO0FBS3ZCLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQWlCbEQscUJBQWEsaUJBQWlCO2FBYVYsSUFBSSxFQUFFLGNBQWM7SUFaL0IsS0FBSyxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFDM0IsV0FBVyxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFDakMsYUFBYSxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFFbkMsTUFBTSxFQUFHLGNBQWMsQ0FBQztJQUN4QixpQkFBaUIsRUFBRyxVQUFVLEVBQUUsQ0FBQztJQUV4QyxPQUFPLENBQUMsT0FBTyxDQUFTO0lBQ3hCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUztJQUNsQyxPQUFPLENBQUMsZUFBZSxDQUFVO0lBRWpDLFlBQ2tCLElBQUksRUFBRSxjQUFjLEVBQ3BDLElBQUksRUFBRTtRQUFFLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUFDLGVBQWUsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtLQUFFLEVBSy9EO0lBRUQsT0FBYSxNQUFNLENBQ2pCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLElBQUksRUFBRTtRQUFFLHdDQUF3QyxFQUFFLE1BQU0sQ0FBQztRQUFDLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUFDLGVBQWUsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtLQUFFLDhCQStCakg7SUFFWSxLQUFLLGtCQTBFakI7SUFFWSxRQUFRLGtCQU1wQjtJQUVELElBQVcsR0FBRyxtREFFYjtJQUVELElBQVcsTUFBTSwyQ0FFaEI7SUFFRCxJQUFXLGNBQWMsV0FFeEI7Q0FDRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"inactivity_slash_test.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/inactivity_slash_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAI3D,OAAO,eAAe,CAAC;AAKvB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAiBlD,qBAAa,iBAAiB;aAaV,IAAI,EAAE,cAAc;IAZ/B,KAAK,EAAG,gBAAgB,EAAE,CAAC;IAC3B,WAAW,EAAG,gBAAgB,EAAE,CAAC;IACjC,aAAa,EAAG,gBAAgB,EAAE,CAAC;IAEnC,MAAM,EAAG,cAAc,CAAC;IACxB,iBAAiB,EAAG,UAAU,EAAE,CAAC;IAExC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,eAAe,CAAU;IAEjC,YACkB,IAAI,EAAE,cAAc,EACpC,IAAI,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,EAK/D;IAED,OAAa,MAAM,CACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;QAAE,wCAAwC,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,8BA+BjH;IAEY,KAAK,kBA0EjB;IAEY,QAAQ,kBAMpB;IAED,IAAW,GAAG,mDAEb;IAED,IAAW,MAAM,2CAEhB;IAED,IAAW,cAAc,WAExB;CACF"}

package/dest/e2e_p2p/inactivity_slash_test.js

@@ -0,0 +1,137 @@
+import { EpochNumber } from '@aztec/foundation/branded-types';
+import fs from 'fs';
+import 'jest-extended';
+import os from 'os';
+import path from 'path';
+import { createNodes } from '../fixtures/setup_p2p_test.js';
+import { P2PNetworkTest } from './p2p_network.js';
+const NUM_NODES = 6;
+const NUM_VALIDATORS = NUM_NODES;
+const COMMITTEE_SIZE = NUM_VALIDATORS;
+const SLASHING_QUORUM = 3;
+const EPOCH_DURATION = 2;
+const SLASHING_ROUND_SIZE_IN_EPOCHS = 2;
+const BOOT_NODE_UDP_PORT = 4500;
+const ETHEREUM_SLOT_DURATION = process.env.CI ? 8 : 4;
+const AZTEC_SLOT_DURATION = ETHEREUM_SLOT_DURATION * 2;
+const SLASHING_UNIT = BigInt(1e18);
+const SLASHING_AMOUNT = SLASHING_UNIT * 3n;
+// How many epochs it may take to set everything up, so we dont slash during this period
+const SETUP_EPOCH_DURATION = 8;
+export class P2PInactivityTest {
+    test;
+    nodes;
+    activeNodes;
+    inactiveNodes;
+    rollup;
+    offlineValidators;
+    dataDir;
+    inactiveNodeCount;
+    keepInitialNode;
+    constructor(test, opts){
+        this.test = test;
+        this.dataDir = fs.mkdtempSync(path.join(os.tmpdir(), test.testName));
+        this.inactiveNodeCount = opts.inactiveNodeCount;
+        this.keepInitialNode = opts.keepInitialNode ?? false;
+    }
+    static async create(testName, opts) {
+        const test = await P2PNetworkTest.create({
+            testName,
+            numberOfNodes: 0,
+            numberOfValidators: NUM_VALIDATORS,
+            basePort: BOOT_NODE_UDP_PORT,
+            startProverNode: true,
+            initialConfig: {
+                inboxLag: 2,
+                anvilSlotsInAnEpoch: 4,
+                proverNodeConfig: {
+                    proverNodeEpochProvingDelayMs: AZTEC_SLOT_DURATION * 1000
+                },
+                aztecTargetCommitteeSize: COMMITTEE_SIZE,
+                aztecSlotDuration: AZTEC_SLOT_DURATION,
+                ethereumSlotDuration: ETHEREUM_SLOT_DURATION,
+                aztecProofSubmissionEpochs: 1024,
+                listenAddress: '127.0.0.1',
+                minTxsPerBlock: 0,
+                aztecEpochDuration: EPOCH_DURATION,
+                sentinelEnabled: true,
+                slashingQuorum: SLASHING_QUORUM,
+                slashingRoundSizeInEpochs: SLASHING_ROUND_SIZE_IN_EPOCHS,
+                slashInactivityTargetPercentage: 0.8,
+                slashGracePeriodL2Slots: SETUP_EPOCH_DURATION * EPOCH_DURATION,
+                slashAmountSmall: SLASHING_UNIT,
+                slashAmountMedium: SLASHING_UNIT * 2n,
+                slashAmountLarge: SLASHING_UNIT * 3n,
+                ...opts
+            }
+        });
+        return new P2PInactivityTest(test, opts);
+    }
+    async setup() {
+        await this.test.setup();
+        await this.test.applyBaseSetup();
+        // Set slashing penalties for inactivity
+        const { rollup } = await this.test.getContracts();
+        const [activationThreshold, ejectionThreshold, localEjectionThreshold] = await Promise.all([
+            rollup.getActivationThreshold(),
+            rollup.getEjectionThreshold(),
+            rollup.getLocalEjectionThreshold()
+        ]);
+        const biggestEjection = ejectionThreshold > localEjectionThreshold ? ejectionThreshold : localEjectionThreshold;
+        expect(activationThreshold - SLASHING_AMOUNT).toBeLessThan(biggestEjection);
+        this.test.ctx.aztecNodeConfig.slashInactivityPenalty = SLASHING_AMOUNT;
+        this.rollup = rollup;
+        if (!this.keepInitialNode) {
+            await this.test.ctx.aztecNodeService.stop();
+        }
+        // Create all active nodes
+        this.activeNodes = await createNodes(this.test.ctx.aztecNodeConfig, this.test.ctx.dateProvider, this.test.bootstrapNodeEnr, NUM_NODES - this.inactiveNodeCount - Number(this.keepInitialNode), BOOT_NODE_UDP_PORT, this.test.genesis, this.dataDir, undefined, Number(this.keepInitialNode));
+        // And the ones with an initially disabled sequencer
+        const inactiveConfig = {
+            ...this.test.ctx.aztecNodeConfig,
+            dontStartSequencer: true
+        };
+        this.inactiveNodes = await createNodes(inactiveConfig, this.test.ctx.dateProvider, this.test.bootstrapNodeEnr, this.inactiveNodeCount, BOOT_NODE_UDP_PORT, this.test.genesis, this.dataDir, undefined, NUM_NODES - this.inactiveNodeCount);
+        this.nodes = [
+            ...this.keepInitialNode ? [
+                this.test.ctx.aztecNodeService
+            ] : [],
+            ...this.activeNodes,
+            ...this.inactiveNodes
+        ];
+        if (this.nodes.length !== NUM_NODES) {
+            throw new Error(`Expected ${NUM_NODES} nodes but got ${this.nodes.length}`);
+        }
+        this.offlineValidators = this.test.validators.slice(this.test.validators.length - this.inactiveNodeCount).map((a)=>a.attester);
+        this.test.logger.warn(`Setup complete. Offline validators are ${this.offlineValidators.join(', ')}.`, {
+            validators: this.test.validators,
+            offlineValidators: this.offlineValidators
+        });
+        // Wait for P2P mesh to be fully formed before starting slashing period
+        // This prevents race conditions where validators propose blocks before the network is ready
+        await this.test.waitForP2PMeshConnectivity(this.nodes, NUM_NODES);
+        this.test.logger.warn(`Advancing to epoch ${SETUP_EPOCH_DURATION - 1} (slashing will start after it is completed)`);
+        await this.test.ctx.cheatCodes.rollup.advanceToEpoch(EpochNumber(SETUP_EPOCH_DURATION - 1));
+        return this;
+    }
+    async teardown() {
+        await this.test.stopNodes(this.nodes);
+        await this.test.teardown();
+        for(let i = 0; i < NUM_NODES; i++){
+            fs.rmSync(`${this.dataDir}-${i}`, {
+                recursive: true,
+                force: true,
+                maxRetries: 3
+            });
+        }
+    }
+    get ctx() {
+        return this.test.ctx;
+    }
+    get logger() {
+        return this.test.logger;
+    }
+    get slashingAmount() {
+        return SLASHING_AMOUNT;
+    }
+}