Merge branch 'main' into runtime-config

privacy-scaling-explorations · Jan 22, 2024 · 350fe00 · 350fe00
2 parents 94e2f84 + a631c09
commit 350fe00
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/zkevm-circuits/src/bytecode_circuit.rs b/zkevm-circuits/src/bytecode_circuit.rs
@@ -66,7 +66,7 @@ impl<F: Field> BytecodeCircuitRow<F> {
         }
     }
 
-    /// Padding must be a header, acording to the q_last constraints
+    /// Padding must be a header, according to the q_last constraints
     fn pad() -> Self {
         Self {
             code_hash: empty_code_hash_word_value(),

diff --git a/zkevm-circuits/src/evm_circuit/execution.rs b/zkevm-circuits/src/evm_circuit/execution.rs
@@ -493,7 +493,7 @@ impl<F: Field> ExecutionConfig<F> {
                 // the gadget value before being copied to the box is freed immediately after
                 // the boxed gadget is returned.
                 // We put each gadget in a box so that they stay in the heap to keep
-                // ExecutionConfig at a managable size.
+                // ExecutionConfig at a manageable size.
                 (|| {
                     Box::new(Self::configure_gadget(
                         meta,

diff --git a/zkevm-circuits/src/evm_circuit/execution/error_invalid_jump.rs b/zkevm-circuits/src/evm_circuit/execution/error_invalid_jump.rs
@@ -49,7 +49,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorInvalidJumpGadget<F> {
         let condition = cb.query_word_unchecked();
 
         cb.require_in_set(
-            "ErrorInvalidJump only happend in JUMP or JUMPI",
+            "ErrorInvalidJump only happened in JUMP or JUMPI",
             opcode.expr(),
             vec![OpcodeId::JUMP.expr(), OpcodeId::JUMPI.expr()],
         );

diff --git a/zkevm-circuits/src/evm_circuit/util/math_gadget/test_util.rs b/zkevm-circuits/src/evm_circuit/util/math_gadget/test_util.rs
@@ -204,7 +204,7 @@ impl<F: Field, G: MathGadgetContainer<F>> Circuit<F> for UnitTestMathGadgetBaseC
         )?;
 
         // assign fixed range tables only as they are the only tables referred by a
-        // specfic math gadget -- ConstantDivisionGadget.
+        // specific math gadget -- ConstantDivisionGadget.
         layouter.assign_region(
             || "fixed table",
             |mut region| {