From 58c2e7214a8f9e2de8502c030184603d5b9c93e3 Mon Sep 17 00:00:00 2001
From: Nicholas Ward <npward@berkeley.edu>
Date: Wed, 6 Jul 2022 17:10:00 -0700
Subject: [PATCH] another padding-row constraint fix

---
 evm/src/memory/memory_stark.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs
index d20cf776..ed1af7ff 100644
--- a/evm/src/memory/memory_stark.rs
+++ b/evm/src/memory/memory_stark.rs
@@ -442,13 +442,13 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for MemoryStark<F
         let computed_range_check = context_first_change * (next_addr_context - addr_context - one)
             + segment_first_change * (next_addr_segment - addr_segment - one)
             + virtual_first_change * (next_addr_virtual - addr_virtual - one)
-            + address_unchanged * (next_timestamp - timestamp - one);
-        // yield_constr.constraint_transition(range_check - computed_range_check);
+            + valid_row * address_unchanged * (next_timestamp - timestamp - one);
+        yield_constr.constraint_transition(range_check - computed_range_check);
 
         // Enumerate purportedly-ordered log.
         for i in 0..8 {
-            // yield_constr
-            //     .constraint(next_is_read * address_unchanged * (next_values[i] - values[i]));
+            yield_constr
+                .constraint(next_is_read * address_unchanged * (next_values[i] - values[i]));
         }
 
         eval_lookups(vars, yield_constr, RANGE_CHECK_PERMUTED, COUNTER_PERMUTED)
@@ -559,6 +559,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for MemoryStark<F
             builder.sub_extension(diff, one)
         };
         let timestamp_range_check = builder.mul_extension(address_unchanged, timestamp_diff);
+        let timestamp_range_check = builder.mul_extension(valid_row, timestamp_range_check);
 
         let computed_range_check = {
             let mut sum = builder.add_extension(context_range_check, segment_range_check);