Merge branch 'main' into ec2/go-compat

Cargo.toml

@@ -65,7 +65,6 @@ snark-verifier-sdk = { git = "https://github.com/axiom-crypto/snark-verifier.git
     "loader_evm",
     "halo2-pse",
 ] }
-halo2_solidity_verifier = { git = "https://github.com/privacy-scaling-explorations/halo2-solidity-verifier", branch = "ac/initial-verifier-PR" }
 
 # ethereum types
 ethereum-consensus-types = { git = "https://github.com/ChainSafe/ethereum-consensus-types", branch = "capella" }
@@ -77,7 +76,7 @@ group = "0.13"
 num-bigint = { version = "0.4", features = ["rand"] }
 pasta_curves = "0.5.1"
 ff = "0.13"
-sha2 = { version = "0.10.6", features = ["compress"] }
+sha2 = { version = "0.9", features = ["compress"] }
 uint = "0.9.1"
 ark-std = { version = "0.4.0", features = ["print-trace"] }
 
@@ -89,7 +88,7 @@ log = "0.4.14"
 hex = "0.4"
 
 [patch.crates-io]
-halo2curves = { git = "https://github.com/timoftime/halo2curves", package = "halo2curves-axiom", rev = "f3bb3f5a7d3a8ca806368f185c112283a73a94cb" }
+halo2curves = { git = "https://github.com/timoftime/halo2curves", package = "halo2curves-axiom", rev = "1bd39b8" }
 ssz_rs = { git = "https://github.com/ralexstokes/ssz-rs", rev = "5f1ec833718efa07bbbff427ab28a1eeaa706164" }
 
 
@@ -115,7 +114,8 @@ zkevm-hashes = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/
 
 
 [patch."https://github.com/axiom-crypto/snark-verifier.git"]
-snark-verifier = { git = "https://github.com/timoftime/snark-verifier", branch = "halo2-pse-fix", default-features = false }
-snark-verifier-sdk = { git = "https://github.com/timoftime/snark-verifier", branch = "halo2-pse-fix", default-features = false }
+snark-verifier = { git = "https://github.com/timoftime/snark-verifier", branch = "yul-codegen", default-features = false }
+snark-verifier-sdk = { git = "https://github.com/timoftime/snark-verifier", branch = "yul-codegen", default-features = false }
 # snark-verifier = { path = "../snark-verifier/snark-verifier" }
 # snark-verifier-sdk = { path = "../snark-verifier/snark-verifier-sdk" }
+

contracts/rust-abi/lib.rs

