From 3a930bd4a0b3d5d2a611401ac8805af33ad23062 Mon Sep 17 00:00:00 2001
From: swasilyev <swasilyev@gmail.com>
Date: Thu, 30 Nov 2023 13:57:02 +0100
Subject: [PATCH] VerifierKey::from_ring_and_kzg_vk

---
 ring/src/lib.rs      |  2 +-
 ring/src/piop/mod.rs | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ring/src/lib.rs b/ring/src/lib.rs
index 9619043..e4c2350 100644
--- a/ring/src/lib.rs
+++ b/ring/src/lib.rs
@@ -96,7 +96,7 @@ mod tests {
 
         let ring = Ring::<_, Bls12_381, _>::with_keys(&piop_params, &pks, &ring_builder_key);
 
-        let fixed_columns_committed = FixedColumnsCommitted::from_ring(ring);
+        let fixed_columns_committed = FixedColumnsCommitted::from_ring(&ring);
         assert_eq!(fixed_columns_committed, verifier_key.fixed_columns_committed);
     }
 
diff --git a/ring/src/piop/mod.rs b/ring/src/piop/mod.rs
index 30eeceb..7b003bc 100644
--- a/ring/src/piop/mod.rs
+++ b/ring/src/piop/mod.rs
@@ -7,6 +7,8 @@ use ark_std::{vec, vec::Vec};
 use ark_std::marker::PhantomData;
 use fflonk::pcs::{Commitment, PCS, PcsParams};
 use fflonk::pcs::kzg::commitment::KzgCommitment;
+use fflonk::pcs::kzg::KZG;
+use fflonk::pcs::kzg::params::RawKzgVerifierKey;
 
 use common::{Column, ColumnsCommited, ColumnsEvaluated, FieldColumn};
 use common::gadgets::sw_cond_add::AffineColumn;
@@ -96,7 +98,7 @@ impl<F: PrimeField, C: Commitment<F>> FixedColumnsCommitted<F, C> {
 
 impl<E: Pairing> FixedColumnsCommitted<E::ScalarField, KzgCommitment<E>> {
     pub fn from_ring<G: SWCurveConfig<BaseField=E::ScalarField>>(
-        ring: Ring<E::ScalarField, E, G>,
+        ring: &Ring<E::ScalarField, E, G>,
     ) -> Self {
         let cx = KzgCommitment(ring.cx.into_affine());
         let cy = KzgCommitment(ring.cy.into_affine());
@@ -126,7 +128,6 @@ pub struct ProverKey<F: PrimeField, CS: PCS<F>, G: AffineRepr<BaseField=F>> {
     pub(crate) verifier_key: VerifierKey<F, CS>, // used in the Fiat-Shamir transform
 }
 
-
 #[derive(Clone, CanonicalSerialize, CanonicalDeserialize)]
 pub struct VerifierKey<F: PrimeField, CS: PCS<F>> {
     pub(crate) pcs_raw_vk: <CS::Params as PcsParams>::RVK,
@@ -134,6 +135,19 @@ pub struct VerifierKey<F: PrimeField, CS: PCS<F>> {
     //TODO: domain
 }
 
+impl<E: Pairing> VerifierKey<E::ScalarField, KZG<E>> {
+    pub fn from_ring_and_kzg_vk<G: SWCurveConfig<BaseField=E::ScalarField>>(
+        ring: &Ring<E::ScalarField, E, G>,
+        kzg_vk: RawKzgVerifierKey<E>,
+    ) -> Self {
+        Self {
+            pcs_raw_vk: kzg_vk,
+            fixed_columns_committed: FixedColumnsCommitted::from_ring(ring),
+        }
+    }
+}
+
+
 pub fn index<F: PrimeField, CS: PCS<F>, Curve: SWCurveConfig<BaseField=F>>(
     pcs_params: CS::Params,
     piop_params: &PiopParams<F, Curve>,