@aztec/sequencer-client 0.76.4 → 0.77.0-testnet-ignition.21
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/index.js +0 -1
- package/dest/client/sequencer-client.d.ts +12 -9
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +55 -60
- package/dest/config.d.ts +2 -2
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +41 -46
- package/dest/global_variable_builder/global_builder.d.ts +5 -2
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +45 -31
- package/dest/global_variable_builder/index.js +0 -1
- package/dest/index.js +0 -1
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/config.js +33 -48
- package/dest/publisher/index.js +0 -1
- package/dest/publisher/sequencer-publisher-metrics.d.ts +5 -2
- package/dest/publisher/sequencer-publisher-metrics.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher-metrics.js +47 -23
- package/dest/publisher/sequencer-publisher.d.ts +10 -9
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +191 -160
- package/dest/sequencer/allowed.d.ts +1 -1
- package/dest/sequencer/allowed.d.ts.map +1 -1
- package/dest/sequencer/allowed.js +6 -13
- package/dest/sequencer/config.d.ts +1 -1
- package/dest/sequencer/config.d.ts.map +1 -1
- package/dest/sequencer/config.js +1 -2
- package/dest/sequencer/index.js +0 -1
- package/dest/sequencer/metrics.js +26 -18
- package/dest/sequencer/sequencer.d.ts +18 -12
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +589 -560
- package/dest/sequencer/timetable.d.ts +1 -1
- package/dest/sequencer/timetable.d.ts.map +1 -1
- package/dest/sequencer/timetable.js +33 -19
- package/dest/sequencer/utils.d.ts +2 -2
- package/dest/sequencer/utils.d.ts.map +1 -1
- package/dest/sequencer/utils.js +22 -32
- package/dest/slasher/factory.d.ts +4 -8
- package/dest/slasher/factory.d.ts.map +1 -1
- package/dest/slasher/factory.js +5 -7
- package/dest/slasher/index.js +0 -1
- package/dest/slasher/slasher_client.d.ts +10 -62
- package/dest/slasher/slasher_client.d.ts.map +1 -1
- package/dest/slasher/slasher_client.js +47 -231
- package/dest/test/index.d.ts +3 -3
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +4 -1
- package/dest/tx_validator/archive_cache.d.ts +3 -3
- package/dest/tx_validator/archive_cache.d.ts.map +1 -1
- package/dest/tx_validator/archive_cache.js +8 -8
- package/dest/tx_validator/gas_validator.d.ts +5 -3
- package/dest/tx_validator/gas_validator.d.ts.map +1 -1
- package/dest/tx_validator/gas_validator.js +70 -70
- package/dest/tx_validator/nullifier_cache.d.ts +2 -2
- package/dest/tx_validator/nullifier_cache.d.ts.map +1 -1
- package/dest/tx_validator/nullifier_cache.js +9 -9
- package/dest/tx_validator/phases_validator.d.ts +3 -2
- package/dest/tx_validator/phases_validator.d.ts.map +1 -1
- package/dest/tx_validator/phases_validator.js +29 -21
- package/dest/tx_validator/test_utils.d.ts +4 -2
- package/dest/tx_validator/test_utils.d.ts.map +1 -1
- package/dest/tx_validator/test_utils.js +2 -3
- package/dest/tx_validator/tx_validator_factory.d.ts +7 -5
- package/dest/tx_validator/tx_validator_factory.d.ts.map +1 -1
- package/dest/tx_validator/tx_validator_factory.js +14 -13
- package/package.json +28 -29
- package/src/client/sequencer-client.ts +17 -14
- package/src/config.ts +6 -14
- package/src/global_variable_builder/global_builder.ts +18 -19
- package/src/publisher/config.ts +9 -17
- package/src/publisher/sequencer-publisher-metrics.ts +23 -2
- package/src/publisher/sequencer-publisher.ts +15 -17
- package/src/sequencer/allowed.ts +4 -4
- package/src/sequencer/config.ts +1 -1
- package/src/sequencer/sequencer.ts +40 -35
- package/src/sequencer/timetable.ts +1 -1
- package/src/sequencer/utils.ts +2 -2
- package/src/slasher/factory.ts +7 -13
- package/src/slasher/slasher_client.ts +30 -252
- package/src/test/index.ts +3 -3
- package/src/tx_validator/archive_cache.ts +4 -3
- package/src/tx_validator/gas_validator.ts +22 -31
- package/src/tx_validator/nullifier_cache.ts +3 -2
- package/src/tx_validator/phases_validator.ts +8 -8
- package/src/tx_validator/test_utils.ts +5 -3
- package/src/tx_validator/tx_validator_factory.ts +23 -17
|
@@ -1,34 +1,49 @@
|
|
|
1
1
|
import { Blob } from '@aztec/blob-lib';
|
|
2
2
|
import { createBlobSinkClient } from '@aztec/blob-sink/client';
|
|
3
|
-
import {
|
|
4
|
-
import { EthAddress } from '@aztec/circuits.js';
|
|
5
|
-
import { FormattedViemError, RollupContract, formatViemError, } from '@aztec/ethereum';
|
|
3
|
+
import { FormattedViemError, RollupContract, formatViemError } from '@aztec/ethereum';
|
|
6
4
|
import { toHex } from '@aztec/foundation/bigint-buffer';
|
|
5
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
7
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
8
7
|
import { Timer } from '@aztec/foundation/timer';
|
|
9
8
|
import { ForwarderAbi, RollupAbi } from '@aztec/l1-artifacts';
|
|
9
|
+
import { ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayload } from '@aztec/stdlib/p2p';
|
|
10
10
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
11
11
|
import pick from 'lodash.pick';
|
|
12
12
|
import { encodeFunctionData } from 'viem';
|
|
13
13
|
import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
|
|
14
|
-
export var VoteType
|
|
15
|
-
(function (VoteType) {
|
|
14
|
+
export var VoteType = /*#__PURE__*/ function(VoteType) {
|
|
16
15
|
VoteType[VoteType["GOVERNANCE"] = 0] = "GOVERNANCE";
|
|
17
16
|
VoteType[VoteType["SLASHING"] = 1] = "SLASHING";
|
|
18
|
-
|
|
17
|
+
return VoteType;
|
|
18
|
+
}({});
|
|
19
19
|
export class SequencerPublisher {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
20
|
+
interrupted = false;
|
|
21
|
+
metrics;
|
|
22
|
+
epochCache;
|
|
23
|
+
forwarderContract;
|
|
24
|
+
governanceLog = createLogger('sequencer:publisher:governance');
|
|
25
|
+
governanceProposerAddress;
|
|
26
|
+
governancePayload = EthAddress.ZERO;
|
|
27
|
+
slashingLog = createLogger('sequencer:publisher:slashing');
|
|
28
|
+
slashingProposerAddress;
|
|
29
|
+
getSlashPayload = undefined;
|
|
30
|
+
myLastVotes = {
|
|
31
|
+
[0]: 0n,
|
|
32
|
+
[1]: 0n
|
|
33
|
+
};
|
|
34
|
+
log = createLogger('sequencer:publisher');
|
|
35
|
+
ethereumSlotDuration;
|
|
36
|
+
blobSinkClient;
|
|
37
|
+
// @note - with blobs, the below estimate seems too large.
|
|
38
|
+
// Total used for full block from int_l1_pub e2e test: 1m (of which 86k is 1x blob)
|
|
39
|
+
// Total used for emptier block from above test: 429k (of which 84k is 1x blob)
|
|
40
|
+
static PROPOSE_GAS_GUESS = 12_000_000n;
|
|
41
|
+
l1TxUtils;
|
|
42
|
+
rollupContract;
|
|
43
|
+
govProposerContract;
|
|
44
|
+
slashingProposerContract;
|
|
45
|
+
requests = [];
|
|
46
|
+
constructor(config, deps){
|
|
32
47
|
this.ethereumSlotDuration = BigInt(config.ethereumSlotDuration);
|
|
33
48
|
this.epochCache = deps.epochCache;
|
|
34
49
|
this.blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config);
|
|
@@ -62,31 +77,32 @@ export class SequencerPublisher {
|
|
|
62
77
|
return this.epochCache.getEpochAndSlotNow().slot;
|
|
63
78
|
}
|
|
64
79
|
/**
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
80
|
+
* Sends all requests that are still valid.
|
|
81
|
+
* @returns one of:
|
|
82
|
+
* - A receipt and stats if the tx succeeded
|
|
83
|
+
* - a receipt and errorMsg if it failed on L1
|
|
84
|
+
* - undefined if no valid requests are found OR the tx failed to send.
|
|
85
|
+
*/ async sendRequests() {
|
|
86
|
+
const requestsToProcess = [
|
|
87
|
+
...this.requests
|
|
88
|
+
];
|
|
73
89
|
this.requests = [];
|
|
74
90
|
if (this.interrupted) {
|
|
75
91
|
return undefined;
|
|
76
92
|
}
|
|
77
93
|
const currentL2Slot = this.getCurrentL2Slot();
|
|
78
94
|
this.log.debug(`Current L2 slot: ${currentL2Slot}`);
|
|
79
|
-
const validRequests = requestsToProcess.filter(request
|
|
95
|
+
const validRequests = requestsToProcess.filter((request)=>request.lastValidL2Slot >= currentL2Slot);
|
|
80
96
|
if (validRequests.length !== requestsToProcess.length) {
|
|
81
97
|
this.log.warn(`Some requests were expired for slot ${currentL2Slot}`, {
|
|
82
|
-
validRequests: validRequests.map(request
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
requests: requestsToProcess.map(request
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
98
|
+
validRequests: validRequests.map((request)=>({
|
|
99
|
+
action: request.action,
|
|
100
|
+
lastValidL2Slot: request.lastValidL2Slot
|
|
101
|
+
})),
|
|
102
|
+
requests: requestsToProcess.map((request)=>({
|
|
103
|
+
action: request.action,
|
|
104
|
+
lastValidL2Slot: request.lastValidL2Slot
|
|
105
|
+
}))
|
|
90
106
|
});
|
|
91
107
|
}
|
|
92
108
|
if (validRequests.length === 0) {
|
|
@@ -96,8 +112,8 @@ export class SequencerPublisher {
|
|
|
96
112
|
// @note - we can only have one gas config and one blob config per bundle
|
|
97
113
|
// find requests with gas and blob configs
|
|
98
114
|
// See https://github.com/AztecProtocol/aztec-packages/issues/11513
|
|
99
|
-
const gasConfigs = requestsToProcess.filter(request
|
|
100
|
-
const blobConfigs = requestsToProcess.filter(request
|
|
115
|
+
const gasConfigs = requestsToProcess.filter((request)=>request.gasConfig);
|
|
116
|
+
const blobConfigs = requestsToProcess.filter((request)=>request.blobConfig);
|
|
101
117
|
if (gasConfigs.length > 1 || blobConfigs.length > 1) {
|
|
102
118
|
throw new Error('Multiple gas or blob configs found');
|
|
103
119
|
}
|
|
@@ -105,68 +121,75 @@ export class SequencerPublisher {
|
|
|
105
121
|
const blobConfig = blobConfigs[0]?.blobConfig;
|
|
106
122
|
try {
|
|
107
123
|
this.log.debug('Forwarding transactions', {
|
|
108
|
-
validRequests: validRequests.map(request
|
|
124
|
+
validRequests: validRequests.map((request)=>request.action)
|
|
109
125
|
});
|
|
110
|
-
const result = await this.forwarderContract.forward(validRequests.map(request
|
|
126
|
+
const result = await this.forwarderContract.forward(validRequests.map((request)=>request.request), this.l1TxUtils, gasConfig, blobConfig, this.log);
|
|
111
127
|
this.callbackBundledTransactions(validRequests, result);
|
|
112
128
|
return result;
|
|
113
|
-
}
|
|
114
|
-
catch (err) {
|
|
129
|
+
} catch (err) {
|
|
115
130
|
const viemError = formatViemError(err);
|
|
116
131
|
this.log.error(`Failed to publish bundled transactions`, viemError);
|
|
117
132
|
return undefined;
|
|
133
|
+
} finally{
|
|
134
|
+
try {
|
|
135
|
+
this.metrics.recordSenderBalance(await this.l1TxUtils.getSenderBalance(), this.l1TxUtils.getSenderAddress());
|
|
136
|
+
} catch (err) {
|
|
137
|
+
this.log.warn(`Failed to record balance after sending tx: ${err}`);
|
|
138
|
+
}
|
|
118
139
|
}
|
|
119
140
|
}
|
|
120
141
|
callbackBundledTransactions(requests, result) {
|
|
121
142
|
const success = result?.receipt.status === 'success';
|
|
122
143
|
const logger = success ? this.log.info : this.log.error;
|
|
123
|
-
for (const request of requests)
|
|
144
|
+
for (const request of requests){
|
|
124
145
|
logger(`Bundled [${request.action}] transaction [${success ? 'succeeded' : 'failed'}]`);
|
|
125
146
|
request.onResult?.(request.request, result);
|
|
126
147
|
}
|
|
127
148
|
}
|
|
128
149
|
/**
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
150
|
+
* @notice Will call `canProposeAtNextEthBlock` to make sure that it is possible to propose
|
|
151
|
+
* @param tipArchive - The archive to check
|
|
152
|
+
* @returns The slot and block number if it is possible to propose, undefined otherwise
|
|
153
|
+
*/ canProposeAtNextEthBlock(tipArchive) {
|
|
154
|
+
const ignoredErrors = [
|
|
155
|
+
'SlotAlreadyInChain',
|
|
156
|
+
'InvalidProposer',
|
|
157
|
+
'InvalidArchive'
|
|
158
|
+
];
|
|
159
|
+
return this.rollupContract.canProposeAtNextEthBlock(tipArchive, this.getForwarderAddress().toString(), this.ethereumSlotDuration).catch((err)=>{
|
|
160
|
+
if (err instanceof FormattedViemError && ignoredErrors.find((e)=>err.message.includes(e))) {
|
|
139
161
|
this.log.debug(err.message);
|
|
140
|
-
}
|
|
141
|
-
else {
|
|
162
|
+
} else {
|
|
142
163
|
this.log.error(err.name, err);
|
|
143
164
|
}
|
|
144
165
|
return undefined;
|
|
145
166
|
});
|
|
146
167
|
}
|
|
147
168
|
/**
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
async validateBlockForSubmission(header, attestationData = {
|
|
169
|
+
* @notice Will call `validateHeader` to make sure that it is possible to propose
|
|
170
|
+
*
|
|
171
|
+
* @dev Throws if unable to propose
|
|
172
|
+
*
|
|
173
|
+
* @param header - The header to propose
|
|
174
|
+
* @param digest - The digest that attestations are signing over
|
|
175
|
+
*
|
|
176
|
+
*/ async validateBlockForSubmission(header, attestationData = {
|
|
157
177
|
digest: Buffer.alloc(32),
|
|
158
|
-
signatures: []
|
|
178
|
+
signatures: []
|
|
159
179
|
}) {
|
|
160
180
|
const ts = BigInt((await this.l1TxUtils.getBlock()).timestamp + this.ethereumSlotDuration);
|
|
161
|
-
const formattedSignatures = attestationData.signatures.map(attest
|
|
162
|
-
const flags = {
|
|
181
|
+
const formattedSignatures = attestationData.signatures.map((attest)=>attest.toViemSignature());
|
|
182
|
+
const flags = {
|
|
183
|
+
ignoreDA: true,
|
|
184
|
+
ignoreSignatures: formattedSignatures.length == 0
|
|
185
|
+
};
|
|
163
186
|
const args = [
|
|
164
187
|
`0x${header.toBuffer().toString('hex')}`,
|
|
165
188
|
formattedSignatures,
|
|
166
189
|
`0x${attestationData.digest.toString('hex')}`,
|
|
167
190
|
ts,
|
|
168
191
|
`0x${header.contentCommitment.blobsHash.toString('hex')}`,
|
|
169
|
-
flags
|
|
192
|
+
flags
|
|
170
193
|
];
|
|
171
194
|
await this.rollupContract.validateHeader(args, this.getForwarderAddress().toString());
|
|
172
195
|
return ts;
|
|
@@ -185,7 +208,7 @@ export class SequencerPublisher {
|
|
|
185
208
|
const round = await base.computeRound(slotNumber);
|
|
186
209
|
const [proposer, roundInfo] = await Promise.all([
|
|
187
210
|
this.rollupContract.getProposerAt(timestamp),
|
|
188
|
-
base.getRoundInfo(this.rollupContract.address, round)
|
|
211
|
+
base.getRoundInfo(this.rollupContract.address, round)
|
|
189
212
|
]);
|
|
190
213
|
if (proposer.toLowerCase() !== this.getForwarderAddress().toString().toLowerCase()) {
|
|
191
214
|
return false;
|
|
@@ -196,25 +219,26 @@ export class SequencerPublisher {
|
|
|
196
219
|
const cachedLastVote = this.myLastVotes[voteType];
|
|
197
220
|
this.myLastVotes[voteType] = slotNumber;
|
|
198
221
|
this.addRequest({
|
|
199
|
-
action: voteType ===
|
|
222
|
+
action: voteType === 0 ? 'governance-vote' : 'slashing-vote',
|
|
200
223
|
request: base.createVoteRequest(payload.toString()),
|
|
201
224
|
lastValidL2Slot: slotNumber,
|
|
202
|
-
onResult: (_request, result)
|
|
225
|
+
onResult: (_request, result)=>{
|
|
203
226
|
if (!result || result.receipt.status !== 'success') {
|
|
204
227
|
this.myLastVotes[voteType] = cachedLastVote;
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
228
|
+
} else {
|
|
207
229
|
this.log.info(`Cast [${voteType}] vote for slot ${slotNumber}`);
|
|
208
230
|
}
|
|
209
|
-
}
|
|
231
|
+
}
|
|
210
232
|
});
|
|
211
233
|
return true;
|
|
212
234
|
}
|
|
213
235
|
async getVoteConfig(slotNumber, voteType) {
|
|
214
|
-
if (voteType ===
|
|
215
|
-
return {
|
|
216
|
-
|
|
217
|
-
|
|
236
|
+
if (voteType === 0) {
|
|
237
|
+
return {
|
|
238
|
+
payload: this.governancePayload,
|
|
239
|
+
base: this.govProposerContract
|
|
240
|
+
};
|
|
241
|
+
} else if (voteType === 1) {
|
|
218
242
|
if (!this.getSlashPayload) {
|
|
219
243
|
return undefined;
|
|
220
244
|
}
|
|
@@ -222,18 +246,20 @@ export class SequencerPublisher {
|
|
|
222
246
|
if (!slashPayload) {
|
|
223
247
|
return undefined;
|
|
224
248
|
}
|
|
225
|
-
return {
|
|
249
|
+
return {
|
|
250
|
+
payload: slashPayload,
|
|
251
|
+
base: this.slashingProposerContract
|
|
252
|
+
};
|
|
226
253
|
}
|
|
227
254
|
throw new Error('Unreachable: Invalid vote type');
|
|
228
255
|
}
|
|
229
256
|
/**
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
async enqueueCastVote(slotNumber, timestamp, voteType) {
|
|
257
|
+
* Enqueues a castVote transaction to cast a vote for a given slot number.
|
|
258
|
+
* @param slotNumber - The slot number to cast a vote for.
|
|
259
|
+
* @param timestamp - The timestamp of the slot to cast a vote for.
|
|
260
|
+
* @param voteType - The type of vote to cast.
|
|
261
|
+
* @returns True if the vote was successfully enqueued, false otherwise.
|
|
262
|
+
*/ async enqueueCastVote(slotNumber, timestamp, voteType) {
|
|
237
263
|
const voteConfig = await this.getVoteConfig(slotNumber, voteType);
|
|
238
264
|
if (!voteConfig) {
|
|
239
265
|
return false;
|
|
@@ -242,12 +268,11 @@ export class SequencerPublisher {
|
|
|
242
268
|
return this.enqueueCastVoteHelper(slotNumber, timestamp, voteType, payload, base);
|
|
243
269
|
}
|
|
244
270
|
/**
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
async enqueueProposeL2Block(block, attestations, txHashes, opts = {}) {
|
|
271
|
+
* Proposes a L2 block on L1.
|
|
272
|
+
*
|
|
273
|
+
* @param block - L2 block to propose.
|
|
274
|
+
* @returns True if the tx has been enqueued, throws otherwise. See #9315
|
|
275
|
+
*/ async enqueueProposeL2Block(block, attestations, txHashes, opts = {}) {
|
|
251
276
|
const consensusPayload = new ConsensusPayload(block.header, block.archive.root, txHashes ?? []);
|
|
252
277
|
const digest = await getHashedSignaturePayload(consensusPayload, SignatureDomainSeparator.blockAttestation);
|
|
253
278
|
const blobs = await Blob.getBlobs(block.body.toBlobFields());
|
|
@@ -258,7 +283,7 @@ export class SequencerPublisher {
|
|
|
258
283
|
body: block.body.toBuffer(),
|
|
259
284
|
blobs,
|
|
260
285
|
attestations,
|
|
261
|
-
txHashes: txHashes ?? []
|
|
286
|
+
txHashes: txHashes ?? []
|
|
262
287
|
};
|
|
263
288
|
// @note This will make sure that we are passing the checks for our header ASSUMING that the data is also made available
|
|
264
289
|
// This means that we can avoid the simulation issues in later checks.
|
|
@@ -266,88 +291,92 @@ export class SequencerPublisher {
|
|
|
266
291
|
// make time consistency checks break.
|
|
267
292
|
const ts = await this.validateBlockForSubmission(block.header, {
|
|
268
293
|
digest: digest.toBuffer(),
|
|
269
|
-
signatures: attestations ?? []
|
|
294
|
+
signatures: attestations ?? []
|
|
270
295
|
});
|
|
271
296
|
this.log.debug(`Submitting propose transaction`);
|
|
272
297
|
await this.addProposeTx(block, proposeTxArgs, opts, ts);
|
|
273
298
|
return true;
|
|
274
299
|
}
|
|
275
300
|
/**
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
interrupt() {
|
|
301
|
+
* Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
|
|
302
|
+
* Be warned, the call may return false even if the tx subsequently gets successfully mined.
|
|
303
|
+
* In practice this shouldn't matter, as we'll only ever be calling `interrupt` when we know it's going to fail.
|
|
304
|
+
* A call to `restart` is required before you can continue publishing.
|
|
305
|
+
*/ interrupt() {
|
|
282
306
|
this.interrupted = true;
|
|
283
307
|
this.l1TxUtils.interrupt();
|
|
284
308
|
}
|
|
285
|
-
/** Restarts the publisher after calling `interrupt`. */
|
|
286
|
-
restart() {
|
|
309
|
+
/** Restarts the publisher after calling `interrupt`. */ restart() {
|
|
287
310
|
this.interrupted = false;
|
|
288
311
|
this.l1TxUtils.restart();
|
|
289
312
|
}
|
|
290
313
|
async prepareProposeTx(encodedData, timestamp) {
|
|
291
314
|
const kzg = Blob.getViemKzgInstance();
|
|
292
315
|
const blobInput = Blob.getEthBlobEvaluationInputs(encodedData.blobs);
|
|
293
|
-
this.log.debug('Validating blob input', {
|
|
294
|
-
|
|
295
|
-
|
|
316
|
+
this.log.debug('Validating blob input', {
|
|
317
|
+
blobInput
|
|
318
|
+
});
|
|
319
|
+
const blobEvaluationGas = await this.l1TxUtils.estimateGas(this.l1TxUtils.walletClient.account, {
|
|
296
320
|
to: this.rollupContract.address,
|
|
297
321
|
data: encodeFunctionData({
|
|
298
322
|
abi: RollupAbi,
|
|
299
323
|
functionName: 'validateBlobs',
|
|
300
|
-
args: [
|
|
301
|
-
|
|
324
|
+
args: [
|
|
325
|
+
blobInput
|
|
326
|
+
]
|
|
327
|
+
})
|
|
302
328
|
}, {}, {
|
|
303
|
-
blobs: encodedData.blobs.map(b
|
|
304
|
-
kzg
|
|
305
|
-
})
|
|
306
|
-
.catch(err => {
|
|
329
|
+
blobs: encodedData.blobs.map((b)=>b.data),
|
|
330
|
+
kzg
|
|
331
|
+
}).catch((err)=>{
|
|
307
332
|
const { message, metaMessages } = formatViemError(err);
|
|
308
|
-
this.log.error(`Failed to validate blobs`, message, {
|
|
333
|
+
this.log.error(`Failed to validate blobs`, message, {
|
|
334
|
+
metaMessages
|
|
335
|
+
});
|
|
309
336
|
throw new Error('Failed to validate blobs');
|
|
310
337
|
});
|
|
311
|
-
const attestations = encodedData.attestations
|
|
312
|
-
|
|
313
|
-
: [];
|
|
314
|
-
const txHashes = encodedData.txHashes ? encodedData.txHashes.map(txHash => txHash.toString()) : [];
|
|
338
|
+
const attestations = encodedData.attestations ? encodedData.attestations.map((attest)=>attest.toViemSignature()) : [];
|
|
339
|
+
const txHashes = encodedData.txHashes ? encodedData.txHashes.map((txHash)=>txHash.toString()) : [];
|
|
315
340
|
const args = [
|
|
316
341
|
{
|
|
317
342
|
header: `0x${encodedData.header.toString('hex')}`,
|
|
318
343
|
archive: `0x${encodedData.archive.toString('hex')}`,
|
|
319
344
|
oracleInput: {
|
|
320
345
|
// We are currently not modifying these. See #9963
|
|
321
|
-
feeAssetPriceModifier: 0n
|
|
346
|
+
feeAssetPriceModifier: 0n
|
|
322
347
|
},
|
|
323
348
|
blockHash: `0x${encodedData.blockHash.toString('hex')}`,
|
|
324
|
-
txHashes
|
|
349
|
+
txHashes
|
|
325
350
|
},
|
|
326
351
|
attestations,
|
|
327
|
-
|
|
328
|
-
`0x${encodedData.body.toString('hex')}`,
|
|
329
|
-
blobInput,
|
|
352
|
+
blobInput
|
|
330
353
|
];
|
|
331
354
|
const rollupData = encodeFunctionData({
|
|
332
355
|
abi: RollupAbi,
|
|
333
356
|
functionName: 'propose',
|
|
334
|
-
args
|
|
357
|
+
args
|
|
335
358
|
});
|
|
336
359
|
const forwarderData = encodeFunctionData({
|
|
337
360
|
abi: ForwarderAbi,
|
|
338
361
|
functionName: 'forward',
|
|
339
|
-
args: [
|
|
362
|
+
args: [
|
|
363
|
+
[
|
|
364
|
+
this.rollupContract.address
|
|
365
|
+
],
|
|
366
|
+
[
|
|
367
|
+
rollupData
|
|
368
|
+
]
|
|
369
|
+
]
|
|
340
370
|
});
|
|
341
|
-
const simulationResult = await this.l1TxUtils
|
|
342
|
-
.simulateGasUsed({
|
|
371
|
+
const simulationResult = await this.l1TxUtils.simulateGasUsed({
|
|
343
372
|
to: this.getForwarderAddress().toString(),
|
|
344
373
|
data: forwarderData,
|
|
345
|
-
gas: SequencerPublisher.PROPOSE_GAS_GUESS
|
|
374
|
+
gas: SequencerPublisher.PROPOSE_GAS_GUESS
|
|
346
375
|
}, {
|
|
347
376
|
// @note we add 1n to the timestamp because geth implementation doesn't like simulation timestamp to be equal to the current block timestamp
|
|
348
377
|
time: timestamp + 1n,
|
|
349
378
|
// @note reth should have a 30m gas limit per block but throws errors that this tx is beyond limit
|
|
350
|
-
gasLimit: SequencerPublisher.PROPOSE_GAS_GUESS * 2n
|
|
379
|
+
gasLimit: SequencerPublisher.PROPOSE_GAS_GUESS * 2n
|
|
351
380
|
}, [
|
|
352
381
|
{
|
|
353
382
|
address: this.rollupContract.address,
|
|
@@ -355,20 +384,26 @@ export class SequencerPublisher {
|
|
|
355
384
|
stateDiff: [
|
|
356
385
|
{
|
|
357
386
|
slot: toHex(RollupContract.checkBlobStorageSlot, true),
|
|
358
|
-
value: toHex(0n, true)
|
|
359
|
-
}
|
|
360
|
-
]
|
|
361
|
-
}
|
|
387
|
+
value: toHex(0n, true)
|
|
388
|
+
}
|
|
389
|
+
]
|
|
390
|
+
}
|
|
362
391
|
], {
|
|
363
392
|
// @note fallback gas estimate to use if the node doesn't support simulation API
|
|
364
|
-
fallbackGasEstimate: SequencerPublisher.PROPOSE_GAS_GUESS
|
|
365
|
-
})
|
|
366
|
-
.catch(err => {
|
|
393
|
+
fallbackGasEstimate: SequencerPublisher.PROPOSE_GAS_GUESS
|
|
394
|
+
}).catch((err)=>{
|
|
367
395
|
const { message, metaMessages } = formatViemError(err);
|
|
368
|
-
this.log.error(`Failed to simulate gas used`, message, {
|
|
396
|
+
this.log.error(`Failed to simulate gas used`, message, {
|
|
397
|
+
metaMessages
|
|
398
|
+
});
|
|
369
399
|
throw new Error('Failed to simulate gas used');
|
|
370
400
|
});
|
|
371
|
-
return {
|
|
401
|
+
return {
|
|
402
|
+
args,
|
|
403
|
+
blobEvaluationGas,
|
|
404
|
+
rollupData,
|
|
405
|
+
simulationResult
|
|
406
|
+
};
|
|
372
407
|
}
|
|
373
408
|
async addProposeTx(block, encodedData, opts = {}, timestamp) {
|
|
374
409
|
const timer = new Timer();
|
|
@@ -380,18 +415,18 @@ export class SequencerPublisher {
|
|
|
380
415
|
action: 'propose',
|
|
381
416
|
request: {
|
|
382
417
|
to: this.rollupContract.address,
|
|
383
|
-
data: rollupData
|
|
418
|
+
data: rollupData
|
|
384
419
|
},
|
|
385
420
|
lastValidL2Slot: block.header.globalVariables.slotNumber.toBigInt(),
|
|
386
421
|
gasConfig: {
|
|
387
422
|
...opts,
|
|
388
|
-
gasLimit: this.l1TxUtils.bumpGasLimit(simulationResult + blobEvaluationGas)
|
|
423
|
+
gasLimit: this.l1TxUtils.bumpGasLimit(simulationResult + blobEvaluationGas)
|
|
389
424
|
},
|
|
390
425
|
blobConfig: {
|
|
391
|
-
blobs: encodedData.blobs.map(b
|
|
392
|
-
kzg
|
|
426
|
+
blobs: encodedData.blobs.map((b)=>b.data),
|
|
427
|
+
kzg
|
|
393
428
|
},
|
|
394
|
-
onResult: (request, result)
|
|
429
|
+
onResult: (request, result)=>{
|
|
395
430
|
if (!result) {
|
|
396
431
|
return;
|
|
397
432
|
}
|
|
@@ -409,42 +444,38 @@ export class SequencerPublisher {
|
|
|
409
444
|
...block.getStats(),
|
|
410
445
|
eventName: 'rollup-published-to-l1',
|
|
411
446
|
blobCount: encodedData.blobs.length,
|
|
412
|
-
inclusionBlocks
|
|
447
|
+
inclusionBlocks
|
|
413
448
|
};
|
|
414
|
-
this.log.verbose(`Published L2 block to L1 rollup contract`, {
|
|
449
|
+
this.log.verbose(`Published L2 block to L1 rollup contract`, {
|
|
450
|
+
...stats,
|
|
451
|
+
...block.getStats()
|
|
452
|
+
});
|
|
415
453
|
this.metrics.recordProcessBlockTx(timer.ms(), publishStats);
|
|
416
454
|
// Send the blobs to the blob sink
|
|
417
|
-
this.sendBlobsToBlobSink(receipt.blockHash, encodedData.blobs).catch(_err
|
|
455
|
+
this.sendBlobsToBlobSink(receipt.blockHash, encodedData.blobs).catch((_err)=>{
|
|
418
456
|
this.log.error('Failed to send blobs to blob sink');
|
|
419
457
|
});
|
|
420
458
|
return true;
|
|
421
|
-
}
|
|
422
|
-
else {
|
|
459
|
+
} else {
|
|
423
460
|
this.metrics.recordFailedTx('process');
|
|
424
461
|
this.log.error(`Rollup process tx reverted. ${errorMsg ?? 'No error message'}`, undefined, {
|
|
425
462
|
...block.getStats(),
|
|
426
463
|
txHash: receipt.transactionHash,
|
|
427
464
|
blockHash,
|
|
428
|
-
slotNumber: block.header.globalVariables.slotNumber.toBigInt()
|
|
465
|
+
slotNumber: block.header.globalVariables.slotNumber.toBigInt()
|
|
429
466
|
});
|
|
430
467
|
}
|
|
431
|
-
}
|
|
468
|
+
}
|
|
432
469
|
});
|
|
433
470
|
}
|
|
434
471
|
/**
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
sendBlobsToBlobSink(blockHash, blobs) {
|
|
472
|
+
* Send blobs to the blob sink
|
|
473
|
+
*
|
|
474
|
+
* If a blob sink url is configured, then we send blobs to the blob sink
|
|
475
|
+
* - for now we use the blockHash as the identifier for the blobs;
|
|
476
|
+
* In the future this will move to be the beacon block id - which takes a bit more work
|
|
477
|
+
* to calculate and will need to be mocked in e2e tests
|
|
478
|
+
*/ sendBlobsToBlobSink(blockHash, blobs) {
|
|
443
479
|
return this.blobSinkClient.sendBlobsToBlobSink(blockHash, blobs);
|
|
444
480
|
}
|
|
445
481
|
}
|
|
446
|
-
// @note - with blobs, the below estimate seems too large.
|
|
447
|
-
// Total used for full block from int_l1_pub e2e test: 1m (of which 86k is 1x blob)
|
|
448
|
-
// Total used for emptier block from above test: 429k (of which 84k is 1x blob)
|
|
449
|
-
SequencerPublisher.PROPOSE_GAS_GUESS = 12000000n;
|
|
450
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer-publisher.js","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allowed.d.ts","sourceRoot":"","sources":["../../src/sequencer/allowed.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"allowed.d.ts","sourceRoot":"","sources":["../../src/sequencer/allowed.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,wBAAsB,+BAA+B,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CA2BjF"}
|