Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RPO STARK-based signature scheme verification in MASM #1591

Open
wants to merge 20 commits into
base: next
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 80 additions & 61 deletions Cargo.lock

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,17 @@ inherits = "release"
debug = true
debug-assertions = true
overflow-checks = true


[patch.crates-io]
winter-air = {git = 'https://github.com/Al-Kindi-0/winterfell', branch = 'al-zk', package = 'winter-air' }
winter-crypto = {git = 'https://github.com/Al-Kindi-0/winterfell', branch = 'al-zk', package = 'winter-crypto' }
winter-prover = {git = 'https://github.com/Al-Kindi-0/winterfell', branch = 'al-zk', package = 'winter-prover' }
winter-verifier = { git = 'https://github.com/Al-Kindi-0/winterfell', branch = 'al-zk', package = 'winter-verifier' }
winter-math = {git = 'https://github.com/Al-Kindi-0/winterfell', branch = 'al-zk', package = 'winter-math' }
winter-fri = {git = 'https://github.com/Al-Kindi-0/winterfell', branch = 'al-zk', package = 'winter-fri' }
winter-maybe-async = {git = 'https://github.com/Al-Kindi-0/winterfell', branch = 'al-zk', package = 'winter-maybe-async' }
winter-utils = {git = 'https://github.com/Al-Kindi-0/winterfell', branch = 'al-zk', package = 'winter-utils' }
winter-rand-utils = {git = 'https://github.com/Al-Kindi-0/winterfell', branch = 'al-zk', package = 'winter-rand-utils' }

miden-crypto = {git = 'https://github.com/0xPolygonMiden/crypto', branch = 'al-stark-signature-dev-masm' }
9 changes: 5 additions & 4 deletions air/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ impl ProvingOptions {

/// Standard proof parameters for 96-bit conjectured security in non-recursive context.
pub const REGULAR_96_BITS: WinterProofOptions =
WinterProofOptions::new(27, 8, 16, FieldExtension::Quadratic, 8, 255);
WinterProofOptions::new(27, 8, 16, FieldExtension::Quadratic, 8, 255, false);

/// Standard proof parameters for 128-bit conjectured security in non-recursive context.
pub const REGULAR_128_BITS: WinterProofOptions =
WinterProofOptions::new(27, 16, 21, FieldExtension::Cubic, 8, 255);
WinterProofOptions::new(27, 16, 21, FieldExtension::Cubic, 8, 255, false);

/// Standard proof parameters for 96-bit conjectured security in recursive context.
pub const RECURSIVE_96_BITS: WinterProofOptions =
WinterProofOptions::new(27, 8, 16, FieldExtension::Quadratic, 4, 7);
WinterProofOptions::new(11, 8, 12, FieldExtension::Quadratic, 4, 7, false);

/// Standard proof parameters for 128-bit conjectured security in recursive context.
pub const RECURSIVE_128_BITS: WinterProofOptions =
WinterProofOptions::new(27, 16, 21, FieldExtension::Cubic, 4, 7);
WinterProofOptions::new(27, 16, 21, FieldExtension::Cubic, 4, 7, false);

// CONSTRUCTORS
// --------------------------------------------------------------------------------------------
Expand All @@ -53,6 +53,7 @@ impl ProvingOptions {
field_extension,
fri_folding_factor,
fri_remainder_max_degree,
false,
);
let exec_options = ExecutionOptions::default();
Self { exec_options, proof_options, hash_fn }
Expand Down
2 changes: 1 addition & 1 deletion core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ pub mod crypto {
}

pub mod dsa {
pub use miden_crypto::dsa::rpo_falcon512;
pub use miden_crypto::dsa::{rpo_falcon512, rpo_stark};
}
}

