@aztec/archiver 0.0.1-commit.993d240 → 0.0.1-commit.9a89641

package/dest/test/noop_l1_archiver.d.ts

@@ -1,5 +1,6 @@
 import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { DateProvider } from '@aztec/foundation/timer';
 import type { BlockHash } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import type { BlockHeader } from '@aztec/stdlib/tx';
@@ -8,6 +9,9 @@ import { Archiver } from '../archiver.js';
 import { ArchiverInstrumentation } from '../modules/instrumentation.js';
 import type { ArchiverDataStores } from '../store/data_stores.js';
 import { L2TipsCache } from '../store/l2_tips_cache.js';
+type NoopL1ArchiverConfigOverrides = Partial<{
+    skipOrphanProposedBlockPruning: boolean;
+}>;
 /**
  * Archiver with mocked L1 connectivity for testing.
  * Uses mock L1 clients and a noop synchronizer, enabling tests that
@@ -16,7 +20,7 @@ import { L2TipsCache } from '../store/l2_tips_cache.js';
 export declare class NoopL1Archiver extends Archiver {
     constructor(dataStores: ArchiverDataStores, l1Constants: L1RollupConstants & {
         genesisArchiveRoot: Fr;
-    }, instrumentation: ArchiverInstrumentation, initialHeader: BlockHeader, initialBlockHash: BlockHash, l2TipsCache: L2TipsCache);
+    }, instrumentation: ArchiverInstrumentation, initialHeader: BlockHeader, initialBlockHash: BlockHash, l2TipsCache: L2TipsCache, dateProvider?: DateProvider, configOverrides?: NoopL1ArchiverConfigOverrides);
     /** Override start to skip L1 validation checks. */
     start(_blockUntilSynced?: boolean): Promise<void>;
     /** Always reports as fully synced since there is no real L1 to sync from. */
@@ -25,5 +29,6 @@ export declare class NoopL1Archiver extends Archiver {
 /** Creates an archiver with mocked L1 connectivity for testing. */
 export declare function createNoopL1Archiver(dataStores: ArchiverDataStores, l1Constants: L1RollupConstants & {
     genesisArchiveRoot: Fr;
-}, telemetry: TelemetryClient | undefined, initialHeader: BlockHeader): Promise<NoopL1Archiver>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9vcF9sMV9hcmNoaXZlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3Qvbm9vcF9sMV9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFN0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sS0FBSyxFQUFtQixTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBbUMsTUFBTSx5QkFBeUIsQ0FBQztBQUtoRyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDMUMsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFeEUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUF5QnhEOzs7O0dBSUc7QUFDSCxxQkFBYSxjQUFlLFNBQVEsUUFBUTtJQUMxQyxZQUNFLFVBQVUsRUFBRSxrQkFBa0IsRUFDOUIsV0FBVyxFQUFFLGlCQUFpQixHQUFHO1FBQUUsa0JBQWtCLEVBQUUsRUFBRSxDQUFBO0tBQUUsRUFDM0QsZUFBZSxFQUFFLHVCQUF1QixFQUN4QyxhQUFhLEVBQUUsV0FBVyxFQUMxQixnQkFBZ0IsRUFBRSxTQUFTLEVBQzNCLFdBQVcsRUFBRSxXQUFXLEVBaUR6QjtJQUVELG1EQUFtRDtJQUNuQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUloRTtJQUVELDZFQUE2RTtJQUM3RCxxQkFBcUIsSUFBSSxPQUFPLENBQUMsVUFBVSxHQUFHLFNBQVMsQ0FBQyxDQUV2RTtDQUNGO0FBRUQsbUVBQW1FO0FBQ25FLHdCQUFzQixvQkFBb0IsQ0FDeEMsVUFBVSxFQUFFLGtCQUFrQixFQUM5QixXQUFXLEVBQUUsaUJBQWlCLEdBQUc7SUFBRSxrQkFBa0IsRUFBRSxFQUFFLENBQUE7Q0FBRSxFQUMzRCxTQUFTLDZCQUF3QyxFQUNqRCxhQUFhLEVBQUUsV0FBVyxHQUN6QixPQUFPLENBQUMsY0FBYyxDQUFDLENBU3pCIn0=
+}, telemetry: TelemetryClient | undefined, initialHeader: BlockHeader, dateProvider?: DateProvider, configOverrides?: NoopL1ArchiverConfigOverrides): Promise<NoopL1Archiver>;
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9vcF9sMV9hcmNoaXZlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3Qvbm9vcF9sMV9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFN0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RCxPQUFPLEtBQUssRUFBbUIsU0FBUyxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQW1DLE1BQU0seUJBQXlCLENBQUM7QUFLaEcsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzFDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRXhFLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXhELEtBQUssNkJBQTZCLEdBQUcsT0FBTyxDQUFDO0lBQzNDLDhCQUE4QixFQUFFLE9BQU8sQ0FBQztDQUN6QyxDQUFDLENBQUM7QUF5Qkg7Ozs7R0FJRztBQUNILHFCQUFhLGNBQWUsU0FBUSxRQUFRO0lBQzFDLFlBQ0UsVUFBVSxFQUFFLGtCQUFrQixFQUM5QixXQUFXLEVBQUUsaUJBQWlCLEdBQUc7UUFBRSxrQkFBa0IsRUFBRSxFQUFFLENBQUE7S0FBRSxFQUMzRCxlQUFlLEVBQUUsdUJBQXVCLEVBQ3hDLGFBQWEsRUFBRSxXQUFXLEVBQzFCLGdCQUFnQixFQUFFLFNBQVMsRUFDM0IsV0FBVyxFQUFFLFdBQVcsRUFDeEIsWUFBWSxHQUFFLFlBQWlDLEVBQy9DLGVBQWUsR0FBRSw2QkFBa0MsRUFvRHBEO0lBRUQsbURBQW1EO0lBQ25DLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLE9BQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWhFO0lBRUQsNkVBQTZFO0lBQzdELHFCQUFxQixJQUFJLE9BQU8sQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDLENBRXZFO0NBQ0Y7QUFFRCxtRUFBbUU7QUFDbkUsd0JBQXNCLG9CQUFvQixDQUN4QyxVQUFVLEVBQUUsa0JBQWtCLEVBQzlCLFdBQVcsRUFBRSxpQkFBaUIsR0FBRztJQUFFLGtCQUFrQixFQUFFLEVBQUUsQ0FBQTtDQUFFLEVBQzNELFNBQVMsNkJBQXdDLEVBQ2pELGFBQWEsRUFBRSxXQUFXLEVBQzFCLFlBQVksQ0FBQyxFQUFFLFlBQVksRUFDM0IsZUFBZSxDQUFDLEVBQUUsNkJBQTZCLEdBQzlDLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FrQnpCIn0=

