@aztec/end-to-end 0.86.0-nightly.20250515 → 0.86.0-nightly.20250517
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +5 -1
- package/dest/e2e_p2p/p2p_network.d.ts +2 -1
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +6 -14
- package/package.json +34 -34
- package/src/bench/utils.ts +3 -1
- package/src/e2e_p2p/p2p_network.ts +5 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAKxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAwBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAuEF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiBvG"}
|
package/dest/bench/utils.js
CHANGED
|
@@ -2,7 +2,8 @@ import { BatchCall } from '@aztec/aztec.js';
|
|
|
2
2
|
import { mean, stdDev, times } from '@aztec/foundation/collection';
|
|
3
3
|
import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
|
|
4
4
|
import { createPXEService } from '@aztec/pxe/server';
|
|
5
|
-
import { writeFileSync } from 'fs';
|
|
5
|
+
import { mkdirSync, writeFileSync } from 'fs';
|
|
6
|
+
import path from 'path';
|
|
6
7
|
import { setup } from '../fixtures/utils.js';
|
|
7
8
|
/**
|
|
8
9
|
* Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
|
|
@@ -28,6 +29,9 @@ import { setup } from '../fixtures/utils.js';
|
|
|
28
29
|
throw new Error(`No benchmark data generated. Please review your test setup.`);
|
|
29
30
|
}
|
|
30
31
|
const benchOutput = opts.benchOutput ?? process.env.BENCH_OUTPUT ?? 'bench.json';
|
|
32
|
+
mkdirSync(path.dirname(benchOutput), {
|
|
33
|
+
recursive: true
|
|
34
|
+
});
|
|
31
35
|
writeFileSync(benchOutput, JSON.stringify(formatted));
|
|
32
36
|
context.logger.info(`Wrote ${data.length} metrics to ${benchOutput}`);
|
|
33
37
|
await origTeardown();
|
|
@@ -8,9 +8,10 @@ import type { BootstrapNode } from '@aztec/p2p/bootstrap';
|
|
|
8
8
|
import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
|
|
9
9
|
import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
|
|
10
10
|
export declare const WAIT_FOR_TX_TIMEOUT: number;
|
|
11
|
-
export declare const
|
|
11
|
+
export declare const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES: {
|
|
12
12
|
aztecSlotDuration: number;
|
|
13
13
|
ethereumSlotDuration: number;
|
|
14
|
+
aztecProofSubmissionWindow: number;
|
|
14
15
|
};
|
|
15
16
|
export declare class P2PNetworkTest {
|
|
16
17
|
bootstrapNodeEnr: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
|
|
2
2
|
import { L1TxUtils, RollupContract, deployL1Contract, getExpectedAddress, getL1ContractsConfigEnvVars, l1Artifacts } from '@aztec/ethereum';
|
|
3
|
-
import { ChainMonitor
|
|
3
|
+
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
5
|
import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
|
|
6
6
|
import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
|
|
@@ -17,9 +17,10 @@ import { getEndToEndTestTelemetryClient } from '../fixtures/with_telemetry_utils
|
|
|
17
17
|
const BOOTSTRAP_NODE_PRIVATE_KEY = '080212208f988fc0899e4a73a5aee4d271a5f20670603a756ad8d84f2c94263a6427c591';
|
|
18
18
|
const l1ContractsConfig = getL1ContractsConfigEnvVars();
|
|
19
19
|
export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
|
|
20
|
-
export const
|
|
20
|
+
export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
|
|
21
21
|
aztecSlotDuration: 12,
|
|
22
|
-
ethereumSlotDuration: 4
|
|
22
|
+
ethereumSlotDuration: 4,
|
|
23
|
+
aztecProofSubmissionWindow: 640
|
|
23
24
|
};
|
|
24
25
|
export class P2PNetworkTest {
|
|
25
26
|
bootstrapNodeEnr;
|
|
@@ -127,7 +128,7 @@ export class P2PNetworkTest {
|
|
|
127
128
|
}
|
|
128
129
|
async applyBaseSnapshots() {
|
|
129
130
|
await this.addBootstrapNode();
|
|
130
|
-
await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues,
|
|
131
|
+
await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, dateProvider, cheatCodes })=>{
|
|
131
132
|
const rollup = getContract({
|
|
132
133
|
address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
|
|
133
134
|
abi: RollupAbi,
|
|
@@ -164,16 +165,7 @@ export class P2PNetworkTest {
|
|
|
164
165
|
this.validators
|
|
165
166
|
])
|
|
166
167
|
});
|
|
167
|
-
const
|
|
168
|
-
const timestamp = await rollup.read.getTimestampForSlot([
|
|
169
|
-
slotsInEpoch
|
|
170
|
-
]);
|
|
171
|
-
const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
|
|
172
|
-
try {
|
|
173
|
-
await cheatCodes.warp(Number(timestamp));
|
|
174
|
-
} catch (err) {
|
|
175
|
-
this.logger.debug('Warp failed, time already satisfied');
|
|
176
|
-
}
|
|
168
|
+
const timestamp = await cheatCodes.rollup.advanceToEpoch(2n);
|
|
177
169
|
// Send and await a tx to make sure we mine a block for the warp to correctly progress.
|
|
178
170
|
await this._sendDummyTx(deployL1ContractsValues.l1Client);
|
|
179
171
|
// Set the system time in the node, only after we have warped the time and waited for a block
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "0.86.0-nightly.
|
|
3
|
+
"version": "0.86.0-nightly.20250517",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -25,39 +25,39 @@
|
|
|
25
25
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@aztec/accounts": "0.86.0-nightly.
|
|
29
|
-
"@aztec/archiver": "0.86.0-nightly.
|
|
30
|
-
"@aztec/aztec": "0.86.0-nightly.
|
|
31
|
-
"@aztec/aztec-node": "0.86.0-nightly.
|
|
32
|
-
"@aztec/aztec.js": "0.86.0-nightly.
|
|
33
|
-
"@aztec/bb-prover": "0.86.0-nightly.
|
|
34
|
-
"@aztec/blob-lib": "0.86.0-nightly.
|
|
35
|
-
"@aztec/blob-sink": "0.86.0-nightly.
|
|
36
|
-
"@aztec/bot": "0.86.0-nightly.
|
|
37
|
-
"@aztec/cli": "0.86.0-nightly.
|
|
38
|
-
"@aztec/constants": "0.86.0-nightly.
|
|
39
|
-
"@aztec/entrypoints": "0.86.0-nightly.
|
|
40
|
-
"@aztec/epoch-cache": "0.86.0-nightly.
|
|
41
|
-
"@aztec/ethereum": "0.86.0-nightly.
|
|
42
|
-
"@aztec/foundation": "0.86.0-nightly.
|
|
43
|
-
"@aztec/kv-store": "0.86.0-nightly.
|
|
44
|
-
"@aztec/l1-artifacts": "0.86.0-nightly.
|
|
45
|
-
"@aztec/merkle-tree": "0.86.0-nightly.
|
|
46
|
-
"@aztec/noir-contracts.js": "0.86.0-nightly.
|
|
47
|
-
"@aztec/noir-noirc_abi": "0.86.0-nightly.
|
|
48
|
-
"@aztec/noir-protocol-circuits-types": "0.86.0-nightly.
|
|
49
|
-
"@aztec/noir-test-contracts.js": "0.86.0-nightly.
|
|
50
|
-
"@aztec/p2p": "0.86.0-nightly.
|
|
51
|
-
"@aztec/protocol-contracts": "0.86.0-nightly.
|
|
52
|
-
"@aztec/prover-client": "0.86.0-nightly.
|
|
53
|
-
"@aztec/prover-node": "0.86.0-nightly.
|
|
54
|
-
"@aztec/pxe": "0.86.0-nightly.
|
|
55
|
-
"@aztec/sequencer-client": "0.86.0-nightly.
|
|
56
|
-
"@aztec/simulator": "0.86.0-nightly.
|
|
57
|
-
"@aztec/stdlib": "0.86.0-nightly.
|
|
58
|
-
"@aztec/telemetry-client": "0.86.0-nightly.
|
|
59
|
-
"@aztec/validator-client": "0.86.0-nightly.
|
|
60
|
-
"@aztec/world-state": "0.86.0-nightly.
|
|
28
|
+
"@aztec/accounts": "0.86.0-nightly.20250517",
|
|
29
|
+
"@aztec/archiver": "0.86.0-nightly.20250517",
|
|
30
|
+
"@aztec/aztec": "0.86.0-nightly.20250517",
|
|
31
|
+
"@aztec/aztec-node": "0.86.0-nightly.20250517",
|
|
32
|
+
"@aztec/aztec.js": "0.86.0-nightly.20250517",
|
|
33
|
+
"@aztec/bb-prover": "0.86.0-nightly.20250517",
|
|
34
|
+
"@aztec/blob-lib": "0.86.0-nightly.20250517",
|
|
35
|
+
"@aztec/blob-sink": "0.86.0-nightly.20250517",
|
|
36
|
+
"@aztec/bot": "0.86.0-nightly.20250517",
|
|
37
|
+
"@aztec/cli": "0.86.0-nightly.20250517",
|
|
38
|
+
"@aztec/constants": "0.86.0-nightly.20250517",
|
|
39
|
+
"@aztec/entrypoints": "0.86.0-nightly.20250517",
|
|
40
|
+
"@aztec/epoch-cache": "0.86.0-nightly.20250517",
|
|
41
|
+
"@aztec/ethereum": "0.86.0-nightly.20250517",
|
|
42
|
+
"@aztec/foundation": "0.86.0-nightly.20250517",
|
|
43
|
+
"@aztec/kv-store": "0.86.0-nightly.20250517",
|
|
44
|
+
"@aztec/l1-artifacts": "0.86.0-nightly.20250517",
|
|
45
|
+
"@aztec/merkle-tree": "0.86.0-nightly.20250517",
|
|
46
|
+
"@aztec/noir-contracts.js": "0.86.0-nightly.20250517",
|
|
47
|
+
"@aztec/noir-noirc_abi": "0.86.0-nightly.20250517",
|
|
48
|
+
"@aztec/noir-protocol-circuits-types": "0.86.0-nightly.20250517",
|
|
49
|
+
"@aztec/noir-test-contracts.js": "0.86.0-nightly.20250517",
|
|
50
|
+
"@aztec/p2p": "0.86.0-nightly.20250517",
|
|
51
|
+
"@aztec/protocol-contracts": "0.86.0-nightly.20250517",
|
|
52
|
+
"@aztec/prover-client": "0.86.0-nightly.20250517",
|
|
53
|
+
"@aztec/prover-node": "0.86.0-nightly.20250517",
|
|
54
|
+
"@aztec/pxe": "0.86.0-nightly.20250517",
|
|
55
|
+
"@aztec/sequencer-client": "0.86.0-nightly.20250517",
|
|
56
|
+
"@aztec/simulator": "0.86.0-nightly.20250517",
|
|
57
|
+
"@aztec/stdlib": "0.86.0-nightly.20250517",
|
|
58
|
+
"@aztec/telemetry-client": "0.86.0-nightly.20250517",
|
|
59
|
+
"@aztec/validator-client": "0.86.0-nightly.20250517",
|
|
60
|
+
"@aztec/world-state": "0.86.0-nightly.20250517",
|
|
61
61
|
"@iarna/toml": "^2.2.5",
|
|
62
62
|
"@jest/globals": "^29.5.0",
|
|
63
63
|
"@noble/curves": "^1.0.0",
|
package/src/bench/utils.ts
CHANGED
|
@@ -6,7 +6,8 @@ import { type PXEService, type PXEServiceConfig, createPXEService } from '@aztec
|
|
|
6
6
|
import type { MetricsType } from '@aztec/telemetry-client';
|
|
7
7
|
import type { BenchmarkDataPoint, BenchmarkMetricsType, BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
|
|
8
8
|
|
|
9
|
-
import { writeFileSync } from 'fs';
|
|
9
|
+
import { mkdirSync, writeFileSync } from 'fs';
|
|
10
|
+
import path from 'path';
|
|
10
11
|
|
|
11
12
|
import { type EndToEndContext, type SetupOptions, setup } from '../fixtures/utils.js';
|
|
12
13
|
|
|
@@ -36,6 +37,7 @@ export async function benchmarkSetup(
|
|
|
36
37
|
throw new Error(`No benchmark data generated. Please review your test setup.`);
|
|
37
38
|
}
|
|
38
39
|
const benchOutput = opts.benchOutput ?? process.env.BENCH_OUTPUT ?? 'bench.json';
|
|
40
|
+
mkdirSync(path.dirname(benchOutput), { recursive: true });
|
|
39
41
|
writeFileSync(benchOutput, JSON.stringify(formatted));
|
|
40
42
|
context.logger.info(`Wrote ${data.length} metrics to ${benchOutput}`);
|
|
41
43
|
await origTeardown();
|
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
getL1ContractsConfigEnvVars,
|
|
12
12
|
l1Artifacts,
|
|
13
13
|
} from '@aztec/ethereum';
|
|
14
|
-
import { ChainMonitor
|
|
14
|
+
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
15
15
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
16
16
|
import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
|
|
17
17
|
import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
|
|
@@ -44,9 +44,10 @@ const BOOTSTRAP_NODE_PRIVATE_KEY = '080212208f988fc0899e4a73a5aee4d271a5f2067060
|
|
|
44
44
|
const l1ContractsConfig = getL1ContractsConfigEnvVars();
|
|
45
45
|
export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
|
|
46
46
|
|
|
47
|
-
export const
|
|
47
|
+
export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
|
|
48
48
|
aztecSlotDuration: 12,
|
|
49
49
|
ethereumSlotDuration: 4,
|
|
50
|
+
aztecProofSubmissionWindow: 640,
|
|
50
51
|
};
|
|
51
52
|
|
|
52
53
|
export class P2PNetworkTest {
|
|
@@ -194,7 +195,7 @@ export class P2PNetworkTest {
|
|
|
194
195
|
await this.addBootstrapNode();
|
|
195
196
|
await this.snapshotManager.snapshot(
|
|
196
197
|
'add-validators',
|
|
197
|
-
async ({ deployL1ContractsValues,
|
|
198
|
+
async ({ deployL1ContractsValues, dateProvider, cheatCodes }) => {
|
|
198
199
|
const rollup = getContract({
|
|
199
200
|
address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
|
|
200
201
|
abi: RollupAbi,
|
|
@@ -236,14 +237,7 @@ export class P2PNetworkTest {
|
|
|
236
237
|
hash: await multiAdder.write.addValidators([this.validators]),
|
|
237
238
|
});
|
|
238
239
|
|
|
239
|
-
const
|
|
240
|
-
const timestamp = await rollup.read.getTimestampForSlot([slotsInEpoch]);
|
|
241
|
-
const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
|
|
242
|
-
try {
|
|
243
|
-
await cheatCodes.warp(Number(timestamp));
|
|
244
|
-
} catch (err) {
|
|
245
|
-
this.logger.debug('Warp failed, time already satisfied');
|
|
246
|
-
}
|
|
240
|
+
const timestamp = await cheatCodes.rollup.advanceToEpoch(2n);
|
|
247
241
|
|
|
248
242
|
// Send and await a tx to make sure we mine a block for the warp to correctly progress.
|
|
249
243
|
await this._sendDummyTx(deployL1ContractsValues.l1Client);
|