fix api after expander v1.1 (#149)

Author: zhenfeizhang

Cargo.lock

@@ -46,6 +46,7 @@ babybear = { git = "https://github.com/PolyhedraZK/Expander", branch = "main" }
 crosslayer_prototype = { git = "https://github.com/PolyhedraZK/Expander", branch = "main"}
 expander_circuit = { git = "https://github.com/PolyhedraZK/Expander", branch = "main", package = "circuit" }
 expander_transcript = { git = "https://github.com/PolyhedraZK/Expander", branch = "main", package = "transcript" }
+expander_binary = { git = "https://github.com/PolyhedraZK/Expander", branch = "main", package = "bin" }
 gf2 = { git = "https://github.com/PolyhedraZK/Expander", branch = "main" }
 gkr = { git = "https://github.com/PolyhedraZK/Expander", branch = "main" }
 gkr_engine = { git = "https://github.com/PolyhedraZK/Expander", branch = "main", package = "gkr_engine" }

Cargo.toml

@@ -13,6 +13,7 @@ clap.workspace = true
 crosslayer_prototype.workspace = true
 macros = { path = "./macros" }
 ethnum.workspace = true
+expander_binary.workspace = true
 expander_circuit.workspace = true
 expander_transcript.workspace = true
 gf2.workspace = true

expander_compiler/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["dylib"]
 
 [dependencies]
 arith.workspace = true
+expander_binary.workspace = true
 expander_circuit.workspace = true
 expander_transcript.workspace = true
 gkr.workspace = true

expander_compiler/ec_go_lib/Cargo.toml

@@ -1,6 +1,7 @@
 use std::ptr;
 use std::slice;
 
+use expander_binary::executor;
 use expander_compiler::frontend::ChallengeField;
 use expander_compiler::frontend::SIMDField;
 
@@ -31,8 +32,8 @@ fn prove_circuit_file_inner<C: config::Config>(
     circuit.layers[0].input_vals = simd_input;
     circuit.public_input = simd_public_input;
     circuit.evaluate();
-    let (claimed_v, proof) = gkr::executor::prove::<C>(&mut circuit, mpi_config.clone());
-    gkr::executor::dump_proof_and_claimed_v(&proof, &claimed_v).map_err(|e| e.to_string())
+    let (claimed_v, proof) = executor::prove::<C>(&mut circuit, mpi_config.clone());
+    executor::dump_proof_and_claimed_v(&proof, &claimed_v).map_err(|e| e.to_string())
 }
 
 fn verify_circuit_file_inner<C: config::Config>(
@@ -49,13 +50,13 @@ fn verify_circuit_file_inner<C: config::Config>(
     circuit.layers[0].input_vals = simd_input;
     circuit.public_input = simd_public_input.clone();
     let (proof, claimed_v) =
-        match gkr::executor::load_proof_and_claimed_v::<ChallengeField<C>>(proof_and_claimed_v) {
+        match executor::load_proof_and_claimed_v::<ChallengeField<C>>(proof_and_claimed_v) {
             Ok((proof, claimed_v)) => (proof, claimed_v),
             Err(_) => {
                 return Ok(0);
             }
         };
-    Ok(gkr::executor::verify::<C>(&mut circuit, mpi_config, &proof, &claimed_v) as u8)
+    Ok(executor::verify::<C>(&mut circuit, mpi_config, &proof, &claimed_v) as u8)
 }
 
 #[no_mangle]

expander_compiler/ec_go_lib/src/proving.rs

@@ -1,5 +1,6 @@
 use arith::Field;
 use arith::SimdField as _SimdField;
+use expander_binary::executor;
 use expander_compiler::frontend::*;
 use gkr_engine::{MPIConfig, MPIEngine};
 use rand::SeedableRng;
@@ -54,10 +55,10 @@ fn example<C: Config>() {
 
     // prove
     expander_circuit.evaluate();
-    let (claimed_v, proof) = gkr::executor::prove::<C>(&mut expander_circuit, mpi_config.clone());
+    let (claimed_v, proof) = executor::prove::<C>(&mut expander_circuit, mpi_config.clone());
 
     // verify
-    assert!(gkr::executor::verify::<C>(
+    assert!(executor::verify::<C>(
         &mut expander_circuit,
         mpi_config,
         &proof,

expander_compiler/tests/example_call_expander.rs

@@ -1,3 +1,4 @@
+use expander_binary::executor;
 use expander_compiler::frontend::*;
 use gkr_engine::{MPIConfig, MPIEngine};
 use rand::{Rng, SeedableRng};
@@ -295,10 +296,10 @@ fn keccak_gf2_full() {
     expander_circuit.evaluate();
     let mpi_config = MPIConfig::prover_new();
     let (claimed_v, proof) =
-        gkr::executor::prove::<GF2Config>(&mut expander_circuit, mpi_config.clone());
+        executor::prove::<GF2Config>(&mut expander_circuit, mpi_config.clone());
 
     // verify
-    assert!(gkr::executor::verify::<GF2Config>(
+    assert!(executor::verify::<GF2Config>(
         &mut expander_circuit,
         mpi_config,
         &proof,

expander_compiler/tests/keccak_gf2_full.rs

@@ -279,10 +279,7 @@ fn keccak_gf2_full_crosslayer() {
     println!("{} {}", simd_input.len(), simd_public_input.len());
     assert_eq!(simd_public_input.len(), 0); // public input is not supported in current virgo++
 
-    let mut transcript = BytesHashTranscript::<
-        <gkr_engine::GF2ExtConfig as gkr_engine::FieldEngine>::ChallengeField,
-        SHA256hasher,
-    >::new();
+    let mut transcript = BytesHashTranscript::<SHA256hasher>::new();
 
     let connections = crosslayer_prototype::CrossLayerConnections::parse_circuit(&expander_circuit);