@aztec/sequencer-client 0.0.1-commit.21ecf947b → 0.0.1-commit.2448fdb
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 +16 -7
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +56 -23
- package/dest/config.d.ts +25 -5
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +42 -20
- package/dest/global_variable_builder/global_builder.d.ts +14 -10
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +22 -21
- package/dest/global_variable_builder/index.d.ts +2 -2
- package/dest/global_variable_builder/index.d.ts.map +1 -1
- package/dest/publisher/config.d.ts +31 -17
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/config.js +101 -42
- package/dest/publisher/sequencer-publisher-factory.d.ts +11 -3
- package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher-factory.js +13 -2
- package/dest/publisher/sequencer-publisher.d.ts +22 -13
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +92 -52
- package/dest/sequencer/checkpoint_proposal_job.d.ts +4 -4
- package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_proposal_job.js +129 -75
- package/dest/sequencer/checkpoint_voter.d.ts +1 -2
- package/dest/sequencer/checkpoint_voter.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_voter.js +2 -5
- package/dest/sequencer/metrics.d.ts +13 -5
- package/dest/sequencer/metrics.d.ts.map +1 -1
- package/dest/sequencer/metrics.js +32 -10
- package/dest/sequencer/sequencer.d.ts +27 -13
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +41 -42
- package/dest/sequencer/timetable.d.ts +4 -3
- package/dest/sequencer/timetable.d.ts.map +1 -1
- package/dest/sequencer/timetable.js +6 -7
- package/dest/sequencer/types.d.ts +2 -2
- package/dest/sequencer/types.d.ts.map +1 -1
- package/dest/test/index.d.ts +3 -5
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.d.ts +7 -9
- package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.js +41 -30
- package/package.json +28 -28
- package/src/client/sequencer-client.ts +78 -21
- package/src/config.ts +52 -27
- package/src/global_variable_builder/global_builder.ts +23 -24
- package/src/global_variable_builder/index.ts +1 -1
- package/src/publisher/config.ts +112 -43
- package/src/publisher/sequencer-publisher-factory.ts +23 -6
- package/src/publisher/sequencer-publisher.ts +96 -66
- package/src/sequencer/checkpoint_proposal_job.ts +200 -106
- package/src/sequencer/checkpoint_voter.ts +1 -12
- package/src/sequencer/metrics.ts +39 -13
- package/src/sequencer/sequencer.ts +52 -48
- package/src/sequencer/timetable.ts +7 -7
- package/src/sequencer/types.ts +1 -1
- package/src/test/index.ts +2 -4
- package/src/test/mock_checkpoint_builder.ts +53 -48
|
@@ -379,15 +379,18 @@ import { FormattedViemError, formatViemError, mergeAbis, tryExtractEvent } from
|
|
|
379
379
|
import { sumBigint } from '@aztec/foundation/bigint';
|
|
380
380
|
import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
|
|
381
381
|
import { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
382
|
+
import { trimmedBytesLength } from '@aztec/foundation/buffer';
|
|
382
383
|
import { pick } from '@aztec/foundation/collection';
|
|
383
384
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
384
385
|
import { Signature } from '@aztec/foundation/eth-signature';
|
|
385
386
|
import { createLogger } from '@aztec/foundation/log';
|
|
387
|
+
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
386
388
|
import { bufferToHex } from '@aztec/foundation/string';
|
|
387
389
|
import { Timer } from '@aztec/foundation/timer';
|
|
388
390
|
import { EmpireBaseAbi, ErrorsAbi, RollupAbi } from '@aztec/l1-artifacts';
|
|
389
391
|
import { encodeSlashConsensusVotes } from '@aztec/slasher';
|
|
390
392
|
import { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
|
|
393
|
+
import { getLastL1SlotTimestampForL2Slot, getNextL1SlotTimestamp } from '@aztec/stdlib/epoch-helpers';
|
|
391
394
|
import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
|
|
392
395
|
import { encodeFunctionData, toHex } from 'viem';
|
|
393
396
|
import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
|
|
@@ -433,8 +436,11 @@ export class SequencerPublisher {
|
|
|
433
436
|
slashingLog;
|
|
434
437
|
lastActions;
|
|
435
438
|
isPayloadEmptyCache;
|
|
439
|
+
payloadProposedCache;
|
|
436
440
|
log;
|
|
437
441
|
ethereumSlotDuration;
|
|
442
|
+
aztecSlotDuration;
|
|
443
|
+
dateProvider;
|
|
438
444
|
blobClient;
|
|
439
445
|
/** Address to use for simulations in fisherman mode (actual proposer's address) */ proposerAddressForSimulation;
|
|
440
446
|
/** L1 fee analyzer for fisherman mode */ l1FeeAnalyzer;
|
|
@@ -457,9 +463,12 @@ export class SequencerPublisher {
|
|
|
457
463
|
this.slashingLog = createLogger('sequencer:publisher:slashing');
|
|
458
464
|
this.lastActions = {};
|
|
459
465
|
this.isPayloadEmptyCache = new Map();
|
|
466
|
+
this.payloadProposedCache = new Set();
|
|
460
467
|
this.requests = [];
|
|
461
468
|
this.log = deps.log ?? createLogger('sequencer:publisher');
|
|
462
469
|
this.ethereumSlotDuration = BigInt(config.ethereumSlotDuration);
|
|
470
|
+
this.aztecSlotDuration = BigInt(config.aztecSlotDuration);
|
|
471
|
+
this.dateProvider = deps.dateProvider;
|
|
463
472
|
this.epochCache = deps.epochCache;
|
|
464
473
|
this.lastActions = deps.lastActions;
|
|
465
474
|
this.blobClient = deps.blobClient;
|
|
@@ -599,8 +608,8 @@ export class SequencerPublisher {
|
|
|
599
608
|
// @note - we can only have one blob config per bundle
|
|
600
609
|
// find requests with gas and blob configs
|
|
601
610
|
// See https://github.com/AztecProtocol/aztec-packages/issues/11513
|
|
602
|
-
const gasConfigs =
|
|
603
|
-
const blobConfigs =
|
|
611
|
+
const gasConfigs = validRequests.filter((request)=>request.gasConfig).map((request)=>request.gasConfig);
|
|
612
|
+
const blobConfigs = validRequests.filter((request)=>request.blobConfig).map((request)=>request.blobConfig);
|
|
604
613
|
if (blobConfigs.length > 1) {
|
|
605
614
|
throw new Error('Multiple blob configs found');
|
|
606
615
|
}
|
|
@@ -662,7 +671,16 @@ export class SequencerPublisher {
|
|
|
662
671
|
} else {
|
|
663
672
|
this.log.verbose(`Published bundled transactions (${actionsListStr})`, {
|
|
664
673
|
result,
|
|
665
|
-
requests
|
|
674
|
+
requests: requests.map((r)=>({
|
|
675
|
+
...r,
|
|
676
|
+
// Avoid logging large blob data
|
|
677
|
+
blobConfig: r.blobConfig ? {
|
|
678
|
+
...r.blobConfig,
|
|
679
|
+
blobs: r.blobConfig.blobs.map((b)=>({
|
|
680
|
+
size: trimmedBytesLength(b)
|
|
681
|
+
}))
|
|
682
|
+
} : undefined
|
|
683
|
+
}))
|
|
666
684
|
});
|
|
667
685
|
const successfulActions = [];
|
|
668
686
|
const failedActions = [];
|
|
@@ -680,17 +698,20 @@ export class SequencerPublisher {
|
|
|
680
698
|
}
|
|
681
699
|
}
|
|
682
700
|
/**
|
|
683
|
-
* @notice Will call `
|
|
701
|
+
* @notice Will call `canProposeAt` to make sure that it is possible to propose
|
|
684
702
|
* @param tipArchive - The archive to check
|
|
685
703
|
* @returns The slot and block number if it is possible to propose, undefined otherwise
|
|
686
|
-
*/
|
|
704
|
+
*/ canProposeAt(tipArchive, msgSender, opts = {}) {
|
|
687
705
|
// TODO: #14291 - should loop through multiple keys to check if any of them can propose
|
|
688
706
|
const ignoredErrors = [
|
|
689
707
|
'SlotAlreadyInChain',
|
|
690
708
|
'InvalidProposer',
|
|
691
709
|
'InvalidArchive'
|
|
692
710
|
];
|
|
693
|
-
|
|
711
|
+
const pipelined = opts.pipelined ?? false;
|
|
712
|
+
const slotOffset = pipelined ? this.aztecSlotDuration : 0n;
|
|
713
|
+
const nextL1SlotTs = this.getNextL1SlotTimestamp() + slotOffset;
|
|
714
|
+
return this.rollupContract.canProposeAt(tipArchive.toBuffer(), msgSender.toString(), nextL1SlotTs, {
|
|
694
715
|
forcePendingCheckpointNumber: opts.forcePendingCheckpointNumber
|
|
695
716
|
}).catch((err)=>{
|
|
696
717
|
if (err instanceof FormattedViemError && ignoredErrors.find((e)=>err.message.includes(e))) {
|
|
@@ -722,7 +743,7 @@ export class SequencerPublisher {
|
|
|
722
743
|
header.blobsHash.toString(),
|
|
723
744
|
flags
|
|
724
745
|
];
|
|
725
|
-
const ts =
|
|
746
|
+
const ts = this.getSimulationTimestamp(header.slotNumber);
|
|
726
747
|
const stateOverrides = await this.rollupContract.makePendingCheckpointNumberOverride(opts?.forcePendingCheckpointNumber);
|
|
727
748
|
let balance = 0n;
|
|
728
749
|
if (this.config.fishermanMode) {
|
|
@@ -745,7 +766,7 @@ export class SequencerPublisher {
|
|
|
745
766
|
}),
|
|
746
767
|
from: MULTI_CALL_3_ADDRESS
|
|
747
768
|
}, {
|
|
748
|
-
time: ts
|
|
769
|
+
time: ts
|
|
749
770
|
}, stateOverrides);
|
|
750
771
|
this.log.debug(`Simulated validateHeader`);
|
|
751
772
|
}
|
|
@@ -843,23 +864,8 @@ export class SequencerPublisher {
|
|
|
843
864
|
}
|
|
844
865
|
}
|
|
845
866
|
/** Simulates `propose` to make sure that the checkpoint is valid for submission */ async validateCheckpointForSubmission(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, options) {
|
|
846
|
-
const ts = BigInt((await this.l1TxUtils.getBlock()).timestamp + this.ethereumSlotDuration);
|
|
847
|
-
// TODO(palla/mbps): This should not be needed, there's no flow where we propose with zero attestations. Or is there?
|
|
848
|
-
// If we have no attestations, we still need to provide the empty attestations
|
|
849
|
-
// so that the committee is recalculated correctly
|
|
850
|
-
// const ignoreSignatures = attestationsAndSigners.attestations.length === 0;
|
|
851
|
-
// if (ignoreSignatures) {
|
|
852
|
-
// const { committee } = await this.epochCache.getCommittee(block.header.globalVariables.slotNumber);
|
|
853
|
-
// if (!committee) {
|
|
854
|
-
// this.log.warn(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
|
|
855
|
-
// throw new Error(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
|
|
856
|
-
// }
|
|
857
|
-
// attestationsAndSigners.attestations = committee.map(committeeMember =>
|
|
858
|
-
// CommitteeAttestation.fromAddress(committeeMember),
|
|
859
|
-
// );
|
|
860
|
-
// }
|
|
861
867
|
const blobFields = checkpoint.toBlobFields();
|
|
862
|
-
const blobs = getBlobsPerL1Block(blobFields);
|
|
868
|
+
const blobs = await getBlobsPerL1Block(blobFields);
|
|
863
869
|
const blobInput = getPrefixedEthBlobCommitments(blobs);
|
|
864
870
|
const args = [
|
|
865
871
|
{
|
|
@@ -874,10 +880,9 @@ export class SequencerPublisher {
|
|
|
874
880
|
attestationsAndSignersSignature.toViemSignature(),
|
|
875
881
|
blobInput
|
|
876
882
|
];
|
|
877
|
-
await this.simulateProposeTx(args,
|
|
878
|
-
return ts;
|
|
883
|
+
await this.simulateProposeTx(args, options);
|
|
879
884
|
}
|
|
880
|
-
async enqueueCastSignalHelper(slotNumber,
|
|
885
|
+
async enqueueCastSignalHelper(slotNumber, signalType, payload, base, signerAddress, signer) {
|
|
881
886
|
if (this.lastActions[signalType] && this.lastActions[signalType] === slotNumber) {
|
|
882
887
|
this.log.debug(`Skipping duplicate vote cast signal ${signalType} for slot ${slotNumber}`);
|
|
883
888
|
return false;
|
|
@@ -901,6 +906,28 @@ export class SequencerPublisher {
|
|
|
901
906
|
this.log.warn(`Skipping vote cast for payload with empty code`);
|
|
902
907
|
return false;
|
|
903
908
|
}
|
|
909
|
+
// Check if payload was already submitted to governance
|
|
910
|
+
const cacheKey = payload.toString();
|
|
911
|
+
if (!this.payloadProposedCache.has(cacheKey)) {
|
|
912
|
+
try {
|
|
913
|
+
const l1StartBlock = await this.rollupContract.getL1StartBlock();
|
|
914
|
+
const proposed = await retry(()=>base.hasPayloadBeenProposed(payload.toString(), l1StartBlock), 'Check if payload was proposed', makeBackoff([
|
|
915
|
+
0,
|
|
916
|
+
1,
|
|
917
|
+
2
|
|
918
|
+
]), this.log, true);
|
|
919
|
+
if (proposed) {
|
|
920
|
+
this.payloadProposedCache.add(cacheKey);
|
|
921
|
+
}
|
|
922
|
+
} catch (err) {
|
|
923
|
+
this.log.warn(`Failed to check if payload ${payload} was proposed after retries, skipping signal`, err);
|
|
924
|
+
return false;
|
|
925
|
+
}
|
|
926
|
+
}
|
|
927
|
+
if (this.payloadProposedCache.has(cacheKey)) {
|
|
928
|
+
this.log.info(`Payload ${payload} was already proposed to governance, stopping signals`);
|
|
929
|
+
return false;
|
|
930
|
+
}
|
|
904
931
|
const cachedLastVote = this.lastActions[signalType];
|
|
905
932
|
this.lastActions[signalType] = slotNumber;
|
|
906
933
|
const action = signalType;
|
|
@@ -911,6 +938,7 @@ export class SequencerPublisher {
|
|
|
911
938
|
signer: this.l1TxUtils.client.account?.address,
|
|
912
939
|
lastValidL2Slot: slotNumber
|
|
913
940
|
});
|
|
941
|
+
const timestamp = this.getSimulationTimestamp(slotNumber);
|
|
914
942
|
try {
|
|
915
943
|
await this.l1TxUtils.simulate(request, {
|
|
916
944
|
time: timestamp
|
|
@@ -922,7 +950,10 @@ export class SequencerPublisher {
|
|
|
922
950
|
request
|
|
923
951
|
});
|
|
924
952
|
} catch (err) {
|
|
925
|
-
|
|
953
|
+
const viemError = formatViemError(err);
|
|
954
|
+
this.log.error(`Failed simulation for ${action} at slot ${slotNumber} (enqueuing the action anyway)`, viemError, {
|
|
955
|
+
simulationTimestamp: timestamp
|
|
956
|
+
});
|
|
926
957
|
// Yes, we enqueue the request anyway, in case there was a bug with the simulation itself
|
|
927
958
|
}
|
|
928
959
|
// TODO(palla/slash): All votes (governance and slashing) should txTimeoutAt at the end of the slot.
|
|
@@ -966,12 +997,11 @@ export class SequencerPublisher {
|
|
|
966
997
|
/**
|
|
967
998
|
* Enqueues a governance castSignal transaction to cast a signal for a given slot number.
|
|
968
999
|
* @param slotNumber - The slot number to cast a signal for.
|
|
969
|
-
* @param timestamp - The timestamp of the slot to cast a signal for.
|
|
970
1000
|
* @returns True if the signal was successfully enqueued, false otherwise.
|
|
971
|
-
*/ enqueueGovernanceCastSignal(governancePayload, slotNumber,
|
|
972
|
-
return this.enqueueCastSignalHelper(slotNumber,
|
|
1001
|
+
*/ enqueueGovernanceCastSignal(governancePayload, slotNumber, signerAddress, signer) {
|
|
1002
|
+
return this.enqueueCastSignalHelper(slotNumber, 'governance-signal', governancePayload, this.govProposerContract, signerAddress, signer);
|
|
973
1003
|
}
|
|
974
|
-
/** Enqueues all slashing actions as returned by the slasher client. */ async enqueueSlashingActions(actions, slotNumber,
|
|
1004
|
+
/** Enqueues all slashing actions as returned by the slasher client. */ async enqueueSlashingActions(actions, slotNumber, signerAddress, signer) {
|
|
975
1005
|
if (actions.length === 0) {
|
|
976
1006
|
this.log.debug(`No slashing actions to enqueue for slot ${slotNumber}`);
|
|
977
1007
|
return false;
|
|
@@ -987,7 +1017,7 @@ export class SequencerPublisher {
|
|
|
987
1017
|
this.log.debug(`Enqueuing slashing vote for payload ${action.payload} at slot ${slotNumber}`, {
|
|
988
1018
|
signerAddress
|
|
989
1019
|
});
|
|
990
|
-
await this.enqueueCastSignalHelper(slotNumber,
|
|
1020
|
+
await this.enqueueCastSignalHelper(slotNumber, 'empire-slashing-signal', action.payload, this.slashingProposerContract, signerAddress, signer);
|
|
991
1021
|
break;
|
|
992
1022
|
}
|
|
993
1023
|
case 'create-empire-payload':
|
|
@@ -997,7 +1027,7 @@ export class SequencerPublisher {
|
|
|
997
1027
|
signerAddress
|
|
998
1028
|
});
|
|
999
1029
|
const request = this.slashFactoryContract.buildCreatePayloadRequest(action.data);
|
|
1000
|
-
await this.simulateAndEnqueueRequest('create-empire-payload', request, (receipt)=>!!this.slashFactoryContract.tryExtractSlashPayloadCreatedEvent(receipt.logs), slotNumber
|
|
1030
|
+
await this.simulateAndEnqueueRequest('create-empire-payload', request, (receipt)=>!!this.slashFactoryContract.tryExtractSlashPayloadCreatedEvent(receipt.logs), slotNumber);
|
|
1001
1031
|
break;
|
|
1002
1032
|
}
|
|
1003
1033
|
case 'execute-empire-payload':
|
|
@@ -1012,7 +1042,7 @@ export class SequencerPublisher {
|
|
|
1012
1042
|
}
|
|
1013
1043
|
const empireSlashingProposer = this.slashingProposerContract;
|
|
1014
1044
|
const request = empireSlashingProposer.buildExecuteRoundRequest(action.round);
|
|
1015
|
-
await this.simulateAndEnqueueRequest('execute-empire-payload', request, (receipt)=>!!empireSlashingProposer.tryExtractPayloadSubmittedEvent(receipt.logs), slotNumber
|
|
1045
|
+
await this.simulateAndEnqueueRequest('execute-empire-payload', request, (receipt)=>!!empireSlashingProposer.tryExtractPayloadSubmittedEvent(receipt.logs), slotNumber);
|
|
1016
1046
|
break;
|
|
1017
1047
|
}
|
|
1018
1048
|
case 'vote-offenses':
|
|
@@ -1030,7 +1060,7 @@ export class SequencerPublisher {
|
|
|
1030
1060
|
const tallySlashingProposer = this.slashingProposerContract;
|
|
1031
1061
|
const votes = bufferToHex(encodeSlashConsensusVotes(action.votes));
|
|
1032
1062
|
const request = await tallySlashingProposer.buildVoteRequestFromSigner(votes, slotNumber, signer);
|
|
1033
|
-
await this.simulateAndEnqueueRequest('vote-offenses', request, (receipt)=>!!tallySlashingProposer.tryExtractVoteCastEvent(receipt.logs), slotNumber
|
|
1063
|
+
await this.simulateAndEnqueueRequest('vote-offenses', request, (receipt)=>!!tallySlashingProposer.tryExtractVoteCastEvent(receipt.logs), slotNumber);
|
|
1034
1064
|
break;
|
|
1035
1065
|
}
|
|
1036
1066
|
case 'execute-slash':
|
|
@@ -1046,7 +1076,7 @@ export class SequencerPublisher {
|
|
|
1046
1076
|
}
|
|
1047
1077
|
const tallySlashingProposer = this.slashingProposerContract;
|
|
1048
1078
|
const request = tallySlashingProposer.buildExecuteRoundRequest(action.round, action.committees);
|
|
1049
|
-
await this.simulateAndEnqueueRequest('execute-slash', request, (receipt)=>!!tallySlashingProposer.tryExtractRoundExecutedEvent(receipt.logs), slotNumber
|
|
1079
|
+
await this.simulateAndEnqueueRequest('execute-slash', request, (receipt)=>!!tallySlashingProposer.tryExtractRoundExecutedEvent(receipt.logs), slotNumber);
|
|
1050
1080
|
break;
|
|
1051
1081
|
}
|
|
1052
1082
|
default:
|
|
@@ -1061,7 +1091,7 @@ export class SequencerPublisher {
|
|
|
1061
1091
|
/** Simulates and enqueues a proposal for a checkpoint on L1 */ async enqueueProposeCheckpoint(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, opts = {}) {
|
|
1062
1092
|
const checkpointHeader = checkpoint.header;
|
|
1063
1093
|
const blobFields = checkpoint.toBlobFields();
|
|
1064
|
-
const blobs = getBlobsPerL1Block(blobFields);
|
|
1094
|
+
const blobs = await getBlobsPerL1Block(blobFields);
|
|
1065
1095
|
const proposeTxArgs = {
|
|
1066
1096
|
header: checkpointHeader,
|
|
1067
1097
|
archive: checkpoint.archive.root.toBuffer(),
|
|
@@ -1070,14 +1100,13 @@ export class SequencerPublisher {
|
|
|
1070
1100
|
attestationsAndSignersSignature,
|
|
1071
1101
|
feeAssetPriceModifier: checkpoint.feeAssetPriceModifier
|
|
1072
1102
|
};
|
|
1073
|
-
let ts;
|
|
1074
1103
|
try {
|
|
1075
1104
|
// @note This will make sure that we are passing the checks for our header ASSUMING that the data is also made available
|
|
1076
1105
|
// This means that we can avoid the simulation issues in later checks.
|
|
1077
1106
|
// By simulation issue, I mean the fact that the block.timestamp is equal to the last block, not the next, which
|
|
1078
1107
|
// make time consistency checks break.
|
|
1079
1108
|
// TODO(palla): Check whether we're validating twice, once here and once within addProposeTx, since we call simulateProposeTx in both places.
|
|
1080
|
-
|
|
1109
|
+
await this.validateCheckpointForSubmission(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, opts);
|
|
1081
1110
|
} catch (err) {
|
|
1082
1111
|
this.log.error(`Checkpoint validation failed. ${err instanceof Error ? err.message : 'No error message'}`, err, {
|
|
1083
1112
|
...checkpoint.getStats(),
|
|
@@ -1090,7 +1119,7 @@ export class SequencerPublisher {
|
|
|
1090
1119
|
...checkpoint.toCheckpointInfo(),
|
|
1091
1120
|
...opts
|
|
1092
1121
|
});
|
|
1093
|
-
await this.addProposeTx(checkpoint, proposeTxArgs, opts
|
|
1122
|
+
await this.addProposeTx(checkpoint, proposeTxArgs, opts);
|
|
1094
1123
|
}
|
|
1095
1124
|
enqueueInvalidateCheckpoint(request, opts = {}) {
|
|
1096
1125
|
if (!request) {
|
|
@@ -1131,7 +1160,8 @@ export class SequencerPublisher {
|
|
|
1131
1160
|
}
|
|
1132
1161
|
});
|
|
1133
1162
|
}
|
|
1134
|
-
async simulateAndEnqueueRequest(action, request, checkSuccess, slotNumber
|
|
1163
|
+
async simulateAndEnqueueRequest(action, request, checkSuccess, slotNumber) {
|
|
1164
|
+
const timestamp = this.getSimulationTimestamp(slotNumber);
|
|
1135
1165
|
const logData = {
|
|
1136
1166
|
slotNumber,
|
|
1137
1167
|
timestamp,
|
|
@@ -1152,7 +1182,7 @@ export class SequencerPublisher {
|
|
|
1152
1182
|
try {
|
|
1153
1183
|
({ gasUsed } = await this.l1TxUtils.simulate(request, {
|
|
1154
1184
|
time: timestamp
|
|
1155
|
-
}, [], simulateAbi));
|
|
1185
|
+
}, [], simulateAbi));
|
|
1156
1186
|
this.log.verbose(`Simulation for ${action} succeeded`, {
|
|
1157
1187
|
...logData,
|
|
1158
1188
|
request,
|
|
@@ -1212,7 +1242,7 @@ export class SequencerPublisher {
|
|
|
1212
1242
|
this.interrupted = false;
|
|
1213
1243
|
this.l1TxUtils.restart();
|
|
1214
1244
|
}
|
|
1215
|
-
async prepareProposeTx(encodedData,
|
|
1245
|
+
async prepareProposeTx(encodedData, options) {
|
|
1216
1246
|
const kzg = Blob.getViemKzgInstance();
|
|
1217
1247
|
const blobInput = getPrefixedEthBlobCommitments(encodedData.blobs);
|
|
1218
1248
|
this.log.debug('Validating blob input', {
|
|
@@ -1261,7 +1291,7 @@ export class SequencerPublisher {
|
|
|
1261
1291
|
encodedData.attestationsAndSignersSignature.toViemSignature(),
|
|
1262
1292
|
blobInput
|
|
1263
1293
|
];
|
|
1264
|
-
const { rollupData, simulationResult } = await this.simulateProposeTx(args,
|
|
1294
|
+
const { rollupData, simulationResult } = await this.simulateProposeTx(args, options);
|
|
1265
1295
|
return {
|
|
1266
1296
|
args,
|
|
1267
1297
|
blobEvaluationGas,
|
|
@@ -1272,9 +1302,8 @@ export class SequencerPublisher {
|
|
|
1272
1302
|
/**
|
|
1273
1303
|
* Simulates the propose tx with eth_simulateV1
|
|
1274
1304
|
* @param args - The propose tx args
|
|
1275
|
-
* @param timestamp - The timestamp to simulate proposal at
|
|
1276
1305
|
* @returns The simulation result
|
|
1277
|
-
*/ async simulateProposeTx(args,
|
|
1306
|
+
*/ async simulateProposeTx(args, options) {
|
|
1278
1307
|
const rollupData = encodeFunctionData({
|
|
1279
1308
|
abi: RollupAbi,
|
|
1280
1309
|
functionName: 'propose',
|
|
@@ -1302,6 +1331,7 @@ export class SequencerPublisher {
|
|
|
1302
1331
|
balance: 10n * WEI_CONST * WEI_CONST
|
|
1303
1332
|
});
|
|
1304
1333
|
}
|
|
1334
|
+
const simTs = this.getSimulationTimestamp(SlotNumber.fromBigInt(args[0].header.slotNumber));
|
|
1305
1335
|
const simulationResult = await this.l1TxUtils.simulate({
|
|
1306
1336
|
to: this.rollupContract.address,
|
|
1307
1337
|
data: rollupData,
|
|
@@ -1310,8 +1340,7 @@ export class SequencerPublisher {
|
|
|
1310
1340
|
from: this.proposerAddressForSimulation.toString()
|
|
1311
1341
|
}
|
|
1312
1342
|
}, {
|
|
1313
|
-
|
|
1314
|
-
time: timestamp + 1n,
|
|
1343
|
+
time: simTs,
|
|
1315
1344
|
// @note reth should have a 30m gas limit per block but throws errors that this tx is beyond limit so we increase here
|
|
1316
1345
|
gasLimit: MAX_L1_TX_LIMIT * 2n
|
|
1317
1346
|
}, stateOverrides, RollupAbi, {
|
|
@@ -1328,7 +1357,9 @@ export class SequencerPublisher {
|
|
|
1328
1357
|
logs: []
|
|
1329
1358
|
};
|
|
1330
1359
|
}
|
|
1331
|
-
this.log.error(`Failed to simulate propose tx`, viemError
|
|
1360
|
+
this.log.error(`Failed to simulate propose tx`, viemError, {
|
|
1361
|
+
simulationTimestamp: simTs
|
|
1362
|
+
});
|
|
1332
1363
|
throw err;
|
|
1333
1364
|
});
|
|
1334
1365
|
return {
|
|
@@ -1336,11 +1367,11 @@ export class SequencerPublisher {
|
|
|
1336
1367
|
simulationResult
|
|
1337
1368
|
};
|
|
1338
1369
|
}
|
|
1339
|
-
async addProposeTx(checkpoint, encodedData, opts = {}
|
|
1370
|
+
async addProposeTx(checkpoint, encodedData, opts = {}) {
|
|
1340
1371
|
const slot = checkpoint.header.slotNumber;
|
|
1341
1372
|
const timer = new Timer();
|
|
1342
1373
|
const kzg = Blob.getViemKzgInstance();
|
|
1343
|
-
const { rollupData, simulationResult, blobEvaluationGas } = await this.prepareProposeTx(encodedData,
|
|
1374
|
+
const { rollupData, simulationResult, blobEvaluationGas } = await this.prepareProposeTx(encodedData, opts);
|
|
1344
1375
|
const startBlock = await this.l1TxUtils.getBlockNumber();
|
|
1345
1376
|
const gasLimit = this.l1TxUtils.bumpGasLimit(BigInt(Math.ceil(Number(simulationResult.gasUsed) * 64 / 63)) + blobEvaluationGas + SequencerPublisher.MULTICALL_OVERHEAD_GAS_GUESS);
|
|
1346
1377
|
// Send the blobs to the blob client preemptively. This helps in tests where the sequencer mistakingly thinks that the propose
|
|
@@ -1405,4 +1436,13 @@ export class SequencerPublisher {
|
|
|
1405
1436
|
}
|
|
1406
1437
|
});
|
|
1407
1438
|
}
|
|
1439
|
+
/** Returns the timestamp of the last L1 slot within a given L2 slot. Used as the simulation timestamp
|
|
1440
|
+
* for eth_simulateV1 calls, since it's guaranteed to be greater than any L1 block produced during the slot. */ getSimulationTimestamp(slot) {
|
|
1441
|
+
const l1Constants = this.epochCache.getL1Constants();
|
|
1442
|
+
return getLastL1SlotTimestampForL2Slot(slot, l1Constants);
|
|
1443
|
+
}
|
|
1444
|
+
/** Returns the timestamp of the next L1 slot boundary after now. */ getNextL1SlotTimestamp() {
|
|
1445
|
+
const l1Constants = this.epochCache.getL1Constants();
|
|
1446
|
+
return getNextL1SlotTimestamp(this.dateProvider.nowInSeconds(), l1Constants);
|
|
1447
|
+
}
|
|
1408
1448
|
}
|
|
@@ -7,7 +7,7 @@ import { type TypedEventEmitter } from '@aztec/foundation/types';
|
|
|
7
7
|
import type { P2P } from '@aztec/p2p';
|
|
8
8
|
import type { SlasherClientInterface } from '@aztec/slasher';
|
|
9
9
|
import { L2Block, type L2BlockSink, type L2BlockSource } from '@aztec/stdlib/block';
|
|
10
|
-
import type
|
|
10
|
+
import { type Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
11
11
|
import { type ResolvedSequencerConfig, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
12
12
|
import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
13
13
|
import { Tx } from '@aztec/stdlib/tx';
|
|
@@ -62,6 +62,8 @@ export declare class CheckpointProposalJob implements Traceable {
|
|
|
62
62
|
execute(): Promise<Checkpoint | undefined>;
|
|
63
63
|
private proposeCheckpoint;
|
|
64
64
|
private buildBlocksForCheckpoint;
|
|
65
|
+
/** Creates a block proposal for a given block via the validator client (unless in fisherman mode) */
|
|
66
|
+
private createBlockProposal;
|
|
65
67
|
private waitUntilNextSubslot;
|
|
66
68
|
/** Builds a single block. Called from the main block building loop. */
|
|
67
69
|
protected buildSingleBlock(checkpointBuilder: CheckpointBuilder, opts: {
|
|
@@ -71,11 +73,9 @@ export declare class CheckpointProposalJob implements Traceable {
|
|
|
71
73
|
indexWithinCheckpoint: IndexWithinCheckpoint;
|
|
72
74
|
buildDeadline: Date | undefined;
|
|
73
75
|
txHashesAlreadyIncluded: Set<string>;
|
|
74
|
-
remainingBlobFields: number;
|
|
75
76
|
}): Promise<{
|
|
76
77
|
block: L2Block;
|
|
77
78
|
usedTxs: Tx[];
|
|
78
|
-
remainingBlobFields: number;
|
|
79
79
|
} | {
|
|
80
80
|
error: Error;
|
|
81
81
|
} | undefined>;
|
|
@@ -99,4 +99,4 @@ export declare class CheckpointProposalJob implements Traceable {
|
|
|
99
99
|
private getSecondsIntoSlot;
|
|
100
100
|
getPublisher(): SequencerPublisher;
|
|
101
101
|
}
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbF9qb2IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvY2hlY2twb2ludF9wcm9wb3NhbF9qb2IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxFQUNMLFdBQVcsRUFDWCxnQkFBZ0IsRUFDaEIsV0FBVyxFQUNYLHFCQUFxQixFQUNyQixVQUFVLEVBQ1gsTUFBTSxpQ0FBaUMsQ0FBQztBQVF6QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFFLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBRXZGLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBUyxNQUFNLHlCQUF5QixDQUFDO0FBQ25FLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUEwQixNQUFNLHlCQUF5QixDQUFDO0FBQ3pGLE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUN0QyxPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzdELE9BQU8sRUFHTCxPQUFPLEVBQ1AsS0FBSyxXQUFXLEVBQ2hCLEtBQUssYUFBYSxFQUVuQixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBc0IsTUFBTSwwQkFBMEIsQ0FBQztBQUcvRSxPQUFPLEVBR0wsS0FBSyx1QkFBdUIsRUFDNUIsS0FBSyxzQkFBc0IsRUFDNUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBbUMsTUFBTSx5QkFBeUIsQ0FBQztBQVNwRyxPQUFPLEVBQWlCLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXJELE9BQU8sRUFBYyxLQUFLLFNB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint_proposal_job.d.ts","sourceRoot":"","sources":["../../src/sequencer/checkpoint_proposal_job.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"checkpoint_proposal_job.d.ts","sourceRoot":"","sources":["../../src/sequencer/checkpoint_proposal_job.ts"],"names":[],"mappings":"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"}
|