mirror of https://github.com/zcash/halo2.git
Merge pull request #97 from zcash/bump-halo2
Migrate to latest revision of halo2
This commit is contained in:
commit
5d57bee562
|
@ -33,7 +33,7 @@ subtle = "2.3"
|
||||||
|
|
||||||
[dependencies.halo2]
|
[dependencies.halo2]
|
||||||
git = "https://github.com/zcash/halo2.git"
|
git = "https://github.com/zcash/halo2.git"
|
||||||
rev = "cae6f6af725cf1f5bc94e126a0b41e9ac602a302"
|
rev = "0448584333c1e262e4a7dbaefa6fdd896bdaaefb"
|
||||||
|
|
||||||
[dependencies.pasta_curves]
|
[dependencies.pasta_curves]
|
||||||
git = "https://github.com/zcash/pasta_curves.git"
|
git = "https://github.com/zcash/pasta_curves.git"
|
||||||
|
|
|
@ -31,7 +31,9 @@ impl plonk::Circuit<pallas::Base> for Circuit {
|
||||||
|
|
||||||
// Placeholder gate so there is something for the prover to operate on.
|
// Placeholder gate so there is something for the prover to operate on.
|
||||||
let advice = meta.advice_column();
|
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(
|
fn synthesize(
|
||||||
|
@ -138,7 +140,7 @@ impl Proof {
|
||||||
.collect();
|
.collect();
|
||||||
let instances: Vec<_> = instances.iter().map(|i| &i[..]).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)?;
|
plonk::create_proof(&pk.params, &pk.pk, circuits, &instances, &mut transcript)?;
|
||||||
Ok(Proof(transcript.finalize()))
|
Ok(Proof(transcript.finalize()))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue