@aztec/sequencer-client 0.71.0 → 0.72.1
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/publisher/l1-publisher.d.ts +1 -1
- package/dest/publisher/l1-publisher.d.ts.map +1 -1
- package/dest/publisher/l1-publisher.js +93 -27
- package/dest/sequencer/allowed.js +3 -3
- package/dest/sequencer/sequencer.d.ts +2 -3
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +22 -23
- package/dest/tx_validator/gas_validator.d.ts +1 -1
- package/dest/tx_validator/gas_validator.d.ts.map +1 -1
- package/dest/tx_validator/gas_validator.js +8 -4
- package/package.json +21 -21
- package/src/publisher/l1-publisher.ts +104 -24
- package/src/sequencer/allowed.ts +2 -2
- package/src/sequencer/sequencer.ts +23 -33
- package/src/tx_validator/gas_validator.ts +15 -3
|
@@ -182,15 +182,12 @@ let Sequencer = (() => {
|
|
|
182
182
|
}
|
|
183
183
|
this.setState(SequencerState.PROPOSER_CHECK, 0n);
|
|
184
184
|
const chainTip = await this.l2BlockSource.getBlock(-1);
|
|
185
|
-
const
|
|
186
|
-
const newBlockNumber = (historicalHeader === undefined
|
|
187
|
-
? await this.l2BlockSource.getBlockNumber()
|
|
188
|
-
: Number(historicalHeader.globalVariables.blockNumber.toBigInt())) + 1;
|
|
185
|
+
const newBlockNumber = (chainTip?.header.globalVariables.blockNumber.toNumber() ?? 0) + 1;
|
|
189
186
|
// If we cannot find a tip archive, assume genesis.
|
|
190
|
-
const chainTipArchive = chainTip
|
|
187
|
+
const chainTipArchive = chainTip?.archive.root ?? new Fr(GENESIS_ARCHIVE_ROOT);
|
|
191
188
|
let slot;
|
|
192
189
|
try {
|
|
193
|
-
slot = await this.mayProposeBlock(chainTipArchive, BigInt(newBlockNumber));
|
|
190
|
+
slot = await this.mayProposeBlock(chainTipArchive.toBuffer(), BigInt(newBlockNumber));
|
|
194
191
|
}
|
|
195
192
|
catch (err) {
|
|
196
193
|
this.log.debug(`Cannot propose for block ${newBlockNumber}`);
|
|
@@ -211,7 +208,7 @@ let Sequencer = (() => {
|
|
|
211
208
|
}
|
|
212
209
|
this.setState(SequencerState.INITIALIZING_PROPOSAL, slot);
|
|
213
210
|
this.log.verbose(`Preparing proposal for block ${newBlockNumber} at slot ${slot}`, {
|
|
214
|
-
chainTipArchive
|
|
211
|
+
chainTipArchive,
|
|
215
212
|
blockNumber: newBlockNumber,
|
|
216
213
|
slot,
|
|
217
214
|
});
|
|
@@ -219,16 +216,18 @@ let Sequencer = (() => {
|
|
|
219
216
|
// and also we may need to fetch more if we don't have enough valid txs.
|
|
220
217
|
const pendingTxs = this.p2pClient.iteratePendingTxs();
|
|
221
218
|
// If I created a "partial" header here that should make our job much easier.
|
|
222
|
-
const proposalHeader = new BlockHeader(new AppendOnlyTreeSnapshot(
|
|
219
|
+
const proposalHeader = new BlockHeader(new AppendOnlyTreeSnapshot(chainTipArchive, 1), ContentCommitment.empty(), StateReference.empty(), newGlobalVariables, Fr.ZERO, Fr.ZERO);
|
|
223
220
|
try {
|
|
224
221
|
// TODO(palla/txs) Is the note below still valid? We don't seem to be doing any rollback in there.
|
|
225
222
|
// @note It is very important that the following function will FAIL and not just return early
|
|
226
223
|
// if it have made any state changes. If not, we won't rollback the state, and you will
|
|
227
224
|
// be in for a world of pain.
|
|
228
|
-
await this.buildBlockAndAttemptToPublish(pendingTxs, proposalHeader
|
|
225
|
+
await this.buildBlockAndAttemptToPublish(pendingTxs, proposalHeader);
|
|
229
226
|
}
|
|
230
227
|
catch (err) {
|
|
231
228
|
this.log.error(`Error assembling block`, err, { blockNumber: newBlockNumber, slot });
|
|
229
|
+
// If the block failed to build, we might still want to claim the proving rights
|
|
230
|
+
await this.claimEpochProofRightIfAvailable(slot);
|
|
232
231
|
}
|
|
233
232
|
this.setState(SequencerState.IDLE, 0n);
|
|
234
233
|
}
|
|
@@ -295,11 +294,11 @@ let Sequencer = (() => {
|
|
|
295
294
|
* @param historicalHeader - The historical header of the parent
|
|
296
295
|
* @param opts - Whether to just validate the block as a validator, as opposed to building it as a proposal
|
|
297
296
|
*/
|
|
298
|
-
async buildBlock(pendingTxs, newGlobalVariables,
|
|
299
|
-
const blockNumber = newGlobalVariables.blockNumber.
|
|
297
|
+
async buildBlock(pendingTxs, newGlobalVariables, opts = {}) {
|
|
298
|
+
const blockNumber = newGlobalVariables.blockNumber.toNumber();
|
|
300
299
|
const slot = newGlobalVariables.slotNumber.toBigInt();
|
|
301
300
|
this.log.debug(`Requesting L1 to L2 messages from contract for block ${blockNumber}`);
|
|
302
|
-
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
|
|
301
|
+
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(blockNumber));
|
|
303
302
|
const msgCount = l1ToL2Messages.length;
|
|
304
303
|
this.log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
|
|
305
304
|
slot,
|
|
@@ -308,16 +307,17 @@ let Sequencer = (() => {
|
|
|
308
307
|
validator: opts.validateOnly,
|
|
309
308
|
});
|
|
310
309
|
// Sync to the previous block at least
|
|
311
|
-
await this.worldState.syncImmediate(
|
|
312
|
-
this.log.debug(`Synced to previous block ${
|
|
310
|
+
await this.worldState.syncImmediate(blockNumber - 1);
|
|
311
|
+
this.log.debug(`Synced to previous block ${blockNumber - 1}`);
|
|
313
312
|
// NB: separating the dbs because both should update the state
|
|
314
313
|
const publicProcessorFork = await this.worldState.fork();
|
|
315
314
|
const orchestratorFork = await this.worldState.fork();
|
|
315
|
+
const previousBlockHeader = (await this.l2BlockSource.getBlock(blockNumber - 1))?.header ?? orchestratorFork.getInitialHeader();
|
|
316
316
|
try {
|
|
317
|
-
const processor = this.publicProcessorFactory.create(publicProcessorFork,
|
|
317
|
+
const processor = this.publicProcessorFactory.create(publicProcessorFork, newGlobalVariables, true);
|
|
318
318
|
const blockBuildingTimer = new Timer();
|
|
319
319
|
const blockBuilder = this.blockBuilderFactory.create(orchestratorFork);
|
|
320
|
-
await blockBuilder.startNewBlock(newGlobalVariables, l1ToL2Messages);
|
|
320
|
+
await blockBuilder.startNewBlock(newGlobalVariables, l1ToL2Messages, previousBlockHeader);
|
|
321
321
|
// Deadline for processing depends on whether we're proposing a block
|
|
322
322
|
const secondsIntoSlot = this.getSecondsIntoSlot(slot);
|
|
323
323
|
const processingEndTimeWithinSlot = opts.validateOnly
|
|
@@ -399,9 +399,8 @@ let Sequencer = (() => {
|
|
|
399
399
|
*
|
|
400
400
|
* @param pendingTxs - Iterable of pending transactions to construct the block from
|
|
401
401
|
* @param proposalHeader - The partial header constructed for the proposal
|
|
402
|
-
* @param historicalHeader - The historical header of the parent
|
|
403
402
|
*/
|
|
404
|
-
async buildBlockAndAttemptToPublish(pendingTxs, proposalHeader
|
|
403
|
+
async buildBlockAndAttemptToPublish(pendingTxs, proposalHeader) {
|
|
405
404
|
await this.publisher.validateBlockForSubmission(proposalHeader);
|
|
406
405
|
const newGlobalVariables = proposalHeader.globalVariables;
|
|
407
406
|
const blockNumber = newGlobalVariables.blockNumber.toNumber();
|
|
@@ -412,7 +411,7 @@ let Sequencer = (() => {
|
|
|
412
411
|
// Start collecting proof quotes for the previous epoch if needed in the background
|
|
413
412
|
const proofQuotePromise = this.createProofClaimForPreviousEpoch(slot);
|
|
414
413
|
try {
|
|
415
|
-
const buildBlockRes = await this.buildBlock(pendingTxs, newGlobalVariables
|
|
414
|
+
const buildBlockRes = await this.buildBlock(pendingTxs, newGlobalVariables);
|
|
416
415
|
const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer } = buildBlockRes;
|
|
417
416
|
// TODO(@PhilWindle) We should probably periodically check for things like another
|
|
418
417
|
// block being published before ours instead of just waiting on our block
|
|
@@ -492,8 +491,8 @@ let Sequencer = (() => {
|
|
|
492
491
|
this.log.debug('Creating block proposal for validators');
|
|
493
492
|
const proposal = await this.validatorClient.createBlockProposal(block.header, block.archive.root, txHashes);
|
|
494
493
|
if (!proposal) {
|
|
495
|
-
|
|
496
|
-
|
|
494
|
+
const msg = `Failed to create block proposal`;
|
|
495
|
+
throw new Error(msg);
|
|
497
496
|
}
|
|
498
497
|
this.log.debug('Broadcasting block proposal to validators');
|
|
499
498
|
this.validatorClient.broadcastBlockProposal(proposal);
|
|
@@ -628,7 +627,7 @@ let Sequencer = (() => {
|
|
|
628
627
|
(() => {
|
|
629
628
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
|
|
630
629
|
_work_decorators = [trackSpan('Sequencer.work')];
|
|
631
|
-
_buildBlockAndAttemptToPublish_decorators = [trackSpan('Sequencer.buildBlockAndAttemptToPublish', (_validTxs, proposalHeader
|
|
630
|
+
_buildBlockAndAttemptToPublish_decorators = [trackSpan('Sequencer.buildBlockAndAttemptToPublish', (_validTxs, proposalHeader) => ({
|
|
632
631
|
[Attributes.BLOCK_NUMBER]: proposalHeader.globalVariables.blockNumber.toNumber(),
|
|
633
632
|
}))];
|
|
634
633
|
_collectAttestations_decorators = [trackSpan('Sequencer.collectAttestations', (block, txHashes) => ({
|
|
@@ -650,4 +649,4 @@ let Sequencer = (() => {
|
|
|
650
649
|
_a;
|
|
651
650
|
})();
|
|
652
651
|
export { Sequencer };
|
|
653
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
|
|
652
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Tx, type TxValidationResult, type TxValidator } from '@aztec/circuit-types';
|
|
2
|
-
import { type AztecAddress,
|
|
2
|
+
import { type AztecAddress, Fr, type GasFees } from '@aztec/circuits.js';
|
|
3
3
|
/** Provides a view into public contract state */
|
|
4
4
|
export interface PublicStateSource {
|
|
5
5
|
storageRead: (contractAddress: AztecAddress, slot: Fr) => Promise<Fr>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gas_validator.d.ts","sourceRoot":"","sources":["../../src/tx_validator/gas_validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAoB,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5G,OAAO,EAAE,KAAK,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"gas_validator.d.ts","sourceRoot":"","sources":["../../src/tx_validator/gas_validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAoB,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5G,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAoB,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAK3F,iDAAiD;AACjD,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;CACvE;AAED,qBAAa,cAAe,YAAW,WAAW,CAAC,EAAE,CAAC;;gBAQlD,gBAAgB,EAAE,iBAAiB,EACnC,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,OAAO;IAQlB,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA8EhD"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
var _GasTxValidator_instances, _GasTxValidator_log, _GasTxValidator_publicDataSource, _GasTxValidator_feeJuiceAddress, _GasTxValidator_enforceFees, _GasTxValidator_gasFees, _GasTxValidator_shouldSkip, _GasTxValidator_validateTxFee;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import { TxExecutionPhase } from '@aztec/circuit-types';
|
|
4
|
-
import { FunctionSelector } from '@aztec/circuits.js';
|
|
4
|
+
import { Fr, FunctionSelector } from '@aztec/circuits.js';
|
|
5
|
+
import { U128 } from '@aztec/foundation/abi';
|
|
5
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
7
|
import { computeFeePayerBalanceStorageSlot, getExecutionRequestsByPhase } from '@aztec/simulator/server';
|
|
7
8
|
export class GasTxValidator {
|
|
@@ -56,10 +57,13 @@ _GasTxValidator_log = new WeakMap(), _GasTxValidator_publicDataSource = new Weak
|
|
|
56
57
|
fn.callContext.msgSender.equals(__classPrivateFieldGet(this, _GasTxValidator_feeJuiceAddress, "f")) &&
|
|
57
58
|
fn.args.length > 2 &&
|
|
58
59
|
// Public functions get routed through the dispatch function, whose first argument is the target function selector.
|
|
59
|
-
fn.args[0].equals(FunctionSelector.fromSignature('_increase_public_balance((Field),Field)').toField()) &&
|
|
60
|
+
fn.args[0].equals(FunctionSelector.fromSignature('_increase_public_balance((Field),(Field,Field))').toField()) &&
|
|
60
61
|
fn.args[1].equals(feePayer.toField()) &&
|
|
61
62
|
!fn.callContext.isStaticCall);
|
|
62
|
-
|
|
63
|
+
// `amount` in the claim function call arguments occupies 2 fields as it is represented as U128.
|
|
64
|
+
const balance = claimFunctionCall
|
|
65
|
+
? initialBalance.add(new Fr(U128.fromFields(claimFunctionCall.args.slice(2, 4)).toInteger()))
|
|
66
|
+
: initialBalance;
|
|
63
67
|
if (balance.lt(feeLimit)) {
|
|
64
68
|
__classPrivateFieldGet(this, _GasTxValidator_log, "f").warn(`Rejecting transaction due to not enough fee payer balance`, {
|
|
65
69
|
feePayer,
|
|
@@ -70,4 +74,4 @@ _GasTxValidator_log = new WeakMap(), _GasTxValidator_publicDataSource = new Weak
|
|
|
70
74
|
}
|
|
71
75
|
return { result: 'valid' };
|
|
72
76
|
};
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzX3ZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eF92YWxpZGF0b3IvZ2FzX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFBVyxnQkFBZ0IsRUFBNkMsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RyxPQUFPLEVBQXFCLEVBQUUsRUFBRSxnQkFBZ0IsRUFBZ0IsTUFBTSxvQkFBb0IsQ0FBQztBQUMzRixPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0MsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBT3pHLE1BQU0sT0FBTyxjQUFjO0lBT3pCLFlBQ0UsZ0JBQW1DLEVBQ25DLGVBQTZCLEVBQzdCLFdBQW9CLEVBQ3BCLE9BQWdCOztRQVZsQiw4QkFBTyxZQUFZLENBQUMsK0JBQStCLENBQUMsRUFBQztRQUNyRCxtREFBcUM7UUFDckMsa0RBQStCO1FBQy9CLDhDQUFzQjtRQUN0QiwwQ0FBa0I7UUFRaEIsdUJBQUEsSUFBSSxvQ0FBcUIsZ0JBQWdCLE1BQUEsQ0FBQztRQUMxQyx1QkFBQSxJQUFJLG1DQUFvQixlQUFlLE1BQUEsQ0FBQztRQUN4Qyx1QkFBQSxJQUFJLCtCQUFnQixXQUFXLE1BQUEsQ0FBQztRQUNoQyx1QkFBQSxJQUFJLDJCQUFZLE9BQU8sTUFBQSxDQUFDO0lBQzFCLENBQUM7SUFFRCxVQUFVLENBQUMsRUFBTTtRQUNmLElBQUksdUJBQUEsSUFBSSw2REFBWSxNQUFoQixJQUFJLEVBQWEsRUFBRSxDQUFDLEVBQUUsQ0FBQztZQUN6QixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDLDBCQUEwQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3RG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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/sequencer-client",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.72.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -28,31 +28,31 @@
|
|
|
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.72.1",
|
|
32
|
+
"@aztec/bb-prover": "0.72.1",
|
|
33
|
+
"@aztec/blob-sink": "0.72.1",
|
|
34
|
+
"@aztec/circuit-types": "0.72.1",
|
|
35
|
+
"@aztec/circuits.js": "0.72.1",
|
|
36
|
+
"@aztec/ethereum": "0.72.1",
|
|
37
|
+
"@aztec/foundation": "0.72.1",
|
|
38
|
+
"@aztec/l1-artifacts": "0.72.1",
|
|
39
|
+
"@aztec/merkle-tree": "0.72.1",
|
|
40
|
+
"@aztec/noir-contracts.js": "0.72.1",
|
|
41
|
+
"@aztec/noir-protocol-circuits-types": "0.72.1",
|
|
42
|
+
"@aztec/p2p": "0.72.1",
|
|
43
|
+
"@aztec/protocol-contracts": "0.72.1",
|
|
44
|
+
"@aztec/prover-client": "0.72.1",
|
|
45
|
+
"@aztec/simulator": "0.72.1",
|
|
46
|
+
"@aztec/telemetry-client": "0.72.1",
|
|
47
|
+
"@aztec/types": "0.72.1",
|
|
48
|
+
"@aztec/validator-client": "0.72.1",
|
|
49
|
+
"@aztec/world-state": "0.72.1",
|
|
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",
|
|
53
53
|
"lodash.pick": "^4.4.0",
|
|
54
54
|
"tslib": "^2.4.0",
|
|
55
|
-
"viem": "
|
|
55
|
+
"viem": "2.22.8"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@aztec/archiver": "workspace:^",
|