zec
/
halo2
mirror of https://github.com/zcash/halo2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #97 from zcash/bump-halo2 

Migrate to latest revision of halo2
This commit is contained in:
str4d 2021-06-01 17:54:09 +01:00 committed by GitHub
parent 803fc2bea3 dfa3fbb19b
commit 5d57bee562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -33,7 +33,7 @@ subtle = "2.3"
[dependencies.halo2]
git = "https://github.com/zcash/halo2.git"
rev = "cae6f6af725cf1f5bc94e126a0b41e9ac602a302"
rev = "0448584333c1e262e4a7dbaefa6fdd896bdaaefb"
[dependencies.pasta_curves]
git = "https://github.com/zcash/pasta_curves.git"

6
src/circuit.rs
View File

@ -31,7 +31,9 @@ impl plonk::Circuit<pallas::Base> for Circuit {
// Placeholder gate so there is something for the prover to operate on.
let advice = meta.advice_column();
meta.create_gate("TODO", |meta| meta.query_advice(advice, Rotation::cur()));
meta.create_gate("TODO", |meta| {
vec![meta.query_advice(advice, Rotation::cur())]
});
}
fn synthesize(
@ -138,7 +140,7 @@ impl Proof {
.collect();
let instances: Vec<_> = instances.iter().map(|i| &i[..]).collect();
let mut transcript = Blake2bWrite::<_, vesta::Affine>::init(vec![]);
let mut transcript = Blake2bWrite::<_, vesta::Affine, _>::init(vec![]);
plonk::create_proof(&pk.params, &pk.pk, circuits, &instances, &mut transcript)?;
Ok(Proof(transcript.finalize()))
}