Skip to content
This repository has been archived by the owner on Oct 1, 2024. It is now read-only.

Commit

Permalink
sync with latest stwo
Browse files Browse the repository at this point in the history
  • Loading branch information
@weikengchen
weikengchen committed Aug 15, 2024
1 parent 2b27af0 commit beec486
Show file tree
Hide file tree
Showing 9 changed files with 130 additions and 101 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ anyhow = "1.0.86"
covenants-gadgets = { git = "https://github.com/Bitcoin-Wildlife-Sanctuary/covenants-gadgets" }
clap = { version = "4.5.0", features = ["derive"] }
colored = "2.1.0"
bitcoin-circle-stark = {git = "https://github.com/Bitcoin-Wildlife-Sanctuary/bitcoin-circle-stark"}
bitcoin-circle-stark = { git = "https://github.com/Bitcoin-Wildlife-Sanctuary/bitcoin-circle-stark" }

[profile.dev]
opt-level = 3
Expand Down
33 changes: 19 additions & 14 deletions src/bin/demo.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ use fibonacci_example::quotients::compute_quotients_hints;
use fibonacci_example::split::{FibonacciSplitInput, FibonacciSplitProgram, FibonacciSplitState};
use fibonacci_example::FIB_LOG_SIZE;
use std::io::Write;
use stwo_prover::core::channel::{BWSSha256Channel, Channel};
use stwo_prover::core::channel::Sha256Channel;
use stwo_prover::core::fields::m31::{BaseField, M31};
use stwo_prover::core::fields::IntoSlice;
use stwo_prover::core::vcs::bws_sha256_hash::BWSSha256Hasher;
use stwo_prover::core::pcs::PcsConfig;
use stwo_prover::core::vcs::sha256_hash::Sha256Hasher;
use stwo_prover::core::vcs::sha256_merkle::Sha256MerkleChannel;
use stwo_prover::examples::fibonacci::Fibonacci;
use stwo_prover::trace_generation::commit_and_prove;

