From 9cd6452f85c85a42b608e006a83d2598fedda35a Mon Sep 17 00:00:00 2001
From: fcarreiro <facundo@aztecprotocol.com>
Date: Thu, 8 Aug 2024 19:35:42 +0000
Subject: [PATCH] chore(bb): define missing univ-fr operators

---
 .../ecc/groups/affine_element.hpp             |  3 +++
 .../ecc/groups/affine_element_impl.hpp        |  6 ++++++
 .../src/barretenberg/ecc/groups/element.hpp   | 14 -------------
 .../barretenberg/polynomials/univariate.hpp   | 21 +++++++++++++++++++
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
index 7f3754c7e17..883f8bcb017 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "barretenberg/common/serialize.hpp"
 #include "barretenberg/ecc/curves/bn254/fq2.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
@@ -63,6 +64,8 @@ template <typename Fq_, typename Fr_, typename Params> class alignas(64) affine_
 
     constexpr affine_element operator+(const affine_element& other) const noexcept;
 
+    constexpr affine_element operator*(const Fr& exponent) const noexcept;
+
     template <typename BaseField = Fq,
               typename CompileTimeEnabled = std::enable_if_t<(BaseField::modulus >> 255) == uint256_t(0), void>>
     [[nodiscard]] constexpr uint256_t compress() const noexcept;
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp
index f58e6f5b7bd..1c1df91b819 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp
@@ -68,6 +68,12 @@ constexpr affine_element<Fq, Fr, T> affine_element<Fq, Fr, T>::operator+(
     return affine_element(element<Fq, Fr, T>(*this) + element<Fq, Fr, T>(other));
 }
 
+template <class Fq, class Fr, class T>
+constexpr affine_element<Fq, Fr, T> affine_element<Fq, Fr, T>::operator*(const Fr& exponent) const noexcept
+{
+    return bb::group_elements::element(*this) * exponent;
+}
+
 template <class Fq, class Fr, class T>
 template <typename BaseField, typename CompileTimeEnabled>
 
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
index cb7946beb0f..4203bfdf4dd 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
@@ -153,17 +153,3 @@ template <class Fq, class Fr, class Params> std::ostream& operator<<(std::ostrea
 } // namespace bb::group_elements
 
 #include "./element_impl.hpp"
-
-template <class Fq, class Fr, class Params>
-bb::group_elements::affine_element<Fq, Fr, Params> operator*(
-    const bb::group_elements::affine_element<Fq, Fr, Params>& base, const Fr& exponent) noexcept
-{
-    return bb::group_elements::affine_element<Fq, Fr, Params>(bb::group_elements::element(base) * exponent);
-}
-
-template <class Fq, class Fr, class Params>
-bb::group_elements::affine_element<Fq, Fr, Params> operator*(const bb::group_elements::element<Fq, Fr, Params>& base,
-                                                             const Fr& exponent) noexcept
-{
-    return (bb::group_elements::element(base) * exponent);
-}
diff --git a/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp b/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp
index 69ebd9765a3..beba262ca5e 100644
--- a/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp
+++ b/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp
@@ -524,6 +524,27 @@ inline void write(B& it, Univariate<Fr, domain_end, domain_start> const& univari
     write(it, univariate.evaluations);
 }
 
+template <class Fr, size_t domain_end, size_t domain_start = 0, size_t skip_count = 0>
+Univariate<Fr, domain_end, domain_start, skip_count> operator+(
+    const Fr& ff, const Univariate<Fr, domain_end, domain_start, skip_count>& uv)
+{
+    return uv + ff;
+}
+
+template <class Fr, size_t domain_end, size_t domain_start = 0, size_t skip_count = 0>
+Univariate<Fr, domain_end, domain_start, skip_count> operator-(
+    const Fr& ff, const Univariate<Fr, domain_end, domain_start, skip_count>& uv)
+{
+    return uv - ff;
+}
+
+template <class Fr, size_t domain_end, size_t domain_start = 0, size_t skip_count = 0>
+Univariate<Fr, domain_end, domain_start, skip_count> operator*(
+    const Fr& ff, const Univariate<Fr, domain_end, domain_start, skip_count>& uv)
+{
+    return uv * ff;
+}
+
 template <class Fr, size_t domain_end, size_t domain_start = 0, size_t skip_count = 0> class UnivariateView {
   public:
     static constexpr size_t LENGTH = domain_end - domain_start;