github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

zk/vm: Shorten From impls with a macro.

Browse Source
This commit is contained in:
parazyd
2022-11-15 21:16:39 +01:00
parent 371011959c
commit 8b648874d5
2 changed files with 22 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/zk/vm.rs
View File

@@ -425,6 +425,9 @@ impl Circuit<pallas::Base> for ZkCircuit {
}
Witness::Scalar(w) => {
// NOTE: Because the type in `halo2_gadgets` does not have a `Clone`
// impl, we push scalars as-is to the stack. They get witnessed
// when they get used.
debug!("Pushing Scalar to stack index {}", stack.len());
stack.push(StackVar::Scalar(*w));
}

88
src/zk/vm_stack.rs
View File

@@ -20,7 +20,7 @@
use darkfi_sdk::crypto::{constants::OrchardFixedBases, MerkleNode};
use halo2_gadgets::ecc::{chip::EccChip, FixedPoint, FixedPointBaseField, FixedPointShort, Point};
use halo2_proofs::circuit::{AssignedCell, Value};
use pasta_curves::{pallas, EpAffine};
use pasta_curves::pallas;
use crate::zkas::{decoder::ZkBinary, types::VarType};
@@ -77,74 +77,24 @@ pub enum StackVar {
Uint64(Value<u64>),
}
impl From<StackVar> for Point<pallas::Affine, EccChip<OrchardFixedBases>> {
fn from(value: StackVar) -> Self {
match value {
StackVar::EcPoint(v) => v,
_ => unimplemented!(),
macro_rules! impl_from {
($variant:ident, $fortype:ty) => {
impl From<StackVar> for $fortype {
fn from(value: StackVar) -> Self {
match value {
StackVar::$variant(v) => v,
_ => unreachable!(),
}
}
}
}
};
}
impl From<StackVar> for FixedPoint<pallas::Affine, EccChip<OrchardFixedBases>> {
fn from(value: StackVar) -> Self {
match value {
StackVar::EcFixedPoint(v) => v,
_ => unimplemented!(),
}
}
}
impl From<StackVar> for Value<pallas::Scalar> {
fn from(value: StackVar) -> Self {
match value {
StackVar::Scalar(v) => v,
_ => unimplemented!(),
}
}
}
impl From<StackVar> for AssignedCell<pallas::Base, pallas::Base> {
fn from(value: StackVar) -> Self {
match value {
StackVar::Base(v) => v,
_ => unimplemented!(),
}
}
}
impl From<StackVar> for Value<u32> {
fn from(value: StackVar) -> Self {
match value {
StackVar::Uint32(v) => v,
_ => unimplemented!(),
}
}
}
impl From<StackVar> for Value<[pallas::Base; 32]> {
fn from(value: StackVar) -> Self {
match value {
StackVar::MerklePath(v) => v,
_ => unimplemented!(),
}
}
}
impl From<StackVar> for FixedPointShort<EpAffine, EccChip<OrchardFixedBases>> {
fn from(value: StackVar) -> Self {
match value {
StackVar::EcFixedPointShort(v) => v,
_ => unimplemented!(),
}
}
}
impl From<StackVar> for FixedPointBaseField<EpAffine, EccChip<OrchardFixedBases>> {
fn from(value: StackVar) -> Self {
match value {
StackVar::EcFixedPointBase(v) => v,
_ => unimplemented!(),
}
}
}
impl_from!(EcPoint, Point<pallas::Affine, EccChip<OrchardFixedBases>>);
impl_from!(EcFixedPoint, FixedPoint<pallas::Affine, EccChip<OrchardFixedBases>>);
impl_from!(EcFixedPointShort, FixedPointShort<pallas::Affine, EccChip<OrchardFixedBases>>);
impl_from!(EcFixedPointBase, FixedPointBaseField<pallas::Affine, EccChip<OrchardFixedBases>>);
impl_from!(Scalar, Value<pallas::Scalar>);
impl_from!(Base, AssignedCell<pallas::Base, pallas::Base>);
impl_from!(Uint32, Value<u32>);
impl_from!(MerklePath, Value<[pallas::Base; 32]>);