package/dest/test/noop_l1_archiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noop_l1_archiver.d.ts","sourceRoot":"","sources":["../../src/test/noop_l1_archiver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,KAAK,EAAmB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,yBAAyB,CAAC;AAKhG,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAyBxD;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,YACE,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;QAAE,kBAAkB,EAAE,EAAE,CAAA;KAAE,EAC3D,eAAe,EAAE,uBAAuB,EACxC,aAAa,EAAE,WAAW,EAC1B,gBAAgB,EAAE,SAAS,EAC3B,WAAW,EAAE,WAAW,EAiDzB;IAED,mDAAmD;IACnC,KAAK,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhE;IAED,6EAA6E;IAC7D,qBAAqB,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAEvE;CACF;AAED,mEAAmE;AACnE,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;IAAE,kBAAkB,EAAE,EAAE,CAAA;CAAE,EAC3D,SAAS,6BAAwC,EACjD,aAAa,EAAE,WAAW,GACzB,OAAO,CAAC,cAAc,CAAC,CASzB"}
+{"version":3,"file":"noop_l1_archiver.d.ts","sourceRoot":"","sources":["../../src/test/noop_l1_archiver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,KAAK,EAAmB,SAAS,EAAW,MAAM,qBAAqB,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,yBAAyB,CAAC;AAKhG,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,KAAK,6BAA6B,GAAG,OAAO,CAAC;IAC3C,8BAA8B,EAAE,OAAO,CAAC;CACzC,CAAC,CAAC;AAyBH;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,YACE,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;QAAE,kBAAkB,EAAE,EAAE,CAAA;KAAE,EAC3D,eAAe,EAAE,uBAAuB,EACxC,aAAa,EAAE,WAAW,EAC1B,gBAAgB,EAAE,SAAS,EAC3B,WAAW,EAAE,WAAW,EACxB,YAAY,GAAE,YAAiC,EAC/C,eAAe,GAAE,6BAAkC,EAoDpD;IAED,mDAAmD;IACnC,KAAK,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhE;IAED,6EAA6E;IAC7D,qBAAqB,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAEvE;CACF;AAED,mEAAmE;AACnE,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,kBAAkB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;IAAE,kBAAkB,EAAE,EAAE,CAAA;CAAE,EAC3D,SAAS,6BAAwC,EACjD,aAAa,EAAE,WAAW,EAC1B,YAAY,CAAC,EAAE,YAAY,EAC3B,eAAe,CAAC,EAAE,6BAA6B,GAC9C,OAAO,CAAC,cAAc,CAAC,CAkBzB"}

package/dest/test/noop_l1_archiver.js

@@ -24,7 +24,7 @@ import { L2TipsCache } from '../store/l2_tips_cache.js';
         return Promise.resolve();
     }
     syncFromL1(_initialSyncComplete) {
-        return Promise.resolve();
+        return Promise.resolve([]);
     }
 }
 /**
@@ -32,20 +32,19 @@ import { L2TipsCache } from '../store/l2_tips_cache.js';
  * Uses mock L1 clients and a noop synchronizer, enabling tests that
  * don't require real Ethereum connectivity.
  */ export class NoopL1Archiver extends Archiver {
-    constructor(dataStores, l1Constants, instrumentation, initialHeader, initialBlockHash, l2TipsCache){
+    constructor(dataStores, l1Constants, instrumentation, initialHeader, initialBlockHash, l2TipsCache, dateProvider = new DateProvider(), configOverrides = {}){
         // Create mocks for L1 clients
         const publicClient = mock();
         const debugClient = mock();
         const rollup = mock();
+        const outbox = mock();
         const blobClient = mock();
         // Mock methods called during start()
         blobClient.testSources.mockResolvedValue();
         publicClient.getBlockNumber.mockResolvedValue(1n);
         const events = new EventEmitter();
         const synchronizer = new NoopL1Synchronizer(instrumentation.tracer);
-        const epochCache = mock();
-        epochCache.pipeliningOffset.mockReturnValue(0);
-        super(publicClient, debugClient, rollup, {
+        super(publicClient, debugClient, rollup, outbox, {
             rollupAddress: EthAddress.ZERO,
             registryAddress: EthAddress.ZERO,
             inboxAddress: EthAddress.ZERO,
@@ -58,11 +57,15 @@ import { L2TipsCache } from '../store/l2_tips_cache.js';
             maxAllowedEthClientDriftSeconds: 300,
             ethereumAllowNoDebugHosts: true,
             skipHistoricalLogsCheck: true,
-            orphanProposedBlockPruneGraceSeconds: 2
+            checkpointProposalSyncGrace: 4,
+            orphanPruneNoProposalTolerance: 1,
+            skipOrphanProposedBlockPruning: true,
+            blockDuration: 2,
+            ...configOverrides
         }, blobClient, instrumentation, {
             ...l1Constants,
             l1StartBlockHash: Buffer32.random()
-        }, synchronizer, events, initialHeader, initialBlockHash, l2TipsCache, epochCache, new DateProvider());
+        }, synchronizer, events, initialHeader, initialBlockHash, l2TipsCache, dateProvider);
     }
     /** Override start to skip L1 validation checks. */ start(_blockUntilSynced) {
         // Just start the running promise without L1 checks
@@ -73,7 +76,7 @@ import { L2TipsCache } from '../store/l2_tips_cache.js';
         return Promise.resolve(SlotNumber(Number.MAX_SAFE_INTEGER));
     }
 }
-/** Creates an archiver with mocked L1 connectivity for testing. */ export async function createNoopL1Archiver(dataStores, l1Constants, telemetry = getTelemetryClient(), initialHeader) {
+/** Creates an archiver with mocked L1 connectivity for testing. */ export async function createNoopL1Archiver(dataStores, l1Constants, telemetry = getTelemetryClient(), initialHeader, dateProvider, configOverrides) {
     const instrumentation = await ArchiverInstrumentation.new(telemetry, ()=>dataStores.db.estimateSize());
     // Mirror the production factory: precompute the dynamic genesis block hash from the injected
     // initial header so `L2TipsCache` reports the correct tip hash at block 0. Without this, the
@@ -81,5 +84,5 @@ import { L2TipsCache } from '../store/l2_tips_cache.js';
     // with default empty genesis.
     const initialBlockHash = await initialHeader.hash();
     const l2TipsCache = new L2TipsCache(dataStores.blocks, initialBlockHash);
-    return new NoopL1Archiver(dataStores, l1Constants, instrumentation, initialHeader, initialBlockHash, l2TipsCache);
+    return new NoopL1Archiver(dataStores, l1Constants, instrumentation, initialHeader, initialBlockHash, l2TipsCache, dateProvider, configOverrides);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/archiver",
-  "version": "0.0.1-commit.993d240",
+  "version": "0.0.1-commit.9a89641",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -65,18 +65,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-client": "0.0.1-commit.993d240",
-    "@aztec/blob-lib": "0.0.1-commit.993d240",
-    "@aztec/constants": "0.0.1-commit.993d240",
-    "@aztec/epoch-cache": "0.0.1-commit.993d240",
-    "@aztec/ethereum": "0.0.1-commit.993d240",
-    "@aztec/foundation": "0.0.1-commit.993d240",
-    "@aztec/kv-store": "0.0.1-commit.993d240",
-    "@aztec/l1-artifacts": "0.0.1-commit.993d240",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.993d240",
-    "@aztec/protocol-contracts": "0.0.1-commit.993d240",
-    "@aztec/stdlib": "0.0.1-commit.993d240",
-    "@aztec/telemetry-client": "0.0.1-commit.993d240",
+    "@aztec/blob-client": "0.0.1-commit.9a89641",
+    "@aztec/blob-lib": "0.0.1-commit.9a89641",
+    "@aztec/constants": "0.0.1-commit.9a89641",
+    "@aztec/epoch-cache": "0.0.1-commit.9a89641",
+    "@aztec/ethereum": "0.0.1-commit.9a89641",
+    "@aztec/foundation": "0.0.1-commit.9a89641",
+    "@aztec/kv-store": "0.0.1-commit.9a89641",
+    "@aztec/l1-artifacts": "6.0.0-nightly.20260807",
+    "@aztec/protocol-contracts": "0.0.1-commit.9a89641",
+    "@aztec/standard-contracts": "0.0.1-commit.9a89641",
+    "@aztec/stdlib": "0.0.1-commit.9a89641",
+    "@aztec/telemetry-client": "0.0.1-commit.9a89641",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",
     "tslib": "^2.5.0",

package/src/archiver.ts

@@ -1,11 +1,11 @@
 import type { BlobClientInterface } from '@aztec/blob-client/client';
 import { EpochCache } from '@aztec/epoch-cache';
-import { BlockTagTooOldError, RollupContract } from '@aztec/ethereum/contracts';
+import { BlockTagTooOldError, OutboxContract, RollupContract } from '@aztec/ethereum/contracts';
 import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import type { ViemPublicClient, ViemPublicDebugClient } from '@aztec/ethereum/types';
 import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { merge, pick } from '@aztec/foundation/collection';
+import { merge } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
@@ -20,6 +20,7 @@ import {
   L2BlockSourceEvents,
   type L2Tips,
   type ValidateCheckpointResult,
+  l2TipsEqual,
 } from '@aztec/stdlib/block';
 import { type ProposedCheckpointInput, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import {
@@ -30,7 +31,9 @@ import {
   getTimestampForSlot,
   getTimestampRangeForEpoch,
 } from '@aztec/stdlib/epoch-helpers';
-import type { BlockHeader } from '@aztec/stdlib/tx';
+import type { L2ToL1MembershipWitness } from '@aztec/stdlib/messaging';
+import { ConsensusTimetable } from '@aztec/stdlib/timetable';
+import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
 
 import { type ArchiverConfig, mapArchiverConfig } from './config.js';
@@ -41,6 +44,7 @@ import { ArchiverDataSourceBase } from './modules/data_source_base.js';
 import { ArchiverDataStoreUpdater } from './modules/data_store_updater.js';
 import type { ArchiverInstrumentation } from './modules/instrumentation.js';
 import type { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
+import { OutboxTreesResolver } from './modules/outbox_trees_resolver.js';
 import { type ArchiverDataStores, backupArchiverDataStores, getArchiverSynchPoint } from './store/data_stores.js';
 import { L2TipsCache } from './store/l2_tips_cache.js';
 
@@ -70,6 +74,16 @@ export type ArchiverDeps = {
   dateProvider?: DateProvider;
 };
 
+/** Minimal dependency for observing whether a checkpoint proposal was received for a slot. */
+export type CheckpointProposalPresence = {
+  /** Returns true when a checkpoint proposal for `slot` has been retained locally. */
+  hasCheckpointProposalForSlot(slot: SlotNumber): Promise<boolean>;
+};
+
+const noCheckpointProposalPresence: CheckpointProposalPresence = {
+  hasCheckpointProposalForSlot: () => Promise.resolve(false),
+};
+
 /**
  * Pulls checkpoints in a non-blocking manner and provides interface for their retrieval.
  * Responsible for handling robust L1 polling so that other components do not need to
@@ -85,6 +99,9 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
   /** L1 synchronizer that handles fetching checkpoints and messages from L1. */
   private readonly synchronizer: ArchiverL1Synchronizer;
 
+  /** Resolver for L2-to-L1 message membership witnesses, built over this archiver's read view. */
+  private readonly outboxTreesResolver: OutboxTreesResolver;
+
   private initialSyncComplete: boolean = false;
   private initialSyncPromise: PromiseWithResolvers<void>;
 
@@ -97,6 +114,9 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
   /** In-memory cache for L2 chain tips. */
   private readonly l2TipsCache: L2TipsCache;
 
+  /** Consensus timing model used for proposed-checkpoint arrival expectations. */
+  private readonly timetable: ConsensusTimetable;
+
   public readonly tracer: Tracer;
 
   private readonly instrumentation: ArchiverInstrumentation;
@@ -106,6 +126,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
    * @param publicClient - A client for interacting with the Ethereum node.
    * @param debugClient - A client for interacting with the Ethereum node for debug/trace methods.
    * @param rollup - Rollup contract instance.
+   * @param outbox - Outbox contract instance, used to read per-epoch L2-to-L1 message roots.
    * @param inbox - Inbox contract instance.
    * @param l1Addresses - L1 contract addresses (registry, governance proposer, slashing proposer).
    * @param dataStores - Archiver substores for storage & retrieval of blocks, encrypted logs & contract data.
@@ -118,7 +139,6 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
    * @param initialHeader - Genesis block header.
    * @param initialBlockHash - Precomputed hash of the genesis block header.
    * @param l2TipsCache - In-memory cache for L2 chain tips.
-   * @param epochCache - Cache used to compute the proposer pipelining offset.
    * @param dateProvider - Provider for current date/time, used for wall-clock orphan-block pruning.
    * @param log - A logger.
    */
@@ -126,6 +146,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     private readonly publicClient: ViemPublicClient,
     private readonly debugClient: ViemPublicDebugClient,
     private readonly rollup: RollupContract,
+    private readonly outbox: OutboxContract,
     private readonly l1Addresses: Pick<
       L1ContractAddresses,
       'rollupAddress' | 'registryAddress' | 'inboxAddress' | 'governanceProposerAddress'
@@ -140,7 +161,10 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
       maxAllowedEthClientDriftSeconds: number;
       ethereumAllowNoDebugHosts?: boolean;
       skipHistoricalLogsCheck?: boolean;
-      orphanProposedBlockPruneGraceSeconds: number;
+      checkpointProposalSyncGrace: number;
+      orphanPruneNoProposalTolerance: number;
+      skipOrphanProposedBlockPruning: boolean;
+      blockDuration: number;
     },
     private readonly blobClient: BlobClientInterface,
     instrumentation: ArchiverInstrumentation,
@@ -153,8 +177,8 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     initialHeader: BlockHeader,
     initialBlockHash: BlockHash,
     l2TipsCache: L2TipsCache,
-    private readonly epochCache: EpochCache,
     private readonly dateProvider: DateProvider,
+    private checkpointProposalPresence: CheckpointProposalPresence = noCheckpointProposalPresence,
     private readonly log: Logger = createLogger('archiver'),
   ) {
     super(dataStores, l1Constants, initialHeader, initialBlockHash, l1Constants.genesisArchiveRoot);
@@ -165,10 +189,25 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     this.synchronizer = synchronizer;
     this.events = events;
     this.l2TipsCache = l2TipsCache;
+    this.timetable = new ConsensusTimetable({
+      l1Constants,
+      blockDuration: this.config.blockDuration,
+      checkpointProposalSyncGrace: this.config.checkpointProposalSyncGrace,
+    });
     this.updater = new ArchiverDataStoreUpdater(this.dataStores, this.l2TipsCache, {
       rollupManaLimit: l1Constants.rollupManaLimit,
     });
 
+    // The resolver reads its witness data from this archiver and pins its lazy Outbox-root fetches
+    // to the archiver's synced L1 block. No method on `this` is invoked during construction.
+    this.outboxTreesResolver = new OutboxTreesResolver(
+      this.outbox,
+      this,
+      this.dataStores.db,
+      () => Promise.resolve(this.getL1BlockNumber()),
+      l1Constants.epochDuration,
+    );
+
     // Running promise starts with a small interval inbetween runs, so all iterations needed for the initial sync
     // are done as fast as possible. This then gets updated once the initial sync completes.
     this.runningPromise = new RunningPromise(
@@ -179,6 +218,27 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     );
   }
 
+  /**
+   * Returns the L2-to-L1 membership witness for `message` emitted by tx `txHash`. The node selects
+   * the smallest partial-proof root on the Outbox that covers the tx's checkpoint and builds the
+   * witness against it.
+   *
+   * The node reads the Outbox roots lazily, pinned to its synced L1 block, so the witness reflects
+   * the node's synced view. Returns `undefined` if the tx isn't yet in a block/epoch or no covering
+   * root has landed on L1 as of the synced block.
+   *
+   * Caveat: roots are cached only for the current synced L1 block and re-fetched once the node
+   * advances, so a reorg is picked up on the next synced-block advance rather than re-validated per
+   * request.
+   */
+  public getL2ToL1MembershipWitness(
+    txHash: TxHash,
+    message: Fr,
+    messageIndexInTx?: number,
+  ): Promise<L2ToL1MembershipWitness | undefined> {
+    return this.outboxTreesResolver.getL2ToL1MembershipWitness(txHash, message, messageIndexInTx);
+  }
+
   /** Updates archiver config */
   public updateConfig(newConfig: Partial<ArchiverConfig>) {
     this.config = merge(this.config, mapArchiverConfig(newConfig));
@@ -235,6 +295,11 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     return this.runningPromise.trigger();
   }
 
+  /** Sets the proposal-presence provider used by orphan proposed-block pruning. */
+  public setCheckpointProposalPresence(checkpointProposalPresence: CheckpointProposalPresence): void {
+    this.checkpointProposalPresence = checkpointProposalPresence;
+  }
+
   public trySyncImmediate() {
     try {
       return this.syncImmediate();
@@ -276,9 +341,10 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
    * Called at the beginning of each sync iteration.
    * Items are processed in the order they were queued.
    */
-  private async processInboundQueue(): Promise<void> {
+  private async processInboundQueue(): Promise<L2Block[]> {
+    const blocksAdded: L2Block[] = [];
     if (this.inboundQueue.length === 0) {
-      return;
+      return blocksAdded;
     }
 
     // Take all items from the queue
@@ -315,6 +381,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
         if (type === 'block') {
           const [durationMs] = await elapsed(() => this.updater.addProposedBlock(item.block));
           this.instrumentation.processNewProposedBlock(durationMs, item.block);
+          blocksAdded.push(item.block);
         } else {
           await this.updater.addProposedCheckpoint(item.checkpoint);
         }
@@ -323,6 +390,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
       } catch (err: any) {
         if (err instanceof BlockAlreadyCheckpointedError) {
           this.log.debug(`Proposed block ${itemNumber} matches already checkpointed block, ignoring late proposal`);
+          // A late proposal that matches an already-checkpointed block adds nothing new, so it is not appended.
           resolve();
           continue;
         }
@@ -333,6 +401,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
         reject(err);
       }
     }
+    return blocksAdded;
   }
 
   public waitForInitialSync() {
@@ -344,12 +413,31 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
    */
   @trackSpan('Archiver.sync')
   private async sync() {
+    // Capture the tips before any mutation so the aggregate event can report what moved this pass.
+    const fromTips = await this.getL2Tips();
+
+    // Accumulate the blocks added across the pass's sub-steps (queued proposals + L1 checkpoint payloads).
+    const blocksAdded: L2Block[] = [];
     // Process any queued blocks first, before doing L1 sync
-    await this.processInboundQueue();
+    blocksAdded.push(...(await this.processInboundQueue()));
     // Now perform L1 sync
-    await this.syncFromL1();
-    // Prune proposed blocks with no corresponding proposed checkpoint by the end of their build slot.
+    blocksAdded.push(...(await this.syncFromL1()));
+    // Prune proposed blocks with no corresponding proposed checkpoint after the appropriate materialization deadline.
     await this.pruneOrphanProposedBlocks();
+
+    // Emit a single aggregate update event after all pass work has committed and the tips cache has refreshed,
+    // so `toTips` and the source state observed by listeners are consistent with the event payload. The pass
+    // mutated state if the tips moved (added blocks, a prune, or a thin tier movement) or blocks were added; a
+    // fully-synced no-op pass emits nothing.
+    const toTips = await this.getL2Tips();
+    if (!l2TipsEqual(fromTips, toTips) || blocksAdded.length > 0) {
+      this.events.emit(L2BlockSourceEvents.L2BlockSourceUpdated, {
+        type: L2BlockSourceEvents.L2BlockSourceUpdated,
+        fromTips,
+        toTips,
+        blocksAdded,
+      });
+    }
   }
 
   /**
@@ -357,38 +445,38 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
    *
    * Under pipelining, a proposer publishes the blocks for a checkpoint (block-only proposals) before
    * assembling and publishing the enclosing proposed checkpoint at the end of the build slot. A node
-   * that received those blocks but never the proposed checkpoint is left with an orphan tip it must
-   * not build on. We prune it once enough wall-clock time has elapsed that the proposed checkpoint
-   * should have arrived. This runs on wall-clock time (not L1 block advancement) so it fires during
-   * quiet L1 periods, and is the liveness counterpart to the sequencer's checkSync guard.
+   * that received those blocks but never the proposed checkpoint is left with an orphan tip it must not build on.
+   * If no checkpoint proposal was received for the orphan slot, we prune after the receive deadline plus local
+   * tolerance. If a checkpoint proposal was received but has not materialized into proposed archiver state,
+   * we prune after the consensus materialization deadline.
    *
    * The uncheckpointed suffix is scanned in order. Blocks covered by proposed checkpoints are left in
    * place; the first block not covered by a proposed checkpoint starts the orphan suffix to prune.
    */
   private async pruneOrphanProposedBlocks(): Promise<void> {
+    if (this.config.skipOrphanProposedBlockPruning) {
+      return;
+    }
     const tips = await this.getL2Tips();
     const now = BigInt(this.dateProvider.nowInSeconds());
-    const pipeliningOffset = this.epochCache.pipeliningOffset();
 
-    // This only applies under pipelining
-    if (pipeliningOffset === 0) {
-      this.log.trace(`Pipelining offset is 0, skipping orphan proposed block pruning`);
-      return;
-    }
+    // Frontier block covered by a proposed (or, falling back, confirmed) checkpoint. Blocks beyond it
+    // have no enclosing checkpoint proposal and are the orphan-pruning candidates.
+    const proposedCheckpointBlockNumber = await this.stores.blocks.getProposedCheckpointL2BlockNumber();
 
     // The proposed tip is a proposed-checkpointed block, so there are no orphan proposed blocks to prune
-    if (tips.proposedCheckpoint.block.number === tips.proposed.number) {
-      this.log.trace(
-        `No orphan proposed blocks to prune: proposed tip ${tips.proposed.number} is checkpointed`,
-        pick(tips, 'proposed', 'proposedCheckpoint'),
-      );
+    if (proposedCheckpointBlockNumber === tips.proposed.number) {
+      this.log.trace(`No orphan proposed blocks to prune: proposed tip ${tips.proposed.number} is checkpointed`, {
+        proposed: tips.proposed,
+        proposedCheckpointBlockNumber,
+      });
       return;
     }
 
     // Load the blocks that are candidates for pruning (ie blocks without a proposed checkpoint covering them)
     const blocksWithoutProposedCheckpoint = await this.stores.blocks.getBlocksData({
-      from: BlockNumber(tips.proposedCheckpoint.block.number + 1),
-      limit: tips.proposed.number - tips.proposedCheckpoint.block.number,
+      from: BlockNumber(proposedCheckpointBlockNumber + 1),
+      limit: tips.proposed.number - proposedCheckpointBlockNumber,
     });
 
     // Iterate through them in order, the first one with a slot that should have received a proposed checkpoint
@@ -403,15 +491,21 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
       }
       lastSlotChecked = blockSlot;
 
-      // The proposed checkpoint should have landed by the start of the slot after the block's build slot
-      // (build slot = blockSlot - pipeliningOffset). Wait a grace period beyond that to tolerate propagation.
-      const expectedCheckpointedBySlot = SlotNumber(Number(blockSlot) - pipeliningOffset + 1);
-      const expectedCheckpointedByTime =
-        getTimestampForSlot(expectedCheckpointedBySlot, this.l1Constants) +
-        BigInt(this.config.orphanProposedBlockPruneGraceSeconds);
+      const hasCheckpointProposal = await this.checkpointProposalPresence.hasCheckpointProposalForSlot(blockSlot);
+      const deadlineType = hasCheckpointProposal ? 'checkpoint-proposal-synced' : 'checkpoint-proposal-received';
+      const selectedDeadline = BigInt(
+        hasCheckpointProposal
+          ? this.timetable.getCheckpointProposalSyncedDeadline(blockSlot)
+          : Math.ceil(
+              this.timetable.getCheckpointProposalReceiveDeadline(blockSlot) +
+                this.config.orphanPruneNoProposalTolerance,
+            ),
+      );
 
-      // If it's not checkpointed by the expected time, prune it along with all blocks after it.
-      if (now >= expectedCheckpointedByTime) {
+      // If it's still not checkpointed once strictly past the selected deadline, prune it along with all blocks after
+      // it. A proposal may still legitimately arrive or materialize at exactly its deadline, so the tip is only
+      // orphaned once that instant has fully elapsed.
+      if (now > selectedDeadline) {
         const pruneAfterBlockNumber = BlockNumber(blockNumber - 1);
         this.log.warn(
           `Pruning orphan blocks after block ${pruneAfterBlockNumber}: block at slot ${blockSlot} belongs to ` +
@@ -421,15 +515,16 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
             blockCheckpointNumber: blockData.checkpointNumber,
             blockNumber,
             blockSlot,
-            pipeliningOffset,
-            expectedCheckpointedBySlot,
-            expectedCheckpointedByTime,
+            hasCheckpointProposal,
+            deadlineType,
+            selectedDeadline,
             now,
           },
         );
 
         const prunedBlocks = await this.updater.removeBlocksWithoutProposedCheckpointAfter(pruneAfterBlockNumber);
         if (prunedBlocks.length > 0) {
+          this.instrumentation.recordPrune('orphan');
           this.events.emit(L2BlockSourceEvents.L2PruneUncheckpointed, {
             type: L2BlockSourceEvents.L2PruneUncheckpointed,
             slotNumber: blockSlot,
@@ -440,14 +535,14 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
       }
     }
 
-    this.log.trace('No orphan proposed blocks to prune: all uncheckpointed blocks are still within the grace period', {
+    this.log.trace('No orphan proposed blocks to prune: all uncheckpointed blocks are still within deadline', {
       blocksWithoutProposedCheckpoint: blocksWithoutProposedCheckpoint.map(b => b.header.toInspect()),
     });
   }
 
-  private async syncFromL1() {
+  private async syncFromL1(): Promise<L2Block[]> {
     // Delegate to the L1 synchronizer
-    await this.synchronizer.syncFromL1(this.initialSyncComplete);
+    const blocksAdded = await this.synchronizer.syncFromL1(this.initialSyncComplete);
 
     // Check if we've completed initial sync
     const currentL1BlockNumber = this.synchronizer.getL1BlockNumber();
@@ -464,6 +559,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
         this.initialSyncPromise.resolve();
       }
     }
+    return blocksAdded;
   }
 
   /** Resumes the archiver after a stop. */
@@ -599,6 +695,15 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     return this.updater.removeCheckpointsAfter(checkpointNumber);
   }
 
+  /**
+   * Removes all uncheckpointed blocks strictly after `blockNumber`, along with the proposed checkpoints
+   * that referenced them. Used by the AutomineSequencer to undo a local insert whose propose tx failed
+   * to land on L1 (no reorg needed — nothing reached L1). Refuses to touch checkpointed blocks.
+   */
+  public removeUncheckpointedBlocksAfter(blockNumber: BlockNumber): Promise<L2Block[]> {
+    return this.updater.removeUncheckpointedBlocksAfter(blockNumber);
+  }
+
   /** Used by TXE to add checkpoints directly without syncing from L1. */
   public async addCheckpoints(
     checkpoints: PublishedCheckpoint[],

package/src/config.ts

@@ -8,13 +8,9 @@ import {
   numberConfigHelper,
   optionalNumberConfigHelper,
 } from '@aztec/foundation/config';
-import {
-  type ChainConfig,
-  type PipelineConfig,
-  chainConfigMappings,
-  pipelineConfigMappings,
-} from '@aztec/stdlib/config';
+import { type ChainConfig, type SequencerConfig, chainConfigMappings } from '@aztec/stdlib/config';
 import type { ArchiverSpecificConfig } from '@aztec/stdlib/interfaces/server';
+import { DEFAULT_ORPHAN_PRUNE_NO_PROPOSAL_TOLERANCE } from '@aztec/stdlib/timetable';
 
 /**
  * The archiver configuration.
@@ -26,13 +22,12 @@ import type { ArchiverSpecificConfig } from '@aztec/stdlib/interfaces/server';
 export type ArchiverConfig = ArchiverSpecificConfig &
   L1ReaderConfig &
   L1ContractsConfig &
-  PipelineConfig & // required to pass through to epoch cache
   BlobClientConfig &
-  ChainConfig;
+  ChainConfig &
+  Pick<SequencerConfig, 'blockDurationMs' | 'checkpointProposalSyncGraceSeconds'>;
 
 export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
   ...blobClientConfigMapping,
-  ...pipelineConfigMappings,
   archiverPollingIntervalMS: {
     env: 'ARCHIVER_POLLING_INTERVAL_MS',
     description: 'The polling interval in ms for retrieving new L2 blocks and encrypted logs.',
@@ -48,6 +43,18 @@ export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
     ...optionalNumberConfigHelper(),
     description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.',
   },
+  blockDurationMs: {
+    env: 'SEQ_BLOCK_DURATION_MS',
+    description:
+      'Duration per block in milliseconds when building multiple blocks per slot. Used to derive orphan proposed block pruning timing.',
+    ...optionalNumberConfigHelper(),
+  },
+  checkpointProposalSyncGraceSeconds: {
+    env: 'CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS',
+    description:
+      'Consensus grace in seconds for a received checkpoint proposal to materialize into local proposed state.',
+    ...optionalNumberConfigHelper(),
+  },
   skipValidateCheckpointAttestations: {
     description: 'Skip validating checkpoint attestations (for testing purposes only)',
     ...booleanConfigHelper(false),
@@ -73,13 +80,23 @@ export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
       'Set to true to bypass the check when the connected RPC node is known to prune old logs.',
     ...booleanConfigHelper(false),
   },
-  orphanProposedBlockPruneGraceSeconds: {
-    env: 'ARCHIVER_ORPHAN_PROPOSED_BLOCK_PRUNE_GRACE_SECONDS',
+  orphanPruneNoProposalTolerance: {
+    env: 'ARCHIVER_ORPHAN_PRUNE_NO_PROPOSAL_TOLERANCE',
+    description: 'Local tolerance in seconds before pruning an orphan block when no checkpoint proposal was received.',
+    ...numberConfigHelper(DEFAULT_ORPHAN_PRUNE_NO_PROPOSAL_TOLERANCE),
+  },
+  skipOrphanProposedBlockPruning: {
+    env: 'ARCHIVER_SKIP_ORPHAN_PROPOSED_BLOCK_PRUNING',
+    description: 'Skip pruning orphan proposed blocks that have no matching proposed checkpoint.',
+    ...booleanConfigHelper(false),
+  },
+  testPreloadStandardContracts: {
+    env: 'TEST_PRELOAD_STANDARD_CONTRACTS',
     description:
-      'Grace period in seconds, measured from the end of a proposed block build slot, after which a ' +
-      'proposed block with no matching proposed checkpoint is pruned as an orphan. Defaults from the ' +
-      'sequencer block duration at the node wiring layer when unset.',
-    ...optionalNumberConfigHelper(),
+      'Preload the standard contracts (AuthRegistry, PublicChecks, HandshakeRegistry) into the contract store at ' +
+      'block 0. For test environments only, and only safe when genesis seeds the matching registration/deployment ' +
+      'nullifiers; otherwise a later on-chain publish would collide with the block-0 preload.',
+    ...booleanConfigHelper(false),
   },
   ...chainConfigMappings,
   ...l1ReaderConfigMappings,
@@ -110,6 +127,7 @@ export function mapArchiverConfig(config: Partial<ArchiverConfig>) {
     maxAllowedEthClientDriftSeconds: config.maxAllowedEthClientDriftSeconds,
     ethereumAllowNoDebugHosts: config.ethereumAllowNoDebugHosts,
     skipHistoricalLogsCheck: config.archiverSkipHistoricalLogsCheck,
-    orphanProposedBlockPruneGraceSeconds: config.orphanProposedBlockPruneGraceSeconds,
+    orphanPruneNoProposalTolerance: config.orphanPruneNoProposalTolerance,
+    skipOrphanProposedBlockPruning: config.skipOrphanProposedBlockPruning,
   };
 }