@aztec/sequencer-client 0.69.1-devnet → 0.70.0
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/client/sequencer-client.js +2 -2
- package/dest/sequencer/metrics.d.ts +2 -1
- package/dest/sequencer/metrics.d.ts.map +1 -1
- package/dest/sequencer/metrics.js +8 -2
- package/dest/sequencer/sequencer.d.ts +2 -1
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +50 -17
- package/dest/test/index.d.ts +1 -1
- package/dest/test/index.d.ts.map +1 -1
- package/dest/tx_validator/gas_validator.js +2 -2
- package/dest/tx_validator/phases_validator.js +2 -2
- package/dest/tx_validator/tx_validator_factory.js +2 -2
- package/package.json +20 -20
- package/src/client/sequencer-client.ts +1 -1
- package/src/sequencer/metrics.ts +11 -1
- package/src/sequencer/sequencer.ts +60 -17
- package/src/test/index.ts +1 -1
- package/src/tx_validator/gas_validator.ts +1 -1
- package/src/tx_validator/phases_validator.ts +1 -1
- package/src/tx_validator/tx_validator_factory.ts +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isAnvilTestChain } from '@aztec/ethereum';
|
|
2
2
|
import { LightweightBlockBuilderFactory } from '@aztec/prover-client/block-builder';
|
|
3
|
-
import { PublicProcessorFactory } from '@aztec/simulator';
|
|
3
|
+
import { PublicProcessorFactory } from '@aztec/simulator/server';
|
|
4
4
|
import { GlobalVariableBuilder } from '../global_variable_builder/index.js';
|
|
5
5
|
import { L1Publisher } from '../publisher/index.js';
|
|
6
6
|
import { Sequencer } from '../sequencer/index.js';
|
|
@@ -82,4 +82,4 @@ export class SequencerClient {
|
|
|
82
82
|
return this.sequencer.feeRecipient;
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvc2VxdWVuY2VyLWNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUluRCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUNwRixPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUtqRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUM1RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLFNBQVMsRUFBd0IsTUFBTSx1QkFBdUIsQ0FBQztBQUd4RTs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBQzFCLFlBQXNCLFNBQW9CO1FBQXBCLGNBQVMsR0FBVCxTQUFTLENBQVc7SUFBRyxDQUFDO0lBRTlDOzs7Ozs7Ozs7Ozs7T0FZRztJQUNJLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUNyQixNQUE2QixFQUM3QixJQVlDO1FBRUQsTUFBTSxFQUNKLGVBQWUsRUFDZixTQUFTLEVBQ1Qsc0JBQXNCLEVBQ3RCLGFBQWEsRUFDYixrQkFBa0IsRUFDbEIsYUFBYSxFQUNiLG1CQUFtQixFQUNuQixTQUFTLEVBQUUsZUFBZSxHQUMzQixHQUFHLElBQUksQ0FBQztRQUNULE1BQU0sU0FBUyxHQUNiLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxXQUFXLENBQUMsTUFBTSxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsRUFBRSxjQUFjLEVBQUUsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDLENBQUM7UUFDakgsTUFBTSxjQUFjLEdBQUcsSUFBSSxxQkFBcUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUV6RCxNQUFNLHNCQUFzQixHQUFHLElBQUksc0JBQXNCLENBQUMsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLFlBQVksRUFBRSxlQUFlLENBQUMsQ0FBQztRQUVsSCxNQUFNLE1BQU0sR0FBRyxTQUFTLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztRQUM3QyxNQUFNLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztZQUN0RCxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRTtZQUMxQixNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRTtTQUNuQixDQUFDLENBQUM7UUFFWixNQUFNLG9CQUFvQixHQUFHLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQztRQUV6RCw4RkFBOEY7UUFDOUYsOEZBQThGO1FBQzlGLHlFQUF5RTtRQUN6RSw0RkFBNEY7UUFDNUYsZ0dBQWdHO1FBQ2hHLDBFQUEwRTtRQUMxRSxNQUFNLDRCQUE0QixHQUNoQyxNQUFNLENBQUMsNEJBQTRCLElBQUksZ0JBQWdCLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBRXZHLE1BQU0sV0FBVyxHQUFHO1lBQ2xCLGFBQWE7WUFDYixZQUFZLEVBQUUsTUFBTSxDQUFDLFlBQVksQ0FBQztZQUNsQyxvQkFBb0I7U0FDckIsQ0FBQztRQUVGLE1BQU0sU0FBUyxHQUFHLElBQUksU0FBUyxDQUM3QixTQUFTLEVBQ1QsZUFBZSxFQUNmLGNBQWMsRUFDZCxTQUFTLEVBQ1Qsc0JBQXNCLEVBQ3RCLGFBQWEsRUFDYixJQUFJLDhCQUE4QixDQUFDLGVBQWUsQ0FBQyxFQUNuRCxhQUFhLEVBQ2IsbUJBQW1CLEVBQ25CLHNCQUFzQixFQUN0QixrQkFBa0IsRUFDbEIsV0FBVyxFQUNYLElBQUksQ0FBQyxZQUFZLEVBQ2pCLGVBQWUsRUFDZixFQUFFLEdBQUcsTUFBTSxFQUFFLDRCQUE0QixFQUFFLENBQzVDLENBQUM7UUFDRixNQUFNLGVBQWUsRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUMvQixNQUFNLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN4QixPQUFPLElBQUksZUFBZSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFFRDs7O09BR0c7SUFDSSxxQkFBcUIsQ0FBQyxNQUF1QjtRQUNsRCxJQUFJLENBQUMsU0FBUyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUM5QixDQUFDO0lBRUQsdUdBQXVHO0lBQ2hHLEtBQUs7UUFDVixJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFRDs7T0FFRztJQUNJLE9BQU87UUFDWixJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFRCxJQUFJLFFBQVE7UUFDVixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDO0lBQ2pDLENBQUM7SUFFRCxJQUFJLFlBQVk7UUFDZCxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsWUFBWSxDQUFDO0lBQ3JDLENBQUM7Q0FDRiJ9
|
|
@@ -4,6 +4,7 @@ export declare class SequencerMetrics {
|
|
|
4
4
|
readonly tracer: Tracer;
|
|
5
5
|
private blockCounter;
|
|
6
6
|
private blockBuildDuration;
|
|
7
|
+
private blockBuildManaPerSecond;
|
|
7
8
|
private stateTransitionBufferDuration;
|
|
8
9
|
private currentBlockNumber;
|
|
9
10
|
private currentBlockSize;
|
|
@@ -14,7 +15,7 @@ export declare class SequencerMetrics {
|
|
|
14
15
|
recordTimeToCollectAttestations(time: number): void;
|
|
15
16
|
recordBlockBuilderTreeInsertions(timeUs: number): void;
|
|
16
17
|
recordCancelledBlock(): void;
|
|
17
|
-
recordPublishedBlock(buildDurationMs: number): void;
|
|
18
|
+
recordPublishedBlock(buildDurationMs: number, totalMana: number): void;
|
|
18
19
|
recordFailedBlock(): void;
|
|
19
20
|
recordNewBlock(blockNumber: number, txCount: number): void;
|
|
20
21
|
recordStateTransitionBufferMs(durationMs: number, state: SequencerState): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/sequencer/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,sBAAsB,EAA0B,MAAM,YAAY,CAAC;AAEtG,qBAAa,gBAAgB;IAC3B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,6BAA6B,CAAY;IACjD,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,sBAAsB,CAAY;IAE1C,OAAO,CAAC,yBAAyB,CAAQ;gBAE7B,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,sBAAsB,EAAE,IAAI,SAAc;
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/sequencer/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,sBAAsB,EAA0B,MAAM,YAAY,CAAC;AAEtG,qBAAa,gBAAgB;IAC3B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,6BAA6B,CAAY;IACjD,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,sBAAsB,CAAY;IAE1C,OAAO,CAAC,yBAAyB,CAAQ;gBAE7B,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,sBAAsB,EAAE,IAAI,SAAc;IAyDzF,gCAAgC,IAAI,MAAM,IAAI;IAS9C,+BAA+B,CAAC,IAAI,EAAE,MAAM;IAI5C,gCAAgC,CAAC,MAAM,EAAE,MAAM;IAI/C,oBAAoB;IAOpB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAS/D,iBAAiB;IAOjB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAInD,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc;IAMvE,OAAO,CAAC,eAAe;CAIxB"}
|
|
@@ -10,6 +10,11 @@ export class SequencerMetrics {
|
|
|
10
10
|
description: 'Duration to build a block',
|
|
11
11
|
valueType: ValueType.INT,
|
|
12
12
|
});
|
|
13
|
+
this.blockBuildManaPerSecond = meter.createGauge(Metrics.SEQUENCER_BLOCK_BUILD_MANA_PER_SECOND, {
|
|
14
|
+
unit: 'mana/s',
|
|
15
|
+
description: 'Mana per second when building a block',
|
|
16
|
+
valueType: ValueType.INT,
|
|
17
|
+
});
|
|
13
18
|
this.stateTransitionBufferDuration = meter.createHistogram(Metrics.SEQUENCER_STATE_TRANSITION_BUFFER_DURATION, {
|
|
14
19
|
unit: 'ms',
|
|
15
20
|
description: 'The time difference between when the sequencer needed to transition to a new state and when it actually did.',
|
|
@@ -60,11 +65,12 @@ export class SequencerMetrics {
|
|
|
60
65
|
});
|
|
61
66
|
this.setCurrentBlock(0, 0);
|
|
62
67
|
}
|
|
63
|
-
recordPublishedBlock(buildDurationMs) {
|
|
68
|
+
recordPublishedBlock(buildDurationMs, totalMana) {
|
|
64
69
|
this.blockCounter.add(1, {
|
|
65
70
|
[Attributes.STATUS]: 'published',
|
|
66
71
|
});
|
|
67
72
|
this.blockBuildDuration.record(Math.ceil(buildDurationMs));
|
|
73
|
+
this.blockBuildManaPerSecond.record(Math.ceil((totalMana * 1000) / buildDurationMs));
|
|
68
74
|
this.setCurrentBlock(0, 0);
|
|
69
75
|
}
|
|
70
76
|
recordFailedBlock() {
|
|
@@ -86,4 +92,4 @@ export class SequencerMetrics {
|
|
|
86
92
|
this.currentBlockSize.record(txCount);
|
|
87
93
|
}
|
|
88
94
|
}
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUdWLE9BQU8sRUFJUCxTQUFTLEdBQ1YsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEVBQW9ELHNCQUFzQixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRXRHLE1BQU0sT0FBTyxnQkFBZ0I7SUFhM0IsWUFBWSxNQUF1QixFQUFFLFFBQWdDLEVBQUUsSUFBSSxHQUFHLFdBQVc7UUFDdkYsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwQyxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFckMsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFFN0UsSUFBSSxDQUFDLGtCQUFrQixHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLDhCQUE4QixFQUFFO1lBQ3RGLElBQUksRUFBRSxJQUFJO1lBQ1YsV0FBVyxFQUFFLDJCQUEyQjtZQUN4QyxTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7U0FDekIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLHVCQUF1QixHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLHFDQUFxQyxFQUFFO1lBQzlGLElBQUksRUFBRSxRQUFRO1lBQ2QsV0FBVyxFQUFFLHVDQUF1QztZQUNwRCxTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7U0FDekIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLDZCQUE2QixHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLDBDQUEwQyxFQUFFO1lBQzdHLElBQUksRUFBRSxJQUFJO1lBQ1Ys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
|
|
@@ -8,7 +8,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
|
|
|
8
8
|
import { type DateProvider } from '@aztec/foundation/timer';
|
|
9
9
|
import { type P2P } from '@aztec/p2p';
|
|
10
10
|
import { type BlockBuilderFactory } from '@aztec/prover-client/block-builder';
|
|
11
|
-
import { type PublicProcessorFactory } from '@aztec/simulator';
|
|
11
|
+
import { type PublicProcessorFactory } from '@aztec/simulator/server';
|
|
12
12
|
import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
13
13
|
import { type ValidatorClient } from '@aztec/validator-client';
|
|
14
14
|
import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
|
|
@@ -62,6 +62,7 @@ export declare class Sequencer {
|
|
|
62
62
|
private maxBlockSizeInBytes;
|
|
63
63
|
private maxBlockGas;
|
|
64
64
|
protected processTxTime: number;
|
|
65
|
+
private attestationPropagationTime;
|
|
65
66
|
private metrics;
|
|
66
67
|
private isFlushing;
|
|
67
68
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,aAAa,EAGlB,KAAK,MAAM,EACX,KAAK,sBAAsB,EAC5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAkB,SAAS,EAAgC,MAAM,iCAAiC,CAAC;AAE/G,OAAO,EAIL,KAAK,kBAAkB,EAKxB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAK3D,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
|
11
11
|
import { pickFromSchema } from '@aztec/foundation/schemas';
|
|
12
12
|
import { Timer, elapsed } from '@aztec/foundation/timer';
|
|
13
13
|
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
14
|
+
import assert from 'assert';
|
|
14
15
|
import { VoteType } from '../publisher/l1-publisher.js';
|
|
15
16
|
import { createValidatorsForBlockBuilding } from '../tx_validator/tx_validator_factory.js';
|
|
16
17
|
import { getDefaultAllowedSetupFunctions } from './allowed.js';
|
|
@@ -74,6 +75,7 @@ let Sequencer = (() => {
|
|
|
74
75
|
this.maxBlockSizeInBytes = 1024 * 1024;
|
|
75
76
|
this.maxBlockGas = new Gas(10e9, 10e9);
|
|
76
77
|
this.processTxTime = 12;
|
|
78
|
+
this.attestationPropagationTime = 2;
|
|
77
79
|
this.isFlushing = false;
|
|
78
80
|
this.enforceTimeTable = false;
|
|
79
81
|
this.updateConfig(config);
|
|
@@ -125,7 +127,9 @@ let Sequencer = (() => {
|
|
|
125
127
|
if (config.maxL1TxInclusionTimeIntoSlot !== undefined) {
|
|
126
128
|
this.maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot;
|
|
127
129
|
}
|
|
128
|
-
|
|
130
|
+
if (config.enforceTimeTable !== undefined) {
|
|
131
|
+
this.enforceTimeTable = config.enforceTimeTable;
|
|
132
|
+
}
|
|
129
133
|
this.setTimeTable();
|
|
130
134
|
// TODO: Just read everything from the config object as needed instead of copying everything into local vars.
|
|
131
135
|
this.config = config;
|
|
@@ -135,28 +139,40 @@ let Sequencer = (() => {
|
|
|
135
139
|
const initialTime = 2;
|
|
136
140
|
// How long it takes to get ready to start building
|
|
137
141
|
const blockPrepareTime = 1;
|
|
138
|
-
// How long it takes to for attestations to travel across the p2p layer
|
|
142
|
+
// How long it takes to for proposals and attestations to travel across the p2p layer (one-way)
|
|
139
143
|
const attestationPropagationTime = 2;
|
|
144
|
+
this.attestationPropagationTime = attestationPropagationTime;
|
|
140
145
|
// How long it takes to get a published block into L1. L1 builders typically accept txs up to 4 seconds into their slot,
|
|
141
146
|
// but we'll timeout sooner to give it more time to propagate (remember we also have blobs!). Still, when working in anvil,
|
|
142
|
-
// we can just post in the very last second of the L1 slot.
|
|
147
|
+
// we can just post in the very last second of the L1 slot and still expect the tx to be accepted.
|
|
143
148
|
const l1PublishingTime = this.l1Constants.ethereumSlotDuration - this.maxL1TxInclusionTimeIntoSlot;
|
|
144
|
-
// How much time we spend validating and processing a block after building it
|
|
149
|
+
// How much time we spend validating and processing a block after building it,
|
|
150
|
+
// and assembling the proposal to send to attestors
|
|
145
151
|
const blockValidationTime = 1;
|
|
146
152
|
// How much time we have left in the slot for actually processing txs and building the block.
|
|
147
153
|
const remainingTimeInSlot = this.aztecSlotDuration -
|
|
148
154
|
initialTime -
|
|
149
155
|
blockPrepareTime -
|
|
150
|
-
|
|
156
|
+
blockValidationTime -
|
|
151
157
|
2 * attestationPropagationTime -
|
|
152
|
-
|
|
153
|
-
// Check that
|
|
158
|
+
l1PublishingTime;
|
|
159
|
+
// Check that we actually have time left for processing txs
|
|
154
160
|
if (this.enforceTimeTable && remainingTimeInSlot < 0) {
|
|
155
161
|
throw new Error(`Not enough time for block building in ${this.aztecSlotDuration}s slot`);
|
|
156
162
|
}
|
|
157
163
|
// How much time we have for actually processing txs. Note that we need both the sequencer and the validators to execute txs.
|
|
158
164
|
const processTxsTime = remainingTimeInSlot / 2;
|
|
159
165
|
this.processTxTime = processTxsTime;
|
|
166
|
+
// Sanity check
|
|
167
|
+
const totalSlotTime = initialTime + // Archiver, world-state, and p2p sync
|
|
168
|
+
blockPrepareTime + // Setup globals, initial checks, etc
|
|
169
|
+
processTxsTime + // Processing public txs for building the block
|
|
170
|
+
blockValidationTime + // Validating the block produced
|
|
171
|
+
attestationPropagationTime + // Propagating the block proposal to validators
|
|
172
|
+
processTxsTime + // Validators run public txs before signing
|
|
173
|
+
attestationPropagationTime + // Attestations fly back to the proposer
|
|
174
|
+
l1PublishingTime; // The publish tx sits on the L1 mempool waiting to be picked up
|
|
175
|
+
assert(totalSlotTime === this.aztecSlotDuration, `Computed total slot time does not match slot duration: ${totalSlotTime}s`);
|
|
160
176
|
const newTimeTable = {
|
|
161
177
|
// No checks needed for any of these transitions
|
|
162
178
|
[SequencerState.STOPPED]: this.aztecSlotDuration,
|
|
@@ -370,7 +386,12 @@ let Sequencer = (() => {
|
|
|
370
386
|
this.log.debug(`Requesting L1 to L2 messages from contract for block ${blockNumber}`);
|
|
371
387
|
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
|
|
372
388
|
const msgCount = l1ToL2Messages.length;
|
|
373
|
-
this.log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
|
|
389
|
+
this.log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
|
|
390
|
+
slot,
|
|
391
|
+
blockNumber,
|
|
392
|
+
msgCount,
|
|
393
|
+
validator: opts.validateOnly,
|
|
394
|
+
});
|
|
374
395
|
// Sync to the previous block at least
|
|
375
396
|
await this.worldState.syncImmediate(newGlobalVariables.blockNumber.toNumber() - 1);
|
|
376
397
|
this.log.debug(`Synced to previous block ${newGlobalVariables.blockNumber.toNumber() - 1}`);
|
|
@@ -382,9 +403,14 @@ let Sequencer = (() => {
|
|
|
382
403
|
const blockBuildingTimer = new Timer();
|
|
383
404
|
const blockBuilder = this.blockBuilderFactory.create(orchestratorFork);
|
|
384
405
|
await blockBuilder.startNewBlock(newGlobalVariables, l1ToL2Messages);
|
|
385
|
-
//
|
|
406
|
+
// When building a block as a proposer, we set the deadline for tx processing to the start of the
|
|
407
|
+
// CREATING_BLOCK phase, plus the expected time for tx processing. When validating, we start counting
|
|
408
|
+
// the time for tx processing from the start of the COLLECTING_ATTESTATIONS phase plus the attestation
|
|
409
|
+
// propagation time. See the comments in setTimeTable for more details.
|
|
410
|
+
const processingEndTimeWithinSlot = opts.validateOnly
|
|
411
|
+
? this.timeTable[SequencerState.COLLECTING_ATTESTATIONS] + this.attestationPropagationTime + this.processTxTime
|
|
412
|
+
: this.timeTable[SequencerState.CREATING_BLOCK] + this.processTxTime;
|
|
386
413
|
// Deadline is only set if enforceTimeTable is enabled.
|
|
387
|
-
const processingEndTimeWithinSlot = this.timeTable[SequencerState.CREATING_BLOCK] + this.processTxTime;
|
|
388
414
|
const deadline = this.enforceTimeTable
|
|
389
415
|
? new Date((this.getSlotStartTimestamp(slot) + processingEndTimeWithinSlot) * 1000)
|
|
390
416
|
: undefined;
|
|
@@ -395,12 +421,12 @@ let Sequencer = (() => {
|
|
|
395
421
|
deadline,
|
|
396
422
|
});
|
|
397
423
|
const validators = createValidatorsForBlockBuilding(publicProcessorFork, this.contractDataSource, newGlobalVariables, !!this.config.enforceFees, this.allowedInSetup);
|
|
398
|
-
//
|
|
424
|
+
// TODO(#11000): Public processor should just handle processing, one tx at a time. It should be responsibility
|
|
399
425
|
// of the sequencer to update world state and iterate over txs. We should refactor this along with unifying the
|
|
400
426
|
// publicProcessorFork and orchestratorFork, to avoid doing tree insertions twice when building the block.
|
|
401
427
|
const limits = { deadline, maxTransactions: this.maxTxsPerBlock, maxBlockSize: this.maxBlockSizeInBytes };
|
|
402
428
|
const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() => processor.process(pendingTxs, limits, validators));
|
|
403
|
-
if (failedTxs.length > 0) {
|
|
429
|
+
if (!opts.validateOnly && failedTxs.length > 0) {
|
|
404
430
|
const failedTxData = failedTxs.map(fail => fail.tx);
|
|
405
431
|
this.log.verbose(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
|
|
406
432
|
await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
|
|
@@ -419,11 +445,15 @@ let Sequencer = (() => {
|
|
|
419
445
|
this.metrics.recordBlockBuilderTreeInsertions(duration);
|
|
420
446
|
// All real transactions have been added, set the block as full and pad if needed
|
|
421
447
|
const block = await blockBuilder.setBlockCompleted();
|
|
448
|
+
// How much public gas was processed
|
|
449
|
+
const publicGas = processedTxs.reduce((acc, tx) => acc.add(tx.gasUsed.publicGas), Gas.empty());
|
|
422
450
|
return {
|
|
423
451
|
block,
|
|
452
|
+
publicGas,
|
|
424
453
|
publicProcessorDuration,
|
|
425
454
|
numMsgs: l1ToL2Messages.length,
|
|
426
455
|
numTxs: processedTxs.length,
|
|
456
|
+
numFailedTxs: failedTxs.length,
|
|
427
457
|
blockBuildingTimer,
|
|
428
458
|
};
|
|
429
459
|
}
|
|
@@ -464,7 +494,7 @@ let Sequencer = (() => {
|
|
|
464
494
|
const proofQuotePromise = this.createProofClaimForPreviousEpoch(slot);
|
|
465
495
|
try {
|
|
466
496
|
const buildBlockRes = await this.buildBlock(pendingTxs, newGlobalVariables, historicalHeader);
|
|
467
|
-
const { block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer } = buildBlockRes;
|
|
497
|
+
const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer } = buildBlockRes;
|
|
468
498
|
// TODO(@PhilWindle) We should probably periodically check for things like another
|
|
469
499
|
// block being published before ours instead of just waiting on our block
|
|
470
500
|
await this.publisher.validateBlockForSubmission(block.header);
|
|
@@ -499,14 +529,17 @@ let Sequencer = (() => {
|
|
|
499
529
|
// Get the proof quote for the previous epoch, if any
|
|
500
530
|
const proofQuote = await proofQuotePromise;
|
|
501
531
|
await this.publishL2Block(block, attestations, txHashes, proofQuote);
|
|
502
|
-
this.metrics.recordPublishedBlock(workDuration);
|
|
503
|
-
|
|
532
|
+
this.metrics.recordPublishedBlock(workDuration, publicGas.l2Gas);
|
|
533
|
+
const duration = Math.ceil(workDuration);
|
|
534
|
+
const manaPerSecond = Math.ceil((publicGas.l2Gas * 1000) / duration);
|
|
535
|
+
this.log.info(`Published block ${block.number} with ${numTxs} txs and ${numMsgs} messages in ${duration} ms at ${manaPerSecond} mana/s`, {
|
|
536
|
+
publicGas,
|
|
504
537
|
blockNumber: block.number,
|
|
505
538
|
blockHash: blockHash,
|
|
506
539
|
slot,
|
|
507
540
|
txCount: txHashes.length,
|
|
508
541
|
msgCount: numMsgs,
|
|
509
|
-
duration
|
|
542
|
+
duration,
|
|
510
543
|
submitter: this.publisher.getSenderAddress().toString(),
|
|
511
544
|
});
|
|
512
545
|
}
|
|
@@ -694,4 +727,4 @@ let Sequencer = (() => {
|
|
|
694
727
|
_a;
|
|
695
728
|
})();
|
|
696
729
|
export { Sequencer };
|
|
697
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
|
|
730
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
|
package/dest/test/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type PublicProcessorFactory } from '@aztec/simulator';
|
|
1
|
+
import { type PublicProcessorFactory } from '@aztec/simulator/server';
|
|
2
2
|
import { SequencerClient } from '../client/sequencer-client.js';
|
|
3
3
|
import { type L1Publisher } from '../publisher/l1-publisher.js';
|
|
4
4
|
import { Sequencer } from '../sequencer/sequencer.js';
|
package/dest/test/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,cAAM,cAAe,SAAQ,SAAS;IACpB,sBAAsB,EAAG,sBAAsB,CAAC;IAChD,SAAS,EAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAC3C,aAAa,EAAG,MAAM,CAAC;IACvB,SAAS,EAAG,WAAW,CAAC;CACzC;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC;AAE3C,cAAM,oBAAqB,SAAQ,eAAe;IAChC,SAAS,EAAG,aAAa,CAAC;CAC3C;AAED,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAEvD,cAAc,wBAAwB,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
|
3
3
|
import { TxExecutionPhase } from '@aztec/circuit-types';
|
|
4
4
|
import { FunctionSelector } from '@aztec/circuits.js';
|
|
5
5
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
|
-
import { computeFeePayerBalanceStorageSlot, getExecutionRequestsByPhase } from '@aztec/simulator';
|
|
6
|
+
import { computeFeePayerBalanceStorageSlot, getExecutionRequestsByPhase } from '@aztec/simulator/server';
|
|
7
7
|
export class GasTxValidator {
|
|
8
8
|
constructor(publicDataSource, feeJuiceAddress, enforceFees, gasFees) {
|
|
9
9
|
_GasTxValidator_instances.add(this);
|
|
@@ -70,4 +70,4 @@ _GasTxValidator_log = new WeakMap(), _GasTxValidator_publicDataSource = new Weak
|
|
|
70
70
|
}
|
|
71
71
|
return { result: 'valid' };
|
|
72
72
|
};
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzX3ZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eF92YWxpZGF0b3IvZ2FzX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFBVyxnQkFBZ0IsRUFBNkMsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RyxPQUFPLEVBQThCLGdCQUFnQixFQUFnQixNQUFNLG9CQUFvQixDQUFDO0FBQ2hHLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsaUNBQWlDLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQU96RyxNQUFNLE9BQU8sY0FBYztJQU96QixZQUNFLGdCQUFtQyxFQUNuQyxlQUE2QixFQUM3QixXQUFvQixFQUNwQixPQUFnQjs7UUFWbEIsOEJBQU8sWUFBWSxDQUFDLCtCQUErQixDQUFDLEVBQUM7UUFDckQsbURBQXFDO1FBQ3JDLGtEQUErQjtRQUMvQiw4Q0FBc0I7UUFDdEIsMENBQWtCO1FBUWhCLHVCQUFBLElBQUksb0NBQXFCLGdCQUFnQixNQUFBLENBQUM7UUFDMUMsdUJBQUEsSUFBSSxtQ0FBb0IsZUFBZSxNQUFBLENBQUM7UUFDeEMsdUJBQUEsSUFBSSwrQkFBZ0IsV0FBVyxNQUFBLENBQUM7UUFDaEMsdUJBQUEsSUFBSSwyQkFBWSxPQUFPLE1BQUEsQ0FBQztJQUMxQixDQUFDO0lBRUQsVUFBVSxDQUFDLEVBQU07UUFDZixJQUFJLHVCQUFBLElBQUksNkRBQVksTUFBaEIsSUFBSSxFQUFhLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDekIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN0RixDQUFDO1FBQ0QsT0FBTyx1QkFBQSxJQUFJLGdFQUFlLE1BQW5CLElBQUksRUFBZ0IsRUFB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
|
|
@@ -2,7 +2,7 @@ var _PhasesTxValidator_log;
|
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
3
|
import { Tx, TxExecutionPhase, } from '@aztec/circuit-types';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
-
import { ContractsDataSourcePublicDB, getExecutionRequestsByPhase } from '@aztec/simulator';
|
|
5
|
+
import { ContractsDataSourcePublicDB, getExecutionRequestsByPhase } from '@aztec/simulator/server';
|
|
6
6
|
export class PhasesTxValidator {
|
|
7
7
|
constructor(contracts, setupAllowList) {
|
|
8
8
|
this.setupAllowList = setupAllowList;
|
|
@@ -69,4 +69,4 @@ export class PhasesTxValidator {
|
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
_PhasesTxValidator_log = new WeakMap();
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGhhc2VzX3ZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eF92YWxpZGF0b3IvcGhhc2VzX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFHTCxFQUFFLEVBQ0YsZ0JBQWdCLEdBR2pCLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSwyQkFBMkIsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRW5HLE1BQU0sT0FBTyxpQkFBaUI7SUFJNUIsWUFBWSxTQUE2QixFQUFVLGNBQWdDO1FBQWhDLG1CQUFjLEdBQWQsY0FBYyxDQUFrQjtRQUhuRixpQ0FBTyxZQUFZLENBQUMsa0NBQWtDLENBQUMsRUFBQztRQUl0RCxJQUFJLENBQUMsa0JBQWtCLEdBQUcsSUFBSSwyQkFBMkIsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUN2RSxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxFQUFNO1FBQ3JCLElBQUksQ0FBQztZQUNILHdGQUF3RjtZQUN4RixtR0FBbUc7WUFDbkcsK0RBQStEO1lBQy9ELE1BQU0sSUFBSSxDQUFDLGtCQUFrQixDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUVsRCxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztnQkFDdkIsdUJBQUEsSUFBSSw4QkFBSyxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLDBFQUEwRSxDQUFDLENBQUM7Z0JBQ2hILE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLENBQUM7WUFDN0IsQ0FBQztZQUVELE1BQU0sUUFBUSxHQUFHLDJCQUEyQixDQUFDLEVBQUUsRUFBRSxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUN6RSxLQUFL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
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Fr } from '@aztec/circuits.js';
|
|
2
2
|
import { AggregateTxValidator, BlockHeaderTxValidator, DataTxValidator, DoubleSpendTxValidator, MetadataTxValidator, TxProofValidator, } from '@aztec/p2p';
|
|
3
3
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
4
|
-
import { readPublicState } from '@aztec/simulator';
|
|
4
|
+
import { readPublicState } from '@aztec/simulator/server';
|
|
5
5
|
import { ArchiveCache } from './archive_cache.js';
|
|
6
6
|
import { GasTxValidator } from './gas_validator.js';
|
|
7
7
|
import { NullifierCache } from './nullifier_cache.js';
|
|
@@ -46,4 +46,4 @@ function preprocessValidator(nullifierCache, archiveCache, publicStateSource, co
|
|
|
46
46
|
function postprocessValidator(nullifierCache) {
|
|
47
47
|
return new DoubleSpendTxValidator(nullifierCache);
|
|
48
48
|
}
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfdmFsaWRhdG9yX2ZhY3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHhfdmFsaWRhdG9yL3R4X3ZhbGlkYXRvcl9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLE9BQU8sRUFBOEMsRUFBRSxFQUFzQyxNQUFNLG9CQUFvQixDQUFDO0FBQ3hILE9BQU8sRUFDTCxvQkFBb0IsRUFDcEIsc0JBQXNCLEVBQ3RCLGVBQWUsRUFDZixzQkFBc0IsRUFDdEIsbUJBQW1CLEVBQ25CLGdCQUFnQixHQUNqQixNQUFNLFlBQVksQ0FBQztBQUNwQixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFMUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxjQUFjLEVBQTBCLE1BQU0sb0JBQW9CLENBQUM7QUFDNUUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTFELE1BQU0sVUFBVSw4QkFBOEIsQ0FDNUMsRUFBNEIsRUFDNUIsa0JBQXNDLEVBQ3RDLFFBQW1ELEVBQ25ELElBTUM7SUFFRCxNQUFNLEVBQUUsV0FBVyxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQztJQUM5RSxNQUFNLFVBQVUsR0FBc0I7UUFDcEMsSUFBSSxlQUFlLEVBQUU7UUFDckIsSUFBSSxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMvRCxJQUFJLHNCQUFzQixDQUFDLElBQUksY0FBYyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2xELElBQUksaUJBQWlCLENBQUMsa0JBQWtCLEVBQUUsY0FBYyxDQUFDO1FBQ3pELElBQUksY0FBYyxDQUFDLElBQUkseUJBQXlCLENBQUMsRUFBRSxDQUFDLEVBQUUsdUJBQXVCLENBQUMsUUFBUSxFQUFFLFdBQVcsRUFBRSxPQUFPLENBQUM7UUFDN0csSUFBSSxzQkFBc0IsQ0FBQyxJQUFJLFlBQVksQ0FBQyxFQUFFLENBQUMsQ0FBQztLQUNqRCxDQUFDO0lBRUYsSUFBSSxRQUFRLEVBQUUsQ0FBQztRQUNiLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFFRCxPQUFPLElBQUksb0JBQW9CLENBQUMsR0FBRyxVQUFVLENBQUMsQ0FBQztBQUNqRCxDQUFDO0FBRUQsTUFBTSxVQUFVLGdDQUFnQyxDQUM5QyxFQUE0QixFQUM1QixrQkFBc0MsRUFDdEMsZUFBZ0MsRUFDaEMsV0FBb0IsRUFDcEIsY0FBZ0M7SUFNaEMsTUFBTSxjQUFjLEdBQUcsSUFBSSxjQUFjLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDOUMsTUFBTSxZQUFZLEdBQUcsSUFBSSxZQUFZLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDMUMsTUFBTSxpQkFBaUIsR0FBRyxJQUFJLHlCQUF5QixDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRTVELE9BQU87UUFDTCxtQkFBbUIsRUFBRSxtQkFBbUIsQ0FDdEMsY0FBYyxFQUNkLFlBQVksRUFDWixpQkFBaUIsRUFDakIsa0JBQWtCLEVBQ2xCLFdBQVcsRUFDWCxlQUFlLEVBQ2YsY0FBYyxDQUNmO1FBQ0Qsb0JBQW9CLEVBQUUsb0JBQW9CLENBQUMsY0FBYyxDQUFDO1FBQzFELGNBQWM7S0FDZixDQUFDO0FBQ0osQ0FBQztBQUVELE1BQU0seUJBQXlCO0lBQzdCLFlBQW9CLEVBQTRCO1FBQTVCLE9BQUUsR0FBRixFQUFFLENBQTBCO0lBQUcsQ0FBQztJQUVwRCxXQUFXLENBQUMsZUFBNkIsRUFBRSxJQUFRO1FBQ2pELE9BQU8sZUFBZSxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsZUFBZSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3pELENBQUM7Q0FDRjtBQUVELFNBQVMsbUJBQW1CLENBQzFCLGNBQThCLEVBQzlCLFlBQTBCLEVBQzFCLGlCQUFvQyxFQUNwQyxrQkFBc0MsRUFDdEMsV0FBb0IsRUFDcEIsZUFBZ0MsRUFDaEMsY0FBZ0M7SUFFaEMsNElBQTRJO0lBQzVJLE9BQU8sSUFBSSxvQkFBb0IsQ0FDN0IsSUFBSSxtQkFBbUIsQ0FBQyxlQUFlLENBQUMsT0FBTyxFQUFFLGVBQWUsQ0FBQyxXQUFXLENBQUMsRUFDN0UsSUFBSSxzQkFBc0IsQ0FBQyxjQUFjLENBQUMsRUFDMUMsSUFBSSxpQkFBaUIsQ0FBQyxrQkFBa0IsRUFBRSxjQUFjLENBQUMsRUFDekQsSUFBSSxjQUFjLENBQUMsaUJBQWlCLEVBQUUsdUJBQXVCLENBQUMsUUFBUSxFQUFFLFdBQVcsRUFBRSxlQUFlLENBQUMsT0FBTyxDQUFDLEVBQzdHLElBQUksc0JBQXNCLENBQUMsWUFBWSxDQUFDLENBQ3pDLENBQUM7QUFDSixDQUFDO0FBRUQsU0FBUyxvQkFBb0IsQ0FBQyxjQUE4QjtJQUMxRCxPQUFPLElBQUksc0JBQXNCLENBQUMsY0FBYyxDQUFDLENBQUM7QUFDcEQsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/sequencer-client",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.70.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -28,25 +28,25 @@
|
|
|
28
28
|
"test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aztec/aztec.js": "0.
|
|
32
|
-
"@aztec/bb-prover": "0.
|
|
33
|
-
"@aztec/blob-sink": "0.
|
|
34
|
-
"@aztec/circuit-types": "0.
|
|
35
|
-
"@aztec/circuits.js": "0.
|
|
36
|
-
"@aztec/ethereum": "0.
|
|
37
|
-
"@aztec/foundation": "0.
|
|
38
|
-
"@aztec/l1-artifacts": "0.
|
|
39
|
-
"@aztec/merkle-tree": "0.
|
|
40
|
-
"@aztec/noir-contracts.js": "0.
|
|
41
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
42
|
-
"@aztec/p2p": "0.
|
|
43
|
-
"@aztec/protocol-contracts": "0.
|
|
44
|
-
"@aztec/prover-client": "0.
|
|
45
|
-
"@aztec/simulator": "0.
|
|
46
|
-
"@aztec/telemetry-client": "0.
|
|
47
|
-
"@aztec/types": "0.
|
|
48
|
-
"@aztec/validator-client": "0.
|
|
49
|
-
"@aztec/world-state": "0.
|
|
31
|
+
"@aztec/aztec.js": "0.70.0",
|
|
32
|
+
"@aztec/bb-prover": "0.70.0",
|
|
33
|
+
"@aztec/blob-sink": "0.70.0",
|
|
34
|
+
"@aztec/circuit-types": "0.70.0",
|
|
35
|
+
"@aztec/circuits.js": "0.70.0",
|
|
36
|
+
"@aztec/ethereum": "0.70.0",
|
|
37
|
+
"@aztec/foundation": "0.70.0",
|
|
38
|
+
"@aztec/l1-artifacts": "0.70.0",
|
|
39
|
+
"@aztec/merkle-tree": "0.70.0",
|
|
40
|
+
"@aztec/noir-contracts.js": "0.70.0",
|
|
41
|
+
"@aztec/noir-protocol-circuits-types": "0.70.0",
|
|
42
|
+
"@aztec/p2p": "0.70.0",
|
|
43
|
+
"@aztec/protocol-contracts": "0.70.0",
|
|
44
|
+
"@aztec/prover-client": "0.70.0",
|
|
45
|
+
"@aztec/simulator": "0.70.0",
|
|
46
|
+
"@aztec/telemetry-client": "0.70.0",
|
|
47
|
+
"@aztec/types": "0.70.0",
|
|
48
|
+
"@aztec/validator-client": "0.70.0",
|
|
49
|
+
"@aztec/world-state": "0.70.0",
|
|
50
50
|
"@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
|
|
51
51
|
"@noir-lang/types": "portal:../../noir/packages/types",
|
|
52
52
|
"lodash.chunk": "^4.2.0",
|
|
@@ -6,7 +6,7 @@ import { type EthAddress } from '@aztec/foundation/eth-address';
|
|
|
6
6
|
import { type DateProvider } from '@aztec/foundation/timer';
|
|
7
7
|
import { type P2P } from '@aztec/p2p';
|
|
8
8
|
import { LightweightBlockBuilderFactory } from '@aztec/prover-client/block-builder';
|
|
9
|
-
import { PublicProcessorFactory } from '@aztec/simulator';
|
|
9
|
+
import { PublicProcessorFactory } from '@aztec/simulator/server';
|
|
10
10
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
11
11
|
import { type ValidatorClient } from '@aztec/validator-client';
|
|
12
12
|
|
package/src/sequencer/metrics.ts
CHANGED
|
@@ -16,6 +16,7 @@ export class SequencerMetrics {
|
|
|
16
16
|
|
|
17
17
|
private blockCounter: UpDownCounter;
|
|
18
18
|
private blockBuildDuration: Histogram;
|
|
19
|
+
private blockBuildManaPerSecond: Gauge;
|
|
19
20
|
private stateTransitionBufferDuration: Histogram;
|
|
20
21
|
private currentBlockNumber: Gauge;
|
|
21
22
|
private currentBlockSize: Gauge;
|
|
@@ -28,11 +29,19 @@ export class SequencerMetrics {
|
|
|
28
29
|
this.tracer = client.getTracer(name);
|
|
29
30
|
|
|
30
31
|
this.blockCounter = meter.createUpDownCounter(Metrics.SEQUENCER_BLOCK_COUNT);
|
|
32
|
+
|
|
31
33
|
this.blockBuildDuration = meter.createHistogram(Metrics.SEQUENCER_BLOCK_BUILD_DURATION, {
|
|
32
34
|
unit: 'ms',
|
|
33
35
|
description: 'Duration to build a block',
|
|
34
36
|
valueType: ValueType.INT,
|
|
35
37
|
});
|
|
38
|
+
|
|
39
|
+
this.blockBuildManaPerSecond = meter.createGauge(Metrics.SEQUENCER_BLOCK_BUILD_MANA_PER_SECOND, {
|
|
40
|
+
unit: 'mana/s',
|
|
41
|
+
description: 'Mana per second when building a block',
|
|
42
|
+
valueType: ValueType.INT,
|
|
43
|
+
});
|
|
44
|
+
|
|
36
45
|
this.stateTransitionBufferDuration = meter.createHistogram(Metrics.SEQUENCER_STATE_TRANSITION_BUFFER_DURATION, {
|
|
37
46
|
unit: 'ms',
|
|
38
47
|
description:
|
|
@@ -96,11 +105,12 @@ export class SequencerMetrics {
|
|
|
96
105
|
this.setCurrentBlock(0, 0);
|
|
97
106
|
}
|
|
98
107
|
|
|
99
|
-
recordPublishedBlock(buildDurationMs: number) {
|
|
108
|
+
recordPublishedBlock(buildDurationMs: number, totalMana: number) {
|
|
100
109
|
this.blockCounter.add(1, {
|
|
101
110
|
[Attributes.STATUS]: 'published',
|
|
102
111
|
});
|
|
103
112
|
this.blockBuildDuration.record(Math.ceil(buildDurationMs));
|
|
113
|
+
this.blockBuildManaPerSecond.record(Math.ceil((totalMana * 1000) / buildDurationMs));
|
|
104
114
|
this.setCurrentBlock(0, 0);
|
|
105
115
|
}
|
|
106
116
|
|
|
@@ -32,10 +32,12 @@ import { pickFromSchema } from '@aztec/foundation/schemas';
|
|
|
32
32
|
import { type DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
|
|
33
33
|
import { type P2P } from '@aztec/p2p';
|
|
34
34
|
import { type BlockBuilderFactory } from '@aztec/prover-client/block-builder';
|
|
35
|
-
import { type PublicProcessorFactory } from '@aztec/simulator';
|
|
35
|
+
import { type PublicProcessorFactory } from '@aztec/simulator/server';
|
|
36
36
|
import { Attributes, type TelemetryClient, type Tracer, trackSpan } from '@aztec/telemetry-client';
|
|
37
37
|
import { type ValidatorClient } from '@aztec/validator-client';
|
|
38
38
|
|
|
39
|
+
import assert from 'assert';
|
|
40
|
+
|
|
39
41
|
import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
|
|
40
42
|
import { type L1Publisher, VoteType } from '../publisher/l1-publisher.js';
|
|
41
43
|
import { type SlasherClient } from '../slasher/slasher_client.js';
|
|
@@ -86,6 +88,7 @@ export class Sequencer {
|
|
|
86
88
|
private maxBlockSizeInBytes: number = 1024 * 1024;
|
|
87
89
|
private maxBlockGas: Gas = new Gas(10e9, 10e9);
|
|
88
90
|
protected processTxTime: number = 12;
|
|
91
|
+
private attestationPropagationTime: number = 2;
|
|
89
92
|
private metrics: SequencerMetrics;
|
|
90
93
|
private isFlushing: boolean = false;
|
|
91
94
|
|
|
@@ -168,7 +171,9 @@ export class Sequencer {
|
|
|
168
171
|
if (config.maxL1TxInclusionTimeIntoSlot !== undefined) {
|
|
169
172
|
this.maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot;
|
|
170
173
|
}
|
|
171
|
-
|
|
174
|
+
if (config.enforceTimeTable !== undefined) {
|
|
175
|
+
this.enforceTimeTable = config.enforceTimeTable;
|
|
176
|
+
}
|
|
172
177
|
|
|
173
178
|
this.setTimeTable();
|
|
174
179
|
|
|
@@ -183,15 +188,17 @@ export class Sequencer {
|
|
|
183
188
|
// How long it takes to get ready to start building
|
|
184
189
|
const blockPrepareTime = 1;
|
|
185
190
|
|
|
186
|
-
// How long it takes to for attestations to travel across the p2p layer
|
|
191
|
+
// How long it takes to for proposals and attestations to travel across the p2p layer (one-way)
|
|
187
192
|
const attestationPropagationTime = 2;
|
|
193
|
+
this.attestationPropagationTime = attestationPropagationTime;
|
|
188
194
|
|
|
189
195
|
// How long it takes to get a published block into L1. L1 builders typically accept txs up to 4 seconds into their slot,
|
|
190
196
|
// but we'll timeout sooner to give it more time to propagate (remember we also have blobs!). Still, when working in anvil,
|
|
191
|
-
// we can just post in the very last second of the L1 slot.
|
|
197
|
+
// we can just post in the very last second of the L1 slot and still expect the tx to be accepted.
|
|
192
198
|
const l1PublishingTime = this.l1Constants.ethereumSlotDuration - this.maxL1TxInclusionTimeIntoSlot;
|
|
193
199
|
|
|
194
|
-
// How much time we spend validating and processing a block after building it
|
|
200
|
+
// How much time we spend validating and processing a block after building it,
|
|
201
|
+
// and assembling the proposal to send to attestors
|
|
195
202
|
const blockValidationTime = 1;
|
|
196
203
|
|
|
197
204
|
// How much time we have left in the slot for actually processing txs and building the block.
|
|
@@ -199,11 +206,11 @@ export class Sequencer {
|
|
|
199
206
|
this.aztecSlotDuration -
|
|
200
207
|
initialTime -
|
|
201
208
|
blockPrepareTime -
|
|
202
|
-
|
|
209
|
+
blockValidationTime -
|
|
203
210
|
2 * attestationPropagationTime -
|
|
204
|
-
|
|
211
|
+
l1PublishingTime;
|
|
205
212
|
|
|
206
|
-
// Check that
|
|
213
|
+
// Check that we actually have time left for processing txs
|
|
207
214
|
if (this.enforceTimeTable && remainingTimeInSlot < 0) {
|
|
208
215
|
throw new Error(`Not enough time for block building in ${this.aztecSlotDuration}s slot`);
|
|
209
216
|
}
|
|
@@ -212,6 +219,22 @@ export class Sequencer {
|
|
|
212
219
|
const processTxsTime = remainingTimeInSlot / 2;
|
|
213
220
|
this.processTxTime = processTxsTime;
|
|
214
221
|
|
|
222
|
+
// Sanity check
|
|
223
|
+
const totalSlotTime =
|
|
224
|
+
initialTime + // Archiver, world-state, and p2p sync
|
|
225
|
+
blockPrepareTime + // Setup globals, initial checks, etc
|
|
226
|
+
processTxsTime + // Processing public txs for building the block
|
|
227
|
+
blockValidationTime + // Validating the block produced
|
|
228
|
+
attestationPropagationTime + // Propagating the block proposal to validators
|
|
229
|
+
processTxsTime + // Validators run public txs before signing
|
|
230
|
+
attestationPropagationTime + // Attestations fly back to the proposer
|
|
231
|
+
l1PublishingTime; // The publish tx sits on the L1 mempool waiting to be picked up
|
|
232
|
+
|
|
233
|
+
assert(
|
|
234
|
+
totalSlotTime === this.aztecSlotDuration,
|
|
235
|
+
`Computed total slot time does not match slot duration: ${totalSlotTime}s`,
|
|
236
|
+
);
|
|
237
|
+
|
|
215
238
|
const newTimeTable: Record<SequencerState, number> = {
|
|
216
239
|
// No checks needed for any of these transitions
|
|
217
240
|
[SequencerState.STOPPED]: this.aztecSlotDuration,
|
|
@@ -472,7 +495,12 @@ export class Sequencer {
|
|
|
472
495
|
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
|
|
473
496
|
const msgCount = l1ToL2Messages.length;
|
|
474
497
|
|
|
475
|
-
this.log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
|
|
498
|
+
this.log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
|
|
499
|
+
slot,
|
|
500
|
+
blockNumber,
|
|
501
|
+
msgCount,
|
|
502
|
+
validator: opts.validateOnly,
|
|
503
|
+
});
|
|
476
504
|
|
|
477
505
|
// Sync to the previous block at least
|
|
478
506
|
await this.worldState.syncImmediate(newGlobalVariables.blockNumber.toNumber() - 1);
|
|
@@ -493,12 +521,19 @@ export class Sequencer {
|
|
|
493
521
|
const blockBuilder = this.blockBuilderFactory.create(orchestratorFork);
|
|
494
522
|
await blockBuilder.startNewBlock(newGlobalVariables, l1ToL2Messages);
|
|
495
523
|
|
|
496
|
-
//
|
|
524
|
+
// When building a block as a proposer, we set the deadline for tx processing to the start of the
|
|
525
|
+
// CREATING_BLOCK phase, plus the expected time for tx processing. When validating, we start counting
|
|
526
|
+
// the time for tx processing from the start of the COLLECTING_ATTESTATIONS phase plus the attestation
|
|
527
|
+
// propagation time. See the comments in setTimeTable for more details.
|
|
528
|
+
const processingEndTimeWithinSlot = opts.validateOnly
|
|
529
|
+
? this.timeTable[SequencerState.COLLECTING_ATTESTATIONS] + this.attestationPropagationTime + this.processTxTime
|
|
530
|
+
: this.timeTable[SequencerState.CREATING_BLOCK] + this.processTxTime;
|
|
531
|
+
|
|
497
532
|
// Deadline is only set if enforceTimeTable is enabled.
|
|
498
|
-
const processingEndTimeWithinSlot = this.timeTable[SequencerState.CREATING_BLOCK] + this.processTxTime;
|
|
499
533
|
const deadline = this.enforceTimeTable
|
|
500
534
|
? new Date((this.getSlotStartTimestamp(slot) + processingEndTimeWithinSlot) * 1000)
|
|
501
535
|
: undefined;
|
|
536
|
+
|
|
502
537
|
this.log.verbose(`Processing pending txs`, {
|
|
503
538
|
slot,
|
|
504
539
|
slotStart: new Date(this.getSlotStartTimestamp(slot) * 1000),
|
|
@@ -514,7 +549,7 @@ export class Sequencer {
|
|
|
514
549
|
this.allowedInSetup,
|
|
515
550
|
);
|
|
516
551
|
|
|
517
|
-
//
|
|
552
|
+
// TODO(#11000): Public processor should just handle processing, one tx at a time. It should be responsibility
|
|
518
553
|
// of the sequencer to update world state and iterate over txs. We should refactor this along with unifying the
|
|
519
554
|
// publicProcessorFork and orchestratorFork, to avoid doing tree insertions twice when building the block.
|
|
520
555
|
const limits = { deadline, maxTransactions: this.maxTxsPerBlock, maxBlockSize: this.maxBlockSizeInBytes };
|
|
@@ -522,7 +557,7 @@ export class Sequencer {
|
|
|
522
557
|
processor.process(pendingTxs, limits, validators),
|
|
523
558
|
);
|
|
524
559
|
|
|
525
|
-
if (failedTxs.length > 0) {
|
|
560
|
+
if (!opts.validateOnly && failedTxs.length > 0) {
|
|
526
561
|
const failedTxData = failedTxs.map(fail => fail.tx);
|
|
527
562
|
this.log.verbose(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
|
|
528
563
|
await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
|
|
@@ -550,11 +585,16 @@ export class Sequencer {
|
|
|
550
585
|
// All real transactions have been added, set the block as full and pad if needed
|
|
551
586
|
const block = await blockBuilder.setBlockCompleted();
|
|
552
587
|
|
|
588
|
+
// How much public gas was processed
|
|
589
|
+
const publicGas = processedTxs.reduce((acc, tx) => acc.add(tx.gasUsed.publicGas), Gas.empty());
|
|
590
|
+
|
|
553
591
|
return {
|
|
554
592
|
block,
|
|
593
|
+
publicGas,
|
|
555
594
|
publicProcessorDuration,
|
|
556
595
|
numMsgs: l1ToL2Messages.length,
|
|
557
596
|
numTxs: processedTxs.length,
|
|
597
|
+
numFailedTxs: failedTxs.length,
|
|
558
598
|
blockBuildingTimer,
|
|
559
599
|
};
|
|
560
600
|
} finally {
|
|
@@ -605,7 +645,7 @@ export class Sequencer {
|
|
|
605
645
|
|
|
606
646
|
try {
|
|
607
647
|
const buildBlockRes = await this.buildBlock(pendingTxs, newGlobalVariables, historicalHeader);
|
|
608
|
-
const { block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer } = buildBlockRes;
|
|
648
|
+
const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer } = buildBlockRes;
|
|
609
649
|
|
|
610
650
|
// TODO(@PhilWindle) We should probably periodically check for things like another
|
|
611
651
|
// block being published before ours instead of just waiting on our block
|
|
@@ -647,16 +687,19 @@ export class Sequencer {
|
|
|
647
687
|
const proofQuote = await proofQuotePromise;
|
|
648
688
|
|
|
649
689
|
await this.publishL2Block(block, attestations, txHashes, proofQuote);
|
|
650
|
-
this.metrics.recordPublishedBlock(workDuration);
|
|
690
|
+
this.metrics.recordPublishedBlock(workDuration, publicGas.l2Gas);
|
|
691
|
+
const duration = Math.ceil(workDuration);
|
|
692
|
+
const manaPerSecond = Math.ceil((publicGas.l2Gas * 1000) / duration);
|
|
651
693
|
this.log.info(
|
|
652
|
-
`Published block ${block.number} with ${numTxs} txs and ${numMsgs} messages in ${
|
|
694
|
+
`Published block ${block.number} with ${numTxs} txs and ${numMsgs} messages in ${duration} ms at ${manaPerSecond} mana/s`,
|
|
653
695
|
{
|
|
696
|
+
publicGas,
|
|
654
697
|
blockNumber: block.number,
|
|
655
698
|
blockHash: blockHash,
|
|
656
699
|
slot,
|
|
657
700
|
txCount: txHashes.length,
|
|
658
701
|
msgCount: numMsgs,
|
|
659
|
-
duration
|
|
702
|
+
duration,
|
|
660
703
|
submitter: this.publisher.getSenderAddress().toString(),
|
|
661
704
|
},
|
|
662
705
|
);
|
package/src/test/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type PublicProcessorFactory } from '@aztec/simulator';
|
|
1
|
+
import { type PublicProcessorFactory } from '@aztec/simulator/server';
|
|
2
2
|
|
|
3
3
|
import { SequencerClient } from '../client/sequencer-client.js';
|
|
4
4
|
import { type L1Publisher } from '../publisher/l1-publisher.js';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type Tx, TxExecutionPhase, type TxValidationResult, type TxValidator } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecAddress, type Fr, FunctionSelector, type GasFees } from '@aztec/circuits.js';
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
|
-
import { computeFeePayerBalanceStorageSlot, getExecutionRequestsByPhase } from '@aztec/simulator';
|
|
4
|
+
import { computeFeePayerBalanceStorageSlot, getExecutionRequestsByPhase } from '@aztec/simulator/server';
|
|
5
5
|
|
|
6
6
|
/** Provides a view into public contract state */
|
|
7
7
|
export interface PublicStateSource {
|
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
} from '@aztec/circuit-types';
|
|
9
9
|
import { type ContractDataSource } from '@aztec/circuits.js';
|
|
10
10
|
import { createLogger } from '@aztec/foundation/log';
|
|
11
|
-
import { ContractsDataSourcePublicDB, getExecutionRequestsByPhase } from '@aztec/simulator';
|
|
11
|
+
import { ContractsDataSourcePublicDB, getExecutionRequestsByPhase } from '@aztec/simulator/server';
|
|
12
12
|
|
|
13
13
|
export class PhasesTxValidator implements TxValidator<Tx> {
|
|
14
14
|
#log = createLogger('sequencer:tx_validator:tx_phases');
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
TxProofValidator,
|
|
17
17
|
} from '@aztec/p2p';
|
|
18
18
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
19
|
-
import { readPublicState } from '@aztec/simulator';
|
|
19
|
+
import { readPublicState } from '@aztec/simulator/server';
|
|
20
20
|
|
|
21
21
|
import { ArchiveCache } from './archive_cache.js';
|
|
22
22
|
import { GasTxValidator, type PublicStateSource } from './gas_validator.js';
|