From e90914d3e5da585792b3e4a524626ed712743aa5 Mon Sep 17 00:00:00 2001 From: Al-Kindi-0 <82364884+Al-Kindi-0@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:25:56 +0200 Subject: [PATCH] chore: adapt to updated AirContext --- Cargo.lock | 20 ++++++++++---------- air/src/lib.rs | 8 +++----- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 839d55990..9a46bc96d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2756,7 +2756,7 @@ dependencies = [ [[package]] name = "winter-air" version = "0.9.0" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "libm", "winter-crypto 0.9.0 (git+https://github.com/facebook/winterfell?branch=logup-gkr)", @@ -2780,7 +2780,7 @@ dependencies = [ [[package]] name = "winter-crypto" version = "0.9.0" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "blake3", "sha3", @@ -2802,7 +2802,7 @@ dependencies = [ [[package]] name = "winter-fri" version = "0.9.0" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "winter-crypto 0.9.0 (git+https://github.com/facebook/winterfell?branch=logup-gkr)", "winter-math 0.9.0 (git+https://github.com/facebook/winterfell?branch=logup-gkr)", @@ -2821,7 +2821,7 @@ dependencies = [ [[package]] name = "winter-math" version = "0.9.0" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "winter-utils 0.9.1", ] @@ -2829,7 +2829,7 @@ dependencies = [ [[package]] name = "winter-maybe-async" version = "0.10.0" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "quote", "syn", @@ -2838,7 +2838,7 @@ dependencies = [ [[package]] name = "winter-prover" version = "0.9.0" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "thiserror 1.0.59", "tracing", @@ -2854,7 +2854,7 @@ dependencies = [ [[package]] name = "winter-rand-utils" version = "0.9.0" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "rand", "winter-utils 0.9.1", @@ -2863,7 +2863,7 @@ dependencies = [ [[package]] name = "winter-sumcheck" version = "0.1.0" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "smallvec", "thiserror 1.0.59", @@ -2876,7 +2876,7 @@ dependencies = [ [[package]] name = "winter-utils" version = "0.9.1" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "rayon", ] @@ -2890,7 +2890,7 @@ checksum = "c3d71ec2c97685c7e7460a30e27f955d26b8426e7c2db0ddb55a6e0537141f53" [[package]] name = "winter-verifier" version = "0.9.0" -source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#48a1d6f6e92b2c842d188172716cb157a8b4dfa5" +source = "git+https://github.com/facebook/winterfell?branch=logup-gkr#0a0f244e01e170fa7cf76ada36ad019817dec936" dependencies = [ "thiserror 1.0.59", "winter-air", diff --git a/air/src/lib.rs b/air/src/lib.rs index 4507bee7e..e0627af1d 100644 --- a/air/src/lib.rs +++ b/air/src/lib.rs @@ -102,12 +102,11 @@ impl Air for ProcessorAir { let num_main_assertions = 2 + stack::NUM_ASSERTIONS + range::NUM_ASSERTIONS; // Define the number of boundary constraints for the auxiliary execution trace segment. - //let num_aux_assertions = stack::NUM_AUX_ASSERTIONS; - let num_aux_assertions = 0; + let num_aux_assertions = stack::NUM_AUX_ASSERTIONS; // Create the context and set the number of transition constraint exemptions to two; this // allows us to inject random values into the last row of the execution trace. - let context = AirContext::with_logup_gkr( + let context = AirContext::new_multi_segment( trace_info, pub_inputs.clone(), main_degrees, @@ -192,8 +191,7 @@ impl Air for ProcessorAir { last_step, ); - //result - vec![] + result } // TRANSITION CONSTRAINTS