Fixing/Adding Prover to make it compatible with Go node (#36)

* serialize ssz instead of json

* config files for mainnet

* update gen verifier justcommands

* CLI main testnet -> mainnet

* gen verifier for agg cirguit

* Debugging the aggregation verifier contract failing to generate

* fmt

* we need to pass witness in?

* un commit some configs

* update contracts. NOTE: I think committee_update contract might be borked... look at the number of pubinputs

* update deps

* add step mainnet config

* print path to pk when fails to find

* mainnet agg config

* update moreconfigs

* attempt to get logging working

* axum tracing

* enable tower log

* update other deps

* jsonrpc logging

* update jsonrpc_v2

* good kids handle errors

* serialize as lowercase for consistancy

* clean some deps

---------

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

Cargo.toml

@@ -72,16 +72,16 @@ beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus.g
 ssz_rs = "0.9"
 
 # crypto
-group = "0.12"
+group = "0.13"
 num-bigint = { version = "0.4", features = ["rand"] }
-pasta_curves = "0.4.1"
-ff = "0.12"
+pasta_curves = "0.5.1"
+ff = "0.13"
 sha2 = { version = "0.9", features = ["compress"] }
 uint = "0.9.1"
 ark-std = { version = "0.4.0", features = ["print-trace"] }
 
 # misc
-itertools = "0.11.0"
+itertools = "0.12.0"
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.78"
 log = "0.4.14"

lightclient-circuits/config/committee_update_18.json

@@ -28,4 +28,4 @@
       262133
     ]
   ]
-}
+}

lightclient-circuits/config/committee_update_mainnet.json

@@ -0,0 +1,31 @@
+{
+  "params": {
+    "k": 18,
+    "num_advice_per_phase": [
+      12
+    ],
+    "num_fixed": 1,
+    "num_lookup_advice_per_phase": [
+      1,
+      0,
+      0
+    ],
+    "lookup_bits": 8,
+    "num_instance_columns": 1
+  },
+  "break_points": [
+    [
+      262134,
+      262132,
+      262134,
+      262132,
+      262133,
+      262132,
+      262132,
+      262133,
+      262132,
+      262134,
+      262133
+    ]
+  ]
+}

lightclient-circuits/config/committee_update_verifier_25.json

@@ -1,12 +1,12 @@
 {
-    "params": {
-      "degree": 25,
-      "num_advice": 1,
-      "num_lookup_advice": 1,
-      "num_fixed": 1,
-      "lookup_bits": 8
-    },
-    "break_points": [
-      []
-    ]
-  }
+  "params": {
+    "degree": 25,
+    "num_advice": 1,
+    "num_lookup_advice": 1,
+    "num_fixed": 1,
+    "lookup_bits": 8
+  },
+  "break_points": [
+    []
+  ]
+}

lightclient-circuits/config/committee_update_verifier_mainnet.json

@@ -0,0 +1,12 @@
+{
+  "params": {
+    "degree": 25,
+    "num_advice": 1,
+    "num_lookup_advice": 1,
+    "num_fixed": 1,
+    "lookup_bits": 8
+  },
+  "break_points": [
+    []
+  ]
+}

lightclient-circuits/config/sync_step_mainnet.json

@@ -0,0 +1,25 @@
+{
+  "params": {
+    "k": 22,
+    "num_advice_per_phase": [
+      6
+    ],
+    "num_fixed": 1,
+    "num_lookup_advice_per_phase": [
+      1,
+      0,
+      0
+    ],
+    "lookup_bits": 8,
+    "num_instance_columns": 1
+  },
+  "break_points": [
+    [
+      4194292,
+      4194294,
+      4194292,
+      4194293,
+      4194293
+    ]
+  ]
+}

lightclient-circuits/src/util/circuit.rs

@@ -294,5 +294,6 @@ where
     C: Circuit<Fr>,
     P: AsRef<Path>,
 {
-    read_pk::<C>(fname.as_ref(), c.params()).expect("proving key should exist")
+    read_pk::<C>(fname.as_ref(), c.params())
+        .expect(format!("proving key: {:?} should exist", fname.as_ref().to_str()).as_str())
 }

prover/Cargo.toml

@@ -11,15 +11,13 @@ path = "src/main.rs"
 # cli
 clap = { version = "4.2", features = ["derive"] }
 strum = { version = "=0.25", features = ["derive"] }
-cli-batteries = "=0.4"
+cli-batteries = "0.5"
 eyre = "0.6"
-anstyle = "=1.0.0"
-axum = "0.6"
+anstyle = "1.0.0"
+axum = { version = "0.7", features = ["tracing", "tower-log"] }
 tokio = { version = "1.32", features = ["macros"] }
 
-jsonrpc-v2 = { version = "0.12", default-features = false, features = ["easy-errors", "macros", "bytes-v10"] }
-
-http = "0.2"
+jsonrpc-v2 = { version = "0.13", default-features = false, features = ["easy-errors", "macros", "bytes-v10", "hyper-integration"] }
 
 # halo2
 halo2curves.workspace = true
@@ -53,9 +51,10 @@ reqwest = "0.11.22"
 beacon-api-client.workspace = true
 ethereum-consensus-types.workspace = true
 futures = "0.3.29"
+ssz_rs.workspace = true
 
 [build-dependencies]
-cli-batteries = "=0.4"
+cli-batteries = "=0.5"
 
 [features]
 default = ["halo2_solidity_verifier"]

prover/src/args.rs

@@ -84,6 +84,7 @@ pub enum OperationCmd {
 }
 
 #[derive(Clone, Debug, PartialEq, EnumString, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
 pub enum Spec {
     #[strum(serialize = "minimal")]
     Minimal,

prover/src/main.rs

@@ -29,7 +29,7 @@ async fn app(options: Cli) -> eyre::Result<()> {
             args::Spec::Testnet => spec_app::<eth_types::Testnet>(op.proof, &options.args)
                 .await
                 .unwrap(),
-            args::Spec::Mainnet => spec_app::<eth_types::Testnet>(op.proof, &options.args)
+            args::Spec::Mainnet => spec_app::<eth_types::Mainnet>(op.proof, &options.args)
                 .await
                 .unwrap(),
         },