Json RPC (#19)

* start jsonrpc conversion

* TODO: Allow CLI to start RPC mode

* start prover from cli

* fix some comments

* removed paths from jsonrpc options

* remove unused `path` args from `AppCircuit::gen_evm_proof_shplonk`

---------

Co-authored-by: ec2 <[email protected]>

lightclient-circuits/src/sync_step_circuit.rs

@@ -70,7 +70,7 @@ use ssz_rs::{Merkleized, Node};
 
 #[allow(type_alias_bounds)]
 #[derive(Clone, Debug, Default)]
-pub struct SyncStepCircuit<S: Spec, F: Field> {
+pub struct SyncStepCircuit<S: Spec + ?Sized, F: Field> {
     _f: PhantomData<F>,
     _spec: PhantomData<S>,
 }

lightclient-circuits/src/util/circuit.rs

@@ -88,7 +88,7 @@ pub trait PinnableCircuit<F: ff::Field>: CircuitExt<F> {
     }
 }
 
-pub trait AppCircuit: Sized {
+pub trait AppCircuit {
     type Pinning: Halo2ConfigPinning;
     type Witness: Clone;
 
@@ -191,7 +191,6 @@ pub trait AppCircuit: Sized {
         params: &ParamsKZG<Bn256>,
         pk: &ProvingKey<G1Affine>,
         pinning_path: impl AsRef<Path>,
-        path: impl AsRef<Path>,
         deployment_code: Option<Vec<u8>>,
         witness: &Self::Witness,
     ) -> Result<(Vec<u8>, Vec<Vec<Fr>>), Error> {

prover/Cargo.toml

@@ -10,7 +10,12 @@ strum = { version = "=0.25", features = ["derive"] }
 cli-batteries = "=0.4"
 eyre = "0.6"
 anstyle = "=1.0.0"
+axum = "0.6"
+tokio = { version = "1.32", features = ["macros"] }
 
+jsonrpc-v2 = { version = "0.12", default-features = false, features = ["easy-errors", "macros", "bytes-v10"] }
+
+http = "0.2"
 
 # halo2
 halo2curves = { git = "https://github.com/privacy-scaling-explorations/halo2curves", tag = "0.3.1" }
@@ -39,6 +44,7 @@ url = "2"
 itertools = "0.11.0"
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.78"
+log = "0.4.14"
 
 
 # ethereum

prover/src/args.rs

@@ -1,9 +1,29 @@
 use std::path::PathBuf;
 
+use serde::{Deserialize, Serialize};
 use strum::EnumString;
 
 #[derive(Clone, clap::Parser)]
-pub struct Options {
+#[command(name = "spectre-prover")]
+#[command(about = "Spectre prover", long_about = None)]
+pub struct Cli {
+    #[command(subcommand)]
+    pub subcommand: Subcommands,
+}
+#[derive(Clone, clap::Parser)]
+#[allow(clippy::large_enum_variant)]
+pub enum Subcommands {
+    Rpc(RpcOptions),
+    Circuit(CircuitOptions),
+}
+#[derive(Clone, clap::Parser)]
+pub struct RpcOptions {
+    #[clap(long, short, default_value = "3000")]
+    pub port: String,
+}
+
+#[derive(Clone, clap::Parser)]
+pub struct CircuitOptions {
     #[command(subcommand)]
     pub proof: Proof,
 
@@ -88,7 +108,7 @@ pub enum Out {
     Tx,
 }
 
-#[derive(Clone, Debug, PartialEq, EnumString)]
+#[derive(Clone, Debug, PartialEq, EnumString, Serialize, Deserialize)]
 pub enum Spec {
     #[strum(serialize = "minimal")]
     Minimal,

prover/src/main.rs

@@ -1,34 +1,43 @@
 #![allow(incomplete_features)]
 #![feature(associated_type_bounds)]
-use std::{
-    fs::{self, File},
-    future::Future,
-    io::Write,
-    path::Path,
-    str::FromStr,
-    sync::Arc,
-};
-
-use args::{Args, Options, Out, Proof};
+mod rpc;
+use args::{Args, Cli, Out, Proof};
+use axum::{response::IntoResponse, routing::post, Router};
 use cli_batteries::version;
 use ethers::prelude::*;
 use halo2curves::bn256::{Bn256, Fr, G1Affine};
+use http::StatusCode;
 use itertools::Itertools;
+use jsonrpc_v2::{MapRouter as JsonRpcMapRouter, Server as JsonRpcServer};
 use lightclient_circuits::{
     committee_update_circuit::CommitteeUpdateCircuit,
     sync_step_circuit::SyncStepCircuit,
     util::{gen_srs, AppCircuit},
 };
 use preprocessor::{fetch_rotation_args, fetch_step_args};
+use rpc::{gen_evm_proof_rotation_circuit_handler, gen_evm_proof_step_circuit_handler};
+
 use snark_verifier::{
     loader::halo2::halo2_ecc::halo2_base::halo2_proofs::{
         plonk::VerifyingKey, poly::kzg::commitment::ParamsKZG,
     },
     system::halo2::Config,
 };
 use snark_verifier_sdk::{halo2::aggregation::AggregationCircuit, read_instances, Snark};
-
+use std::str::FromStr;
+use std::{
+    fs::{self, File},
+    future::Future,
+    io::Write,
+    net::TcpListener,
+    path::Path,
+    sync::Arc,
+};
 mod args;
+use jsonrpc_v2::RequestObject as JsonRpcRequestObject;
+
+use crate::args::RpcOptions;
+pub type JsonRpcServerState = Arc<JsonRpcServer<JsonRpcMapRouter>>;
 
 ethers::contract::abigen!(
     SnarkVerifierSol,
@@ -37,16 +46,43 @@ ethers::contract::abigen!(
     ]"#,
 );
 
-fn main() {
-    cli_batteries::run(version!(), app);
-}
+async fn app(options: Cli) -> eyre::Result<()> {
+    match options.subcommand {
+        args::Subcommands::Rpc(op) => {
+            let RpcOptions { port } = op;
+
+            let tcp_listener = TcpListener::bind(format!("0.0.0.0:{}", port)).unwrap();
+            let rpc_server = Arc::new(
+                JsonRpcServer::new()
+                    .with_method(
+                        "genEvmProofAndInstancesStepSyncCircuit",
+                        gen_evm_proof_step_circuit_handler,
+                    )
+                    .with_method(
+                        "genEvmProofAndInstancesRotationCircuit",
+                        gen_evm_proof_rotation_circuit_handler,
+                    )
+                    .finish_unwrapped(),
+            );
+            let router = Router::new()
+                .route("/rpc", post(handler))
+                .with_state(rpc_server);
 
-async fn app(options: Options) -> eyre::Result<()> {
-    match options.spec {
-        args::Spec::Minimal => spec_app::<eth_types::Minimal>(&options.proof).await,
-        args::Spec::Testnet => spec_app::<eth_types::Testnet>(&options.proof).await,
-        args::Spec::Mainnet => spec_app::<eth_types::Testnet>(&options.proof).await,
+            log::info!("Ready for RPC connections");
+            let server = axum::Server::from_tcp(tcp_listener)
+                .unwrap()
+                .serve(router.into_make_service());
+            server.await.unwrap();
+
+            log::info!("Stopped accepting RPC connections");
+        }
+        args::Subcommands::Circuit(op) => match op.spec {
+            args::Spec::Minimal => spec_app::<eth_types::Minimal>(&op.proof).await.unwrap(),
+            args::Spec::Testnet => spec_app::<eth_types::Testnet>(&op.proof).await.unwrap(),
+            args::Spec::Mainnet => spec_app::<eth_types::Testnet>(&op.proof).await.unwrap(),
+        },
     }
+    Ok(())
 }
 
 async fn spec_app<S: eth_types::Spec>(proof: &Proof) -> eyre::Result<()> {
@@ -209,7 +245,6 @@ async fn generic_circuit_cli<
                 &params,
                 &pk,
                 &args.config_path,
-                &args.path_out,
                 None,
                 &witness,
             )
@@ -241,6 +276,28 @@ async fn generic_circuit_cli<
     Ok(())
 }
 
+async fn handler(
+    axum::extract::State(rpc_server): axum::extract::State<JsonRpcServerState>,
+    axum::Json(rpc_call): axum::Json<JsonRpcRequestObject>,
+) -> impl IntoResponse {
+    let response_headers = [("content-type", "application/json-rpc;charset=utf-8")];
+    let response = rpc_server.handle(rpc_call).await;
+
+    let response_str = serde_json::to_string(&response);
+    match response_str {
+        Ok(result) => (StatusCode::OK, response_headers, result),
+        Err(err) => (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            response_headers,
+            err.to_string(),
+        ),
+    }
+}
+
+fn main() {
+    cli_batteries::run(version!(), app);
+}
+
 fn read_snark(
     params: &ParamsKZG<Bn256>,
     vk: &VerifyingKey<G1Affine>,