update halo2-lib branch & ecc_circuit::decompose_ec_mul_op

Author: DreamWuGit

Cargo.lock

@@ -37,8 +37,8 @@ halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.
 halo2curves = { version = "0.1.0", features = [ "derive_serde" ] }
 poseidon-base = { package = "poseidon-base", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "main" }
 hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "main" }
-halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "ecc_double_p256", default-features=false, features=["halo2-pse","display"] }
-halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "ecc_double_p256", default-features=false, features=["halo2-pse","display"] }
+halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features=false, features=["halo2-pse","display"] }
+halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features=false, features=["halo2-pse","display"] }
 hex = "0.4"
 itertools = "0.11"
 libsecp256k1 = "0.7"
@@ -57,8 +57,8 @@ serde = {version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_stacker = "0.1"
 sha3 = "0.10"
-snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "check_p256_branch" }
-snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "check_p256_branch", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
+snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }
+snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
 strum = "0.25"
 strum_macros = "0.25"
 subtle = "2.4"

Cargo.toml

@@ -608,7 +608,9 @@ impl<F: Field, const XI_0: i64> EccCircuit<F, XI_0> {
         _fp12_chip: &Fp12Chip<F, FpConfig<F, Fq>, Fq12, XI_0>,
         powers_of_256: &[QuantumCell<F>],
         op: &EcMulOp,
-    ) -> EcMulDecomposed<F> {
+    ) -> EcMulDecomposed<F>
+// where C: CurveAffine<Base = Fq>,
+    {
         log::trace!("[ECC] ==> EcMul Assignment START:");
         log_context_cursor!(ctx);
 
@@ -650,7 +652,7 @@ impl<F: Field, const XI_0: i64> EccCircuit<F, XI_0> {
         log::trace!("[ECC] EcMul Inputs Assigned:");
         log_context_cursor!(ctx);
 
-        let point_r_got = ecc_chip.scalar_mult(
+        let point_r_got = ecc_chip.scalar_mult::<G1Affine>(
             ctx,
             &point_p,
             &scalar_s.scalar.limbs().to_vec(),