From 6655ee68e4b5ea226cce3d0fdf5298ae24dba906 Mon Sep 17 00:00:00 2001
From: Nicholas Ward <npward@berkeley.edu>
Date: Thu, 7 Jul 2022 09:29:35 -0700
Subject: [PATCH] restored timestamp column to CTL

---
 evm/src/cpu/cpu_stark.rs       | 9 ++++++++-
 evm/src/memory/memory_stark.rs | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/evm/src/cpu/cpu_stark.rs b/evm/src/cpu/cpu_stark.rs
index 304ccf7c..86b04246 100644
--- a/evm/src/cpu/cpu_stark.rs
+++ b/evm/src/cpu/cpu_stark.rs
@@ -46,7 +46,14 @@ pub fn ctl_data_memory<F: Field>(channel: usize) -> Vec<Column<F>> {
         COL_MAP.mem_addr_virtual[channel],
     ])
     .collect_vec();
-    cols.extend(Column::singles(COL_MAP.mem_value[channel]));
+cols.extend(Column::singles(COL_MAP.mem_value[channel]));
+
+    let scalar = F::from_canonical_usize(NUM_CHANNELS);
+    let addend = F::from_canonical_usize(channel);
+    cols.push(Column::linear_combination_with_constant(
+        vec![(columns::CLOCK, scalar)],
+        addend,
+    ));
 
     let scalar = F::from_canonical_usize(NUM_CHANNELS);
     let addend = F::from_canonical_usize(channel);
diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs
index 616a4105..187435ed 100644
--- a/evm/src/memory/memory_stark.rs
+++ b/evm/src/memory/memory_stark.rs
@@ -33,7 +33,7 @@ pub fn ctl_data<F: Field>() -> Vec<Column<F>> {
     let mut res =
         Column::singles([IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]).collect_vec();
     res.extend(Column::singles((0..8).map(value_limb)));
-    // res.push(Column::single(TIMESTAMP));
+    res.push(Column::single(TIMESTAMP));
     res
 }