@aztec/sequencer-client 0.67.1-devnet → 0.68.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.
@@ -40,6 +40,7 @@ let Sequencer = (() => {
40
40
  let _buildBlockAndAttemptToPublish_decorators;
41
41
  let _collectAttestations_decorators;
42
42
  let _publishL2Block_decorators;
43
+ let _claimEpochProofRightIfAvailable_decorators;
43
44
  return _a = class Sequencer {
44
45
  constructor(publisher, validatorClient, // During migration the validator client can be inactive
45
46
  globalsBuilder, p2pClient, worldState, blockBuilderFactory, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, txValidatorFactory, l1GenesisTime, aztecSlotDuration, telemetry, config = {}, log = createLogger('sequencer')) {
@@ -211,6 +212,7 @@ let Sequencer = (() => {
211
212
  // Get txs to build the new block.
212
213
  const pendingTxs = await this.p2pClient.getPendingTxs();
213
214
  if (!this.shouldProposeBlock(historicalHeader, { pendingTxsCount: pendingTxs.length })) {
215
+ await this.claimEpochProofRightIfAvailable(slot);
214
216
  return;
215
217
  }
216
218
  // If I created a "partial" header here that should make our job much easier.
@@ -226,6 +228,7 @@ let Sequencer = (() => {
226
228
  this.log.verbose(`Collected ${validTxs.length} txs out of ${allValidTxs.length} valid txs out of ${pendingTxs.length} total pending txs for block ${newBlockNumber}`);
227
229
  // Bail if we don't have enough valid txs
228
230
  if (!this.shouldProposeBlock(historicalHeader, { validTxsCount: validTxs.length })) {
231
+ await this.claimEpochProofRightIfAvailable(slot);
229
232
  return;
230
233
  }
231
234
  try {
@@ -321,12 +324,12 @@ let Sequencer = (() => {
321
324
  const elapsedSinceLastBlock = currentTime - lastBlockTime;
322
325
  this.log.debug(`Last block mined at ${lastBlockTime} current time is ${currentTime} (elapsed ${elapsedSinceLastBlock})`);
323
326
  // We need to have at least minTxsPerBLock txs.
324
- if (args.pendingTxsCount != undefined && args.pendingTxsCount < this.minTxsPerBLock) {
327
+ if (args.pendingTxsCount !== undefined && args.pendingTxsCount < this.minTxsPerBLock) {
325
328
  this.log.verbose(`Not creating block because not enough txs in the pool (got ${args.pendingTxsCount} min ${this.minTxsPerBLock})`);
326
329
  return false;
327
330
  }
328
331
  // Bail if we don't have enough valid txs
329
- if (args.validTxsCount != undefined && args.validTxsCount < this.minTxsPerBLock) {
332
+ if (args.validTxsCount !== undefined && args.validTxsCount < this.minTxsPerBLock) {
330
333
  this.log.verbose(`Not creating block because not enough valid txs loaded from the pool (got ${args.validTxsCount} min ${this.minTxsPerBLock})`);
331
334
  return false;
332
335
  }
@@ -370,7 +373,7 @@ let Sequencer = (() => {
370
373
  const publicProcessorFork = await this.worldState.fork();
371
374
  const orchestratorFork = await this.worldState.fork();
372
375
  try {
373
- const processor = this.publicProcessorFactory.create(publicProcessorFork, historicalHeader, newGlobalVariables);
376
+ const processor = this.publicProcessorFactory.create(publicProcessorFork, historicalHeader, newGlobalVariables, true);
374
377
  const blockBuildingTimer = new Timer();
375
378
  const blockBuilder = this.blockBuilderFactory.create(orchestratorFork);
376
379
  await blockBuilder.startNewBlock(newGlobalVariables, l1ToL2Messages);
@@ -380,7 +383,11 @@ let Sequencer = (() => {
380
383
  this.log.verbose(`Dropping failed txs ${Tx.getHashes(failedTxData).join(', ')}`);
381
384
  await this.p2pClient.deleteTxs(Tx.getHashes(failedTxData));
382
385
  }
386
+ const start = process.hrtime.bigint();
383
387
  await blockBuilder.addTxs(processedTxs);
388
+ const end = process.hrtime.bigint();
389
+ const duration = Number(end - start) / 1000;
390
+ this.metrics.recordBlockBuilderTreeInsertions(duration);
384
391
  await interrupt?.(processedTxs);
385
392
  // All real transactions have been added, set the block as full and complete the proving.
386
393
  const block = await blockBuilder.setBlockCompleted();
@@ -525,7 +532,7 @@ let Sequencer = (() => {
525
532
  // Find out which epoch we are currently in
526
533
  const epochToProve = await this.publisher.getClaimableEpoch();
527
534
  if (epochToProve === undefined) {
528
- this.log.debug(`No epoch to prove`);
535
+ this.log.trace(`No epoch to prove at slot ${slotNumber}`);
529
536
  return undefined;
530
537
  }
531
538
  // Get quotes for the epoch to be proven
@@ -536,7 +543,10 @@ let Sequencer = (() => {
536
543
  quotes: quotes.map(q => q.payload),
537
544
  });
538
545
  // ensure these quotes are still valid for the slot and have the contract validate them
539
- const validQuotesPromise = Promise.all(quotes.filter(x => x.payload.validUntilSlot >= slotNumber).map(x => this.publisher.validateProofQuote(x)));
546
+ const validQuotesPromise = Promise.all(quotes
547
+ .filter(x => x.payload.validUntilSlot >= slotNumber)
548
+ .filter(x => x.payload.epochToProve === epochToProve)
549
+ .map(x => this.publisher.validateProofQuote(x)));
540
550
  const validQuotes = (await validQuotesPromise).filter((q) => !!q);
541
551
  if (!validQuotes.length) {
542
552
  this.log.warn(`Failed to find any valid proof quotes`);
@@ -545,7 +555,7 @@ let Sequencer = (() => {
545
555
  // pick the quote with the lowest fee
546
556
  const sortedQuotes = validQuotes.sort((a, b) => a.payload.basisPointFee - b.payload.basisPointFee);
547
557
  const quote = sortedQuotes[0];
548
- this.log.info(`Selected proof quote for proof claim`, quote.payload);
558
+ this.log.info(`Selected proof quote for proof claim`, { quote: quote.toInspect() });
549
559
  return quote;
550
560
  }
551
561
  catch (err) {
@@ -588,6 +598,21 @@ let Sequencer = (() => {
588
598
  }
589
599
  return toReturn;
590
600
  }
601
+ async claimEpochProofRightIfAvailable(slotNumber) {
602
+ const proofQuote = await this.createProofClaimForPreviousEpoch(slotNumber);
603
+ if (proofQuote === undefined) {
604
+ return;
605
+ }
606
+ const epoch = proofQuote.payload.epochToProve;
607
+ const ctx = { slotNumber, epoch, quote: proofQuote.toInspect() };
608
+ this.log.verbose(`Claiming proof right for epoch ${epoch}`, ctx);
609
+ const success = await this.publisher.claimEpochProofRight(proofQuote);
610
+ if (!success) {
611
+ throw new Error(`Failed to claim proof right for epoch ${epoch}`);
612
+ }
613
+ this.log.info(`Claimed proof right for epoch ${epoch}`, ctx);
614
+ return epoch;
615
+ }
591
616
  /**
592
617
  * Returns whether all dependencies have caught up.
593
618
  * We don't check against the previous block submitted since it may have been reorg'd out.
@@ -643,10 +668,12 @@ let Sequencer = (() => {
643
668
  _publishL2Block_decorators = [trackSpan('Sequencer.publishL2Block', block => ({
644
669
  [Attributes.BLOCK_NUMBER]: block.number,
645
670
  }))];
671
+ _claimEpochProofRightIfAvailable_decorators = [trackSpan('Sequencer.claimEpochProofRightIfAvailable', slotNumber => ({ [Attributes.SLOT_NUMBER]: Number(slotNumber) }), epoch => ({ [Attributes.EPOCH_NUMBER]: Number(epoch) }))];
646
672
  __esDecorate(_a, null, _work_decorators, { kind: "method", name: "work", static: false, private: false, access: { has: obj => "work" in obj, get: obj => obj.work }, metadata: _metadata }, null, _instanceExtraInitializers);
647
673
  __esDecorate(_a, null, _buildBlockAndAttemptToPublish_decorators, { kind: "method", name: "buildBlockAndAttemptToPublish", static: false, private: false, access: { has: obj => "buildBlockAndAttemptToPublish" in obj, get: obj => obj.buildBlockAndAttemptToPublish }, metadata: _metadata }, null, _instanceExtraInitializers);
648
674
  __esDecorate(_a, null, _collectAttestations_decorators, { kind: "method", name: "collectAttestations", static: false, private: false, access: { has: obj => "collectAttestations" in obj, get: obj => obj.collectAttestations }, metadata: _metadata }, null, _instanceExtraInitializers);
649
675
  __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);
676
+ __esDecorate(_a, null, _claimEpochProofRightIfAvailable_decorators, { kind: "method", name: "claimEpochProofRightIfAvailable", static: false, private: false, access: { has: obj => "claimEpochProofRightIfAvailable" in obj, get: obj => obj.claimEpochProofRightIfAvailable }, metadata: _metadata }, null, _instanceExtraInitializers);
650
677
  if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
651
678
  })(),
652
679
  _a;
@@ -655,4 +682,4 @@ export { Sequencer };
655
682
  /**
656
683
  * State of the sequencer.
657
684
  */
658
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
685
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/sequencer-client",
3
- "version": "0.67.1-devnet",
3
+ "version": "0.68.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -22,29 +22,29 @@
22
22
  "clean": "rm -rf ./dest .tsbuildinfo",
23
23
  "formatting": "run -T prettier --check ./src && run -T eslint ./src",
24
24
  "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
25
- "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests",
25
+ "test": "HARDWARE_CONCURRENCY=16 RAYON_NUM_THREADS=4 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=8",
26
26
  "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"",
27
27
  "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
28
28
  },
29
29
  "dependencies": {
30
- "@aztec/aztec.js": "0.67.1-devnet",
31
- "@aztec/bb-prover": "0.67.1-devnet",
32
- "@aztec/circuit-types": "0.67.1-devnet",
33
- "@aztec/circuits.js": "0.67.1-devnet",
34
- "@aztec/ethereum": "0.67.1-devnet",
35
- "@aztec/foundation": "0.67.1-devnet",
36
- "@aztec/l1-artifacts": "0.67.1-devnet",
37
- "@aztec/merkle-tree": "0.67.1-devnet",
38
- "@aztec/noir-contracts.js": "0.67.1-devnet",
39
- "@aztec/noir-protocol-circuits-types": "0.67.1-devnet",
40
- "@aztec/p2p": "0.67.1-devnet",
41
- "@aztec/protocol-contracts": "0.67.1-devnet",
42
- "@aztec/prover-client": "0.67.1-devnet",
43
- "@aztec/simulator": "0.67.1-devnet",
44
- "@aztec/telemetry-client": "0.67.1-devnet",
45
- "@aztec/types": "0.67.1-devnet",
46
- "@aztec/validator-client": "0.67.1-devnet",
47
- "@aztec/world-state": "0.67.1-devnet",
30
+ "@aztec/aztec.js": "0.68.0",
31
+ "@aztec/bb-prover": "0.68.0",
32
+ "@aztec/circuit-types": "0.68.0",
33
+ "@aztec/circuits.js": "0.68.0",
34
+ "@aztec/ethereum": "0.68.0",
35
+ "@aztec/foundation": "0.68.0",
36
+ "@aztec/l1-artifacts": "0.68.0",
37
+ "@aztec/merkle-tree": "0.68.0",
38
+ "@aztec/noir-contracts.js": "0.68.0",
39
+ "@aztec/noir-protocol-circuits-types": "0.68.0",
40
+ "@aztec/p2p": "0.68.0",
41
+ "@aztec/protocol-contracts": "0.68.0",
42
+ "@aztec/prover-client": "0.68.0",
43
+ "@aztec/simulator": "0.68.0",
44
+ "@aztec/telemetry-client": "0.68.0",
45
+ "@aztec/types": "0.68.0",
46
+ "@aztec/validator-client": "0.68.0",
47
+ "@aztec/world-state": "0.68.0",
48
48
  "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
49
49
  "@noir-lang/types": "portal:../../noir/packages/types",
50
50
  "lodash.chunk": "^4.2.0",
@@ -107,9 +107,9 @@
107
107
  "rootDir": "./src",
108
108
  "reporters": [
109
109
  [
110
- "default",
110
+ "jest-silent-reporter",
111
111
  {
112
- "summaryThreshold": 9999
112
+ "useDots": true
113
113
  }
114
114
  ]
115
115
  ],
@@ -1,4 +1,4 @@
1
- import type { L1PublishBlockStats, L1PublishProofStats } from '@aztec/circuit-types/stats';
1
+ import type { L1PublishBlockStats, L1PublishProofStats, L1PublishStats } from '@aztec/circuit-types/stats';
2
2
  import {
3
3
  Attributes,
4
4
  type Histogram,
@@ -10,7 +10,7 @@ import {
10
10
 
11
11
  import { formatEther } from 'viem/utils';
12
12
 
13
- export type L1TxType = 'submitProof' | 'process';
13
+ export type L1TxType = 'submitProof' | 'process' | 'claimEpochProofRight';
14
14
 
15
15
  export class L1PublisherMetrics {
16
16
  private gasPrice: Histogram;
@@ -20,6 +20,8 @@ export class L1PublisherMetrics {
20
20
  private txGas: Histogram;
21
21
  private txCalldataSize: Histogram;
22
22
  private txCalldataGas: Histogram;
23
+ private txBlobDataGasUsed: Histogram;
24
+ private txBlobDataGasCost: Histogram;
23
25
 
24
26
  constructor(client: TelemetryClient, name = 'L1Publisher') {
25
27
  const meter = client.getMeter(name);
@@ -57,6 +59,18 @@ export class L1PublisherMetrics {
57
59
  unit: 'gas',
58
60
  valueType: ValueType.INT,
59
61
  });
62
+
63
+ this.txBlobDataGasUsed = meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_USED, {
64
+ description: 'The amount of blob gas used in transactions',
65
+ unit: 'gas',
66
+ valueType: ValueType.INT,
67
+ });
68
+
69
+ this.txBlobDataGasCost = meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_COST, {
70
+ description: 'The gas cost of blobs in transactions',
71
+ unit: 'gwei',
72
+ valueType: ValueType.INT,
73
+ });
60
74
  }
61
75
 
62
76
  recordFailedTx(txType: L1TxType) {
@@ -74,7 +88,11 @@ export class L1PublisherMetrics {
74
88
  this.recordTx('process', durationMs, stats);
75
89
  }
76
90
 
77
- private recordTx(txType: L1TxType, durationMs: number, stats: Omit<L1PublishProofStats, 'eventName'>) {
91
+ recordClaimEpochProofRightTx(durationMs: number, stats: L1PublishStats) {
92
+ this.recordTx('claimEpochProofRight', durationMs, stats);
93
+ }
94
+
95
+ private recordTx(txType: L1TxType, durationMs: number, stats: L1PublishStats) {
78
96
  const attributes = {
79
97
  [Attributes.L1_TX_TYPE]: txType,
80
98
  [Attributes.L1_SENDER]: stats.sender,
@@ -94,6 +112,9 @@ export class L1PublisherMetrics {
94
112
  this.txCalldataGas.record(stats.calldataGas, attributes);
95
113
  this.txCalldataSize.record(stats.calldataSize, attributes);
96
114
 
115
+ this.txBlobDataGasCost.record(Number(stats.blobDataGas), attributes);
116
+ this.txBlobDataGasUsed.record(Number(stats.blobGasUsed), attributes);
117
+
97
118
  try {
98
119
  this.gasPrice.record(parseInt(formatEther(stats.gasPrice, 'gwei'), 10));
99
120
  } catch (e) {
@@ -7,16 +7,15 @@ import {
7
7
  type TxHash,
8
8
  getHashedSignaturePayload,
9
9
  } from '@aztec/circuit-types';
10
- import { type L1PublishBlockStats, type L1PublishProofStats } from '@aztec/circuit-types/stats';
10
+ import { type L1PublishBlockStats, type L1PublishProofStats, type L1PublishStats } from '@aztec/circuit-types/stats';
11
11
  import {
12
12
  AGGREGATION_OBJECT_LENGTH,
13
13
  AZTEC_MAX_EPOCH_DURATION,
14
14
  type BlockHeader,
15
15
  EthAddress,
16
- type FeeRecipient,
17
16
  type Proof,
18
- type RootRollupPublicInputs,
19
17
  } from '@aztec/circuits.js';
18
+ import { type FeeRecipient, type RootRollupPublicInputs } from '@aztec/circuits.js/rollup';
20
19
  import {
21
20
  type EthereumChain,
22
21
  type L1ContractsConfig,
@@ -38,7 +37,6 @@ import { ExtRollupLibAbi, GovernanceProposerAbi, LeonidasLibAbi, RollupAbi } fro
38
37
  import { type TelemetryClient } from '@aztec/telemetry-client';
39
38
 
40
39
  import pick from 'lodash.pick';
41
- import { inspect } from 'util';
42
40
  import {
43
41
  type BaseError,
44
42
  type Chain,
@@ -71,7 +69,7 @@ import { privateKeyToAccount } from 'viem/accounts';
71
69
 
72
70
  import { type PublisherConfig, type TxSenderConfig } from './config.js';
73
71
  import { L1PublisherMetrics } from './l1-publisher-metrics.js';
74
- import { prettyLogViemError, prettyLogViemErrorMsg } from './utils.js';
72
+ import { prettyLogViemErrorMsg } from './utils.js';
75
73
 
76
74
  /**
77
75
  * Stats for a sent transaction.
@@ -581,6 +579,8 @@ export class L1Publisher {
581
579
  const stats: L1PublishBlockStats = {
582
580
  gasPrice: receipt.effectiveGasPrice,
583
581
  gasUsed: receipt.gasUsed,
582
+ blobGasUsed: receipt.blobGasUsed ?? 0n,
583
+ blobDataGas: receipt.blobGasPrice ?? 0n,
584
584
  transactionHash: receipt.transactionHash,
585
585
  ...pick(tx!, 'calldataGas', 'calldataSize', 'sender'),
586
586
  ...block.getStats(),
@@ -615,6 +615,55 @@ export class L1Publisher {
615
615
  return false;
616
616
  }
617
617
 
618
+ /** Calls claimEpochProofRight in the Rollup contract to submit a chosen prover quote for the previous epoch. */
619
+ public async claimEpochProofRight(proofQuote: EpochProofQuote) {
620
+ const timer = new Timer();
621
+
622
+ let receipt;
623
+ try {
624
+ this.log.debug(`Submitting claimEpochProofRight transaction`);
625
+ receipt = await this.l1TxUtils.sendAndMonitorTransaction({
626
+ to: this.rollupContract.address,
627
+ data: encodeFunctionData({
628
+ abi: RollupAbi,
629
+ functionName: 'claimEpochProofRight',
630
+ args: [proofQuote.toViemArgs()],
631
+ }),
632
+ });
633
+ } catch (err) {
634
+ this.log.error(`Failed to claim epoch proof right: ${prettyLogViemErrorMsg(err)}`, err, {
635
+ proofQuote: proofQuote.toInspect(),
636
+ });
637
+ return false;
638
+ }
639
+
640
+ if (receipt.status === 'success') {
641
+ const tx = await this.getTransactionStats(receipt.transactionHash);
642
+ const stats: L1PublishStats = {
643
+ gasPrice: receipt.effectiveGasPrice,
644
+ gasUsed: receipt.gasUsed,
645
+ transactionHash: receipt.transactionHash,
646
+ blobDataGas: 0n,
647
+ blobGasUsed: 0n,
648
+ ...pick(tx!, 'calldataGas', 'calldataSize', 'sender'),
649
+ };
650
+ this.log.verbose(`Submitted claim epoch proof right to L1 rollup contract`, {
651
+ ...stats,
652
+ ...proofQuote.toInspect(),
653
+ });
654
+ this.metrics.recordClaimEpochProofRightTx(timer.ms(), stats);
655
+ return true;
656
+ } else {
657
+ this.metrics.recordFailedTx('claimEpochProofRight');
658
+ // TODO: Get the error message from the reverted tx
659
+ this.log.error(`Claim epoch proof right tx reverted`, {
660
+ txHash: receipt.transactionHash,
661
+ ...proofQuote.toInspect(),
662
+ });
663
+ return false;
664
+ }
665
+ }
666
+
618
667
  private async tryGetErrorFromRevertedTx(
619
668
  data: Hex,
620
669
  args: {
@@ -712,6 +761,8 @@ export class L1Publisher {
712
761
  const stats: L1PublishProofStats = {
713
762
  ...pick(receipt, 'gasPrice', 'gasUsed', 'transactionHash'),
714
763
  ...pick(tx!, 'calldataGas', 'calldataSize', 'sender'),
764
+ blobDataGas: 0n,
765
+ blobGasUsed: 0n,
715
766
  eventName: 'proof-published-to-l1',
716
767
  };
717
768
  this.log.info(`Published epoch proof to L1 rollup contract`, { ...stats, ...ctx });
@@ -958,8 +1009,7 @@ export class L1Publisher {
958
1009
  data,
959
1010
  };
960
1011
  } catch (err) {
961
- prettyLogViemError(err, this.log);
962
- this.log.error(`Rollup publish failed`, err);
1012
+ this.log.error(`Rollup publish failed: ${prettyLogViemErrorMsg(err)}`, err);
963
1013
  return undefined;
964
1014
  }
965
1015
  }
@@ -972,9 +1022,6 @@ export class L1Publisher {
972
1022
  return undefined;
973
1023
  }
974
1024
  try {
975
- this.log.info(`ProposeAndClaim`);
976
- this.log.info(inspect(quote.payload));
977
-
978
1025
  const kzg = Blob.getViemKzgInstance();
979
1026
  const { args, gas } = await this.prepareProposeTx(encodedData);
980
1027
  const data = encodeFunctionData({
@@ -1002,9 +1049,7 @@ export class L1Publisher {
1002
1049
  data,
1003
1050
  };
1004
1051
  } catch (err) {
1005
- prettyLogViemError(err, this.log);
1006
- const errorMessage = err instanceof Error ? err.message : String(err);
1007
- this.log.error(`Rollup publish failed`, errorMessage);
1052
+ this.log.error(`Rollup publish failed: ${prettyLogViemErrorMsg(err)}`, err);
1008
1053
  return undefined;
1009
1054
  }
1010
1055
  }
@@ -1,5 +1,3 @@
1
- import { type Logger } from '@aztec/foundation/log';
2
-
3
1
  import { BaseError, ContractFunctionRevertedError } from 'viem';
4
2
 
5
3
  export function prettyLogViemErrorMsg(err: any) {
@@ -12,12 +10,5 @@ export function prettyLogViemErrorMsg(err: any) {
12
10
  return `${errorName}${args}`;
13
11
  }
14
12
  }
15
- }
16
-
17
- // TODO(palla/log): Review this method
18
- export function prettyLogViemError(err: any, logger: Logger) {
19
- const msg = prettyLogViemErrorMsg(err);
20
- if (msg) {
21
- logger.debug(`canProposeAtTime failed with "${msg}"`);
22
- }
13
+ return err?.message ?? err;
23
14
  }
@@ -19,6 +19,7 @@ export class SequencerMetrics {
19
19
  private stateTransitionBufferDuration: Histogram;
20
20
  private currentBlockNumber: Gauge;
21
21
  private currentBlockSize: Gauge;
22
+ private blockBuilderInsertions: Histogram;
22
23
 
23
24
  private timeToCollectAttestations: Gauge;
24
25
 
@@ -49,14 +50,23 @@ export class SequencerMetrics {
49
50
 
50
51
  this.currentBlockNumber = meter.createGauge(Metrics.SEQUENCER_CURRENT_BLOCK_NUMBER, {
51
52
  description: 'Current block number',
53
+ valueType: ValueType.INT,
52
54
  });
53
55
 
54
56
  this.currentBlockSize = meter.createGauge(Metrics.SEQUENCER_CURRENT_BLOCK_SIZE, {
55
- description: 'Current block number',
57
+ description: 'Current block size',
58
+ valueType: ValueType.INT,
56
59
  });
57
60
 
58
61
  this.timeToCollectAttestations = meter.createGauge(Metrics.SEQUENCER_TIME_TO_COLLECT_ATTESTATIONS, {
59
62
  description: 'The time spent collecting attestations from committee members',
63
+ valueType: ValueType.INT,
64
+ });
65
+
66
+ this.blockBuilderInsertions = meter.createHistogram(Metrics.SEQUENCER_BLOCK_BUILD_INSERTION_TIME, {
67
+ description: 'Timer for tree insertions performed by the block builder',
68
+ unit: 'us',
69
+ valueType: ValueType.INT,
60
70
  });
61
71
 
62
72
  this.setCurrentBlock(0, 0);
@@ -75,6 +85,10 @@ export class SequencerMetrics {
75
85
  this.timeToCollectAttestations.record(time);
76
86
  }
77
87
 
88
+ recordBlockBuilderTreeInsertions(timeUs: number) {
89
+ this.blockBuilderInsertions.record(Math.ceil(timeUs));
90
+ }
91
+
78
92
  recordCancelledBlock() {
79
93
  this.blockCounter.add(1, {
80
94
  [Attributes.STATUS]: 'cancelled',