increment time by 1 for next rollup if warped

yarn-project/end-to-end/src/e2e_cheat_codes.test.ts

@@ -162,7 +162,6 @@ describe('e2e_cheat_codes', () => {
       expect(await cc.l1.timestamp()).toEqual(newTimestamp);
       // ensure rollup contract is correctly updated
       expect(Number(await rollup.read.lastBlockTs())).toEqual(newTimestamp);
-      expect;
     }, 50_000);
   });
 });

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

@@ -62,6 +62,17 @@ export class PublicProcessorFactory {
     globalVariables: GlobalVariables,
   ): Promise<PublicProcessor> {
     const blockData = await getHistoricBlockData(this.merkleTree, prevGlobalVariables);
+
+    // TODO(rahul) - fix #1614. By using the cheatcode warp to modify L2 time,
+    // txs in the new rollup would have same time as the txs in the previous rollup.
+    // We overcome this now by identifying if the last rollup time was warped (if two rollups have same time)
+    // and tell public-processor to use a different time (increment last rollup block)
+    // more details at https://github.com/AztecProtocol/aztec-packages/issues/1614
+    const isWarped = prevGlobalVariables.timestamp == globalVariables.timestamp;
+    if (isWarped) {
+      globalVariables.timestamp = new Fr(globalVariables.timestamp.value + 1n);
+    }
+
     return new PublicProcessor(
       this.merkleTree,
       getPublicExecutor(this.merkleTree, this.contractDataSource, this.l1Tol2MessagesDataSource, blockData),