@aztec/end-to-end 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/dest/bench/utils.js

@@ -1,24 +1,41 @@
-import { BatchCall } from '@aztec/aztec.js/contracts';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
+import { waitForTx } from '@aztec/aztec.js/node';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { mean, stdDev, times } from '@aztec/foundation/collection';
 import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
+import { SequencerState } from '@aztec/sequencer-client';
 import { mkdirSync, writeFileSync } from 'fs';
 import path from 'path';
+import { PIPELINING_SETUP_OPTS } from '../fixtures/fixtures.js';
 import { setup } from '../fixtures/utils.js';
+const MAX_BENCH_WAIT_BLOCKS = 6;
+const BENCH_FINAL_WAIT_TIMEOUT_SECONDS = 10;
+const SEQUENCER_IDLE_TIMEOUT_MS = 60_000;
+const DEFAULT_L1_PUBLISHING_TIME_SECONDS = 12;
 /**
- * Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
+ * Setup for benchmarks. Initializes a remote node with a funded hardcoded account and deploys a benchmark contract.
  */ export async function benchmarkSetup(opts) {
     const context = await setup(1, {
+        ...PIPELINING_SETUP_OPTS,
         ...opts,
         telemetryConfig: {
             benchmark: true
         }
     });
-    const defaultAccountAddress = context.accounts[0];
-    const contract = await BenchmarkingContract.deploy(context.wallet).send({
-        from: defaultAccountAddress
-    }).deployed();
+    const [defaultAccountAddress] = context.accounts;
+    const sequencer = getSequencerClient(context);
+    await waitForSequencerIdle(sequencer.getSequencer());
+    const deployment = BenchmarkingContract.deploy(context.wallet);
+    const { txHash } = await deployment.send({
+        from: defaultAccountAddress,
+        wait: NO_WAIT
+    });
+    await waitTxs([
+        txHash
+    ], context);
+    const contract = await deployment.register();
     context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
-    const sequencer = context.aztecNode.getSequencer();
     const telemetry = context.telemetryClient;
     context.logger.warn(`Cleared benchmark data points from setup`);
     telemetry.clear();
@@ -45,17 +62,27 @@ import { setup } from '../fixtures/utils.js';
         sequencer
     };
 }
