From f472a16b325071fe1c00ca7727b58ba3a272629b Mon Sep 17 00:00:00 2001 From: therealyingtong Date: Tue, 30 Nov 2021 22:00:07 -0500 Subject: [PATCH] chip::mul_fixed: Move running_sum_config into mul_fixed::Config. --- src/circuit/gadget/ecc/chip.rs | 15 +- src/circuit/gadget/ecc/chip/mul_fixed.rs | 12 +- .../ecc/chip/mul_fixed/base_field_elem.rs | 14 +- .../gadget/ecc/chip/mul_fixed/full_width.rs | 16 +- .../gadget/ecc/chip/mul_fixed/short.rs | 14 +- .../gadget/utilities/decompose_running_sum.rs | 4 +- src/circuit_description | 2042 ++++++++--------- 7 files changed, 1049 insertions(+), 1068 deletions(-) diff --git a/src/circuit/gadget/ecc/chip.rs b/src/circuit/gadget/ecc/chip.rs index 6001261c..fd3d31d6 100644 --- a/src/circuit/gadget/ecc/chip.rs +++ b/src/circuit/gadget/ecc/chip.rs @@ -1,8 +1,7 @@ use super::EccInstructions; use crate::{ circuit::gadget::utilities::{ - copy, decompose_running_sum::RunningSumConfig, lookup_range_check::LookupRangeCheckConfig, - CellValue, UtilitiesInstructions, Var, + copy, lookup_range_check::LookupRangeCheckConfig, CellValue, UtilitiesInstructions, Var, }, constants::{self, NullifierK, OrchardFixedBasesFull, ValueCommitV}, primitives::sinsemilla, @@ -151,17 +150,12 @@ pub struct EccConfig { pub q_mul_fixed_short: Selector, /// Canonicity checks on base field element used as scalar in fixed-base mul pub q_mul_fixed_base_field: Selector, - /// Running sum decomposition of a scalar used in fixed-base mul. This is used - /// when the scalar is a signed short exponent or a base-field element. - pub q_mul_fixed_running_sum: Selector, /// Witness point witness_point: witness_point::Config, /// Lookup range check using 10-bit lookup table pub lookup_config: LookupRangeCheckConfig, - /// Running sum decomposition. - pub running_sum_config: RunningSumConfig, } /// A chip implementing EccInstructions @@ -213,10 +207,6 @@ impl EccChip { meta.enable_equality((*column).into()); } - let q_mul_fixed_running_sum = meta.selector(); - let running_sum_config = - RunningSumConfig::configure(meta, q_mul_fixed_running_sum, advices[4]); - // Create witness point gate let witness_point = witness_point::Config::configure(meta, advices[0], advices[1]); // Create incomplete point addition gate @@ -236,7 +226,6 @@ impl EccChip { // fixed-base scalar mul. let mul_fixed = mul_fixed::Config::configure( meta, - q_mul_fixed_running_sum, lagrange_coeffs, advices[4], advices[0], @@ -255,10 +244,8 @@ impl EccChip { q_mul_fixed_full: meta.selector(), q_mul_fixed_short: meta.selector(), q_mul_fixed_base_field: meta.selector(), - q_mul_fixed_running_sum, witness_point, lookup_config: range_check, - running_sum_config, }; // Create gate that is only used in full-width fixed-base scalar mul. diff --git a/src/circuit/gadget/ecc/chip/mul_fixed.rs b/src/circuit/gadget/ecc/chip/mul_fixed.rs index 18ef981a..38afca53 100644 --- a/src/circuit/gadget/ecc/chip/mul_fixed.rs +++ b/src/circuit/gadget/ecc/chip/mul_fixed.rs @@ -2,6 +2,7 @@ use super::{ add, add_incomplete, CellValue, EccBaseFieldElemFixed, EccScalarFixed, EccScalarFixedShort, NonIdentityEccPoint, Var, }; +use crate::circuit::gadget::utilities::decompose_running_sum::RunningSumConfig; use crate::constants::{ self, load::{NullifierK, OrchardFixedBase, OrchardFixedBasesFull, ValueCommitV, WindowUs}, @@ -77,7 +78,7 @@ impl OrchardFixedBases { #[derive(Clone, Copy, Debug, Eq, PartialEq)] pub struct Config { - q_mul_fixed_running_sum: Selector, + running_sum_config: RunningSumConfig, // The fixed Lagrange interpolation coefficients for `x_p`. lagrange_coeffs: [Column; constants::H], // The fixed `z` for each window such that `y + z = u^2`. @@ -101,7 +102,6 @@ impl Config { #[allow(clippy::too_many_arguments)] pub(super) fn configure( meta: &mut ConstraintSystem, - q_mul_fixed_running_sum: Selector, lagrange_coeffs: [Column; constants::H], window: Column, x_p: Column, @@ -113,8 +113,11 @@ impl Config { meta.enable_equality(window.into()); meta.enable_equality(u.into()); + let q_running_sum = meta.selector(); + let running_sum_config = RunningSumConfig::configure(meta, q_running_sum, window); + let config = Self { - q_mul_fixed_running_sum, + running_sum_config, lagrange_coeffs, fixed_z: meta.fixed_column(), window, @@ -171,7 +174,8 @@ impl Config { /// via a running sum. fn running_sum_coords_gate(&self, meta: &mut ConstraintSystem) { meta.create_gate("Running sum coordinates check", |meta| { - let q_mul_fixed_running_sum = meta.query_selector(self.q_mul_fixed_running_sum); + let q_mul_fixed_running_sum = + meta.query_selector(self.running_sum_config.q_range_check); let z_cur = meta.query_advice(self.window, Rotation::cur()); let z_next = meta.query_advice(self.window, Rotation::next()); diff --git a/src/circuit/gadget/ecc/chip/mul_fixed/base_field_elem.rs b/src/circuit/gadget/ecc/chip/mul_fixed/base_field_elem.rs index fc3a9f60..e1c7169c 100644 --- a/src/circuit/gadget/ecc/chip/mul_fixed/base_field_elem.rs +++ b/src/circuit/gadget/ecc/chip/mul_fixed/base_field_elem.rs @@ -3,8 +3,8 @@ use super::H_BASE; use crate::{ circuit::gadget::utilities::{ - bitrange_subset, copy, decompose_running_sum::RunningSumConfig, - lookup_range_check::LookupRangeCheckConfig, range_check, CellValue, Var, + bitrange_subset, copy, lookup_range_check::LookupRangeCheckConfig, range_check, CellValue, + Var, }, constants::{self, T_P}, primitives::sinsemilla, @@ -19,22 +19,18 @@ use pasta_curves::{arithmetic::FieldExt, pallas}; use std::convert::TryInto; pub struct Config { - q_mul_fixed_running_sum: Selector, q_mul_fixed_base_field: Selector, canon_advices: [Column; 3], lookup_config: LookupRangeCheckConfig, - running_sum_config: RunningSumConfig, super_config: super::Config, } impl From<&EccConfig> for Config { fn from(config: &EccConfig) -> Self { let config = Self { - q_mul_fixed_running_sum: config.q_mul_fixed_running_sum, q_mul_fixed_base_field: config.q_mul_fixed_base_field, canon_advices: [config.advices[6], config.advices[7], config.advices[8]], lookup_config: config.lookup_config, - running_sum_config: config.running_sum_config.clone(), super_config: config.mul_fixed, }; @@ -46,8 +42,6 @@ impl From<&EccConfig> for Config { ); } - assert_eq!(config.running_sum_config.z, config.super_config.window); - config } } @@ -166,7 +160,7 @@ impl Config { // Decompose scalar let scalar = { - let running_sum = self.running_sum_config.copy_decompose( + let running_sum = self.super_config.running_sum_config.copy_decompose( &mut region, offset, scalar, @@ -187,7 +181,7 @@ impl Config { offset, &(&scalar).into(), base.into(), - self.q_mul_fixed_running_sum, + self.super_config.running_sum_config.q_range_check, )?; Ok((scalar, acc, mul_b)) diff --git a/src/circuit/gadget/ecc/chip/mul_fixed/full_width.rs b/src/circuit/gadget/ecc/chip/mul_fixed/full_width.rs index 257826fe..a5863587 100644 --- a/src/circuit/gadget/ecc/chip/mul_fixed/full_width.rs +++ b/src/circuit/gadget/ecc/chip/mul_fixed/full_width.rs @@ -124,13 +124,15 @@ impl Config { let scalar = self.witness(&mut region, offset, scalar)?; - let (acc, mul_b) = self.super_config.assign_region_inner::( - &mut region, - offset, - &(&scalar).into(), - base.into(), - self.q_mul_fixed_full, - )?; + let (acc, mul_b) = self + .super_config + .assign_region_inner::<{ constants::NUM_WINDOWS }>( + &mut region, + offset, + &(&scalar).into(), + base.into(), + self.q_mul_fixed_full, + )?; Ok((scalar, acc, mul_b)) }, diff --git a/src/circuit/gadget/ecc/chip/mul_fixed/short.rs b/src/circuit/gadget/ecc/chip/mul_fixed/short.rs index 1aa1cddc..50f3550f 100644 --- a/src/circuit/gadget/ecc/chip/mul_fixed/short.rs +++ b/src/circuit/gadget/ecc/chip/mul_fixed/short.rs @@ -2,10 +2,8 @@ use std::{array, convert::TryInto}; use super::super::{EccConfig, EccPoint, EccScalarFixedShort}; use crate::{ - circuit::gadget::utilities::{ - bool_check, copy, decompose_running_sum::RunningSumConfig, CellValue, Var, - }, - constants::{ValueCommitV, FIXED_BASE_WINDOW_SIZE, L_VALUE, NUM_WINDOWS_SHORT}, + circuit::gadget::utilities::{bool_check, copy, CellValue, Var}, + constants::{ValueCommitV, L_VALUE, NUM_WINDOWS_SHORT}, }; use halo2::{ @@ -19,8 +17,6 @@ use pasta_curves::pallas; pub struct Config { // Selector used for fixed-base scalar mul with short signed exponent. q_mul_fixed_short: Selector, - q_mul_fixed_running_sum: Selector, - running_sum_config: RunningSumConfig, super_config: super::Config, } @@ -28,8 +24,6 @@ impl From<&EccConfig> for Config { fn from(config: &EccConfig) -> Self { Self { q_mul_fixed_short: config.q_mul_fixed_short, - q_mul_fixed_running_sum: config.q_mul_fixed_running_sum, - running_sum_config: config.running_sum_config.clone(), super_config: config.mul_fixed, } } @@ -80,7 +74,7 @@ impl Config { let (magnitude, sign) = magnitude_sign; // Decompose magnitude - let running_sum = self.running_sum_config.copy_decompose( + let running_sum = self.super_config.running_sum_config.copy_decompose( region, offset, magnitude, @@ -115,7 +109,7 @@ impl Config { offset, &(&scalar).into(), base.clone().into(), - self.q_mul_fixed_running_sum, + self.super_config.running_sum_config.q_range_check, )?; Ok((scalar, acc, mul_b)) diff --git a/src/circuit/gadget/utilities/decompose_running_sum.rs b/src/circuit/gadget/utilities/decompose_running_sum.rs index c59de1c7..c5f6823e 100644 --- a/src/circuit/gadget/utilities/decompose_running_sum.rs +++ b/src/circuit/gadget/utilities/decompose_running_sum.rs @@ -44,9 +44,9 @@ impl std::ops::Deref for RunningSum { } } -#[derive(Debug, Clone, Eq, PartialEq)] +#[derive(Debug, Clone, Copy, Eq, PartialEq)] pub struct RunningSumConfig { - q_range_check: Selector, + pub q_range_check: Selector, pub z: Column, _marker: PhantomData, } diff --git a/src/circuit_description b/src/circuit_description index 46141a26..9ff4e74f 100644 --- a/src/circuit_description +++ b/src/circuit_description @@ -37,19 +37,15 @@ PinnedVerificationKey { column_type: Fixed, }, Column { - index: 20, + index: 19, column_type: Fixed, }, Column { - index: 20, + index: 19, column_type: Fixed, }, Column { - index: 20, - column_type: Fixed, - }, - Column { - index: 20, + index: 19, column_type: Fixed, }, Column { @@ -65,19 +61,23 @@ PinnedVerificationKey { column_type: Fixed, }, Column { - index: 21, + index: 20, column_type: Fixed, }, Column { - index: 21, + index: 20, column_type: Fixed, }, Column { - index: 21, + index: 20, column_type: Fixed, }, Column { - index: 21, + index: 20, + column_type: Fixed, + }, + Column { + index: 20, column_type: Fixed, }, Column { @@ -93,15 +93,15 @@ PinnedVerificationKey { column_type: Fixed, }, Column { - index: 22, + index: 21, column_type: Fixed, }, Column { - index: 22, + index: 21, column_type: Fixed, }, Column { - index: 22, + index: 21, column_type: Fixed, }, Column { @@ -940,254 +940,14 @@ PinnedVerificationKey { ), ), ), - Product( - Fixed { - query_index: 19, - column_index: 19, - rotation: Rotation( - 0, - ), - }, - Product( - Product( - Product( - Product( - Product( - Product( - Product( - Sum( - Advice { - query_index: 4, - column_index: 4, - rotation: Rotation( - 0, - ), - }, - Negated( - Scaled( - Advice { - query_index: 12, - column_index: 4, - rotation: Rotation( - 1, - ), - }, - 0x0000000000000000000000000000000000000000000000000000000000000008, - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000001, - ), - Negated( - Sum( - Advice { - query_index: 4, - column_index: 4, - rotation: Rotation( - 0, - ), - }, - Negated( - Scaled( - Advice { - query_index: 12, - column_index: 4, - rotation: Rotation( - 1, - ), - }, - 0x0000000000000000000000000000000000000000000000000000000000000008, - ), - ), - ), - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000002, - ), - Negated( - Sum( - Advice { - query_index: 4, - column_index: 4, - rotation: Rotation( - 0, - ), - }, - Negated( - Scaled( - Advice { - query_index: 12, - column_index: 4, - rotation: Rotation( - 1, - ), - }, - 0x0000000000000000000000000000000000000000000000000000000000000008, - ), - ), - ), - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000003, - ), - Negated( - Sum( - Advice { - query_index: 4, - column_index: 4, - rotation: Rotation( - 0, - ), - }, - Negated( - Scaled( - Advice { - query_index: 12, - column_index: 4, - rotation: Rotation( - 1, - ), - }, - 0x0000000000000000000000000000000000000000000000000000000000000008, - ), - ), - ), - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000004, - ), - Negated( - Sum( - Advice { - query_index: 4, - column_index: 4, - rotation: Rotation( - 0, - ), - }, - Negated( - Scaled( - Advice { - query_index: 12, - column_index: 4, - rotation: Rotation( - 1, - ), - }, - 0x0000000000000000000000000000000000000000000000000000000000000008, - ), - ), - ), - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000005, - ), - Negated( - Sum( - Advice { - query_index: 4, - column_index: 4, - rotation: Rotation( - 0, - ), - }, - Negated( - Scaled( - Advice { - query_index: 12, - column_index: 4, - rotation: Rotation( - 1, - ), - }, - 0x0000000000000000000000000000000000000000000000000000000000000008, - ), - ), - ), - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000006, - ), - Negated( - Sum( - Advice { - query_index: 4, - column_index: 4, - rotation: Rotation( - 0, - ), - }, - Negated( - Scaled( - Advice { - query_index: 12, - column_index: 4, - rotation: Rotation( - 1, - ), - }, - 0x0000000000000000000000000000000000000000000000000000000000000008, - ), - ), - ), - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000007, - ), - Negated( - Sum( - Advice { - query_index: 4, - column_index: 4, - rotation: Rotation( - 0, - ), - }, - Negated( - Scaled( - Advice { - query_index: 12, - column_index: 4, - rotation: Rotation( - 1, - ), - }, - 0x0000000000000000000000000000000000000000000000000000000000000008, - ), - ), - ), - ), - ), - ), - ), Product( Product( Product( Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1198,8 +958,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1213,8 +973,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1228,8 +988,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1304,8 +1064,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1316,8 +1076,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1331,8 +1091,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1346,8 +1106,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1421,8 +1181,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1433,8 +1193,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1448,8 +1208,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1463,8 +1223,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1530,8 +1290,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1542,8 +1302,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1557,8 +1317,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1572,8 +1332,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1587,7 +1347,7 @@ PinnedVerificationKey { Sum( Sum( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -1694,8 +1454,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1706,8 +1466,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1721,8 +1481,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1736,8 +1496,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1749,7 +1509,7 @@ PinnedVerificationKey { Product( Sum( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -1812,7 +1572,7 @@ PinnedVerificationKey { }, Negated( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -1829,8 +1589,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1841,8 +1601,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1856,8 +1616,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1871,8 +1631,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1955,8 +1715,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1967,8 +1727,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1982,8 +1742,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -1997,8 +1757,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2094,8 +1854,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2106,8 +1866,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2121,8 +1881,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2136,8 +1896,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2223,7 +1983,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -2238,8 +1998,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2250,8 +2010,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2265,8 +2025,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2280,8 +2040,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2346,7 +2106,7 @@ PinnedVerificationKey { }, Negated( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -2367,7 +2127,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -2382,8 +2142,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2394,8 +2154,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2409,8 +2169,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2424,8 +2184,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2509,7 +2269,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -2524,8 +2284,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2536,8 +2296,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2551,8 +2311,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2566,8 +2326,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2630,7 +2390,7 @@ PinnedVerificationKey { }, Negated( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -2651,7 +2411,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -2666,8 +2426,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2678,8 +2438,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2693,8 +2453,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2708,8 +2468,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2743,7 +2503,7 @@ PinnedVerificationKey { ), Sum( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -2766,8 +2526,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2778,8 +2538,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2793,8 +2553,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2808,8 +2568,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2843,7 +2603,7 @@ PinnedVerificationKey { ), Sum( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -2866,8 +2626,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2878,8 +2638,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2893,8 +2653,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2908,8 +2668,108 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + Product( + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000001, + ), + Negated( + Product( + Advice { + query_index: 2, + column_index: 2, + rotation: Rotation( + 0, + ), + }, + Advice { + query_index: 7, + column_index: 7, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + Sum( + Advice { + query_index: 12, + column_index: 2, + rotation: Rotation( + 1, + ), + }, + Negated( + Advice { + query_index: 0, + column_index: 0, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + ), + Product( + Product( + Product( + Product( + Fixed { + query_index: 19, + column_index: 19, + rotation: Rotation( + 0, + ), + }, + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000001, + ), + Negated( + Fixed { + query_index: 19, + column_index: 19, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000002, + ), + Negated( + Fixed { + query_index: 19, + column_index: 19, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000003, + ), + Negated( + Fixed { + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -2944,106 +2804,6 @@ PinnedVerificationKey { Sum( Advice { query_index: 13, - column_index: 2, - rotation: Rotation( - 1, - ), - }, - Negated( - Advice { - query_index: 0, - column_index: 0, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - ), - Product( - Product( - Product( - Product( - Fixed { - query_index: 20, - column_index: 20, - rotation: Rotation( - 0, - ), - }, - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000001, - ), - Negated( - Fixed { - query_index: 20, - column_index: 20, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000002, - ), - Negated( - Fixed { - query_index: 20, - column_index: 20, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000003, - ), - Negated( - Fixed { - query_index: 20, - column_index: 20, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - Product( - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000001, - ), - Negated( - Product( - Advice { - query_index: 2, - column_index: 2, - rotation: Rotation( - 0, - ), - }, - Advice { - query_index: 7, - column_index: 7, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - Sum( - Advice { - query_index: 14, column_index: 3, rotation: Rotation( 1, @@ -3066,8 +2826,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -3078,8 +2838,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -3093,8 +2853,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -3108,8 +2868,137 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 20, - column_index: 20, + query_index: 19, + column_index: 19, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + Product( + Sum( + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000001, + ), + Negated( + Product( + Sum( + Advice { + query_index: 2, + column_index: 2, + rotation: Rotation( + 0, + ), + }, + Negated( + Advice { + query_index: 0, + column_index: 0, + rotation: Rotation( + 0, + ), + }, + ), + ), + Advice { + query_index: 5, + column_index: 5, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + Negated( + Product( + Sum( + Advice { + query_index: 3, + column_index: 3, + rotation: Rotation( + 0, + ), + }, + Advice { + query_index: 1, + column_index: 1, + rotation: Rotation( + 0, + ), + }, + ), + Advice { + query_index: 8, + column_index: 8, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + Advice { + query_index: 12, + column_index: 2, + rotation: Rotation( + 1, + ), + }, + ), + ), + Product( + Product( + Product( + Product( + Fixed { + query_index: 19, + column_index: 19, + rotation: Rotation( + 0, + ), + }, + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000001, + ), + Negated( + Fixed { + query_index: 19, + column_index: 19, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000002, + ), + Negated( + Fixed { + query_index: 19, + column_index: 19, + rotation: Rotation( + 0, + ), + }, + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000003, + ), + Negated( + Fixed { + query_index: 19, + column_index: 19, rotation: Rotation( 0, ), @@ -3183,135 +3072,6 @@ PinnedVerificationKey { ), Advice { query_index: 13, - column_index: 2, - rotation: Rotation( - 1, - ), - }, - ), - ), - Product( - Product( - Product( - Product( - Fixed { - query_index: 20, - column_index: 20, - rotation: Rotation( - 0, - ), - }, - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000001, - ), - Negated( - Fixed { - query_index: 20, - column_index: 20, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000002, - ), - Negated( - Fixed { - query_index: 20, - column_index: 20, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000003, - ), - Negated( - Fixed { - query_index: 20, - column_index: 20, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - Product( - Sum( - Sum( - Constant( - 0x0000000000000000000000000000000000000000000000000000000000000001, - ), - Negated( - Product( - Sum( - Advice { - query_index: 2, - column_index: 2, - rotation: Rotation( - 0, - ), - }, - Negated( - Advice { - query_index: 0, - column_index: 0, - rotation: Rotation( - 0, - ), - }, - ), - ), - Advice { - query_index: 5, - column_index: 5, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - Negated( - Product( - Sum( - Advice { - query_index: 3, - column_index: 3, - rotation: Rotation( - 0, - ), - }, - Advice { - query_index: 1, - column_index: 1, - rotation: Rotation( - 0, - ), - }, - ), - Advice { - query_index: 8, - column_index: 8, - rotation: Rotation( - 0, - ), - }, - ), - ), - ), - Advice { - query_index: 14, column_index: 3, rotation: Rotation( 1, @@ -3420,7 +3180,7 @@ PinnedVerificationKey { Product( Sum( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -3436,7 +3196,7 @@ PinnedVerificationKey { ), Sum( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -3447,14 +3207,14 @@ PinnedVerificationKey { Sum( Product( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, ), }, Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -3463,7 +3223,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -4184,7 +3944,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -4352,7 +4112,7 @@ PinnedVerificationKey { }, Negated( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -4439,7 +4199,7 @@ PinnedVerificationKey { Product( Sum( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -4455,7 +4215,7 @@ PinnedVerificationKey { ), Sum( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -4466,14 +4226,14 @@ PinnedVerificationKey { Sum( Product( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, ), }, Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -4482,7 +4242,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -4989,7 +4749,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -5157,7 +4917,7 @@ PinnedVerificationKey { }, Negated( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -5241,7 +5001,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -5256,8 +5016,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5268,8 +5028,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5283,8 +5043,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5298,8 +5058,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5313,8 +5073,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5342,7 +5102,7 @@ PinnedVerificationKey { ), }, Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -5410,8 +5170,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5422,8 +5182,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5437,8 +5197,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5452,8 +5212,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5467,8 +5227,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5501,8 +5261,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5513,8 +5273,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5528,8 +5288,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5543,8 +5303,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5558,8 +5318,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5592,8 +5352,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5604,8 +5364,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5619,8 +5379,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5634,8 +5394,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5649,8 +5409,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5716,8 +5476,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5728,8 +5488,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5743,8 +5503,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5758,8 +5518,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5773,8 +5533,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5932,8 +5692,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5944,8 +5704,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5959,8 +5719,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5974,8 +5734,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -5989,8 +5749,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6085,8 +5845,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6097,8 +5857,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6112,8 +5872,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6127,8 +5887,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6142,8 +5902,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6265,7 +6025,7 @@ PinnedVerificationKey { ), }, Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -6333,8 +6093,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6345,8 +6105,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6360,8 +6120,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6375,8 +6135,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6390,8 +6150,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6457,8 +6217,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6469,8 +6229,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6484,8 +6244,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6499,8 +6259,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6514,8 +6274,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6673,8 +6433,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6685,8 +6445,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6700,8 +6460,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6715,8 +6475,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6730,8 +6490,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6826,8 +6586,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6838,8 +6598,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6853,8 +6613,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6868,8 +6628,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -6883,8 +6643,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7011,8 +6771,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7023,8 +6783,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7038,8 +6798,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7053,8 +6813,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7068,8 +6828,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7139,8 +6899,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7151,8 +6911,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7166,8 +6926,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7181,8 +6941,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7196,8 +6956,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7305,8 +7065,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7317,8 +7077,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7332,8 +7092,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7347,8 +7107,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7362,8 +7122,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7415,8 +7175,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7427,8 +7187,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7442,8 +7202,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7457,8 +7217,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7472,8 +7232,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7513,8 +7273,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7525,8 +7285,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7540,8 +7300,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7555,8 +7315,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7570,8 +7330,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7609,8 +7369,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7621,8 +7381,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7636,8 +7396,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7651,8 +7411,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7666,8 +7426,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7698,8 +7458,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7710,8 +7470,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7725,8 +7485,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7740,8 +7500,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7755,8 +7515,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 21, - column_index: 21, + query_index: 20, + column_index: 20, rotation: Rotation( 0, ), @@ -7818,8 +7578,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -7830,8 +7590,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -7845,8 +7605,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -7860,8 +7620,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -7926,8 +7686,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -7938,8 +7698,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -7953,8 +7713,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -7968,8 +7728,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -8063,8 +7823,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -8075,8 +7835,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -8090,8 +7850,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -8105,8 +7865,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -8195,8 +7955,248 @@ PinnedVerificationKey { ), Product( Fixed { - query_index: 19, - column_index: 19, + query_index: 22, + column_index: 22, + rotation: Rotation( + 0, + ), + }, + Product( + Product( + Product( + Product( + Product( + Product( + Product( + Sum( + Advice { + query_index: 4, + column_index: 4, + rotation: Rotation( + 0, + ), + }, + Negated( + Scaled( + Advice { + query_index: 14, + column_index: 4, + rotation: Rotation( + 1, + ), + }, + 0x0000000000000000000000000000000000000000000000000000000000000008, + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000001, + ), + Negated( + Sum( + Advice { + query_index: 4, + column_index: 4, + rotation: Rotation( + 0, + ), + }, + Negated( + Scaled( + Advice { + query_index: 14, + column_index: 4, + rotation: Rotation( + 1, + ), + }, + 0x0000000000000000000000000000000000000000000000000000000000000008, + ), + ), + ), + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000002, + ), + Negated( + Sum( + Advice { + query_index: 4, + column_index: 4, + rotation: Rotation( + 0, + ), + }, + Negated( + Scaled( + Advice { + query_index: 14, + column_index: 4, + rotation: Rotation( + 1, + ), + }, + 0x0000000000000000000000000000000000000000000000000000000000000008, + ), + ), + ), + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000003, + ), + Negated( + Sum( + Advice { + query_index: 4, + column_index: 4, + rotation: Rotation( + 0, + ), + }, + Negated( + Scaled( + Advice { + query_index: 14, + column_index: 4, + rotation: Rotation( + 1, + ), + }, + 0x0000000000000000000000000000000000000000000000000000000000000008, + ), + ), + ), + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000004, + ), + Negated( + Sum( + Advice { + query_index: 4, + column_index: 4, + rotation: Rotation( + 0, + ), + }, + Negated( + Scaled( + Advice { + query_index: 14, + column_index: 4, + rotation: Rotation( + 1, + ), + }, + 0x0000000000000000000000000000000000000000000000000000000000000008, + ), + ), + ), + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000005, + ), + Negated( + Sum( + Advice { + query_index: 4, + column_index: 4, + rotation: Rotation( + 0, + ), + }, + Negated( + Scaled( + Advice { + query_index: 14, + column_index: 4, + rotation: Rotation( + 1, + ), + }, + 0x0000000000000000000000000000000000000000000000000000000000000008, + ), + ), + ), + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000006, + ), + Negated( + Sum( + Advice { + query_index: 4, + column_index: 4, + rotation: Rotation( + 0, + ), + }, + Negated( + Scaled( + Advice { + query_index: 14, + column_index: 4, + rotation: Rotation( + 1, + ), + }, + 0x0000000000000000000000000000000000000000000000000000000000000008, + ), + ), + ), + ), + ), + ), + Sum( + Constant( + 0x0000000000000000000000000000000000000000000000000000000000000007, + ), + Negated( + Sum( + Advice { + query_index: 4, + column_index: 4, + rotation: Rotation( + 0, + ), + }, + Negated( + Scaled( + Advice { + query_index: 14, + column_index: 4, + rotation: Rotation( + 1, + ), + }, + 0x0000000000000000000000000000000000000000000000000000000000000008, + ), + ), + ), + ), + ), + ), + ), + Product( + Fixed { + query_index: 22, + column_index: 22, rotation: Rotation( 0, ), @@ -8242,7 +8242,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8279,7 +8279,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8301,7 +8301,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8339,7 +8339,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8361,7 +8361,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8383,7 +8383,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8422,7 +8422,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8444,7 +8444,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8466,7 +8466,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8488,7 +8488,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8528,7 +8528,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8550,7 +8550,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8572,7 +8572,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8594,7 +8594,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8616,7 +8616,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8657,7 +8657,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8679,7 +8679,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8701,7 +8701,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8723,7 +8723,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8745,7 +8745,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8767,7 +8767,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8809,7 +8809,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8831,7 +8831,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8853,7 +8853,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8875,7 +8875,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8897,7 +8897,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8919,7 +8919,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8941,7 +8941,7 @@ PinnedVerificationKey { Negated( Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -8974,8 +8974,8 @@ PinnedVerificationKey { ), Product( Fixed { - query_index: 19, - column_index: 19, + query_index: 22, + column_index: 22, rotation: Rotation( 0, ), @@ -9021,8 +9021,8 @@ PinnedVerificationKey { ), Product( Fixed { - query_index: 19, - column_index: 19, + query_index: 22, + column_index: 22, rotation: Rotation( 0, ), @@ -9708,8 +9708,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9720,8 +9720,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9735,8 +9735,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9750,8 +9750,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9788,8 +9788,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9800,8 +9800,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9815,8 +9815,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9830,8 +9830,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9868,8 +9868,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9880,8 +9880,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9895,8 +9895,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9910,8 +9910,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9961,8 +9961,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9973,8 +9973,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -9988,8 +9988,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10003,8 +10003,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10045,8 +10045,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10057,8 +10057,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10072,8 +10072,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10087,8 +10087,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10118,8 +10118,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10130,8 +10130,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10145,8 +10145,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10160,8 +10160,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10207,8 +10207,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10219,8 +10219,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10234,8 +10234,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10249,8 +10249,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10324,8 +10324,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10336,8 +10336,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10351,8 +10351,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10366,8 +10366,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10397,8 +10397,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10409,8 +10409,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10424,8 +10424,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10439,8 +10439,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10509,8 +10509,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10521,8 +10521,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10536,8 +10536,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10551,8 +10551,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10589,8 +10589,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10601,8 +10601,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10616,8 +10616,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10631,8 +10631,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10676,8 +10676,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10688,8 +10688,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10703,8 +10703,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10718,8 +10718,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10777,8 +10777,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10789,8 +10789,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10804,8 +10804,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -10819,8 +10819,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -11122,8 +11122,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -11134,8 +11134,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -11149,8 +11149,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -11164,8 +11164,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -11467,8 +11467,8 @@ PinnedVerificationKey { Product( Product( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -11479,8 +11479,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -11494,8 +11494,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -11509,8 +11509,8 @@ PinnedVerificationKey { ), Negated( Fixed { - query_index: 22, - column_index: 22, + query_index: 21, + column_index: 21, rotation: Rotation( 0, ), @@ -13295,14 +13295,14 @@ PinnedVerificationKey { Product( Sum( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, ), }, Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -13322,14 +13322,14 @@ PinnedVerificationKey { Sum( Product( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, ), }, Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -13389,7 +13389,7 @@ PinnedVerificationKey { 0x0000000000000000000000000000000000000000000000000000000000000002, ), Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -13810,7 +13810,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -13941,7 +13941,7 @@ PinnedVerificationKey { ), Scaled( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -14055,7 +14055,7 @@ PinnedVerificationKey { Sum( Sum( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -14182,7 +14182,7 @@ PinnedVerificationKey { Negated( Sum( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -14190,7 +14190,7 @@ PinnedVerificationKey { }, Scaled( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -15920,7 +15920,7 @@ PinnedVerificationKey { ), Product( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -15932,7 +15932,7 @@ PinnedVerificationKey { ), Negated( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -16163,7 +16163,7 @@ PinnedVerificationKey { ), Sum( Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -16172,7 +16172,7 @@ PinnedVerificationKey { Negated( Sum( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -16180,7 +16180,7 @@ PinnedVerificationKey { }, Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -16435,7 +16435,7 @@ PinnedVerificationKey { ), Scaled( Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -16446,7 +16446,7 @@ PinnedVerificationKey { ), Scaled( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -16990,14 +16990,14 @@ PinnedVerificationKey { ), Product( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, ), }, Advice { - query_index: 14, + query_index: 13, column_index: 3, rotation: Rotation( 1, @@ -17095,7 +17095,7 @@ PinnedVerificationKey { ), Product( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -17331,7 +17331,7 @@ PinnedVerificationKey { ), Product( Advice { - query_index: 12, + query_index: 14, column_index: 4, rotation: Rotation( 1, @@ -27256,15 +27256,6 @@ PinnedVerificationKey { -1, ), ), - ( - Column { - index: 4, - column_type: Advice, - }, - Rotation( - 1, - ), - ), ( Column { index: 2, @@ -27283,6 +27274,15 @@ PinnedVerificationKey { 1, ), ), + ( + Column { + index: 4, + column_type: Advice, + }, + Rotation( + 1, + ), + ), ( Column { index: 5, @@ -27846,7 +27846,7 @@ PinnedVerificationKey { ), ), Advice { - query_index: 13, + query_index: 12, column_index: 2, rotation: Rotation( 1, @@ -28333,10 +28333,10 @@ PinnedVerificationKey { (0x1f777f0e4263ec4a19f30813739c640335ffa951cc3cc586b6c4095e737f95be, 0x061c07fb12cb19582eefd858a08e689acd970c8cb9ed8f7b928d88e691a2f586), (0x13d0bd76da4ace22c0e90b098d6073551322b8c734bf37eeca67fbf19687f550, 0x3d996cc9da5a31cefb453390b906eabbcc75797bc6a6b9c9e3af2fe7b6b8beed), (0x04cad7405b492a30db0a710c842cecc97d02059acf4c02aa79626dce68ac4837, 0x3d6d7b6698b258e61ebe0b25d9cbcd4a016cb0a2ae8d92752532d98cfb27720d), - (0x0974ad1a3c0eb4c8d2c59cd820a82b7f28ea2f7a245008d403815131ff30879e, 0x00bb593cdf920cef4965f788d65eba3c3aa07d9718dfb62e3e385849a0d692a8), (0x1b6f5383c5a0ae5bf457e1c8e17a933e892464d33fef9e9262411e01c117d87e, 0x0c552b960e8ce365b5f2302bcc0b7ce5cdf964e6036602cfc859c8769184f619), (0x3fa4b5cc33e30de3ac7342c84f47f4fffe7ae77dda1689c2f08050d0ab743cb1, 0x327663e39b128ec28c94486b1e5d4429000626f65230ed572c66f80406a42176), (0x2184a7d65b5000cc5c5f178c2f4ab5b11a67fdc626771c29ade508020c8da032, 0x34c98ee1f6dfa6c1e8cd915d1efeb484206e13e5e32e13118925913568e620b7), + (0x0974ad1a3c0eb4c8d2c59cd820a82b7f28ea2f7a245008d403815131ff30879e, 0x00bb593cdf920cef4965f788d65eba3c3aa07d9718dfb62e3e385849a0d692a8), (0x1e355d783cffccafc120f462461fb312773442762383ac444009653f3d8d4be6, 0x3c60e17b18492aa2c41798b409d2bcc1857ca57ee9d2fb0001584cedc8e141d6), (0x0a6fe1cc1ce659681079768ca8ff94d82c7d51ef39cd99b738b144de3a3027f6, 0x30cfc2f4e0ec95f623199970d8b762647ad2d7c3591a20781ee8187702babe5f), (0x00d87a2c430f1db50a63f18f8cf8807f4f70d3acb940d4130ba6811f8ba2d479, 0x13d5742320e1b2cecda6073b7f2bf5816b9067453deeaa829f356a65ef5621b2),