refactor: avoid ambiguous and reduce dependnecy

Cargo.toml

@@ -15,11 +15,11 @@ itertools = "0.11.0"
 blake2b_simd = "1"
 
 # For feature = "evm"
-revm = { version = "3.3.0", optional = true }
+revm = { version = "3.3.0", default-features = false, optional = true }
 
 [dev-dependencies]
 rand = "0.8.5"
-revm = "3.3.0"
+revm = { version = "3.3.0", default-features = false }
 halo2_maingate = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2023_04_20", package = "maingate" }
 
 [features]

src/codegen.rs

@@ -176,7 +176,7 @@ impl<'a> SolidityGenerator<'a> {
                 let l = self.meta.rotation_last.unsigned_abs() as u64;
                 fr_to_u256(domain.get_omega_inv().pow_vartime([l]))
             };
-            let has_accumulator = U256::from(self.acc_encoding.is_some());
+            let has_accumulator = U256::from(self.acc_encoding.is_some() as usize);
             let acc_offset = self
                 .acc_encoding
                 .map(|acc_encoding| U256::from(acc_encoding.offset))

templates/Halo2Verifier.sol

@@ -262,7 +262,6 @@ contract Halo2Verifier {
                 let proof_cptr := PROOF_CPTR
                 let challenge_mptr := CHALLENGE_MPTR
                 {%- for num_advices in num_advices %}
-                {%- let num_challenges = num_challenges[loop.index0] %}
 
                 // Phase {{ loop.index }}
                 for
@@ -274,7 +273,7 @@ contract Halo2Verifier {
                 }
 
                 challenge_mptr, hash_mptr := squeeze_challenge(challenge_mptr, hash_mptr, r)
-                {%- for _ in 0..num_challenges - 1 %}
+                {%- for _ in 0..num_challenges[loop.index0] - 1 %}
                 challenge_mptr := squeeze_challenge_cont(challenge_mptr, r)
                 {%- endfor %}
                 {%- endfor %}