+function getSequencerClient(context) {
+    const sequencer = context.aztecNode.getSequencer();
+    if (!sequencer) {
+        throw new Error('Benchmark setup requires a local sequencer');
+    }
+    return sequencer;
+}
+function isMetricDefinition(f) {
+    return 'description' in f;
+}
 function formatMetricsForGithubBenchmarkAction(data, filter) {
-    const allFilters = filter.map((f)=>typeof f === 'string' ? {
-            name: f,
+    const allFilters = filter.map((f)=>isMetricDefinition(f) ? {
+            name: f.name,
             source: f,
             transform: (x)=>x,
-            unit: undefined
+            unit: f.unit
         } : f);
     return data.flatMap((meter)=>{
-        return meter.metrics.filter((metric)=>allFilters.map((f)=>f.source).includes(metric.name)).map((metric)=>[
+        return meter.metrics.filter((metric)=>allFilters.map((f)=>f.source.name).includes(metric.name)).map((metric)=>[
                 metric,
-                allFilters.find((f)=>f.source === metric.name)
+                allFilters.find((f)=>f.source.name === metric.name)
             ]).map(([metric, filter])=>({
                 name: `${meter.name}/${filter.name}`,
                 unit: filter.unit ?? metric.unit ?? 'unknown',
@@ -91,16 +118,19 @@ function getMetricValues(points) {
  * @param contract - Benchmarking contract.
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns A BatchCall instance.
- */ function makeCall(index, context, contract, heavyPublicCompute) {
-    const [owner] = context.accounts;
+ */ async function makeCall(index, context, contract, heavyPublicCompute) {
     if (heavyPublicCompute) {
         return new BatchCall(context.wallet, [
             contract.methods.sha256_hash_1024(randomBytesAsBigInts(1024))
         ]);
     } else {
+        // We use random address for the new note owner because we can emit at most UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN
+        // logs for a given sender-recipient-contract tuple.
+        const ownerOfNewNote = await AztecAddress.random();
+        const [ownerOfBalance] = context.accounts;
         return new BatchCall(context.wallet, [
-            contract.methods.create_note(owner, index + 1),
-            contract.methods.increment_balance(owner, index + 1)
+            contract.methods.create_note(ownerOfNewNote, index + 1),
+            contract.methods.increment_balance(ownerOfBalance, index + 1)
         ]);
     }
 }
@@ -112,19 +142,92 @@ function getMetricValues(points) {
  * @param contract - Target contract.
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns Array of sent txs.
- */ export function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
-    const calls = times(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute));
+ */ export async function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
+    const calls = await Promise.all(times(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute)));
     context.logger.info(`Creating ${txCount} txs`);
     const [from] = context.accounts;
     context.logger.info(`Sending ${txCount} txs`);
-    return calls.map((call)=>call.send({
-            from
-        }));
+    return Promise.all(calls.map(async (call)=>{
+        const { txHash } = await call.send({
+            from,
+            wait: NO_WAIT
+        });
+        return txHash;
+    }));
 }
 export async function waitTxs(txs, context, txWaitOpts) {
     context.logger.info(`Awaiting ${txs.length} txs to be mined`);
-    await Promise.all(txs.map((tx)=>tx.wait(txWaitOpts)));
-    context.logger.info(`All ${txs.length} txs have been mined`);
+    await waitTxsWithBlockMining(txs, context, txWaitOpts);
+    context.logger.info(`${txs.length} txs have been mined`);
+}
+async function waitTxsWithBlockMining(txs, context, txWaitOpts) {
+    const sequencer = getSequencerClient(context).getSequencer();
+    for(let attempt = 0; attempt <= MAX_BENCH_WAIT_BLOCKS; attempt++){
+        if (await haveAllTxsMined(txs, context, txWaitOpts)) {
+            await waitForSequencerIdle(sequencer);
+            return;
+        }
+        await waitForSequencerIdle(sequencer);
+        context.logger.info('Mining next benchmark block while waiting for txs', {
+            attempt,
+            txs: txs.length
+        });
+        await mineNextBenchmarkBlock(context, sequencer);
+    }
+    await Promise.all(txs.map((txHash)=>waitForTx(context.aztecNode, txHash, {
+            ...txWaitOpts,
+            timeout: txWaitOpts?.timeout ?? BENCH_FINAL_WAIT_TIMEOUT_SECONDS
+        })));
+}
+async function haveAllTxsMined(txs, context, txWaitOpts) {
+    const receipts = await Promise.all(txs.map((txHash)=>context.aztecNode.getTxReceipt(txHash)));
+    for (const receipt of receipts){
+        if (receipt.isDropped()) {
+            throw new Error(`Transaction ${receipt.txHash.toString()} was dropped. Reason: ${receipt.error ?? 'unknown'}`);
+        }
+        if (!receipt.isMined()) {
+            return false;
+        }
+        if (!receipt.hasExecutionSucceeded() && !txWaitOpts?.dontThrowOnRevert) {
+            throw new Error(`Transaction ${receipt.txHash.toString()} reverted: ${receipt.executionResult}. Reason: ${receipt.error ?? 'unknown'}`);
+        }
+    }
+    return true;
+}
+async function mineNextBenchmarkBlock(context, sequencer) {
+    const l1PublishingTime = BigInt(context.config.l1PublishingTime ?? DEFAULT_L1_PUBLISHING_TIME_SECONDS);
+    const currentTimestamp = BigInt(await context.cheatCodes.eth.lastBlockTimestamp());
+    let targetSlot = SlotNumber(await context.cheatCodes.rollup.getSlot() + 1);
+    let targetTimestamp = await context.cheatCodes.rollup.getTimestampForSlot(targetSlot);
+    while(targetTimestamp - l1PublishingTime - 1n <= currentTimestamp){
+        targetSlot = SlotNumber(targetSlot + 1);
+        targetTimestamp = await context.cheatCodes.rollup.getTimestampForSlot(targetSlot);
+    }
+    const triggerTimestamp = targetTimestamp - l1PublishingTime - 1n;
+    await context.cheatCodes.eth.warp(triggerTimestamp, {
+        resetBlockInterval: true
+    });
+    await context.aztecNode.mineBlock();
+    await waitForSequencerIdle(sequencer);
+}
+function waitForSequencerIdle(sequencer, timeout = SEQUENCER_IDLE_TIMEOUT_MS) {
+    if (sequencer.status().state === SequencerState.IDLE) {
+        return Promise.resolve();
+    }
+    return new Promise((resolve, reject)=>{
+        const timer = setTimeout(()=>{
+            sequencer.off('state-changed', handler);
+            reject(new Error('Timeout waiting for sequencer IDLE state'));
+        }, timeout);
+        const handler = (args)=>{
+            if (args.newState === SequencerState.IDLE) {
+                clearTimeout(timer);
+                sequencer.off('state-changed', handler);
+                resolve();
+            }
+        };
+        sequencer.on('state-changed', handler);
+    });
 }
 function randomBytesAsBigInts(length) {
     return [

package/dest/composed/ha/ha_full_setup.d.ts

@@ -0,0 +1,77 @@
+/**
+ * Shared setup for the docker-compose HA full suite.
+ *
+ * Stands up the complete HA cluster used by `e2e_ha_full.parallel.test.ts` and
+ * `e2e_ha_distribute_work.test.ts`: a bootstrap RPC/P2P node plus NODE_COUNT in-proc
+ * `AztecNodeService` HA peers that share one PostgreSQL slashing-protection DB and a Web3Signer keystore.
+ * Requires the docker-compose HA suite (run_test.sh ha): live Postgres (DATABASE_URL) and Web3Signer
+ * sidecar.
+ *
+ * The suite is split across two files because the "distribute work" test kills nodes as it runs, leaving
+ * the cluster unusable; giving it its own file (its own cluster) removes the previous "must run last"
+ * ordering contract without changing what any test asserts.
+ */
+import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
+import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import type { Logger } from '@aztec/aztec.js/log';
+import { type AztecNode } from '@aztec/aztec.js/node';
+import { GovernanceProposerContract } from '@aztec/ethereum/contracts';
+import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import type { TestDateProvider } from '@aztec/foundation/timer';
+import { TestContract } from '@aztec/noir-test-contracts.js/Test';
+import { TxHash, type TxReceipt } from '@aztec/stdlib/tx';
+import type { GenesisData } from '@aztec/stdlib/world-state';
+import { Pool } from 'pg';
+import { type HADatabaseConfig } from '../../fixtures/ha_setup.js';
+import type { TestWallet } from '../../test-wallet/test_wallet.js';
+export declare const NODE_COUNT = 5;
+export declare const VALIDATOR_COUNT = 4;
+export declare const COMMITTEE_SIZE = 4;
+export declare function registerTestContract(wallet: TestWallet): Promise<TestContract>;
+export declare function submitTriggerTx(wallet: TestWallet, testContract: TestContract, from: AztecAddress): Promise<TxHash>;
+export declare function waitForTriggerTx(node: AztecNode, txHash: TxHash): Promise<TxReceipt>;
+/**
+ * Owns the full HA cluster lifecycle and the shared helpers the two HA test files drive it with. Each
+ * test file constructs one instance and calls {@link setup} in `beforeAll` / {@link teardown} in
+ * `afterAll`; state fields are populated by {@link setup} and read directly by the tests.
+ */
+export declare class HaFullTestContext {
+    logger: Logger;
+    wallet: TestWallet;
+    ownerAddress: AztecAddress;
+    testContract: TestContract;
+    aztecNode: AztecNode;
+    config: AztecNodeConfig;
+    accounts: AztecAddress[];
+    dateProvider: TestDateProvider;
+    genesis: GenesisData | undefined;
+    haNodePools: Pool[];
+    haNodeServices: AztecNodeService[];
+    haKeystoreDirs: string[];
+    mainPool: Pool;
+    databaseConfig: HADatabaseConfig;
+    attesterPrivateKeys: `0x${string}`[];
+    attesterAddresses: string[];
+    publisherPrivateKeys: `0x${string}`[];
+    publisherAddresses: string[];
+    web3SignerUrl: string;
+    deployL1ContractsValues: DeployAztecL1ContractsReturnType;
+    governanceProposer: GovernanceProposerContract;
+    /** Per-node initial keystore JSON (all 4 attesters, node's own publisher) for restore after reload test */
+    initialKeystoreJsons: string[];
+    private teardownBootstrap;
+    private haSequencersStarted;
+    private readonly stoppedHANodeIndexes;
+    getSignatureContext: () => {
+        chainId: number;
+        rollupAddress: EthAddress;
+    };
+    startHASequencers: () => Promise<void>;
+    sendTriggerTx: () => Promise<TxReceipt>;
+    stopHANode: (nodeIndex: number) => Promise<void>;
+    setup(): Promise<void>;
+    teardown(): Promise<void>;
+    /** Clean up database state between tests. */
+    resetDutiesTable(): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFfZnVsbF9zZXR1cC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbXBvc2VkL2hhL2hhX2Z1bGxfc2V0dXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLGdCQUFnQixFQUEwQixNQUFNLG1CQUFtQixDQUFDO0FBQ25HLE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHckUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFhLE1BQU0sc0JBQXNCLENBQUM7QUFDakUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkUsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUlsRyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUVsRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssU0FBUyxFQUFZLE1BQU0sa0JBQWtCLENBQUM7QUFDcEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFNN0QsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLElBQUksQ0FBQztBQUcxQixPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFNdEIsTUFBTSw0QkFBNEIsQ0FBQztBQVFwQyxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUduRSxlQUFPLE1BQU0sVUFBVSxJQUFJLENBQUM7QUFDNUIsZUFBTyxNQUFNLGVBQWUsSUFBSSxDQUFDO0FBQ2pDLGVBQU8sTUFBTSxjQUFjLElBQUksQ0FBQztBQVVoQyx3QkFBc0Isb0JBQW9CLENBQUMsTUFBTSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBVXBGO0FBRUQsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxFQUFFLFVBQVUsRUFDbEIsWUFBWSxFQUFFLFlBQVksRUFDMUIsSUFBSSxFQUFFLFlBQVksR0FDakIsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUdqQjtBQUVELHdCQUFzQixnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQU0xRjtBQUVEOzs7O0dBSUc7QUFDSCxxQkFBYSxpQkFBaUI7SUFDNUIsTUFBTSxFQUFHLE1BQU0sQ0FBQztJQUNoQixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLE1BQU0sRUFBRyxlQUFlLENBQUM7SUFDekIsUUFBUSxFQUFHLFlBQVksRUFBRSxDQUFDO0lBQzFCLFlBQVksRUFBRyxnQkFBZ0IsQ0FBQztJQUNoQyxPQUFPLEVBQUUsV0FBVyxHQUFHLFNBQVMsQ0FBQztJQUVqQyxXQUFXLEVBQUcsSUFBSSxFQUFFLENBQUM7SUFDckIsY0FBYyxFQUFHLGdCQUFnQixFQUFFLENBQUM7SUFDcEMsY0FBYyxFQUFHLE1BQU0sRUFBRSxDQUFDO0lBQzFCLFFBQVEsRUFBRyxJQUFJLENBQUM7SUFDaEIsY0FBYyxFQUFHLGdCQUFnQixDQUFDO0lBQ2xDLG1CQUFtQixFQUFHLEtBQUssTUFBTSxFQUFFLEVBQUUsQ0FBQztJQUN0QyxpQkFBaUIsRUFBRyxNQUFNLEVBQUUsQ0FBQztJQUM3QixvQkFBb0IsRUFBRyxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUM7SUFDdkMsa0JBQWtCLEVBQUcsTUFBTSxFQUFFLENBQUM7SUFDOUIsYUFBYSxFQUFHLE1BQU0sQ0FBQztJQUN2Qix1QkFBdUIsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMzRCxrQkFBa0IsRUFBRywwQkFBMEIsQ0FBQztJQUNoRCwyR0FBMkc7SUFDM0csb0JBQW9CLEVBQUcsTUFBTSxFQUFFLENBQUM7SUFFaEMsT0FBTyxDQUFDLGlCQUFpQixDQUF1QztJQUNoRSxPQUFPLENBQUMsbUJBQW1CLENBQVM7SUFDcEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBcUI7SUFFMUQsbUJBQW1COzs7TUFHaEI7SUFFSCxpQkFBaUIsc0JBYWY7SUFFRixhQUFhLDJCQUlYO0lBRUYsVUFBVSx1Q0FRUjtJQUVJLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBc08zQjtJQUVLLFFBQVEsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBdUQ5QjtJQUVELDZDQUE2QztJQUN2QyxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBT3RDO0NBQ0YifQ==

package/dest/composed/ha/ha_full_setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ha_full_setup.d.ts","sourceRoot":"","sources":["../../../src/composed/ha/ha_full_setup.ts"],"names":[],"mappings":"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"}