@aztec/sequencer-client 0.42.0 → 0.44.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.d.ts +2 -1
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +4 -4
- package/dest/config.d.ts +13 -0
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +46 -35
- package/dest/publisher/l1-publisher.d.ts +4 -1
- package/dest/publisher/l1-publisher.d.ts.map +1 -1
- package/dest/publisher/l1-publisher.js +6 -1
- package/dest/publisher/viem-tx-sender.d.ts +3 -0
- package/dest/publisher/viem-tx-sender.d.ts.map +1 -1
- package/dest/publisher/viem-tx-sender.js +15 -1
- package/dest/sequencer/sequencer.d.ts +6 -3
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +284 -255
- package/dest/tx_validator/gas_validator.d.ts +2 -1
- package/dest/tx_validator/gas_validator.d.ts.map +1 -1
- package/dest/tx_validator/gas_validator.js +12 -5
- package/dest/tx_validator/phases_validator.d.ts +3 -3
- package/dest/tx_validator/phases_validator.d.ts.map +1 -1
- package/dest/tx_validator/phases_validator.js +25 -18
- package/dest/tx_validator/tx_validator_factory.d.ts +4 -3
- package/dest/tx_validator/tx_validator_factory.d.ts.map +1 -1
- package/dest/tx_validator/tx_validator_factory.js +4 -3
- package/package.json +24 -15
- package/src/client/sequencer-client.ts +10 -2
- package/src/config.ts +47 -37
- package/src/publisher/l1-publisher.ts +11 -1
- package/src/publisher/viem-tx-sender.ts +15 -0
- package/src/sequencer/sequencer.ts +119 -94
- package/src/tx_validator/gas_validator.ts +9 -5
- package/src/tx_validator/phases_validator.ts +29 -19
- package/src/tx_validator/tx_validator_factory.ts +8 -4
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { __esDecorate, __runInitializers } from "tslib";
|
|
1
2
|
import { Tx, } from '@aztec/circuit-types';
|
|
2
3
|
import { BlockProofError, PROVING_STATUS, } from '@aztec/circuit-types/interfaces';
|
|
3
4
|
import { AztecAddress, EthAddress } from '@aztec/circuits.js';
|
|
@@ -5,6 +6,7 @@ import { Fr } from '@aztec/foundation/fields';
|
|
|
5
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
7
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
7
8
|
import { Timer, elapsed } from '@aztec/foundation/timer';
|
|
9
|
+
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
8
10
|
/**
|
|
9
11
|
* Sequencer client
|
|
10
12
|
* - Wins a period of time to become the sequencer (depending on finalized protocol).
|
|
@@ -14,273 +16,300 @@ import { Timer, elapsed } from '@aztec/foundation/timer';
|
|
|
14
16
|
* - Receives results to those proofs from the network (repeats as necessary) (not for this milestone).
|
|
15
17
|
* - Publishes L1 tx(s) to the rollup contract via RollupPublisher.
|
|
16
18
|
*/
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
async stop() {
|
|
88
|
-
this.log.debug(`Stopping sequencer`);
|
|
89
|
-
await this.runningPromise?.stop();
|
|
90
|
-
this.publisher.interrupt();
|
|
91
|
-
this.state = SequencerState.STOPPED;
|
|
92
|
-
this.log.info('Stopped sequencer');
|
|
93
|
-
}
|
|
94
|
-
/**
|
|
95
|
-
* Starts a previously stopped sequencer.
|
|
96
|
-
*/
|
|
97
|
-
restart() {
|
|
98
|
-
this.log.info('Restarting sequencer');
|
|
99
|
-
this.publisher.restart();
|
|
100
|
-
this.runningPromise.start();
|
|
101
|
-
this.state = SequencerState.IDLE;
|
|
102
|
-
}
|
|
103
|
-
/**
|
|
104
|
-
* Returns the current state of the sequencer.
|
|
105
|
-
* @returns An object with a state entry with one of SequencerState.
|
|
106
|
-
*/
|
|
107
|
-
status() {
|
|
108
|
-
return { state: this.state };
|
|
109
|
-
}
|
|
110
|
-
async initialSync() {
|
|
111
|
-
// TODO: Should we wait for world state to be ready, or is the caller expected to run await start?
|
|
112
|
-
this.lastPublishedBlock = await this.worldState.status().then((s) => s.syncedToL2Block);
|
|
113
|
-
}
|
|
114
|
-
/**
|
|
115
|
-
* Grabs up to maxTxsPerBlock from the p2p client, constructs a block, and pushes it to L1.
|
|
116
|
-
*/
|
|
117
|
-
async work() {
|
|
118
|
-
try {
|
|
119
|
-
// Update state when the previous block has been synced
|
|
120
|
-
const prevBlockSynced = await this.isBlockSynced();
|
|
121
|
-
if (prevBlockSynced && this.state === SequencerState.PUBLISHING_BLOCK) {
|
|
122
|
-
this.log.debug(`Block has been synced`);
|
|
19
|
+
let Sequencer = (() => {
|
|
20
|
+
var _a;
|
|
21
|
+
let _instanceExtraInitializers = [];
|
|
22
|
+
let _buildBlockAndPublish_decorators;
|
|
23
|
+
let _publishL2Block_decorators;
|
|
24
|
+
return _a = class Sequencer {
|
|
25
|
+
constructor(publisher, globalsBuilder, p2pClient, worldState, prover, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, txValidatorFactory, telemetry, config = {}, log = createDebugLogger('aztec:sequencer')) {
|
|
26
|
+
this.publisher = (__runInitializers(this, _instanceExtraInitializers), publisher);
|
|
27
|
+
this.globalsBuilder = globalsBuilder;
|
|
28
|
+
this.p2pClient = p2pClient;
|
|
29
|
+
this.worldState = worldState;
|
|
30
|
+
this.prover = prover;
|
|
31
|
+
this.l2BlockSource = l2BlockSource;
|
|
32
|
+
this.l1ToL2MessageSource = l1ToL2MessageSource;
|
|
33
|
+
this.publicProcessorFactory = publicProcessorFactory;
|
|
34
|
+
this.txValidatorFactory = txValidatorFactory;
|
|
35
|
+
this.log = log;
|
|
36
|
+
this.pollingIntervalMs = 1000;
|
|
37
|
+
this.maxTxsPerBlock = 32;
|
|
38
|
+
this.minTxsPerBLock = 1;
|
|
39
|
+
// TODO: zero values should not be allowed for the following 2 values in PROD
|
|
40
|
+
this._coinbase = EthAddress.ZERO;
|
|
41
|
+
this._feeRecipient = AztecAddress.ZERO;
|
|
42
|
+
this.lastPublishedBlock = 0;
|
|
43
|
+
this.state = SequencerState.STOPPED;
|
|
44
|
+
this.allowedInSetup = [];
|
|
45
|
+
this.allowedInTeardown = [];
|
|
46
|
+
this.maxBlockSizeInBytes = 1024 * 1024;
|
|
47
|
+
this.updateConfig(config);
|
|
48
|
+
this.tracer = telemetry.getTracer('Sequencer');
|
|
49
|
+
this.log.verbose(`Initialized sequencer with ${this.minTxsPerBLock}-${this.maxTxsPerBlock} txs per block.`);
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Updates sequencer config.
|
|
53
|
+
* @param config - New parameters.
|
|
54
|
+
*/
|
|
55
|
+
updateConfig(config) {
|
|
56
|
+
if (config.transactionPollingIntervalMS) {
|
|
57
|
+
this.pollingIntervalMs = config.transactionPollingIntervalMS;
|
|
58
|
+
}
|
|
59
|
+
if (config.maxTxsPerBlock) {
|
|
60
|
+
this.maxTxsPerBlock = config.maxTxsPerBlock;
|
|
61
|
+
}
|
|
62
|
+
if (config.minTxsPerBlock) {
|
|
63
|
+
this.minTxsPerBLock = config.minTxsPerBlock;
|
|
64
|
+
}
|
|
65
|
+
if (config.coinbase) {
|
|
66
|
+
this._coinbase = config.coinbase;
|
|
67
|
+
}
|
|
68
|
+
if (config.feeRecipient) {
|
|
69
|
+
this._feeRecipient = config.feeRecipient;
|
|
70
|
+
}
|
|
71
|
+
if (config.allowedInSetup) {
|
|
72
|
+
this.allowedInSetup = config.allowedInSetup;
|
|
73
|
+
}
|
|
74
|
+
if (config.maxBlockSizeInBytes) {
|
|
75
|
+
this.maxBlockSizeInBytes = config.maxBlockSizeInBytes;
|
|
76
|
+
}
|
|
77
|
+
// TODO(#5917) remove this. it is no longer needed since we don't need to whitelist functions in teardown
|
|
78
|
+
if (config.allowedInTeardown) {
|
|
79
|
+
this.allowedInTeardown = config.allowedInTeardown;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Starts the sequencer and moves to IDLE state. Blocks until the initial sync is complete.
|
|
84
|
+
*/
|
|
85
|
+
async start() {
|
|
86
|
+
await this.initialSync();
|
|
87
|
+
this.runningPromise = new RunningPromise(this.work.bind(this), this.pollingIntervalMs);
|
|
88
|
+
this.runningPromise.start();
|
|
123
89
|
this.state = SequencerState.IDLE;
|
|
90
|
+
this.log.info('Sequencer started');
|
|
124
91
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
92
|
+
/**
|
|
93
|
+
* Stops the sequencer from processing txs and moves to STOPPED state.
|
|
94
|
+
*/
|
|
95
|
+
async stop() {
|
|
96
|
+
this.log.debug(`Stopping sequencer`);
|
|
97
|
+
await this.runningPromise?.stop();
|
|
98
|
+
this.publisher.interrupt();
|
|
99
|
+
this.state = SequencerState.STOPPED;
|
|
100
|
+
this.log.info('Stopped sequencer');
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* Starts a previously stopped sequencer.
|
|
104
|
+
*/
|
|
105
|
+
restart() {
|
|
106
|
+
this.log.info('Restarting sequencer');
|
|
107
|
+
this.publisher.restart();
|
|
108
|
+
this.runningPromise.start();
|
|
109
|
+
this.state = SequencerState.IDLE;
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Returns the current state of the sequencer.
|
|
113
|
+
* @returns An object with a state entry with one of SequencerState.
|
|
114
|
+
*/
|
|
115
|
+
status() {
|
|
116
|
+
return { state: this.state };
|
|
117
|
+
}
|
|
118
|
+
async initialSync() {
|
|
119
|
+
// TODO: Should we wait for world state to be ready, or is the caller expected to run await start?
|
|
120
|
+
this.lastPublishedBlock = await this.worldState.status().then((s) => s.syncedToL2Block);
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Grabs up to maxTxsPerBlock from the p2p client, constructs a block, and pushes it to L1.
|
|
124
|
+
*/
|
|
125
|
+
async work() {
|
|
126
|
+
try {
|
|
127
|
+
// Update state when the previous block has been synced
|
|
128
|
+
const prevBlockSynced = await this.isBlockSynced();
|
|
129
|
+
if (prevBlockSynced && this.state === SequencerState.PUBLISHING_BLOCK) {
|
|
130
|
+
this.log.debug(`Block has been synced`);
|
|
131
|
+
this.state = SequencerState.IDLE;
|
|
132
|
+
}
|
|
133
|
+
// Do not go forward with new block if the previous one has not been mined and processed
|
|
134
|
+
if (!prevBlockSynced) {
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
const historicalHeader = (await this.l2BlockSource.getBlock(-1))?.header;
|
|
138
|
+
const newBlockNumber = (historicalHeader === undefined
|
|
139
|
+
? await this.l2BlockSource.getBlockNumber()
|
|
140
|
+
: Number(historicalHeader.globalVariables.blockNumber.toBigInt())) + 1;
|
|
141
|
+
// Do not go forward with new block if not my turn
|
|
142
|
+
if (!(await this.publisher.isItMyTurnToSubmit(newBlockNumber))) {
|
|
143
|
+
this.log.verbose('Not my turn to submit block');
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
this.state = SequencerState.WAITING_FOR_TXS;
|
|
147
|
+
// Get txs to build the new block
|
|
148
|
+
const pendingTxs = await this.p2pClient.getTxs();
|
|
149
|
+
if (pendingTxs.length < this.minTxsPerBLock) {
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
this.log.debug(`Retrieved ${pendingTxs.length} txs from P2P pool`);
|
|
153
|
+
const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(new Fr(newBlockNumber), this._coinbase, this._feeRecipient);
|
|
154
|
+
// TODO: It should be responsibility of the P2P layer to validate txs before passing them on here
|
|
155
|
+
const allValidTxs = await this.takeValidTxs(pendingTxs, this.txValidatorFactory.validatorForNewTxs(newGlobalVariables, this.allowedInSetup));
|
|
156
|
+
// TODO: We are taking the size of the tx from private-land, but we should be doing this after running
|
|
157
|
+
// public functions. Only reason why we do it here now is because the public processor and orchestrator
|
|
158
|
+
// are set up such that they require knowing the total number of txs in advance. Still, main reason for
|
|
159
|
+
// exceeding max block size in bytes is contract class registration, which happens in private-land. This
|
|
160
|
+
// may break if we start emitting lots of log data from public-land.
|
|
161
|
+
const validTxs = this.takeTxsWithinMaxSize(allValidTxs);
|
|
162
|
+
if (validTxs.length < this.minTxsPerBLock) {
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
await this.buildBlockAndPublish(validTxs, newGlobalVariables, historicalHeader);
|
|
166
|
+
}
|
|
167
|
+
catch (err) {
|
|
168
|
+
if (BlockProofError.isBlockProofError(err)) {
|
|
169
|
+
const txHashes = err.txHashes.filter(h => !h.isZero());
|
|
170
|
+
this.log.warn(`Proving block failed, removing ${txHashes.length} txs from pool`);
|
|
171
|
+
await this.p2pClient.deleteTxs(txHashes);
|
|
172
|
+
}
|
|
173
|
+
this.log.error(`Rolling back world state DB due to error assembling block`, err.stack);
|
|
174
|
+
// Cancel any further proving on the block
|
|
175
|
+
this.prover?.cancelBlock();
|
|
176
|
+
await this.worldState.getLatest().rollback();
|
|
177
|
+
}
|
|
128
178
|
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
179
|
+
async buildBlockAndPublish(validTxs, newGlobalVariables, historicalHeader) {
|
|
180
|
+
const workTimer = new Timer();
|
|
181
|
+
this.state = SequencerState.CREATING_BLOCK;
|
|
182
|
+
this.log.info(`Building block ${newGlobalVariables.blockNumber.toNumber()} with ${validTxs.length} transactions`);
|
|
183
|
+
const assertBlockHeight = async () => {
|
|
184
|
+
const currentBlockNumber = await this.l2BlockSource.getBlockNumber();
|
|
185
|
+
if (currentBlockNumber + 1 !== newGlobalVariables.blockNumber.toNumber()) {
|
|
186
|
+
throw new Error('New block was emitted while building block');
|
|
187
|
+
}
|
|
188
|
+
if (!(await this.publisher.isItMyTurnToSubmit(newGlobalVariables.blockNumber.toNumber()))) {
|
|
189
|
+
throw new Error(`Not this sequencer turn to submit block`);
|
|
190
|
+
}
|
|
191
|
+
};
|
|
192
|
+
// Get l1 to l2 messages from the contract
|
|
193
|
+
this.log.debug('Requesting L1 to L2 messages from contract');
|
|
194
|
+
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(newGlobalVariables.blockNumber.toBigInt());
|
|
195
|
+
this.log.verbose(`Retrieved ${l1ToL2Messages.length} L1 to L2 messages for block ${newGlobalVariables.blockNumber.toNumber()}`);
|
|
196
|
+
// We create a fresh processor each time to reset any cached state (eg storage writes)
|
|
197
|
+
const processor = await this.publicProcessorFactory.create(historicalHeader, newGlobalVariables);
|
|
198
|
+
const numRealTxs = validTxs.length;
|
|
199
|
+
const pow2 = Math.log2(numRealTxs);
|
|
200
|
+
const totalTxs = 2 ** Math.ceil(pow2);
|
|
201
|
+
const blockSize = Math.max(2, totalTxs);
|
|
202
|
+
const blockBuildingTimer = new Timer();
|
|
203
|
+
const blockTicket = await this.prover.startNewBlock(blockSize, newGlobalVariables, l1ToL2Messages);
|
|
204
|
+
const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() => processor.process(validTxs, blockSize, this.prover, this.txValidatorFactory.validatorForProcessedTxs()));
|
|
205
|
+
if (failedTxs.length > 0) {
|
|
206
|
+
const failedTxData = failedTxs.map(fail => fail.tx);
|
|
207
|
+
this.log.debug(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
|
|
208
|
+
await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
|
|
209
|
+
}
|
|
210
|
+
if (processedTxs.length === 0) {
|
|
211
|
+
this.log.verbose('No txs processed correctly to build block. Exiting');
|
|
212
|
+
this.prover.cancelBlock();
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
215
|
+
await assertBlockHeight();
|
|
216
|
+
// All real transactions have been added, set the block as full and complete the proving.
|
|
217
|
+
await this.prover.setBlockCompleted();
|
|
218
|
+
// Here we are now waiting for the block to be proven.
|
|
219
|
+
// TODO(@PhilWindle) We should probably periodically check for things like another
|
|
220
|
+
// block being published before ours instead of just waiting on our block
|
|
221
|
+
const result = await blockTicket.provingPromise;
|
|
222
|
+
if (result.status === PROVING_STATUS.FAILURE) {
|
|
223
|
+
throw new Error(`Block proving failed, reason: ${result.reason}`);
|
|
224
|
+
}
|
|
225
|
+
await assertBlockHeight();
|
|
226
|
+
// Block is proven, now finalise and publish!
|
|
227
|
+
const { block, aggregationObject, proof } = await this.prover.finaliseBlock();
|
|
228
|
+
await assertBlockHeight();
|
|
229
|
+
this.log.verbose(`Assembled block ${block.number}`, {
|
|
230
|
+
eventName: 'l2-block-built',
|
|
231
|
+
duration: workTimer.ms(),
|
|
232
|
+
publicProcessDuration: publicProcessorDuration,
|
|
233
|
+
rollupCircuitsDuration: blockBuildingTimer.ms(),
|
|
234
|
+
...block.getStats(),
|
|
235
|
+
});
|
|
236
|
+
await this.publishL2Block(block, aggregationObject, proof);
|
|
237
|
+
this.log.info(`Submitted rollup block ${block.number} with ${processedTxs.length} transactions`);
|
|
135
238
|
}
|
|
136
|
-
this.log.debug(`Retrieved ${pendingTxs.length} txs from P2P pool`);
|
|
137
|
-
const historicalHeader = (await this.l2BlockSource.getBlock(-1))?.header;
|
|
138
|
-
const newBlockNumber = (historicalHeader === undefined
|
|
139
|
-
? await this.l2BlockSource.getBlockNumber()
|
|
140
|
-
: Number(historicalHeader.globalVariables.blockNumber.toBigInt())) + 1;
|
|
141
239
|
/**
|
|
142
|
-
*
|
|
240
|
+
* Publishes the L2Block to the rollup contract.
|
|
241
|
+
* @param block - The L2Block to be published.
|
|
143
242
|
*/
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
243
|
+
async publishL2Block(block, aggregationObject, proof) {
|
|
244
|
+
// Publishes new block to the network and awaits the tx to be mined
|
|
245
|
+
this.state = SequencerState.PUBLISHING_BLOCK;
|
|
246
|
+
const publishedL2Block = await this.publisher.processL2Block(block, aggregationObject, proof);
|
|
247
|
+
if (publishedL2Block) {
|
|
248
|
+
this.lastPublishedBlock = block.number;
|
|
249
|
+
}
|
|
250
|
+
else {
|
|
251
|
+
throw new Error(`Failed to publish block`);
|
|
148
252
|
}
|
|
149
|
-
};
|
|
150
|
-
const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(new Fr(newBlockNumber), this._coinbase, this._feeRecipient);
|
|
151
|
-
// TODO: It should be responsibility of the P2P layer to validate txs before passing them on here
|
|
152
|
-
const allValidTxs = await this.takeValidTxs(pendingTxs, this.txValidatorFactory.validatorForNewTxs(newGlobalVariables, this.allowedFunctionsInSetup));
|
|
153
|
-
// TODO: We are taking the size of the tx from private-land, but we should be doing this after running
|
|
154
|
-
// public functions. Only reason why we do it here now is because the public processor and orchestrator
|
|
155
|
-
// are set up such that they require knowing the total number of txs in advance. Still, main reason for
|
|
156
|
-
// exceeding max block size in bytes is contract class registration, which happens in private-land. This
|
|
157
|
-
// may break if we start emitting lots of log data from public-land.
|
|
158
|
-
const validTxs = this.takeTxsWithinMaxSize(allValidTxs);
|
|
159
|
-
if (validTxs.length < this.minTxsPerBLock) {
|
|
160
|
-
return;
|
|
161
253
|
}
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
const processor = await this.publicProcessorFactory.create(historicalHeader, newGlobalVariables);
|
|
170
|
-
const blockBuildingTimer = new Timer();
|
|
171
|
-
// We must initialise the block to be a power of 2 in size
|
|
172
|
-
const numRealTxs = validTxs.length;
|
|
173
|
-
const pow2 = Math.log2(numRealTxs);
|
|
174
|
-
// TODO turn this back into a Math.ceil once we can pad blocks to the next-power-of-2 with empty txs
|
|
175
|
-
const totalTxs = 2 ** Math.ceil(pow2);
|
|
176
|
-
const blockSize = Math.max(2, totalTxs);
|
|
177
|
-
const blockTicket = await this.prover.startNewBlock(blockSize, newGlobalVariables, l1ToL2Messages);
|
|
178
|
-
const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() => processor.process(validTxs, blockSize, this.prover, this.txValidatorFactory.validatorForProcessedTxs()));
|
|
179
|
-
if (failedTxs.length > 0) {
|
|
180
|
-
const failedTxData = failedTxs.map(fail => fail.tx);
|
|
181
|
-
this.log.debug(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
|
|
182
|
-
await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
|
|
254
|
+
async takeValidTxs(txs, validator) {
|
|
255
|
+
const [valid, invalid] = await validator.validateTxs(txs);
|
|
256
|
+
if (invalid.length > 0) {
|
|
257
|
+
this.log.debug(`Dropping invalid txs from the p2p pool ${Tx.getHashes(invalid).join(', ')}`);
|
|
258
|
+
await this.p2pClient.deleteTxs(Tx.getHashes(invalid));
|
|
259
|
+
}
|
|
260
|
+
return valid.slice(0, this.maxTxsPerBlock);
|
|
183
261
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
262
|
+
takeTxsWithinMaxSize(txs) {
|
|
263
|
+
const maxSize = this.maxBlockSizeInBytes;
|
|
264
|
+
let totalSize = 0;
|
|
265
|
+
const toReturn = [];
|
|
266
|
+
for (const tx of txs) {
|
|
267
|
+
const txSize = tx.getSize() - tx.proof.toBuffer().length;
|
|
268
|
+
if (totalSize + txSize > maxSize) {
|
|
269
|
+
this.log.warn(`Dropping tx ${tx.getTxHash()} with estimated size ${txSize} due to exceeding ${maxSize} block size limit (currently at ${totalSize})`);
|
|
270
|
+
continue;
|
|
271
|
+
}
|
|
272
|
+
toReturn.push(tx);
|
|
273
|
+
totalSize += txSize;
|
|
274
|
+
}
|
|
275
|
+
return toReturn;
|
|
188
276
|
}
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
277
|
+
/**
|
|
278
|
+
* Returns whether the previous block sent has been mined, and all dependencies have caught up with it.
|
|
279
|
+
* @returns Boolean indicating if our dependencies are synced to the latest block.
|
|
280
|
+
*/
|
|
281
|
+
async isBlockSynced() {
|
|
282
|
+
const syncedBlocks = await Promise.all([
|
|
283
|
+
this.worldState.status().then((s) => s.syncedToL2Block),
|
|
284
|
+
this.p2pClient.getStatus().then(s => s.syncedToL2Block),
|
|
285
|
+
this.l2BlockSource.getBlockNumber(),
|
|
286
|
+
this.l1ToL2MessageSource.getBlockNumber(),
|
|
287
|
+
]);
|
|
288
|
+
const min = Math.min(...syncedBlocks);
|
|
289
|
+
return min >= this.lastPublishedBlock;
|
|
198
290
|
}
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
const { block, aggregationObject, proof } = await this.prover.finaliseBlock();
|
|
202
|
-
await assertBlockHeight();
|
|
203
|
-
this.log.verbose(`Assembled block ${block.number}`, {
|
|
204
|
-
eventName: 'l2-block-built',
|
|
205
|
-
duration: workTimer.ms(),
|
|
206
|
-
publicProcessDuration: publicProcessorDuration,
|
|
207
|
-
rollupCircuitsDuration: blockBuildingTimer.ms(),
|
|
208
|
-
...block.getStats(),
|
|
209
|
-
});
|
|
210
|
-
await this.publishL2Block(block, aggregationObject, proof);
|
|
211
|
-
this.log.info(`Submitted rollup block ${block.number} with ${processedTxs.length} transactions`);
|
|
212
|
-
}
|
|
213
|
-
catch (err) {
|
|
214
|
-
if (BlockProofError.isBlockProofError(err)) {
|
|
215
|
-
const txHashes = err.txHashes.filter(h => !h.isZero());
|
|
216
|
-
this.log.warn(`Proving block failed, removing ${txHashes.length} txs from pool`);
|
|
217
|
-
await this.p2pClient.deleteTxs(txHashes);
|
|
291
|
+
get coinbase() {
|
|
292
|
+
return this._coinbase;
|
|
218
293
|
}
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
this.prover?.cancelBlock();
|
|
222
|
-
await this.worldState.getLatest().rollback();
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
/**
|
|
226
|
-
* Publishes the L2Block to the rollup contract.
|
|
227
|
-
* @param block - The L2Block to be published.
|
|
228
|
-
*/
|
|
229
|
-
async publishL2Block(block, aggregationObject, proof) {
|
|
230
|
-
// Publishes new block to the network and awaits the tx to be mined
|
|
231
|
-
this.state = SequencerState.PUBLISHING_BLOCK;
|
|
232
|
-
const publishedL2Block = await this.publisher.processL2Block(block, aggregationObject, proof);
|
|
233
|
-
if (publishedL2Block) {
|
|
234
|
-
this.lastPublishedBlock = block.number;
|
|
235
|
-
}
|
|
236
|
-
else {
|
|
237
|
-
throw new Error(`Failed to publish block`);
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
async takeValidTxs(txs, validator) {
|
|
241
|
-
const [valid, invalid] = await validator.validateTxs(txs);
|
|
242
|
-
if (invalid.length > 0) {
|
|
243
|
-
this.log.debug(`Dropping invalid txs from the p2p pool ${Tx.getHashes(invalid).join(', ')}`);
|
|
244
|
-
await this.p2pClient.deleteTxs(Tx.getHashes(invalid));
|
|
245
|
-
}
|
|
246
|
-
return valid.slice(0, this.maxTxsPerBlock);
|
|
247
|
-
}
|
|
248
|
-
takeTxsWithinMaxSize(txs) {
|
|
249
|
-
const maxSize = this.maxBlockSizeInBytes;
|
|
250
|
-
let totalSize = 0;
|
|
251
|
-
const toReturn = [];
|
|
252
|
-
for (const tx of txs) {
|
|
253
|
-
const txSize = tx.getStats().size - tx.proof.toBuffer().length;
|
|
254
|
-
if (totalSize + txSize > maxSize) {
|
|
255
|
-
this.log.warn(`Dropping tx ${tx.getTxHash()} with size ${txSize} due to exceeding ${maxSize} block size limit (currently at ${totalSize})`);
|
|
256
|
-
continue;
|
|
294
|
+
get feeRecipient() {
|
|
295
|
+
return this._feeRecipient;
|
|
257
296
|
}
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
const min = Math.min(...syncedBlocks);
|
|
275
|
-
return min >= this.lastPublishedBlock;
|
|
276
|
-
}
|
|
277
|
-
get coinbase() {
|
|
278
|
-
return this._coinbase;
|
|
279
|
-
}
|
|
280
|
-
get feeRecipient() {
|
|
281
|
-
return this._feeRecipient;
|
|
282
|
-
}
|
|
283
|
-
}
|
|
297
|
+
},
|
|
298
|
+
(() => {
|
|
299
|
+
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
|
|
300
|
+
_buildBlockAndPublish_decorators = [trackSpan('Sequencer.buildBlockAndPublish', (_validTxs, newGlobalVariables, _historicalHeader) => ({
|
|
301
|
+
[Attributes.BLOCK_NUMBER]: newGlobalVariables.blockNumber.toNumber(),
|
|
302
|
+
}))];
|
|
303
|
+
_publishL2Block_decorators = [trackSpan('Sequencer.publishL2Block', block => ({
|
|
304
|
+
[Attributes.BLOCK_NUMBER]: block.number,
|
|
305
|
+
}))];
|
|
306
|
+
__esDecorate(_a, null, _buildBlockAndPublish_decorators, { kind: "method", name: "buildBlockAndPublish", static: false, private: false, access: { has: obj => "buildBlockAndPublish" in obj, get: obj => obj.buildBlockAndPublish }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
307
|
+
__esDecorate(_a, null, _publishL2Block_decorators, { kind: "method", name: "publishL2Block", static: false, private: false, access: { has: obj => "publishL2Block" in obj, get: obj => obj.publishL2Block }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
308
|
+
if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
309
|
+
})(),
|
|
310
|
+
_a;
|
|
311
|
+
})();
|
|
312
|
+
export { Sequencer };
|
|
284
313
|
/**
|
|
285
314
|
* State of the sequencer.
|
|
286
315
|
*/
|
|
@@ -311,4 +340,4 @@ export var SequencerState;
|
|
|
311
340
|
*/
|
|
312
341
|
SequencerState[SequencerState["STOPPED"] = 5] = "STOPPED";
|
|
313
342
|
})(SequencerState || (SequencerState = {}));
|
|
314
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
|
|
343
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
|