@aztec/end-to-end 1.0.0-nightly.20250721 → 1.0.0-nightly.20250723
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/client_flows/benchmark.d.ts +1 -1
- package/dest/bench/client_flows/benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/benchmark.js +4 -2
- package/dest/e2e_p2p/shared.js +4 -4
- package/package.json +35 -35
- package/src/bench/client_flows/benchmark.ts +7 -2
- package/src/e2e_p2p/shared.ts +4 -4
|
@@ -11,7 +11,7 @@ export type Log = {
|
|
|
11
11
|
message: string;
|
|
12
12
|
data: any;
|
|
13
13
|
};
|
|
14
|
-
declare const GATE_TYPES: readonly ["ecc_op", "busread", "lookup", "pub_inputs", "arithmetic", "delta_range", "elliptic", "
|
|
14
|
+
declare const GATE_TYPES: readonly ["ecc_op", "busread", "lookup", "pub_inputs", "arithmetic", "delta_range", "elliptic", "memory", "nnf", "poseidon2_external", "poseidon2_internal", "overflow"];
|
|
15
15
|
type GateType = (typeof GATE_TYPES)[number];
|
|
16
16
|
type StructuredTrace = {
|
|
17
17
|
[k in GateType]: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/benchmark.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACZ,aAAa,EACb,MAAM,EACN,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,oBAAoB,EAAkC,MAAM,sBAAsB,CAAC;AACjG,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAMzG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAI/D,QAAA,MAAM,QAAQ,oFAAqF,CAAC;AACpG,KAAK,QAAQ,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1C,MAAM,MAAM,GAAG,GAAG;IAChB,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,QAAA,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/benchmark.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,8 @@ const GATE_TYPES = [
|
|
|
22
22
|
'arithmetic',
|
|
23
23
|
'delta_range',
|
|
24
24
|
'elliptic',
|
|
25
|
-
'
|
|
25
|
+
'memory',
|
|
26
|
+
'nnf',
|
|
26
27
|
'poseidon2_external',
|
|
27
28
|
'poseidon2_internal',
|
|
28
29
|
'overflow'
|
|
@@ -77,9 +78,10 @@ export class ProxyLogger {
|
|
|
77
78
|
}
|
|
78
79
|
}
|
|
79
80
|
function getMinimumTrace(logs) {
|
|
81
|
+
const LOG_MESSAGE_CANDIDATE_PADDING = 5;
|
|
80
82
|
const minimumMessage = 'Minimum required block sizes for structured trace';
|
|
81
83
|
const minimumMessageIndex = logs.findIndex((log)=>log.message.includes(minimumMessage));
|
|
82
|
-
const candidateLogs = logs.slice(minimumMessageIndex - GATE_TYPES.length, minimumMessageIndex +
|
|
84
|
+
const candidateLogs = logs.slice(minimumMessageIndex - GATE_TYPES.length, minimumMessageIndex + LOG_MESSAGE_CANDIDATE_PADDING);
|
|
83
85
|
const traceLogs = candidateLogs.filter((log)=>GATE_TYPES.some((type)=>log.message.includes(type))).map((log)=>log.message.split(/\t|\n/)).flat().map((log)=>log.replace(/\(mem: .*\)/, '').trim()).filter(Boolean);
|
|
84
86
|
const traceSizes = traceLogs.map((log)=>{
|
|
85
87
|
const [gateType, gateSizeStr] = log.replace(/\n.*\)$/, '').replace(/bb - /, '').split(':').map((s)=>s.trim());
|
package/dest/e2e_p2p/shared.js
CHANGED
|
@@ -70,15 +70,15 @@ export async function createPXEServiceAndPrepareTransactions(logger, node, numTx
|
|
|
70
70
|
}
|
|
71
71
|
export async function awaitProposalExecution(slashingProposer, timeoutSeconds) {
|
|
72
72
|
await retryUntil(async ()=>{
|
|
73
|
-
const events = await slashingProposer.getEvents.
|
|
73
|
+
const events = await slashingProposer.getEvents.PayloadSubmitted();
|
|
74
74
|
if (events.length === 0) {
|
|
75
75
|
return false;
|
|
76
76
|
}
|
|
77
77
|
const event = events[0];
|
|
78
78
|
const roundNumber = event.args.round;
|
|
79
|
-
const
|
|
80
|
-
return roundNumber &&
|
|
81
|
-
}, '
|
|
79
|
+
const payload = event.args.payload;
|
|
80
|
+
return roundNumber && payload;
|
|
81
|
+
}, 'payload submitted', timeoutSeconds, 1);
|
|
82
82
|
}
|
|
83
83
|
export async function awaitCommitteeExists({ rollup, logger }) {
|
|
84
84
|
logger.info(`Waiting for committee to be set`);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "1.0.0-nightly.
|
|
3
|
+
"version": "1.0.0-nightly.20250723",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -25,40 +25,40 @@
|
|
|
25
25
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@aztec/accounts": "1.0.0-nightly.
|
|
29
|
-
"@aztec/archiver": "1.0.0-nightly.
|
|
30
|
-
"@aztec/aztec": "1.0.0-nightly.
|
|
31
|
-
"@aztec/aztec-node": "1.0.0-nightly.
|
|
32
|
-
"@aztec/aztec.js": "1.0.0-nightly.
|
|
33
|
-
"@aztec/bb-prover": "1.0.0-nightly.
|
|
34
|
-
"@aztec/blob-lib": "1.0.0-nightly.
|
|
35
|
-
"@aztec/blob-sink": "1.0.0-nightly.
|
|
36
|
-
"@aztec/bot": "1.0.0-nightly.
|
|
37
|
-
"@aztec/cli": "1.0.0-nightly.
|
|
38
|
-
"@aztec/constants": "1.0.0-nightly.
|
|
39
|
-
"@aztec/entrypoints": "1.0.0-nightly.
|
|
40
|
-
"@aztec/epoch-cache": "1.0.0-nightly.
|
|
41
|
-
"@aztec/ethereum": "1.0.0-nightly.
|
|
42
|
-
"@aztec/foundation": "1.0.0-nightly.
|
|
43
|
-
"@aztec/kv-store": "1.0.0-nightly.
|
|
44
|
-
"@aztec/l1-artifacts": "1.0.0-nightly.
|
|
45
|
-
"@aztec/merkle-tree": "1.0.0-nightly.
|
|
46
|
-
"@aztec/noir-contracts.js": "1.0.0-nightly.
|
|
47
|
-
"@aztec/noir-noirc_abi": "1.0.0-nightly.
|
|
48
|
-
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.
|
|
49
|
-
"@aztec/noir-test-contracts.js": "1.0.0-nightly.
|
|
50
|
-
"@aztec/p2p": "1.0.0-nightly.
|
|
51
|
-
"@aztec/protocol-contracts": "1.0.0-nightly.
|
|
52
|
-
"@aztec/prover-client": "1.0.0-nightly.
|
|
53
|
-
"@aztec/prover-node": "1.0.0-nightly.
|
|
54
|
-
"@aztec/pxe": "1.0.0-nightly.
|
|
55
|
-
"@aztec/sequencer-client": "1.0.0-nightly.
|
|
56
|
-
"@aztec/simulator": "1.0.0-nightly.
|
|
57
|
-
"@aztec/slasher": "1.0.0-nightly.
|
|
58
|
-
"@aztec/stdlib": "1.0.0-nightly.
|
|
59
|
-
"@aztec/telemetry-client": "1.0.0-nightly.
|
|
60
|
-
"@aztec/validator-client": "1.0.0-nightly.
|
|
61
|
-
"@aztec/world-state": "1.0.0-nightly.
|
|
28
|
+
"@aztec/accounts": "1.0.0-nightly.20250723",
|
|
29
|
+
"@aztec/archiver": "1.0.0-nightly.20250723",
|
|
30
|
+
"@aztec/aztec": "1.0.0-nightly.20250723",
|
|
31
|
+
"@aztec/aztec-node": "1.0.0-nightly.20250723",
|
|
32
|
+
"@aztec/aztec.js": "1.0.0-nightly.20250723",
|
|
33
|
+
"@aztec/bb-prover": "1.0.0-nightly.20250723",
|
|
34
|
+
"@aztec/blob-lib": "1.0.0-nightly.20250723",
|
|
35
|
+
"@aztec/blob-sink": "1.0.0-nightly.20250723",
|
|
36
|
+
"@aztec/bot": "1.0.0-nightly.20250723",
|
|
37
|
+
"@aztec/cli": "1.0.0-nightly.20250723",
|
|
38
|
+
"@aztec/constants": "1.0.0-nightly.20250723",
|
|
39
|
+
"@aztec/entrypoints": "1.0.0-nightly.20250723",
|
|
40
|
+
"@aztec/epoch-cache": "1.0.0-nightly.20250723",
|
|
41
|
+
"@aztec/ethereum": "1.0.0-nightly.20250723",
|
|
42
|
+
"@aztec/foundation": "1.0.0-nightly.20250723",
|
|
43
|
+
"@aztec/kv-store": "1.0.0-nightly.20250723",
|
|
44
|
+
"@aztec/l1-artifacts": "1.0.0-nightly.20250723",
|
|
45
|
+
"@aztec/merkle-tree": "1.0.0-nightly.20250723",
|
|
46
|
+
"@aztec/noir-contracts.js": "1.0.0-nightly.20250723",
|
|
47
|
+
"@aztec/noir-noirc_abi": "1.0.0-nightly.20250723",
|
|
48
|
+
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250723",
|
|
49
|
+
"@aztec/noir-test-contracts.js": "1.0.0-nightly.20250723",
|
|
50
|
+
"@aztec/p2p": "1.0.0-nightly.20250723",
|
|
51
|
+
"@aztec/protocol-contracts": "1.0.0-nightly.20250723",
|
|
52
|
+
"@aztec/prover-client": "1.0.0-nightly.20250723",
|
|
53
|
+
"@aztec/prover-node": "1.0.0-nightly.20250723",
|
|
54
|
+
"@aztec/pxe": "1.0.0-nightly.20250723",
|
|
55
|
+
"@aztec/sequencer-client": "1.0.0-nightly.20250723",
|
|
56
|
+
"@aztec/simulator": "1.0.0-nightly.20250723",
|
|
57
|
+
"@aztec/slasher": "1.0.0-nightly.20250723",
|
|
58
|
+
"@aztec/stdlib": "1.0.0-nightly.20250723",
|
|
59
|
+
"@aztec/telemetry-client": "1.0.0-nightly.20250723",
|
|
60
|
+
"@aztec/validator-client": "1.0.0-nightly.20250723",
|
|
61
|
+
"@aztec/world-state": "1.0.0-nightly.20250723",
|
|
62
62
|
"@iarna/toml": "^2.2.5",
|
|
63
63
|
"@jest/globals": "^30.0.0",
|
|
64
64
|
"@noble/curves": "^1.0.0",
|
|
@@ -36,7 +36,8 @@ const GATE_TYPES = [
|
|
|
36
36
|
'arithmetic',
|
|
37
37
|
'delta_range',
|
|
38
38
|
'elliptic',
|
|
39
|
-
'
|
|
39
|
+
'memory',
|
|
40
|
+
'nnf',
|
|
40
41
|
'poseidon2_external',
|
|
41
42
|
'poseidon2_internal',
|
|
42
43
|
'overflow',
|
|
@@ -126,9 +127,13 @@ type ClientFlowBenchmark = {
|
|
|
126
127
|
};
|
|
127
128
|
|
|
128
129
|
function getMinimumTrace(logs: Log[]): StructuredTrace {
|
|
130
|
+
const LOG_MESSAGE_CANDIDATE_PADDING = 5;
|
|
129
131
|
const minimumMessage = 'Minimum required block sizes for structured trace';
|
|
130
132
|
const minimumMessageIndex = logs.findIndex(log => log.message.includes(minimumMessage));
|
|
131
|
-
const candidateLogs = logs.slice(
|
|
133
|
+
const candidateLogs = logs.slice(
|
|
134
|
+
minimumMessageIndex - GATE_TYPES.length,
|
|
135
|
+
minimumMessageIndex + LOG_MESSAGE_CANDIDATE_PADDING,
|
|
136
|
+
);
|
|
132
137
|
|
|
133
138
|
const traceLogs = candidateLogs
|
|
134
139
|
.filter(log => GATE_TYPES.some(type => log.message.includes(type)))
|
package/src/e2e_p2p/shared.ts
CHANGED
|
@@ -112,16 +112,16 @@ export async function awaitProposalExecution(
|
|
|
112
112
|
) {
|
|
113
113
|
await retryUntil(
|
|
114
114
|
async () => {
|
|
115
|
-
const events = await slashingProposer.getEvents.
|
|
115
|
+
const events = await slashingProposer.getEvents.PayloadSubmitted();
|
|
116
116
|
if (events.length === 0) {
|
|
117
117
|
return false;
|
|
118
118
|
}
|
|
119
119
|
const event = events[0];
|
|
120
120
|
const roundNumber = event.args.round;
|
|
121
|
-
const
|
|
122
|
-
return roundNumber &&
|
|
121
|
+
const payload = event.args.payload;
|
|
122
|
+
return roundNumber && payload;
|
|
123
123
|
},
|
|
124
|
-
'
|
|
124
|
+
'payload submitted',
|
|
125
125
|
timeoutSeconds,
|
|
126
126
|
1,
|
|
127
127
|
);
|