Expand Down Expand Up @@ -97,20 +99,23 @@ fn main() {
println!("================================================");
} else {
let fib = Fibonacci::new(FIB_LOG_SIZE, M31::reduce(443693538));
let config = PcsConfig::default();

let trace = fib.get_trace();
let channel =
&mut BWSSha256Channel::new(BWSSha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
let proof = commit_and_prove(&fib.air, channel, vec![trace]).unwrap();

let channel =
&mut BWSSha256Channel::new(BWSSha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
let channel = &mut Sha256Channel::default();
channel.update_digest(Sha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
let proof =
commit_and_prove::<_, Sha256MerkleChannel>(&fib.air, channel, vec![trace], config)
.unwrap();

let channel = &mut Sha256Channel::default();
channel.update_digest(Sha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
let (fiat_shamir_output, fiat_shamir_hints) =
compute_fiat_shamir_hints(proof.clone(), channel, &fib.air).unwrap();

Expand Down
4 changes: 2 additions & 2 deletions src/bitcoin_script/fiat_shamir.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use bitcoin_scriptexec::{profiler_end, profiler_start};
use rust_bitcoin_m31::{
qm31_copy, qm31_dup, qm31_equalverify, qm31_from_bottom, qm31_over, qm31_roll,
};
use stwo_prover::core::channel::BWSSha256Channel;
use stwo_prover::core::channel::Sha256Channel;
use stwo_prover::core::fields::m31::M31;
use stwo_prover::core::poly::circle::CanonicCoset;
use stwo_prover::core::prover::{LOG_BLOWUP_FACTOR, N_QUERIES, PROOF_OF_WORK_BITS};
Expand Down Expand Up @@ -52,7 +52,7 @@ impl FibonacciFiatShamirGadget {
/// - masked points (3 * 8 = 24)
/// - oods point (8)
///
pub fn run(channel: &BWSSha256Channel) -> Script {
pub fn run(channel: &Sha256Channel) -> Script {
script! {
// push the initial channel
{ channel.digest }
Expand Down
46 changes: 26 additions & 20 deletions src/bitcoin_script/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::bitcoin_script::prepare::FibonacciPrepareGadget;
use crate::bitcoin_script::quotients::FibonacciPerQueryQuotientGadget;
use bitcoin_circle_stark::treepp::*;
use bitcoin_circle_stark::utils::clean_stack;
use stwo_prover::core::channel::BWSSha256Channel;
use stwo_prover::core::channel::Sha256Channel;
use stwo_prover::core::prover::N_QUERIES;

mod composition;
Expand All @@ -25,7 +25,7 @@ pub struct FibonacciVerifierGadget;

impl FibonacciVerifierGadget {
/// Run the verifier in the Bitcoin script.
pub fn run_verifier(channel: &BWSSha256Channel) -> Script {
pub fn run_verifier(channel: &Sha256Channel) -> Script {
script! {
// Run the Fiat-Shamir gadget
{ FibonacciFiatShamirGadget::run(channel) }
Expand Down Expand Up @@ -81,39 +81,45 @@ mod test {
use bitcoin_circle_stark::tests_utils::report::report_bitcoin_script_size;
use bitcoin_circle_stark::treepp::*;
use bitcoin_scriptexec::execute_script_with_witness_unlimited_stack;
use stwo_prover::core::channel::{BWSSha256Channel, Channel};
use stwo_prover::core::channel::Sha256Channel;
use stwo_prover::core::fields::m31::{BaseField, M31};
use stwo_prover::core::fields::IntoSlice;
use stwo_prover::core::vcs::bws_sha256_hash::BWSSha256Hasher;
use stwo_prover::core::pcs::PcsConfig;
use stwo_prover::core::vcs::sha256_hash::Sha256Hasher;
use stwo_prover::core::vcs::sha256_merkle::Sha256MerkleChannel;
use stwo_prover::examples::fibonacci::Fibonacci;
use stwo_prover::trace_generation::{commit_and_prove, commit_and_verify};

#[test]
fn test_verifier() {
let fib = Fibonacci::new(FIB_LOG_SIZE, M31::reduce(443693538));
let config = PcsConfig::default();

let trace = fib.get_trace();
let channel =
&mut BWSSha256Channel::new(BWSSha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
let proof = commit_and_prove(&fib.air, channel, vec![trace]).unwrap();
let channel = &mut Sha256Channel::default();
channel.update_digest(Sha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
let proof =
commit_and_prove::<_, Sha256MerkleChannel>(&fib.air, channel, vec![trace], config)
.unwrap();

{
let channel =
&mut BWSSha256Channel::new(BWSSha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
commit_and_verify(proof.clone(), &fib.air, channel).unwrap();
}

let channel =
&mut BWSSha256Channel::new(BWSSha256Hasher::hash(BaseField::into_slice(&[fib
let channel = &mut Sha256Channel::default();
channel.update_digest(Sha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
commit_and_verify::<Sha256MerkleChannel>(proof.clone(), &fib.air, channel, config)
.unwrap();
}

let channel = &mut Sha256Channel::default();
channel.update_digest(Sha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
let channel_clone = channel.clone();

let hint = verify_with_hints(proof, &fib.air, channel).unwrap();
Expand Down
42 changes: 25 additions & 17 deletions src/fiat_shamir.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ use itertools::Itertools;
use stwo_prover::core::air::accumulation::PointEvaluationAccumulator;
use stwo_prover::core::air::ComponentProvers;
use stwo_prover::core::air::{AirProver, Component};
use stwo_prover::core::channel::{BWSSha256Channel, Channel};
use stwo_prover::core::channel::{Channel, Sha256Channel};
use stwo_prover::core::circle::{CirclePoint, Coset};
use stwo_prover::core::fields::m31::M31;
use stwo_prover::core::fields::qm31::{SecureField, QM31};
use stwo_prover::core::fields::secure_column::SECURE_EXTENSION_DEGREE;
use stwo_prover::core::fri::{
get_opening_positions, CirclePolyDegreeBound, FriConfig, FriLayerVerifier,
FriVerificationError, FOLD_STEP,
};
use stwo_prover::core::pcs::{CommitmentSchemeVerifier, TreeVec};
use stwo_prover::core::pcs::{CommitmentSchemeVerifier, PcsConfig, TreeVec};
use stwo_prover::core::poly::line::LineDomain;
use stwo_prover::core::proof_of_work::ProofOfWork;
use stwo_prover::core::prover::{
StarkProof, VerificationError, LOG_BLOWUP_FACTOR, LOG_LAST_LAYER_DEGREE_BOUND, N_QUERIES,
PROOF_OF_WORK_BITS,
};
use stwo_prover::core::queries::{Queries, SparseSubCircleDomain};
use stwo_prover::core::vcs::bws_sha256_hash::BWSSha256Hash;
use stwo_prover::core::vcs::bws_sha256_merkle::BWSSha256MerkleHasher;
use stwo_prover::core::vcs::sha256_hash::{Sha256Hash, Sha256Hasher};
use stwo_prover::core::vcs::sha256_merkle::{Sha256MerkleChannel, Sha256MerkleHasher};
use stwo_prover::core::{ColumnVec, InteractionElements, LookupValues};
use stwo_prover::examples::fibonacci::air::FibonacciAir;
use stwo_prover::trace_generation::AirTraceGenerator;
Expand All @@ -36,7 +36,7 @@ use stwo_prover::trace_generation::AirTraceGenerator;
/// Hints for performing the Fiat-Shamir transform until finalizing the queries.
pub struct FiatShamirHints {
/// Commitments from the proof.
pub commitments: [BWSSha256Hash; 2],
pub commitments: [Sha256Hash; 2],

/// random_coeff comes from adding `proof.commitments[0]` to the channel.
pub random_coeff_hint: DrawHints,
Expand All @@ -60,7 +60,7 @@ pub struct FiatShamirHints {
pub circle_poly_alpha_hint: DrawHints,

/// fri commit and hints for deriving the folding parameter
pub fri_commitment_and_folding_hints: Vec<(BWSSha256Hash, DrawHints)>,
pub fri_commitment_and_folding_hints: Vec<(Sha256Hash, DrawHints)>,

/// last layer poly (assuming only one element)
pub last_layer: QM31,
Expand Down Expand Up @@ -161,18 +161,19 @@ pub struct FiatShamirOutput {
pub last_layer: QM31,

/// fri commit and hints for deriving the folding parameter
pub fri_commitment_and_folding_hints: Vec<(BWSSha256Hash, DrawHints)>,
pub fri_commitment_and_folding_hints: Vec<(Sha256Hash, DrawHints)>,
}

/// Generate Fiat Shamir hints along with fri inputs
pub fn compute_fiat_shamir_hints(
proof: StarkProof<BWSSha256MerkleHasher>,
channel: &mut BWSSha256Channel,
proof: StarkProof<Sha256MerkleHasher>,
channel: &mut Sha256Channel,
air: &FibonacciAir,
) -> Result<(FiatShamirOutput, FiatShamirHints), VerificationError> {
let config = PcsConfig::default();
// Read trace commitment.
let mut commitment_scheme: CommitmentSchemeVerifier<BWSSha256MerkleHasher> =
CommitmentSchemeVerifier::new();
let mut commitment_scheme: CommitmentSchemeVerifier<Sha256MerkleChannel> =
CommitmentSchemeVerifier::new(config);

let air_prover = air.to_air_prover();
let components = ComponentProvers(air_prover.component_provers());
Expand Down Expand Up @@ -212,7 +213,9 @@ pub fn compute_fiat_shamir_hints(
let masked_points = trace_sample_points.clone();

// TODO(spapini): Change when we support multiple interactions.
let sampled_points = components.components().mask_points(oods_point);
let mut sampled_points = components.components().mask_points(oods_point);
// Add the composition polynomial mask points.
sampled_points.push(vec![vec![oods_point]; SECURE_EXTENSION_DEGREE]);

// this step is just a reorganization of the data
assert_eq!(sampled_points.0[0][0][0], masked_points[0][0][0]);
Expand Down Expand Up @@ -311,7 +314,10 @@ pub fn compute_fiat_shamir_hints(
.into_iter()
.enumerate()
{
channel.mix_digest(proof.commitment);
channel.update_digest(Sha256Hasher::concat_and_hash(
&proof.commitment,
&channel.digest(),
));

let (folding_alpha, folding_alpha_hint) = channel.draw_felt_and_hints();
folding_alphas.push(folding_alpha);
Expand Down Expand Up @@ -351,13 +357,15 @@ pub fn compute_fiat_shamir_hints(

let pow_hint = PoWHint::new(
channel.digest,
proof.commitment_scheme_proof.proof_of_work.nonce,
proof.commitment_scheme_proof.proof_of_work,
PROOF_OF_WORK_BITS,
);

// Verify proof of work.
ProofOfWork::new(PROOF_OF_WORK_BITS)
.verify(channel, &proof.commitment_scheme_proof.proof_of_work)?;
channel.mix_nonce(proof.commitment_scheme_proof.proof_of_work);
if channel.trailing_zeros() < PROOF_OF_WORK_BITS {
return Err(VerificationError::ProofOfWork);
}

let column_log_sizes = bounds
.iter()
Expand Down
4 changes: 2 additions & 2 deletions src/fold.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use stwo_prover::core::fft::ibutterfly;
use stwo_prover::core::fields::m31::M31;
use stwo_prover::core::fields::qm31::SecureField;
use stwo_prover::core::fri::FriProof;
use stwo_prover::core::vcs::bws_sha256_merkle::BWSSha256MerkleHasher;
use stwo_prover::core::vcs::sha256_merkle::Sha256MerkleHasher;

/// The hints for folding for each query.
#[derive(Clone)]
Expand All @@ -29,7 +29,7 @@ impl Pushable for PerQueryFoldHints {

/// Compute the hints for folding.
pub fn compute_fold_hints(
fri_proof: &FriProof<BWSSha256MerkleHasher>,
fri_proof: &FriProof<Sha256MerkleHasher>,
fs_output: &FiatShamirOutput,
prepare_output: &PrepareOutput,
quotients_output: &QuotientsOutput,
Expand Down
45 changes: 24 additions & 21 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ use crate::quotients::compute_quotients_hints;
use bitcoin_circle_stark::treepp::pushable::{Builder, Pushable};
use quotients::PerQueryQuotientHint;
use stwo_prover::core::air::Air;
use stwo_prover::core::channel::BWSSha256Channel;
use stwo_prover::core::channel::Sha256Channel;
use stwo_prover::core::circle::CirclePoint;
use stwo_prover::core::fields::qm31::SecureField;
use stwo_prover::core::pcs::TreeVec;
use stwo_prover::core::prover::{InvalidOodsSampleStructure, StarkProof, VerificationError};
use stwo_prover::core::vcs::bws_sha256_merkle::BWSSha256MerkleHasher;
use stwo_prover::core::vcs::sha256_merkle::Sha256MerkleHasher;
use stwo_prover::core::ColumnVec;
use stwo_prover::examples::fibonacci::air::FibonacciAir;

Expand Down Expand Up @@ -65,9 +65,9 @@ impl Pushable for VerifierHints {

/// A verifier program that generates hints.
pub fn verify_with_hints(
proof: StarkProof<BWSSha256MerkleHasher>,
proof: StarkProof<Sha256MerkleHasher>,
air: &FibonacciAir,
channel: &mut BWSSha256Channel,
channel: &mut Sha256Channel,
) -> Result<VerifierHints, VerificationError> {
let (fiat_shamir_output, fiat_shamir_hints) =
compute_fiat_shamir_hints(proof.clone(), channel, air).unwrap();
Expand Down Expand Up @@ -130,34 +130,37 @@ fn sampled_values_to_mask(

#[cfg(test)]
mod test {
use stwo_prover::core::channel::{BWSSha256Channel, Channel};
use stwo_prover::core::channel::Sha256Channel;
use stwo_prover::core::fields::m31::{BaseField, M31};
use stwo_prover::core::fields::IntoSlice;
use stwo_prover::core::pcs::PcsConfig;
use stwo_prover::core::prover::StarkProof;
use stwo_prover::core::vcs::bws_sha256_hash::BWSSha256Hasher;
use stwo_prover::core::vcs::bws_sha256_merkle::BWSSha256MerkleHasher;
use stwo_prover::core::vcs::sha256_hash::Sha256Hasher;
use stwo_prover::core::vcs::sha256_merkle::{Sha256MerkleChannel, Sha256MerkleHasher};
use stwo_prover::examples::fibonacci::Fibonacci;
use stwo_prover::trace_generation::{commit_and_prove, commit_and_verify};

#[test]
fn test_fib_prove() {
const FIB_LOG_SIZE: u32 = 5;
let fib = Fibonacci::new(FIB_LOG_SIZE, M31::reduce(443693538));
let config = PcsConfig::default();

let trace = fib.get_trace();
let channel =
&mut BWSSha256Channel::new(BWSSha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
let proof: StarkProof<BWSSha256MerkleHasher> =
commit_and_prove(&fib.air, channel, vec![trace]).unwrap();

let channel =
&mut BWSSha256Channel::new(BWSSha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
commit_and_verify(proof, &fib.air, channel).unwrap()
let channel = &mut Sha256Channel::default();
channel.update_digest(Sha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
let proof: StarkProof<Sha256MerkleHasher> =
commit_and_prove::<_, Sha256MerkleChannel>(&fib.air, channel, vec![trace], config)
.unwrap();

let channel = &mut Sha256Channel::default();
channel.update_digest(Sha256Hasher::hash(BaseField::into_slice(&[fib
.air
.component
.claim])));
commit_and_verify::<Sha256MerkleChannel>(proof, &fib.air, channel, config).unwrap()
}
}
4 changes: 2 additions & 2 deletions src/prepare.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use bitcoin_circle_stark::precomputed_merkle_tree::PrecomputedMerkleTree;
use bitcoin_circle_stark::treepp::pushable::{Builder, Pushable};
use itertools::Itertools;
use std::iter::zip;
use stwo_prover::core::vcs::bws_sha256_merkle::BWSSha256MerkleHasher;
use stwo_prover::core::vcs::sha256_merkle::Sha256MerkleHasher;
use stwo_prover::core::{
backend::cpu::quotients::{batch_random_coeffs, denominator_inverses},
constraints::complex_conjugate_line_coeffs_normalized,
Expand Down Expand Up @@ -53,7 +53,7 @@ pub struct PrepareOutput {
/// prepare output for quotients and verifier hints
pub fn compute_prepare_hints(
fs_output: &FiatShamirOutput,
proof: &StarkProof<BWSSha256MerkleHasher>,
proof: &StarkProof<Sha256MerkleHasher>,
) -> Result<(PrepareOutput, PrepareHints), VerificationError> {
let column_size: Vec<u32> = fs_output
.commitment_scheme_column_log_sizes
Expand Down
Loading

0 comments on commit beec486

Please sign in to comment.