workspace

ChainSafe · Sep 21, 2023 · 77f3516 · 77f3516
1 parent a8a06e7
commit 77f3516
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,7 @@
 [workspace]
-members = ["lightclient-circuits", "prover", "preprocessor", "eth-types"]
+members = ["lightclient-circuits", "prover", "eth-types"]
+default-members = ["lightclient-circuits", "prover", "eth-types"]
+exclude = ["preprocessor"]
 
 # Definition of benchmarks profile to use.
 [profile.bench]
@@ -47,8 +49,8 @@ snark-verifier-sdk = { git = "https://github.com/timoftime/snark-verifier", bran
 # [patch."https://github.com/timoftime/halo2curves"]
 # halo2curves = { path = "../halo2curves" }
 
-[patch."https://github.com/ralexstokes/ssz-rs"]
-ssz-rs = { git = "https://github.com/polytope-labs/ssz-rs", branch = "main", default-features = false }
+# [patch."https://github.com/ralexstokes/ssz-rs"]
+# ssz-rs = { git = "https://github.com/polytope-labs/ssz-rs", branch = "main", default-features = false }
 
 [patch."https://github.com/polytope-labs/sync-committee-rs"]
 sync-committee-prover = { git = "https://github.com/timoftime/sync-committee-rs", branch = "dev/accept-ssz", features = [

diff --git a/lightclient-circuits/src/sync_step_circuit.rs b/lightclient-circuits/src/sync_step_circuit.rs
@@ -64,7 +64,7 @@ use pasta_curves::group::{ff, GroupEncoding};
 use poseidon::PoseidonChip;
 use sha2::{Digest, Sha256};
 use snark_verifier_sdk::{evm::gen_evm_verifier_shplonk, CircuitExt};
-use ssz_rs::{GeneralizedIndex, Merkleized, Node};
+use ssz_rs::{Merkleized, Node};
 
 #[allow(type_alias_bounds)]
 #[derive(Clone, Debug, Default)]

diff --git a/lightclient-circuits/src/witness/sync.rs b/lightclient-circuits/src/witness/sync.rs
@@ -59,10 +59,10 @@ impl<S: Spec> Default for SyncStepArgs<S> {
             compute_root(execution_state_root.clone(), &state_merkle_branch);
 
         let mut finalized_block = BeaconBlockHeader {
-            body_root: Node::from_bytes(beacon_block_body_root.try_into().unwrap()),
+            body_root: beacon_block_body_root.as_slice().try_into().unwrap(),
             ..Default::default()
         };
-        let finilized_header = finalized_block.hash_tree_root().unwrap().as_ref().to_vec();
+        let finilized_header = vec![]; //finalized_block.hash_tree_root().unwrap().as_ref().to_vec();
 
         let finality_merkle_branch = vec![vec![0; 32]; S::FINALIZED_HEADER_DEPTH];
 

diff --git a/preprocessor/Cargo.toml b/preprocessor/Cargo.toml
@@ -1,3 +1,5 @@
+[workspace]
+
 [package]
 name = "preprocessor"
 version = "0.1.0"
@@ -43,3 +45,33 @@ snark-verifier-sdk = { git = "https://github.com/axiom-crypto/snark-verifier.git
 ] }
 ark-std = { version = "0.4.0", features = ["print-trace"] }
 # sync-committee-verifier = { git = "https://github.com/polytope-labs/sync-committee-rs", version = "0.1.0", features=["testnet"] }
+
+[patch."https://github.com/privacy-scaling-explorations/halo2curves"]
+halo2curves = { git = "https://github.com/timoftime/halo2curves", branch = "dev/bls12_381" }
+# halo2curves = { path = "../halo2curves" }
+
+[patch."https://github.com/axiom-crypto/halo2-lib"]
+halo2-base = { git = "https://github.com/timoftime/halo2-lib", rev = "03c7baedeae208b21359e542b8683644b3eb1ac2", default-features = false, features = [
+    "halo2-pse",
+    "display",
+] }
+halo2-ecc = { git = "https://github.com/timoftime/halo2-lib", rev = "03c7baedeae208b21359e542b8683644b3eb1ac2", default-features = false }
+poseidon = { git = "https://github.com/timoftime/halo2-lib", rev = "03c7baedeae208b21359e542b8683644b3eb1ac2", default-features = false }
+
+[patch."https://github.com/axiom-crypto/snark-verifier.git"]
+snark-verifier = { git = "https://github.com/timoftime/snark-verifier", branch = "timoftime/bump-revm", default-features = false }
+snark-verifier-sdk = { git = "https://github.com/timoftime/snark-verifier", branch = "timoftime/bump-revm", default-features = false }
+
+
+[patch."https://github.com/ralexstokes/ssz-rs"]
+ssz-rs = { git = "https://github.com/polytope-labs/ssz-rs", branch = "main", default-features = false }
+
+
+[patch."https://github.com/polytope-labs/sync-committee-rs"]
+sync-committee-prover = { git = "https://github.com/timoftime/sync-committee-rs", branch = "dev/accept-ssz", features = [
+    "testnet",
+] }
+sync-committee-primitives = { git = "https://github.com/timoftime/sync-committee-rs", branch = "dev/accept-ssz", features = [
+    "testnet",
+] }
+
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -29,7 +29,7 @@ snark-verifier-sdk = { git = "https://github.com/axiom-crypto/snark-verifier.git
 
 # local
 lightclient-circuits = { path = "../lightclient-circuits" }
-preprocessor = { path = "../preprocessor" }
+# preprocessor = { path = "../preprocessor" }
 eth-types = { path = "../eth-types" }