fix failures

scroll-tech · Aug 19, 2024 · 09c16c2 · 09c16c2
1 parent 169e6c7
commit 09c16c2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/zkevm-circuits/src/evm_circuit/execution/extcodecopy.rs b/zkevm-circuits/src/evm_circuit/execution/extcodecopy.rs
@@ -222,8 +222,6 @@ impl<F: Field> ExecutionGadget<F> for ExtcodecopyGadget<F> {
             .code_len_gadget
             .assign(region, offset, block, &code_hash)?;
 
-        self.code_len_gadget
-            .assign(region, offset, block, &code_hash)?;
         self.code_offset
             .assign(region, offset, code_offset, F::from(code_size))?;
 

diff --git a/zkevm-circuits/src/evm_circuit/util/constraint_builder.rs b/zkevm-circuits/src/evm_circuit/util/constraint_builder.rs
@@ -303,6 +303,7 @@ pub(crate) struct EVMConstraintBuilder<'a, F> {
     execution_state: ExecutionState,
     constraints: Constraints<F>,
     rw_counter_offset: Expression<F>,
+    program_counter_offset: Expression<F>,
     stack_pointer_offset: Expression<F>,
     log_id_offset: usize,
     in_next_step: bool,
@@ -350,6 +351,7 @@ impl<'a, F: Field> EVMConstraintBuilder<'a, F> {
                 not_step_last: Vec::new(),
             },
             rw_counter_offset: 0.expr(),
+            program_counter_offset: 0.expr(),
             stack_pointer_offset: 0.expr(),
             log_id_offset: 0,
             in_next_step: false,
@@ -693,17 +695,32 @@ impl<'a, F: Field> EVMConstraintBuilder<'a, F> {
     }
 
     pub(crate) fn opcode_lookup_rlc(&mut self, opcode: Expression<F>, push_rlc: Expression<F>) {
-        self.opcode_lookup_at_rlc(self.curr.state.program_counter.expr(), opcode, push_rlc);
+        //self.opcode_lookup_at_rlc(self.curr.state.program_counter.expr(), opcode, push_rlc);
+        self.opcode_lookup_at_rlc(
+            self.curr.state.program_counter.expr() + self.program_counter_offset.clone(),
+            opcode,
+            push_rlc,
+        );
+
+        self.program_counter_offset = self.program_counter_offset.clone() * self.condition_expr();
     }
 
     #[cfg(feature = "dual_bytecode")]
     // helper to lookup second bytecode table.
     pub(crate) fn opcode_lookup_rlc2(&mut self, opcode: Expression<F>, push_rlc: Expression<F>) {
+        // self.opcode_lookup_at_rlc2(
+        //     self.curr.state.program_counter.expr() + self.condition_expr(),
+        //     opcode,
+        //     push_rlc,
+        // );
         self.opcode_lookup_at_rlc2(
-            self.curr.state.program_counter.expr() + self.condition_expr(),
+            self.curr.state.program_counter.expr()
+                + self.program_counter_offset.expr() * self.condition_expr(),
             opcode,
             push_rlc,
         );
+
+        self.program_counter_offset = self.program_counter_offset.clone() * self.condition_expr();
     }
 
     // lookup bytecode_table.