Merge branch 'main' into 1533-make-plonkverifier-an-external-library-…

…again
EspressoSystems · Jul 30, 2024 · e724d11 · e724d11
2 parents 1ddf1e2 + 671cc1f
commit e724d11
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 42 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -2,7 +2,7 @@
 # later match takes precedence, they will be requested for review when someone
 # opens a pull request.
 
-*       @nomaxg @philippecamacho @ImJeremyHe @sveitser @jbearer @tbro
+*       @nomaxg @philippecamacho @ImJeremyHe @sveitser @jbearer @tbro @imabdulbasit
 
 #  Dependabot PRs
 *.toml  @nomaxg @philippecamacho @ImJeremyHe @sveitser

diff --git a/flake.lock b/flake.lock
diff --git a/hotshot-state-prover/src/circuit.rs b/hotshot-state-prover/src/circuit.rs
@@ -123,13 +123,15 @@ impl AsRef<[Variable]> for LightClientStateVar {
 /// - a list of schnorr signatures of the updated states (`Vec<SchnorrSignature>`), default if the node doesn't sign the state
 /// - updated light client state (`(view_number, block_height, block_comm_root, fee_ledger_comm, stake_table_comm)`)
 /// - a quorum threshold
+///
 /// Lengths of input vectors should not exceed the `stake_table_capacity`.
 /// The list of stake table entries, bit indicators and signatures will be padded to the `stake_table_capacity`.
 /// It checks that
 /// - the vector that indicates who signed is a bit vector
 /// - the signers' accumulated weight exceeds the quorum threshold
 /// - the stake table corresponds to the one committed in the light client state
 /// - all Schnorr signatures over the light client state are valid
+///
 /// and returns
 /// - A circuit for proof generation
 /// - A list of public inputs for verification

diff --git a/hotshot-state-prover/src/snark.rs b/hotshot-state-prover/src/snark.rs
@@ -43,12 +43,15 @@ pub fn preprocess(
 /// - updated light client state (`(view_number, block_height, block_comm_root, fee_ledger_comm, stake_table_comm)`)
 /// - a bit vector indicates the signers
 /// - a quorum threshold
+///
 /// Returns error or a pair `(proof, public_inputs)` asserting that
 /// - the signer's accumulated weight exceeds the quorum threshold
 /// - the stake table corresponds to the one committed in the light client state
 /// - all schnorr signatures over the light client state are valid
+///
 /// # Errors
 /// Errors if unable to generate proof
+///
 /// # Panics
 /// if the stake table is not up to date
 #[allow(clippy::too_many_arguments)]

diff --git a/sequencer/Cargo.toml b/sequencer/Cargo.toml
@@ -125,3 +125,6 @@ zeroize = { workspace = true }
 
 [package.metadata.cargo-udeps.ignore]
 normal = ["hotshot-testing"]
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(async_executor_impl, values("tokio", "async-std"))'] }