Expand Down
3 changes: 3 additions & 0 deletions prover/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ tracing = { version = "0.1", default-features = false, features = ["attributes"]
winter-maybe-async = { package = "winter-maybe-async", version = "0.11", default-features = false }
winter-prover = { package = "winter-prover", version = "0.11", default-features = false }

winter-air = { version = "0.11", default-features = false }
rand_chacha = { version = "0.3", default-features = false }

[target.'cfg(all(target_arch = "aarch64", target_os = "macos"))'.dependencies]
elsa = { version = "1.9", optional = true }
miden-gpu = { version = "0.4", optional = true }
Expand Down
27 changes: 18 additions & 9 deletions prover/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use processor::{
ExecutionTrace, Program,
};
use tracing::instrument;
use winter_air::ZkParameters;
use winter_maybe_async::{maybe_async, maybe_await};
use winter_prover::{
matrix::ColMatrix, CompositionPoly, CompositionPolyTrace, ConstraintCompositionCoefficients,
Expand All @@ -38,7 +39,7 @@ pub use processor::{
crypto, math, utils, AdviceInputs, Digest, ExecutionError, Host, InputError, MemAdviceProvider,
StackInputs, StackOutputs, Word,
};
pub use winter_prover::{crypto::MerkleTree as MerkleTreeVC, Proof};
pub use winter_prover::{crypto::MerkleTree as MerkleTreeVC, MockPrng, Proof};

// PROVER
// ================================================================================================
Expand Down Expand Up @@ -87,15 +88,15 @@ pub fn prove(
stack_inputs,
stack_outputs.clone(),
);
maybe_await!(prover.prove(trace))
maybe_await!(prover.prove(trace, None))
},
HashFunction::Blake3_256 => {
let prover = ExecutionProver::<Blake3_256, WinterRandomCoin<_>>::new(
options,
stack_inputs,
stack_outputs.clone(),
);
maybe_await!(prover.prove(trace))
maybe_await!(prover.prove(trace, None))
},
HashFunction::Rpo256 => {
let prover = ExecutionProver::<Rpo256, RpoRandomCoin>::new(
Expand All @@ -105,7 +106,7 @@ pub fn prove(
);
#[cfg(all(feature = "metal", target_arch = "aarch64", target_os = "macos"))]
let prover = gpu::metal::MetalExecutionProver::new(prover, HashFn::Rpo256);
maybe_await!(prover.prove(trace))
maybe_await!(prover.prove(trace, None))
},
HashFunction::Rpx256 => {
let prover = ExecutionProver::<Rpx256, RpxRandomCoin>::new(
Expand All @@ -115,7 +116,7 @@ pub fn prove(
);
#[cfg(all(feature = "metal", target_arch = "aarch64", target_os = "macos"))]
let prover = gpu::metal::MetalExecutionProver::new(prover, HashFn::Rpx256);
maybe_await!(prover.prove(trace))
maybe_await!(prover.prove(trace, None))
},
}
.map_err(ExecutionError::ProverError)?;
Expand Down Expand Up @@ -188,10 +189,11 @@ where
type VC = MerkleTreeVC<Self::HashFn>;
type RandomCoin = R;
type TraceLde<E: FieldElement<BaseField = Felt>> = DefaultTraceLde<E, H, Self::VC>;
type ConstraintCommitment<E: FieldElement<BaseField = Self::BaseField>> =
DefaultConstraintCommitment<E, Self::HashFn, Self::ZkPrng, Self::VC>;
type ConstraintEvaluator<'a, E: FieldElement<BaseField = Felt>> =
DefaultConstraintEvaluator<'a, ProcessorAir, E>;
type ConstraintCommitment<E: FieldElement<BaseField = Felt>> =
DefaultConstraintCommitment<E, H, Self::VC>;
type ZkPrng = MockPrng;

fn options(&self) -> &WinterProofOptions {
&self.options
Expand Down Expand Up @@ -219,8 +221,10 @@ where
main_trace: &ColMatrix<Felt>,
domain: &StarkDomain<Felt>,
partition_options: PartitionOptions,
zk_parameters: Option<ZkParameters>,
prng: &mut Option<Self::ZkPrng>,
) -> (Self::TraceLde<E>, TracePolyTable<E>) {
DefaultTraceLde::new(trace_info, main_trace, domain, partition_options)
DefaultTraceLde::new(trace_info, main_trace, domain, partition_options, zk_parameters, prng)
}

#[maybe_async]
Expand All @@ -243,19 +247,24 @@ where
trace.build_aux_trace(aux_rand_elements.rand_elements()).unwrap()
}

#[instrument(skip_all)]
#[maybe_async]
fn build_constraint_commitment<E: FieldElement<BaseField = Felt>>(
fn build_constraint_commitment<E: FieldElement<BaseField = Self::BaseField>>(
&self,
composition_poly_trace: CompositionPolyTrace<E>,
num_constraint_composition_columns: usize,
domain: &StarkDomain<Self::BaseField>,
partition_options: PartitionOptions,
zk_parameters: Option<ZkParameters>,
prng: &mut Option<Self::ZkPrng>,
) -> (Self::ConstraintCommitment<E>, CompositionPoly<E>) {
DefaultConstraintCommitment::new(
composition_poly_trace,
num_constraint_composition_columns,
domain,
partition_options,
zk_parameters,
prng,
)
}
}
3 changes: 3 additions & 0 deletions stdlib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ test-utils = { package = "miden-test-utils", path = "../test-utils" }
vm-core = { package = "miden-core", path = "../core", version = "0.11", default-features = false }
winter-air = { package = "winter-air", version = "0.11" }
winter-fri = { package = "winter-fri", version = "0.11" }
winter-crypto = { package = "winter-crypto", version = "0.11" }
rand_chacha = { version = "0.3", default-features = false }


[build-dependencies]
assembly = { package = "miden-assembly", path = "../assembly", version = "0.11" }
Loading
Loading