rebase fixes

Author: Maddiaa0

yarn-project/sequencer-client/src/sequencer/sequencer.ts

@@ -373,19 +373,19 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
     const pendingCheckpointNumber = await this.l2BlockSource.getPendingCheckpointNumber();
     if (
       this.epochCache.isProposerPipeliningEnabled() &&
-      pendingCheckpointNumber === syncedTo.checkpointedCheckpointNumber + 1
+      pendingCheckpointNumber === syncedTo.latestCheckpointNumber + 1
     ) {
       this.log.verbose(`Building on top of pending checkpoint ${pendingCheckpointNumber}`);
     } else if (
       this.epochCache.isProposerPipeliningEnabled() &&
-      syncedTo.checkpointNumber > syncedTo.checkpointedCheckpointNumber
+      syncedTo.checkpointNumber > syncedTo.latestCheckpointNumber
     ) {
       // Pipelining is enabled and there are uncheckpointed blocks beyond the confirmed chain,
       // but the pending checkpoint attestation hasn't arrived yet (skip condition above failed).
       // Wait for the pending checkpoint to be attested or for uncheckpointed blocks to be pruned
       // rather than making an L1 call that would fail or give misleading results.
       this.log.warn(
-        `Pipelining stall: proposed chain at checkpoint ${syncedTo.checkpointNumber} is ahead of confirmed ${syncedTo.checkpointedCheckpointNumber} but no pending attestation (pending=${pendingCheckpointNumber}). Waiting for reconciliation.`,
+        `Pipelining stall: proposed chain at checkpoint ${syncedTo.checkpointNumber} is ahead of confirmed ${syncedTo.latestCheckpointNumber} but no pending attestation (pending=${pendingCheckpointNumber}). Waiting for reconciliation.`,
         logCtx,
       );
       this.metrics.recordCheckpointPrecheckFailed('pipelining_stall');
@@ -619,9 +619,8 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
         archive,
         syncedL2Slot,
         checkpointedArchive: archive,
-        l1Timestamp,
+        latestCheckpointNumber: l2Tips.checkpointed.checkpoint.number,
         pendingChainValidationStatus,
-        checkpointedCheckpointNumber: l2Tips.checkpointed.checkpoint.number,
       };
     }
 
@@ -652,9 +651,8 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
       archive: blockData.archive.root,
       syncedL2Slot,
       checkpointedArchive,
-      l1Timestamp,
+      latestCheckpointNumber: l2Tips.checkpointed.checkpoint.number,
       pendingChainValidationStatus,
-      checkpointedCheckpointNumber: l2Tips.checkpointed.checkpoint.number,
     };
   }
 
@@ -1016,7 +1014,6 @@ type SequencerSyncCheckResult = {
   syncedL2Slot: SlotNumber;
   /** Archive root of the last L1-confirmed (checkpointed) block. Used for L1 canProposeAt checks. */
   checkpointedArchive: Fr;
-  l1Timestamp: bigint;
+  latestCheckpointNumber: CheckpointNumber;
   pendingChainValidationStatus: ValidateCheckpointResult;
-  checkpointedCheckpointNumber: CheckpointNumber;
 };