@@ -14,7 +14,7 @@ abigen!(
     StepVerifier,
     "./out/sync_step.sol/Verifier.json";
     CommitteeUpdateVerifier,
-    "./out/committee_update_aggregated.sol/Verifier.json";
+    "./out/committee_update_verifier.sol/Verifier.json";
     StepMockVerifier,
     "./out/SyncStepMockVerifier.sol/SyncStepMockVerifier.json";
     CommitteeUpdateMockVerifier,

contracts/script/DeploySpectre.s.sol

@@ -5,7 +5,7 @@ import "forge-std/Script.sol";
 
 import {Spectre} from "../src/Spectre.sol";
 import {Verifier as SyncStepVerifier} from "../snark-verifiers/sync_step.sol"; 
-import {Verifier as CommitteeUpdateVerifier} from "../snark-verifiers/committee_update_aggregated.sol"; 
+import {Verifier as CommitteeUpdateVerifier} from "../snark-verifiers/committee_update_verifier.sol"; 
 
 contract DeploySpectre is Script {
 

contracts/script/DeploySpectreTestnet.s.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import "forge-std/Script.sol";
+
+import {Spectre} from "../src/Spectre.sol";
+import {Verifier as SyncStepVerifier} from "../snark-verifiers/sync_step.sol"; 
+import {Verifier as CommitteeUpdateVerifier} from "../snark-verifiers/committee_update_verifier.sol"; 
+
+contract DeploySpectre is Script {
+
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
+        uint256 initialSyncPeriod = vm.envUint("INITIAL_SYNC_PERIOD");
+        bytes32 initialCommitteePoseidon = vm.envBytes32("INITIAL_COMMITTEE_POSEIDON");
+        uint256 slotsPerPeriod = vm.envUint("SLOTS_PER_PERIOD");
+
+        vm.startBroadcast(deployerPrivateKey);
+
+        SyncStepVerifier stepVerifier = new SyncStepVerifier();
+        CommitteeUpdateVerifier updateVerifier = new CommitteeUpdateVerifier();
+
+        Spectre spectre = new Spectre(address(stepVerifier), address(updateVerifier), initialSyncPeriod, initialCommitteePoseidon, slotsPerPeriod);
+
+        vm.stopBroadcast();
+    }
+}

contracts/script/deploy_local.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+cd $(git rev-parse --show-toplevel)
+source .env
+LOCAL_RPC_URL="http://localhost:8545"
+
+forge script script/DeploySpectre.s.sol:DeploySpectre --private-key $ANVIL_PRIVATE_KEY --rpc-url $LOCAL_RPC_URL --broadcast -vvvv

contracts/script/deploy_testnet.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+cd $(git rev-parse --show-toplevel)
+source .env
+LOCAL_RPC_URL="http://localhost:8545"
+
+forge script script/DeploySpectreTestnet.s.sol:DeploySpectre --private-key $ANVIL_PRIVATE_KEY --rpc-url $LOCAL_RPC_URL --broadcast -vvvv

justfile

@@ -13,18 +13,19 @@ check:
 lint: fmt
     cargo clippy --all-targets --all-features --workspace
 
-setup-step network:
-    cargo run -r -- circuit sync-step -p ./build/sync_step_$1.pkey -k 22 setup
+setup-step network *k='22':
+    cargo run -r -- circuit sync-step -p ./build/sync_step_$1.pkey -k $2 setup
 
-setup-committee-update network:
-    cargo run -r -- circuit committee-update  -p ./build/committee_update_$1.pkey -k 18 \
-         --verifier-k 25 --verifier-pk-path ./build/committee_update_verifier_$1.pkey setup
+setup-committee-update network *k='25':
+    cargo run -r -- circuit committee-update -p ./build/committee_update_$1.pkey -k 18 \
+         --verifier-k $2 --verifier-pk-path ./build/committee_update_verifier_$1.pkey setup
 
-gen-step-evm-verifier network:
-   cargo run -r -- circuit sync-step --pk-path ./build/sync_step_$1.pkey gen-verifier --solidity-out ./contracts/snark-verifiers/sync_step.yul 
+gen-verifier-step network:
+    cargo run -r -- circuit sync-step -p ./build/sync_step_$1.pkey gen-verifier -o ./contracts/snark-verifiers/sync_step.sol
 
-gen-rotation-evm-verifier network:
-    cargo run -r -- circuit committee-update --pk-path ./build/committee_update_$1.pkey --verifier-pk-path ./build/committee_update_verifier_$1.pkey  gen-verifier  --solidity-out ./contracts/snark-verifiers/committee_update_aggregated.yul 
+gen-verifier-committee-update network:
+    cargo run -r -- circuit committee-update -p ./build/committee_update_$1.pkey --verifier-pk-path ./build/committee_update_verifier_$1.pkey \
+        gen-verifier -o ./contracts/snark-verifiers/committee_update_verifier.sol
 
 build-contracts:
     cd contracts && forge build
@@ -42,7 +43,7 @@ download-spec-tests: clean-spec-tests
     #!/usr/bin/env bash
     if [[ ! -d 'consensus-spec-tests' ]]; then
         echo "Downloading test data."
-        scripts/download_consensus_specs.sh
+        test-utils/scripts/download_consensus_specs.sh
     fi
 
 # deletes all the downloaded spec tests

lightclient-circuits/src/committee_update_circuit.rs

@@ -217,10 +217,10 @@ impl<S: Spec> AppCircuit for CommitteeUpdateCircuit<S, bn256::Fr> {
         let fp_chip = FpChip::new(&range, LIMB_BITS, NUM_LIMBS);
 
         let assigned_instances = Self::synthesize(&mut builder, &fp_chip, witness)?;
+        builder.set_instances(0, assigned_instances);
 
         match stage {
             CircuitBuilderStage::Prover => {
-                builder.set_instances(0, assigned_instances);
                 if let Some(pinning) = pinning {
                     builder.set_params(pinning.params);
                     builder.set_break_points(pinning.break_points);
@@ -245,7 +245,7 @@ mod tests {
     use std::fs;
 
     use crate::{
-        aggregation::AggregationConfigPinning, util::Halo2ConfigPinning,
+        aggregation_circuit::AggregationConfigPinning, util::Halo2ConfigPinning,
         witness::CommitteeRotationArgs,
     };
 
@@ -306,16 +306,13 @@ mod tests {
     #[test]
     fn test_committee_update_circuit() {
         const K: u32 = 18;
-        let params = gen_srs(K);
-
         let witness = load_circuit_args();
 
-        let pinning = Eth2ConfigPinning::from_path("./config/committee_update_18.json");
         let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::create_circuit(
             CircuitBuilderStage::Mock,
-            Some(pinning),
+            None,
             &witness,
-            params.k(),
+            K,
         )
         .unwrap();
 

lightclient-circuits/src/lib.rs

@@ -11,7 +11,7 @@ pub mod gadget;
 pub mod util;
 pub mod witness;
 
-pub mod aggregation;
+pub mod aggregation_circuit;
 pub mod committee_update_circuit;
 pub mod sync_step_circuit;
 

lightclient-circuits/src/sync_step_circuit.rs

@@ -32,7 +32,7 @@ use halo2_ecc::{
 };
 use halo2curves::{
     bls12_381::{G1Affine, G2Affine},
-    group::{GroupEncoding, UncompressedEncoding},
+    group::UncompressedEncoding,
 };
 use itertools::Itertools;
 use num_bigint::BigUint;
@@ -259,7 +259,7 @@ impl<S: Spec, F: Field> StepCircuit<S, F> {
         let poseidon_commitment_le = poseidon_commitment.to_bytes_le();
         input[88..].copy_from_slice(&poseidon_commitment_le);
 
-        let mut public_input_commitment = sha2::Sha256::digest(input).to_vec();
+        let mut public_input_commitment = sha2::Sha256::digest(&input).to_vec();
         // Truncate to 253 bits
         public_input_commitment[31] &= 0b00011111;
         bn256::Fr::from_bytes_le(&public_input_commitment)
@@ -311,8 +311,8 @@ impl<S: Spec, F: Field> StepCircuit<S, F> {
         g2_chip: &G2Chip<F>,
         bytes_compressed: &[u8],
     ) -> EcPoint<F, Fp2Point<F>> {
-        let sig_affine =
-            G2Affine::from_bytes(&bytes_compressed.try_into().unwrap()).expect("correct signature");
+        let sig_affine = G2Affine::from_compressed_be(&bytes_compressed.try_into().unwrap())
+            .expect("correct signature");
 
         g2_chip.load_private_unchecked(ctx, sig_affine.into_coordinates())
     }
@@ -390,10 +390,10 @@ impl<S: Spec> AppCircuit for StepCircuit<S, bn256::Fr> {
         let fp_chip = FpChip::new(&range, LIMB_BITS, NUM_LIMBS);
 
         let assigned_instances = Self::synthesize(&mut builder, &fp_chip, args)?;
+        builder.set_instances(0, assigned_instances);
 
         match stage {
             CircuitBuilderStage::Prover => {
-                builder.set_instances(0, assigned_instances);
                 if let Some(pinning) = pinning {
                     builder.set_params(pinning.params);
                     builder.set_break_points(pinning.break_points);
@@ -436,14 +436,12 @@ mod tests {
 
     #[test]
     fn test_sync_circuit() {
-        const K: u32 = 21;
+        const K: u32 = 20;
         let witness = load_circuit_args();
 
-        let pinning = Eth2ConfigPinning::from_path("./config/sync_step_21.json");
-
         let circuit = StepCircuit::<Testnet, Fr>::create_circuit(
             CircuitBuilderStage::Mock,
-            Some(pinning),
+            None,
             &witness,
             K,
         )

lightclient-circuits/src/witness.rs

@@ -1,7 +1,7 @@
 //! Witnesses for all circuits.
 
-mod sync;
-pub use sync::*;
+mod step;
+pub use step::*;
 
 mod rotation;
 pub use rotation::*;

lightclient-circuits/src/witness/rotation.rs

@@ -13,6 +13,7 @@ pub struct CommitteeRotationArgs<S: Spec> {
 
     pub sync_committee_branch: Vec<Vec<u8>>,
 
+    #[serde(skip)]
     pub _spec: PhantomData<S>,
 }
 
@@ -23,7 +24,7 @@ impl<S: Spec> Default for CommitteeRotationArgs<S> {
         let sync_committee_branch = vec![vec![0; 32]; S::SYNC_COMMITTEE_PUBKEYS_DEPTH];
 
         let hashed_pk = sha2::Sha256::digest(
-            dummy_x_bytes
+            &dummy_x_bytes
                 .iter()
                 .copied()
                 .pad_using(64, |_| 0)
@@ -39,7 +40,7 @@ impl<S: Spec> Default for CommitteeRotationArgs<S> {
             chunks = chunks
                 .into_iter()
                 .tuples()
-                .map(|(left, right)| sha2::Sha256::digest([left, right].concat()).to_vec())
+                .map(|(left, right)| sha2::Sha256::digest(&[left, right].concat()).to_vec())
                 .collect();
         }
 
@@ -70,7 +71,7 @@ pub(crate) fn mock_root(leaf: Vec<u8>, branch: &[Vec<u8>], mut gindex: usize) ->
 
     for i in 0..branch.len() {
         last_hash = Sha256::digest(
-            if gindex % 2 == 0 {
+            &if gindex % 2 == 0 {
                 [last_hash, branch[i].clone()]
             } else {
                 [branch[i].clone(), last_hash]
@@ -83,3 +84,32 @@ pub(crate) fn mock_root(leaf: Vec<u8>, branch: &[Vec<u8>], mut gindex: usize) ->
 
     last_hash
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{committee_update_circuit::CommitteeUpdateCircuit, util::AppCircuit};
+    use eth_types::Testnet;
+    use halo2_base::{
+        gates::circuit::CircuitBuilderStage, halo2_proofs::dev::MockProver,
+        halo2_proofs::halo2curves::bn256::Fr,
+    };
+    use snark_verifier_sdk::CircuitExt;
+
+    #[test]
+    fn test_committee_update_default_witness() {
+        const K: u32 = 18;
+        let witness = CommitteeRotationArgs::<Testnet>::default();
+
+        let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::create_circuit(
+            CircuitBuilderStage::Mock,
+            None,
+            &witness,
+            K,
+        )
+        .unwrap();
+
+        let prover = MockProver::<Fr>::run(K, &circuit, circuit.instances()).unwrap();
+        prover.assert_satisfied_par();
+    }
+}