Merge branch 'word-lo-hi' of github.com:privacy-scaling-explorations/…

…zkevm-circuits into statecircuit-lo-hi

zkevm-circuits/src/evm_circuit/execution/addmod.rs

@@ -226,7 +226,7 @@ impl<F: Field> ExecutionGadget<F> for AddModGadget<F> {
         self.cmp_areduced_n.assign(region, offset, a_reduced, n)?;
 
         self.n_is_zero
-            .assign_value(region, offset, Value::known(Word::from_u256(n)))?;
+            .assign_value(region, offset, Value::known(Word::from(n)))?;
 
         Ok(())
     }

zkevm-circuits/src/evm_circuit/util/common_gadget.rs

@@ -499,7 +499,7 @@ impl<F: Field> TransferWithGasFeeGadget<F> {
             receiver_balance,
         )?;
         self.value_is_zero
-            .assign_value(region, offset, Value::known(Word::from_u256(value)))?;
+            .assign_value(region, offset, Value::known(Word::from(value)))?;
         Ok(())
     }
 }
@@ -593,7 +593,7 @@ impl<F: Field> TransferGadget<F> {
             receiver_balance,
         )?;
         self.value_is_zero
-            .assign_value(region, offset, Value::known(Word::from_u256(value)))?;
+            .assign_value(region, offset, Value::known(Word::from(value)))?;
         Ok(())
     }
 }
@@ -782,19 +782,19 @@ impl<F: Field, const IS_SUCCESS_CALL: bool> CommonCallGadget<F, IS_SUCCESS_CALL>
         )?;
 
         self.value_is_zero
-            .assign(region, offset, Word::from_u256(value))?;
+            .assign(region, offset, Word::from(value))?;
         self.callee_code_hash
             .assign(region, offset, Some(callee_code_hash.to_le_bytes()))?;
         self.is_empty_code_hash.assign_value(
             region,
             offset,
-            Value::known(Word::from_u256(callee_code_hash)),
-            Value::known(Word::from_u256(CodeDB::empty_code_hash().to_word())),
+            Value::known(Word::from(callee_code_hash)),
+            Value::known(Word::from(CodeDB::empty_code_hash().to_word())),
         )?;
         self.callee_not_exists.assign_value(
             region,
             offset,
-            Value::known(Word::from_u256(callee_code_hash)),
+            Value::known(Word::from(callee_code_hash)),
         )?;
         Ok(memory_expansion_gas_cost)
     }
@@ -939,19 +939,19 @@ impl<F: Field> SstoreGasGadget<F> {
         self.value_eq_prev.assign_value(
             region,
             offset,
-            Value::known(Word::from_u256(value)),
-            Value::known(Word::from_u256(value_prev)),
+            Value::known(Word::from(value)),
+            Value::known(Word::from(value_prev)),
         )?;
         self.original_eq_prev.assign_value(
             region,
             offset,
-            Value::known(Word::from_u256(original_value)),
-            Value::known(Word::from_u256(value_prev)),
+            Value::known(Word::from(original_value)),
+            Value::known(Word::from(value_prev)),
         )?;
         self.original_is_zero.assign_value(
             region,
             offset,
-            Value::known(Word::from_u256(original_value)),
+            Value::known(Word::from(original_value)),
         )?;
         Ok(())
     }

zkevm-circuits/src/evm_circuit/util/math_gadget/modulo.rs

@@ -95,17 +95,17 @@ impl<F: Field> ModGadget<F> {
             .assign(region, offset, Some(a_or_zero.to_le_bytes()))?;
         let n_sum = (0..32).fold(0, |acc, idx| acc + n.byte(idx) as u64);
         self.n_is_zero
-            .assign(region, offset, word::Word::from_u64(n_sum))?;
+            .assign(region, offset, word::Word::from(n_sum))?;
         self.a_or_is_zero
-            .assign(region, offset, word::Word::from_u256(a_or_zero))?;
+            .assign(region, offset, word::Word::from(a_or_zero))?;
         self.mul_add_words
             .assign(region, offset, [k, n, r, a_or_zero])?;
         self.lt.assign(region, offset, r, n)?;
         self.eq.assign_value(
             region,
             offset,
-            Value::known(word::Word::from_u256(a)),
-            Value::known(word::Word::from_u256(a_or_zero)),
+            Value::known(word::Word::from(a)),
+            Value::known(word::Word::from(a_or_zero)),
         )?;
 
         Ok(())

zkevm-circuits/src/evm_circuit/util/memory_gadget.rs

@@ -130,7 +130,7 @@ impl<F: Field> MemoryAddressGadget<F> {
             .assign(region, offset, Some(memory_length.to_le_bytes()))?;
 
         self.memory_length_is_zero
-            .assign(region, offset, Word::from_u256(memory_length))?;
+            .assign(region, offset, Word::from(memory_length))?;
         Ok(if memory_length_is_zero {
             0
         } else {

zkevm-circuits/src/state_circuit.rs

@@ -270,7 +270,7 @@ impl<F: Field> StateCircuitConfig<F> {
             }
 
             // The initial value can be determined from the mpt updates or is 0.
-            let initial_value = word::Word::<F>::from_u256(
+            let initial_value = word::Word::<F>::from(
                 updates
                     .get(row)
                     .map(|u| u.value_assignments().1)
@@ -292,8 +292,8 @@ impl<F: Field> StateCircuitConfig<F> {
                     .unwrap_or_default();
                 let value = row.value_assignment();
                 (
-                    word::Word::<F>::from_u256(committed_value),
-                    word::Word::<F>::from_u256(value),
+                    word::Word::<F>::from(committed_value),
+                    word::Word::<F>::from(value),
                 )
             };
 
@@ -340,7 +340,7 @@ impl<F: Field> StateCircuitConfig<F> {
             // State root assignment is at previous row (offset - 1) because the state root
             // changes on the last access row.
             if offset != 0 {
-                word::Word::<F>::from_u256(state_root)
+                word::Word::<F>::from(state_root)
                     .into_value()
                     .assign_advice(region, || "state root", self.state_root, offset - 1)?;
             }
@@ -355,7 +355,7 @@ impl<F: Field> StateCircuitConfig<F> {
                         new_root
                     };
                 }
-                word::Word::<F>::from_u256(state_root)
+                word::Word::<F>::from(state_root)
                     .into_value()
                     .assign_advice(region, || "last row state_root", self.state_root, offset)?;
             }