@aztec/archiver 0.0.1-commit.f2ce05ee → 0.0.1-commit.f81dbcf
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/archiver.d.ts +7 -4
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +55 -106
- package/dest/factory.d.ts +2 -3
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +13 -13
- package/dest/index.d.ts +2 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -0
- package/dest/l1/bin/retrieve-calldata.js +32 -28
- package/dest/l1/calldata_retriever.d.ts +73 -50
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +190 -259
- package/dest/l1/data_retrieval.d.ts +4 -7
- package/dest/l1/data_retrieval.d.ts.map +1 -1
- package/dest/l1/data_retrieval.js +9 -13
- package/dest/l1/spire_proposer.d.ts +5 -5
- package/dest/l1/spire_proposer.d.ts.map +1 -1
- package/dest/l1/spire_proposer.js +9 -17
- package/dest/modules/data_source_base.d.ts +10 -5
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +29 -73
- package/dest/modules/data_store_updater.d.ts +18 -3
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +75 -23
- package/dest/modules/instrumentation.d.ts +4 -2
- package/dest/modules/instrumentation.d.ts.map +1 -1
- package/dest/modules/instrumentation.js +9 -2
- package/dest/modules/l1_synchronizer.d.ts +5 -8
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +37 -10
- package/dest/store/block_store.d.ts +25 -22
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +100 -30
- package/dest/store/kv_archiver_store.d.ts +30 -6
- package/dest/store/kv_archiver_store.d.ts.map +1 -1
- package/dest/store/kv_archiver_store.js +34 -4
- package/dest/store/l2_tips_cache.d.ts +19 -0
- package/dest/store/l2_tips_cache.d.ts.map +1 -0
- package/dest/store/l2_tips_cache.js +89 -0
- package/dest/store/log_store.d.ts +1 -1
- package/dest/store/log_store.d.ts.map +1 -1
- package/dest/store/log_store.js +48 -10
- package/dest/store/message_store.js +1 -1
- package/dest/test/fake_l1_state.d.ts +13 -1
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +84 -20
- package/dest/test/mock_archiver.d.ts +1 -1
- package/dest/test/mock_archiver.d.ts.map +1 -1
- package/dest/test/mock_archiver.js +3 -2
- package/dest/test/mock_l2_block_source.d.ts +21 -5
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +132 -86
- package/dest/test/mock_structs.d.ts +4 -1
- package/dest/test/mock_structs.d.ts.map +1 -1
- package/dest/test/mock_structs.js +13 -1
- package/dest/test/noop_l1_archiver.d.ts +4 -1
- package/dest/test/noop_l1_archiver.d.ts.map +1 -1
- package/dest/test/noop_l1_archiver.js +5 -1
- package/package.json +13 -13
- package/src/archiver.ts +67 -128
- package/src/factory.ts +12 -5
- package/src/index.ts +1 -0
- package/src/l1/README.md +25 -68
- package/src/l1/bin/retrieve-calldata.ts +40 -27
- package/src/l1/calldata_retriever.ts +249 -379
- package/src/l1/data_retrieval.ts +6 -16
- package/src/l1/spire_proposer.ts +7 -15
- package/src/modules/data_source_base.ts +56 -95
- package/src/modules/data_store_updater.ts +82 -22
- package/src/modules/instrumentation.ts +9 -2
- package/src/modules/l1_synchronizer.ts +44 -14
- package/src/store/block_store.ts +126 -49
- package/src/store/kv_archiver_store.ts +57 -7
- package/src/store/l2_tips_cache.ts +89 -0
- package/src/store/log_store.ts +66 -12
- package/src/store/message_store.ts +1 -1
- package/src/test/fake_l1_state.ts +110 -21
- package/src/test/mock_archiver.ts +3 -2
- package/src/test/mock_l2_block_source.ts +173 -81
- package/src/test/mock_structs.ts +20 -6
- package/src/test/noop_l1_archiver.ts +7 -1
package/dest/archiver.d.ts
CHANGED
|
@@ -19,6 +19,7 @@ import { ArchiverDataSourceBase } from './modules/data_source_base.js';
|
|
|
19
19
|
import type { ArchiverInstrumentation } from './modules/instrumentation.js';
|
|
20
20
|
import type { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
|
|
21
21
|
import type { KVArchiverDataStore } from './store/kv_archiver_store.js';
|
|
22
|
+
import { L2TipsCache } from './store/l2_tips_cache.js';
|
|
22
23
|
/** Export ArchiverEmitter for use in factory and tests. */
|
|
23
24
|
export type { ArchiverEmitter };
|
|
24
25
|
export type ArchiverDeps = {
|
|
@@ -57,6 +58,8 @@ export declare class Archiver extends ArchiverDataSourceBase implements L2BlockS
|
|
|
57
58
|
private blockQueue;
|
|
58
59
|
/** Helper to handle updates to the store */
|
|
59
60
|
private readonly updater;
|
|
61
|
+
/** In-memory cache for L2 chain tips. */
|
|
62
|
+
private readonly l2TipsCache;
|
|
60
63
|
readonly tracer: Tracer;
|
|
61
64
|
/**
|
|
62
65
|
* Creates a new instance of the Archiver.
|
|
@@ -85,7 +88,7 @@ export declare class Archiver extends ArchiverDataSourceBase implements L2BlockS
|
|
|
85
88
|
}, blobClient: BlobClientInterface, instrumentation: ArchiverInstrumentation, l1Constants: L1RollupConstants & {
|
|
86
89
|
l1StartBlockHash: Buffer32;
|
|
87
90
|
genesisArchiveRoot: Fr;
|
|
88
|
-
}, synchronizer: ArchiverL1Synchronizer, events: ArchiverEmitter, log?: Logger);
|
|
91
|
+
}, synchronizer: ArchiverL1Synchronizer, events: ArchiverEmitter, l2TipsCache?: L2TipsCache, log?: Logger);
|
|
89
92
|
/** Updates archiver config */
|
|
90
93
|
updateConfig(newConfig: Partial<ArchiverConfig>): void;
|
|
91
94
|
/**
|
|
@@ -122,8 +125,8 @@ export declare class Archiver extends ArchiverDataSourceBase implements L2BlockS
|
|
|
122
125
|
getRegistryAddress(): Promise<EthAddress>;
|
|
123
126
|
getL1BlockNumber(): bigint | undefined;
|
|
124
127
|
getL1Timestamp(): Promise<bigint | undefined>;
|
|
125
|
-
|
|
126
|
-
|
|
128
|
+
getSyncedL2SlotNumber(): Promise<SlotNumber | undefined>;
|
|
129
|
+
getSyncedL2EpochNumber(): Promise<EpochNumber | undefined>;
|
|
127
130
|
isEpochComplete(epochNumber: EpochNumber): Promise<boolean>;
|
|
128
131
|
/** Returns whether the archiver has completed an initial sync run successfully. */
|
|
129
132
|
isInitialSyncComplete(): boolean;
|
|
@@ -133,4 +136,4 @@ export declare class Archiver extends ArchiverDataSourceBase implements L2BlockS
|
|
|
133
136
|
getL2Tips(): Promise<L2Tips>;
|
|
134
137
|
rollbackTo(targetL2BlockNumber: BlockNumber): Promise<void>;
|
|
135
138
|
}
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQXVCLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2hGLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRixPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6RyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFcEQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFbEUsT0FBTyxFQUFFLGNBQWMsRUFBMkIsTUFBTSxtQ0FBbUMsQ0FBQztBQUM1RixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUNwQixPQUFPLEVBQ1AsS0FBSyxXQUFXLEVBQ2hCLEtBQUssTUFBTSxFQUNYLEtBQUssd0JBQXdCLEVBQzlCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDL0QsT0FBTyxFQUNMLEtBQUssaUJBQWlCLEVBS3ZCLE1BQU0sNkJBQTZCLENBQUM7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
|
package/dest/archiver.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../src/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../src/archiver.ts"],"names":[],"mappings":"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"}
|
package/dest/archiver.js
CHANGED
|
@@ -371,23 +371,22 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
|
|
|
371
371
|
return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
|
|
372
372
|
}
|
|
373
373
|
var _dec, _initProto;
|
|
374
|
-
import { GENESIS_BLOCK_HEADER_HASH, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
375
374
|
import { BlockTagTooOldError } from '@aztec/ethereum/contracts';
|
|
376
|
-
import { BlockNumber,
|
|
375
|
+
import { BlockNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
377
376
|
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
378
377
|
import { merge } from '@aztec/foundation/collection';
|
|
379
378
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
380
379
|
import { createLogger } from '@aztec/foundation/log';
|
|
381
380
|
import { promiseWithResolvers } from '@aztec/foundation/promise';
|
|
382
381
|
import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/running-promise';
|
|
383
|
-
import {
|
|
384
|
-
import { getEpochNumberAtTimestamp, getSlotAtNextL1Block, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
382
|
+
import { getEpochAtSlot, getSlotAtNextL1Block, getSlotRangeForEpoch, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
385
383
|
import { trackSpan } from '@aztec/telemetry-client';
|
|
386
384
|
import { mapArchiverConfig } from './config.js';
|
|
387
385
|
import { NoBlobBodiesFoundError } from './errors.js';
|
|
388
386
|
import { validateAndLogTraceAvailability } from './l1/validate_trace.js';
|
|
389
387
|
import { ArchiverDataSourceBase } from './modules/data_source_base.js';
|
|
390
388
|
import { ArchiverDataStoreUpdater } from './modules/data_store_updater.js';
|
|
389
|
+
import { L2TipsCache } from './store/l2_tips_cache.js';
|
|
391
390
|
_dec = trackSpan('Archiver.sync');
|
|
392
391
|
/**
|
|
393
392
|
* Pulls checkpoints in a non-blocking manner and provides interface for their retrieval.
|
|
@@ -419,6 +418,7 @@ _dec = trackSpan('Archiver.sync');
|
|
|
419
418
|
initialSyncPromise;
|
|
420
419
|
/** Queue of blocks to be added to the store, processed by the sync loop. */ blockQueue;
|
|
421
420
|
/** Helper to handle updates to the store */ updater;
|
|
421
|
+
/** In-memory cache for L2 chain tips. */ l2TipsCache;
|
|
422
422
|
tracer;
|
|
423
423
|
/**
|
|
424
424
|
* Creates a new instance of the Archiver.
|
|
@@ -435,13 +435,16 @@ _dec = trackSpan('Archiver.sync');
|
|
|
435
435
|
* @param instrumentation - Instrumentation for metrics and tracing.
|
|
436
436
|
* @param l1Constants - L1 rollup constants.
|
|
437
437
|
* @param log - A logger.
|
|
438
|
-
*/ constructor(publicClient, debugClient, rollup, l1Addresses, dataStore, config, blobClient, instrumentation, l1Constants, synchronizer, events, log = createLogger('archiver')){
|
|
438
|
+
*/ constructor(publicClient, debugClient, rollup, l1Addresses, dataStore, config, blobClient, instrumentation, l1Constants, synchronizer, events, l2TipsCache, log = createLogger('archiver')){
|
|
439
439
|
super(dataStore, l1Constants), this.publicClient = publicClient, this.debugClient = debugClient, this.rollup = rollup, this.l1Addresses = l1Addresses, this.dataStore = dataStore, this.config = config, this.blobClient = blobClient, this.l1Constants = l1Constants, this.log = log, this.initialSyncComplete = (_initProto(this), false), this.blockQueue = [];
|
|
440
440
|
this.tracer = instrumentation.tracer;
|
|
441
441
|
this.initialSyncPromise = promiseWithResolvers();
|
|
442
442
|
this.synchronizer = synchronizer;
|
|
443
443
|
this.events = events;
|
|
444
|
-
this.
|
|
444
|
+
this.l2TipsCache = l2TipsCache ?? new L2TipsCache(this.dataStore.blockStore);
|
|
445
|
+
this.updater = new ArchiverDataStoreUpdater(this.dataStore, this.l2TipsCache, {
|
|
446
|
+
rollupManaLimit: l1Constants.rollupManaLimit
|
|
447
|
+
});
|
|
445
448
|
// Running promise starts with a small interval inbetween runs, so all iterations needed for the initial sync
|
|
446
449
|
// are done as fast as possible. This then gets updated once the initial sync completes.
|
|
447
450
|
this.runningPromise = new RunningPromise(()=>this.sync(), this.log, this.config.pollingIntervalMs / 10, makeLoggingErrorHandler(this.log, NoBlobBodiesFoundError, BlockTagTooOldError));
|
|
@@ -605,13 +608,34 @@ _dec = trackSpan('Archiver.sync');
|
|
|
605
608
|
getL1Timestamp() {
|
|
606
609
|
return Promise.resolve(this.synchronizer.getL1Timestamp());
|
|
607
610
|
}
|
|
608
|
-
|
|
611
|
+
getSyncedL2SlotNumber() {
|
|
609
612
|
const l1Timestamp = this.synchronizer.getL1Timestamp();
|
|
610
|
-
|
|
613
|
+
if (l1Timestamp === undefined) {
|
|
614
|
+
return Promise.resolve(undefined);
|
|
615
|
+
}
|
|
616
|
+
// The synced slot is the last L2 slot whose all L1 blocks have been processed.
|
|
617
|
+
// If the next L1 block (at l1Timestamp + ethereumSlotDuration) falls in slot N,
|
|
618
|
+
// then we've fully synced slot N-1.
|
|
619
|
+
const nextL1BlockSlot = getSlotAtNextL1Block(l1Timestamp, this.l1Constants);
|
|
620
|
+
if (Number(nextL1BlockSlot) === 0) {
|
|
621
|
+
return Promise.resolve(undefined);
|
|
622
|
+
}
|
|
623
|
+
return Promise.resolve(SlotNumber(nextL1BlockSlot - 1));
|
|
611
624
|
}
|
|
612
|
-
|
|
613
|
-
const
|
|
614
|
-
|
|
625
|
+
async getSyncedL2EpochNumber() {
|
|
626
|
+
const syncedSlot = await this.getSyncedL2SlotNumber();
|
|
627
|
+
if (syncedSlot === undefined) {
|
|
628
|
+
return undefined;
|
|
629
|
+
}
|
|
630
|
+
// An epoch is fully synced when all its slots are synced.
|
|
631
|
+
// We check if syncedSlot is the last slot of its epoch; if so, that epoch is fully synced.
|
|
632
|
+
// Otherwise, only the previous epoch is fully synced.
|
|
633
|
+
const epoch = getEpochAtSlot(syncedSlot, this.l1Constants);
|
|
634
|
+
const [, endSlot] = getSlotRangeForEpoch(epoch, this.l1Constants);
|
|
635
|
+
if (syncedSlot >= endSlot) {
|
|
636
|
+
return epoch;
|
|
637
|
+
}
|
|
638
|
+
return Number(epoch) > 0 ? EpochNumber(Number(epoch) - 1) : undefined;
|
|
615
639
|
}
|
|
616
640
|
async isEpochComplete(epochNumber) {
|
|
617
641
|
// The epoch is complete if the current checkpointed L2 block is the last one in the epoch (or later).
|
|
@@ -650,94 +674,10 @@ _dec = trackSpan('Archiver.sync');
|
|
|
650
674
|
await this.updater.addCheckpoints(checkpoints, pendingChainValidationStatus);
|
|
651
675
|
return true;
|
|
652
676
|
}
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
this.getBlockNumber(),
|
|
656
|
-
this.getProvenBlockNumber(),
|
|
657
|
-
this.getCheckpointedL2BlockNumber(),
|
|
658
|
-
this.getFinalizedL2BlockNumber()
|
|
659
|
-
]);
|
|
660
|
-
const beforeInitialblockNumber = BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
|
|
661
|
-
// Get the latest block header and checkpointed blocks for proven, finalised and checkpointed blocks
|
|
662
|
-
const [latestBlockHeader, provenCheckpointedBlock, finalizedCheckpointedBlock, checkpointedBlock] = await Promise.all([
|
|
663
|
-
latestBlockNumber > beforeInitialblockNumber ? this.getBlockHeader(latestBlockNumber) : undefined,
|
|
664
|
-
provenBlockNumber > beforeInitialblockNumber ? this.getCheckpointedBlock(provenBlockNumber) : undefined,
|
|
665
|
-
finalizedBlockNumber > beforeInitialblockNumber ? this.getCheckpointedBlock(finalizedBlockNumber) : undefined,
|
|
666
|
-
checkpointedBlockNumber > beforeInitialblockNumber ? this.getCheckpointedBlock(checkpointedBlockNumber) : undefined
|
|
667
|
-
]);
|
|
668
|
-
if (latestBlockNumber > beforeInitialblockNumber && !latestBlockHeader) {
|
|
669
|
-
throw new Error(`Failed to retrieve latest block header for block ${latestBlockNumber}`);
|
|
670
|
-
}
|
|
671
|
-
// Checkpointed blocks must exist for proven, finalized and checkpointed tips if they are beyond the initial block number.
|
|
672
|
-
if (checkpointedBlockNumber > beforeInitialblockNumber && !checkpointedBlock?.block.header) {
|
|
673
|
-
throw new Error(`Failed to retrieve checkpointed block header for block ${checkpointedBlockNumber} (latest block is ${latestBlockNumber})`);
|
|
674
|
-
}
|
|
675
|
-
if (provenBlockNumber > beforeInitialblockNumber && !provenCheckpointedBlock?.block.header) {
|
|
676
|
-
throw new Error(`Failed to retrieve proven checkpointed for block ${provenBlockNumber} (latest block is ${latestBlockNumber})`);
|
|
677
|
-
}
|
|
678
|
-
if (finalizedBlockNumber > beforeInitialblockNumber && !finalizedCheckpointedBlock?.block.header) {
|
|
679
|
-
throw new Error(`Failed to retrieve finalized block header for block ${finalizedBlockNumber} (latest block is ${latestBlockNumber})`);
|
|
680
|
-
}
|
|
681
|
-
const latestBlockHeaderHash = await latestBlockHeader?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
|
|
682
|
-
const provenBlockHeaderHash = await provenCheckpointedBlock?.block.header?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
|
|
683
|
-
const finalizedBlockHeaderHash = await finalizedCheckpointedBlock?.block.header?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
|
|
684
|
-
const checkpointedBlockHeaderHash = await checkpointedBlock?.block.header?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
|
|
685
|
-
// Now attempt to retrieve checkpoints for proven, finalised and checkpointed blocks
|
|
686
|
-
const [[provenBlockCheckpoint], [finalizedBlockCheckpoint], [checkpointedBlockCheckpoint]] = await Promise.all([
|
|
687
|
-
provenCheckpointedBlock !== undefined ? await this.getCheckpoints(provenCheckpointedBlock?.checkpointNumber, 1) : [
|
|
688
|
-
undefined
|
|
689
|
-
],
|
|
690
|
-
finalizedCheckpointedBlock !== undefined ? await this.getCheckpoints(finalizedCheckpointedBlock?.checkpointNumber, 1) : [
|
|
691
|
-
undefined
|
|
692
|
-
],
|
|
693
|
-
checkpointedBlock !== undefined ? await this.getCheckpoints(checkpointedBlock?.checkpointNumber, 1) : [
|
|
694
|
-
undefined
|
|
695
|
-
]
|
|
696
|
-
]);
|
|
697
|
-
const initialcheckpointId = {
|
|
698
|
-
number: CheckpointNumber.ZERO,
|
|
699
|
-
hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
|
|
700
|
-
};
|
|
701
|
-
const makeCheckpointId = (checkpoint)=>{
|
|
702
|
-
if (checkpoint === undefined) {
|
|
703
|
-
return initialcheckpointId;
|
|
704
|
-
}
|
|
705
|
-
return {
|
|
706
|
-
number: checkpoint.checkpoint.number,
|
|
707
|
-
hash: checkpoint.checkpoint.hash().toString()
|
|
708
|
-
};
|
|
709
|
-
};
|
|
710
|
-
const l2Tips = {
|
|
711
|
-
proposed: {
|
|
712
|
-
number: latestBlockNumber,
|
|
713
|
-
hash: latestBlockHeaderHash.toString()
|
|
714
|
-
},
|
|
715
|
-
proven: {
|
|
716
|
-
block: {
|
|
717
|
-
number: provenBlockNumber,
|
|
718
|
-
hash: provenBlockHeaderHash.toString()
|
|
719
|
-
},
|
|
720
|
-
checkpoint: makeCheckpointId(provenBlockCheckpoint)
|
|
721
|
-
},
|
|
722
|
-
finalized: {
|
|
723
|
-
block: {
|
|
724
|
-
number: finalizedBlockNumber,
|
|
725
|
-
hash: finalizedBlockHeaderHash.toString()
|
|
726
|
-
},
|
|
727
|
-
checkpoint: makeCheckpointId(finalizedBlockCheckpoint)
|
|
728
|
-
},
|
|
729
|
-
checkpointed: {
|
|
730
|
-
block: {
|
|
731
|
-
number: checkpointedBlockNumber,
|
|
732
|
-
hash: checkpointedBlockHeaderHash.toString()
|
|
733
|
-
},
|
|
734
|
-
checkpoint: makeCheckpointId(checkpointedBlockCheckpoint)
|
|
735
|
-
}
|
|
736
|
-
};
|
|
737
|
-
return l2Tips;
|
|
677
|
+
getL2Tips() {
|
|
678
|
+
return this.l2TipsCache.getL2Tips();
|
|
738
679
|
}
|
|
739
680
|
async rollbackTo(targetL2BlockNumber) {
|
|
740
|
-
// TODO(pw/mbps): This still assumes 1 block per checkpoint
|
|
741
681
|
const currentBlocks = await this.getL2Tips();
|
|
742
682
|
const currentL2Block = currentBlocks.proposed.number;
|
|
743
683
|
const currentProvenBlock = currentBlocks.proven.block.number;
|
|
@@ -748,8 +688,17 @@ _dec = trackSpan('Archiver.sync');
|
|
|
748
688
|
if (!targetL2Block) {
|
|
749
689
|
throw new Error(`Target L2 block ${targetL2BlockNumber} not found`);
|
|
750
690
|
}
|
|
751
|
-
const targetL1BlockNumber = targetL2Block.l1.blockNumber;
|
|
752
691
|
const targetCheckpointNumber = targetL2Block.checkpointNumber;
|
|
692
|
+
// Rollback operates at checkpoint granularity: the target block must be the last block of its checkpoint.
|
|
693
|
+
const checkpointData = await this.store.getCheckpointData(targetCheckpointNumber);
|
|
694
|
+
if (checkpointData) {
|
|
695
|
+
const lastBlockInCheckpoint = BlockNumber(checkpointData.startBlock + checkpointData.blockCount - 1);
|
|
696
|
+
if (targetL2BlockNumber !== lastBlockInCheckpoint) {
|
|
697
|
+
const previousCheckpointBoundary = checkpointData.startBlock > 1 ? BlockNumber(checkpointData.startBlock - 1) : BlockNumber(0);
|
|
698
|
+
throw new Error(`Target L2 block ${targetL2BlockNumber} is not at a checkpoint boundary. ` + `Checkpoint ${targetCheckpointNumber} spans blocks ${checkpointData.startBlock} to ${lastBlockInCheckpoint}. ` + `Use block ${lastBlockInCheckpoint} to roll back to this checkpoint, ` + `or block ${previousCheckpointBoundary} to roll back to the previous one.`);
|
|
699
|
+
}
|
|
700
|
+
}
|
|
701
|
+
const targetL1BlockNumber = targetL2Block.l1.blockNumber;
|
|
753
702
|
const targetL1Block = await this.publicClient.getBlock({
|
|
754
703
|
blockNumber: targetL1BlockNumber,
|
|
755
704
|
includeTransactions: false
|
|
@@ -769,13 +718,13 @@ _dec = trackSpan('Archiver.sync');
|
|
|
769
718
|
l1BlockHash: targetL1BlockHash
|
|
770
719
|
});
|
|
771
720
|
if (targetL2BlockNumber < currentProvenBlock) {
|
|
772
|
-
this.log.info(`
|
|
773
|
-
await this.
|
|
774
|
-
}
|
|
775
|
-
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
721
|
+
this.log.info(`Rolling back proven L2 checkpoint to ${targetCheckpointNumber}`);
|
|
722
|
+
await this.updater.setProvenCheckpointNumber(targetCheckpointNumber);
|
|
723
|
+
}
|
|
724
|
+
const currentFinalizedBlock = currentBlocks.finalized.block.number;
|
|
725
|
+
if (targetL2BlockNumber < currentFinalizedBlock) {
|
|
726
|
+
this.log.info(`Rolling back finalized L2 checkpoint to ${targetCheckpointNumber}`);
|
|
727
|
+
await this.updater.setFinalizedCheckpointNumber(targetCheckpointNumber);
|
|
728
|
+
}
|
|
780
729
|
}
|
|
781
730
|
}
|
package/dest/factory.d.ts
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
2
|
-
import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
3
2
|
import { Archiver, type ArchiverDeps } from './archiver.js';
|
|
4
3
|
import { type ArchiverConfig } from './config.js';
|
|
5
4
|
import { KVArchiverDataStore } from './store/kv_archiver_store.js';
|
|
6
5
|
export declare const ARCHIVER_STORE_NAME = "archiver";
|
|
7
6
|
/** Creates an archiver store. */
|
|
8
|
-
export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & DataStoreConfig
|
|
7
|
+
export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & DataStoreConfig): Promise<KVArchiverDataStore>;
|
|
9
8
|
/**
|
|
10
9
|
* Creates a local archiver.
|
|
11
10
|
* @param config - The archiver configuration.
|
|
@@ -18,4 +17,4 @@ export declare function createArchiver(config: ArchiverConfig & DataStoreConfig,
|
|
|
18
17
|
}): Promise<Archiver>;
|
|
19
18
|
/** Registers protocol contracts in the archiver store. */
|
|
20
19
|
export declare function registerProtocolContracts(store: KVArchiverDataStore): Promise<void>;
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFZOUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxLQUFLLFlBQVksRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUM1RCxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQXFCLE1BQU0sYUFBYSxDQUFDO0FBR3JFLE9BQU8sRUFBdUIsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUd4RixlQUFPLE1BQU0sbUJBQW1CLGFBQWEsQ0FBQztBQUU5QyxpQ0FBaUM7QUFDakMsd0JBQXNCLG1CQUFtQixDQUN2QyxVQUFVLEVBQUUsSUFBSSxDQUFDLGNBQWMsRUFBRSx3QkFBd0IsR0FBRyxTQUFTLENBQUMsR0FBRyxlQUFlLGdDQVF6RjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLE1BQU0sRUFBRSxjQUFjLEdBQUcsZUFBZSxFQUN4QyxJQUFJLEVBQUUsWUFBWSxFQUNsQixJQUFJLEdBQUU7SUFBRSxjQUFjLEVBQUUsT0FBTyxDQUFBO0NBQTZCLEdBQzNELE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FzSG5CO0FBRUQsMERBQTBEO0FBQzFELHdCQUFzQix5QkFBeUIsQ0FBQyxLQUFLLEVBQUUsbUJBQW1CLGlCQW9CekUifQ==
|
package/dest/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAY9D,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,aAAa,CAAC;AAGrE,OAAO,EAAuB,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGxF,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAE9C,iCAAiC;AACjC,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAAG,eAAe,gCAQzF;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE,YAAY,EAClB,IAAI,GAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAA6B,GAC3D,OAAO,CAAC,QAAQ,CAAC,CAsHnB;AAED,0DAA0D;AAC1D,wBAAsB,yBAAyB,CAAC,KAAK,EAAE,mBAAmB,iBAoBzE"}
|
package/dest/factory.js
CHANGED
|
@@ -19,14 +19,15 @@ import { mapArchiverConfig } from './config.js';
|
|
|
19
19
|
import { ArchiverInstrumentation } from './modules/instrumentation.js';
|
|
20
20
|
import { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
|
|
21
21
|
import { ARCHIVER_DB_VERSION, KVArchiverDataStore } from './store/kv_archiver_store.js';
|
|
22
|
+
import { L2TipsCache } from './store/l2_tips_cache.js';
|
|
22
23
|
export const ARCHIVER_STORE_NAME = 'archiver';
|
|
23
|
-
/** Creates an archiver store. */ export async function createArchiverStore(userConfig
|
|
24
|
+
/** Creates an archiver store. */ export async function createArchiverStore(userConfig) {
|
|
24
25
|
const config = {
|
|
25
26
|
...userConfig,
|
|
26
27
|
dataStoreMapSizeKb: userConfig.archiverStoreMapSizeKb ?? userConfig.dataStoreMapSizeKb
|
|
27
28
|
};
|
|
28
29
|
const store = await createStore(ARCHIVER_STORE_NAME, ARCHIVER_DB_VERSION, config);
|
|
29
|
-
return new KVArchiverDataStore(store, config.maxLogs
|
|
30
|
+
return new KVArchiverDataStore(store, config.maxLogs);
|
|
30
31
|
}
|
|
31
32
|
/**
|
|
32
33
|
* Creates a local archiver.
|
|
@@ -37,9 +38,7 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
37
38
|
*/ export async function createArchiver(config, deps, opts = {
|
|
38
39
|
blockUntilSync: true
|
|
39
40
|
}) {
|
|
40
|
-
const archiverStore = await createArchiverStore(config
|
|
41
|
-
epochDuration: config.aztecEpochDuration
|
|
42
|
-
});
|
|
41
|
+
const archiverStore = await createArchiverStore(config);
|
|
43
42
|
await registerProtocolContracts(archiverStore);
|
|
44
43
|
// Create Ethereum clients
|
|
45
44
|
const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
|
|
@@ -63,13 +62,14 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
63
62
|
const rollup = new RollupContract(publicClient, config.l1Contracts.rollupAddress);
|
|
64
63
|
const inbox = new InboxContract(publicClient, config.l1Contracts.inboxAddress);
|
|
65
64
|
// Fetch L1 constants from rollup contract
|
|
66
|
-
const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress, targetCommitteeSize] = await Promise.all([
|
|
65
|
+
const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress, targetCommitteeSize, rollupManaLimit] = await Promise.all([
|
|
67
66
|
rollup.getL1StartBlock(),
|
|
68
67
|
rollup.getL1GenesisTime(),
|
|
69
68
|
rollup.getProofSubmissionEpochs(),
|
|
70
69
|
rollup.getGenesisArchiveTreeRoot(),
|
|
71
70
|
rollup.getSlashingProposerAddress(),
|
|
72
|
-
rollup.getTargetCommitteeSize()
|
|
71
|
+
rollup.getTargetCommitteeSize(),
|
|
72
|
+
rollup.getManaLimit()
|
|
73
73
|
]);
|
|
74
74
|
const l1StartBlockHash = await publicClient.getBlock({
|
|
75
75
|
blockNumber: l1StartBlock,
|
|
@@ -85,7 +85,8 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
85
85
|
ethereumSlotDuration,
|
|
86
86
|
proofSubmissionEpochs: Number(proofSubmissionEpochs),
|
|
87
87
|
targetCommitteeSize,
|
|
88
|
-
genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString())
|
|
88
|
+
genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString()),
|
|
89
|
+
rollupManaLimit: Number(rollupManaLimit)
|
|
89
90
|
};
|
|
90
91
|
const archiverConfig = merge({
|
|
91
92
|
pollingIntervalMs: 10_000,
|
|
@@ -98,15 +99,14 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
98
99
|
const instrumentation = await ArchiverInstrumentation.new(telemetry, ()=>archiverStore.estimateSize());
|
|
99
100
|
// Create the event emitter that will be shared by archiver and synchronizer
|
|
100
101
|
const events = new EventEmitter();
|
|
102
|
+
// Create L2 tips cache shared by archiver and synchronizer
|
|
103
|
+
const l2TipsCache = new L2TipsCache(archiverStore.blockStore);
|
|
101
104
|
// Create the L1 synchronizer
|
|
102
|
-
const synchronizer = new ArchiverL1Synchronizer(publicClient, debugClient, rollup, inbox,
|
|
103
|
-
...config.l1Contracts,
|
|
104
|
-
slashingProposerAddress
|
|
105
|
-
}, archiverStore, archiverConfig, deps.blobClient, epochCache, deps.dateProvider ?? new DateProvider(), instrumentation, l1Constants, events, instrumentation.tracer);
|
|
105
|
+
const synchronizer = new ArchiverL1Synchronizer(publicClient, debugClient, rollup, inbox, archiverStore, archiverConfig, deps.blobClient, epochCache, deps.dateProvider ?? new DateProvider(), instrumentation, l1Constants, events, instrumentation.tracer, l2TipsCache, undefined);
|
|
106
106
|
const archiver = new Archiver(publicClient, debugClient, rollup, {
|
|
107
107
|
...config.l1Contracts,
|
|
108
108
|
slashingProposerAddress
|
|
109
|
-
}, archiverStore, archiverConfig, deps.blobClient, instrumentation, l1Constants, synchronizer, events);
|
|
109
|
+
}, archiverStore, archiverConfig, deps.blobClient, instrumentation, l1Constants, synchronizer, events, l2TipsCache);
|
|
110
110
|
await archiver.start(opts.blockUntilSync);
|
|
111
111
|
return archiver;
|
|
112
112
|
}
|
package/dest/index.d.ts
CHANGED
|
@@ -7,5 +7,6 @@ export * from './config.js';
|
|
|
7
7
|
export { type L1PublishedData } from './structs/published.js';
|
|
8
8
|
export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './store/kv_archiver_store.js';
|
|
9
9
|
export { ContractInstanceStore } from './store/contract_instance_store.js';
|
|
10
|
+
export { L2TipsCache } from './store/l2_tips_cache.js';
|
|
10
11
|
export { retrieveCheckpointsFromRollup, retrieveL2ProofVerifiedEvents } from './l1/data_retrieval.js';
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLGFBQWEsQ0FBQztBQUU1QixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN4RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUMzRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdkQsT0FBTyxFQUFFLDZCQUE2QixFQUFFLDZCQUE2QixFQUFFLE1BQU0sd0JBQXdCLENBQUMifQ==
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,aAAa,CAAC;AAE5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,aAAa,CAAC;AAE5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -6,4 +6,5 @@ export * from './modules/data_store_updater.js';
|
|
|
6
6
|
export * from './config.js';
|
|
7
7
|
export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './store/kv_archiver_store.js';
|
|
8
8
|
export { ContractInstanceStore } from './store/contract_instance_store.js';
|
|
9
|
+
export { L2TipsCache } from './store/l2_tips_cache.js';
|
|
9
10
|
export { retrieveCheckpointsFromRollup, retrieveL2ProofVerifiedEvents } from './l1/data_retrieval.js';
|
|
@@ -3,7 +3,7 @@ import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
5
|
import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
|
|
6
|
-
import { createPublicClient, getAbiItem, http, toEventSelector } from 'viem';
|
|
6
|
+
import { createPublicClient, decodeEventLog, getAbiItem, http, toEventSelector } from 'viem';
|
|
7
7
|
import { mainnet } from 'viem/chains';
|
|
8
8
|
import { CalldataRetriever } from '../calldata_retriever.js';
|
|
9
9
|
const logger = createLogger('archiver:calldata-test');
|
|
@@ -74,47 +74,51 @@ async function main() {
|
|
|
74
74
|
throw new Error(`Transaction ${txHash} not found`);
|
|
75
75
|
}
|
|
76
76
|
logger.info(`Transaction found in block ${tx.blockNumber}`);
|
|
77
|
-
// For simplicity, use zero addresses for optional contract addresses
|
|
78
|
-
// In production, these would be fetched from the rollup contract or configuration
|
|
79
|
-
const slashingProposerAddress = EthAddress.ZERO;
|
|
80
|
-
const governanceProposerAddress = EthAddress.ZERO;
|
|
81
|
-
const slashFactoryAddress = undefined;
|
|
82
|
-
logger.info('Using zero addresses for governance/slashing (can be configured if needed)');
|
|
83
77
|
// Create CalldataRetriever
|
|
84
|
-
const retriever = new CalldataRetriever(publicClient, publicClient, targetCommitteeSize, undefined, logger,
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
slashingProposerAddress,
|
|
88
|
-
slashFactoryAddress
|
|
89
|
-
});
|
|
90
|
-
// Extract checkpoint number from transaction logs
|
|
91
|
-
logger.info('Decoding transaction to extract checkpoint number...');
|
|
78
|
+
const retriever = new CalldataRetriever(publicClient, publicClient, targetCommitteeSize, undefined, logger, rollupAddress);
|
|
79
|
+
// Extract checkpoint number and hashes from transaction logs
|
|
80
|
+
logger.info('Decoding transaction to extract checkpoint number and hashes...');
|
|
92
81
|
const receipt = await publicClient.getTransactionReceipt({
|
|
93
82
|
hash: txHash
|
|
94
83
|
});
|
|
95
|
-
// Look for CheckpointProposed event
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
84
|
+
// Look for CheckpointProposed event
|
|
85
|
+
const checkpointProposedEventAbi = getAbiItem({
|
|
86
|
+
abi: RollupAbi,
|
|
87
|
+
name: 'CheckpointProposed'
|
|
88
|
+
});
|
|
89
|
+
const checkpointProposedLog = receipt.logs.find((log)=>{
|
|
99
90
|
try {
|
|
100
|
-
return log.address.toLowerCase() === rollupAddress.toString().toLowerCase() && log.topics[0] === toEventSelector(
|
|
101
|
-
abi: RollupAbi,
|
|
102
|
-
name: 'CheckpointProposed'
|
|
103
|
-
}));
|
|
91
|
+
return log.address.toLowerCase() === rollupAddress.toString().toLowerCase() && log.topics[0] === toEventSelector(checkpointProposedEventAbi);
|
|
104
92
|
} catch {
|
|
105
93
|
return false;
|
|
106
94
|
}
|
|
107
95
|
});
|
|
108
|
-
if (!
|
|
96
|
+
if (!checkpointProposedLog || checkpointProposedLog.topics[1] === undefined) {
|
|
109
97
|
throw new Error(`Checkpoint proposed event not found`);
|
|
110
98
|
}
|
|
111
|
-
const checkpointNumber = CheckpointNumber.fromBigInt(BigInt(
|
|
99
|
+
const checkpointNumber = CheckpointNumber.fromBigInt(BigInt(checkpointProposedLog.topics[1]));
|
|
100
|
+
// Decode the full event to extract attestationsHash and payloadDigest
|
|
101
|
+
const decodedEvent = decodeEventLog({
|
|
102
|
+
abi: RollupAbi,
|
|
103
|
+
data: checkpointProposedLog.data,
|
|
104
|
+
topics: checkpointProposedLog.topics
|
|
105
|
+
});
|
|
106
|
+
const eventArgs = decodedEvent.args;
|
|
107
|
+
if (!eventArgs.attestationsHash || !eventArgs.payloadDigest) {
|
|
108
|
+
throw new Error(`CheckpointProposed event missing attestationsHash or payloadDigest`);
|
|
109
|
+
}
|
|
110
|
+
const expectedHashes = {
|
|
111
|
+
attestationsHash: eventArgs.attestationsHash,
|
|
112
|
+
payloadDigest: eventArgs.payloadDigest
|
|
113
|
+
};
|
|
114
|
+
logger.info(`Checkpoint Number: ${checkpointNumber}`);
|
|
115
|
+
logger.info(`Attestations Hash: ${expectedHashes.attestationsHash}`);
|
|
116
|
+
logger.info(`Payload Digest: ${expectedHashes.payloadDigest}`);
|
|
112
117
|
logger.info('');
|
|
113
118
|
logger.info('Retrieving checkpoint from rollup transaction...');
|
|
114
119
|
logger.info('');
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
logger.info(' Successfully retrieved block header!');
|
|
120
|
+
const result = await retriever.getCheckpointFromRollupTx(txHash, [], checkpointNumber, expectedHashes);
|
|
121
|
+
logger.info(' Successfully retrieved block header!');
|
|
118
122
|
logger.info('');
|
|
119
123
|
logger.info('Block Header Details:');
|
|
120
124
|
logger.info('====================');
|