From b6583db44514a75c1579f972588fab21cffa593e Mon Sep 17 00:00:00 2001
From: guipublic <guipublic@gmail.com>
Date: Wed, 5 Feb 2025 10:33:43 +0000
Subject: [PATCH 1/3] Do not differentiate variable vs fixed length for
 Poseidon2

---
 .../barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp
index a812ec7811e..e3c73513325 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp
@@ -145,13 +145,6 @@ template <size_t rate, size_t capacity, size_t t, typename Permutation, typename
             sponge.absorb(input[i]);
         }
 
-        // In the case where the hash preimage is variable-length, we append `1` to the end of the input, to distinguish
-        // from fixed-length hashes. (the combination of this additional field element + the hash IV ensures
-        // fixed-length and variable-length hashes do not collide)
-        if constexpr (is_variable_length) {
-            sponge.absorb(1);
-        }
-
         std::array<field_t, out_len> output;
         for (size_t i = 0; i < out_len; ++i) {
             output[i] = sponge.squeeze();

From 81da4c95cb275cf602f32073c6f370db76535445 Mon Sep 17 00:00:00 2001
From: guipublic <guipublic@gmail.com>
Date: Thu, 6 Feb 2025 11:28:03 +0000
Subject: [PATCH 2/3] remove variable/fixed length variants of Poseidon2

---
 .../stdlib/hash/poseidon2/poseidon2.cpp       |  2 +-
 .../stdlib/hash/poseidon2/sponge/sponge.hpp   | 21 +++----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp
index 82aa0ffc054..2e41a8ceae8 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp
@@ -14,7 +14,7 @@ template <typename C> field_t<C> poseidon2<C>::hash(C& builder, const std::vecto
      * This should just call the sponge variable length hash function
      *
      */
-    return Sponge::hash_fixed_length(builder, inputs);
+    return Sponge::hash_internal(builder, inputs);
 }
 
 /**
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp
index e3c73513325..72d9df6cd35 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp
@@ -134,7 +134,7 @@ template <size_t rate, size_t capacity, size_t t, typename Permutation, typename
      * @param input
      * @return std::array<field_t, out_len>
      */
-    template <size_t out_len, bool is_variable_length>
+    template <size_t out_len>
     static std::array<field_t, out_len> hash_internal(Builder& builder, std::span<const field_t> input)
     {
         size_t in_len = input.size();
@@ -152,24 +152,9 @@ template <size_t rate, size_t capacity, size_t t, typename Permutation, typename
         return output;
     }
 
-    template <size_t out_len>
-    static std::array<field_t, out_len> hash_fixed_length(Builder& builder, std::span<const field_t> input)
-    {
-        return hash_internal<out_len, false>(builder, input);
-    }
-    static field_t hash_fixed_length(Builder& builder, std::span<const field_t> input)
-    {
-        return hash_fixed_length<1>(builder, input)[0];
-    }
-
-    template <size_t out_len>
-    static std::array<field_t, out_len> hash_variable_length(Builder& builder, std::span<field_t> input)
-    {
-        return hash_internal<out_len, true>(builder, input);
-    }
-    static field_t hash_variable_length(Builder& builder, std::span<field_t> input)
+    static field_t hash_internal(Builder& builder, std::span<const field_t> input)
     {
-        return hash_variable_length<1>(builder, input)[0];
+        return hash_internal<1>(builder, input)[0];
     }
 };
 } // namespace bb::stdlib
\ No newline at end of file

From ba826c65833292dd3cce0a250d714a8a76cfda06 Mon Sep 17 00:00:00 2001
From: guipublic <guipublic@gmail.com>
Date: Thu, 6 Feb 2025 12:34:48 +0000
Subject: [PATCH 3/3] remove fixed/variable size poseidon2 variants also from
 crypto folder

---
 .../crypto/poseidon2/poseidon2.cpp            |  2 +-
 .../crypto/poseidon2/sponge/sponge.hpp        | 23 ++-----------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp
index dad8ea1d3b1..bb2f920a152 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp
@@ -7,7 +7,7 @@ namespace bb::crypto {
 template <typename Params>
 typename Poseidon2<Params>::FF Poseidon2<Params>::hash(const std::vector<typename Poseidon2<Params>::FF>& input)
 {
-    return Sponge::hash_fixed_length(input);
+    return Sponge::hash_internal(input);
 }
 
 /**
diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp
index eb89c96e471..72324c2654b 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp
@@ -125,12 +125,10 @@ template <typename FF, size_t rate, size_t capacity, size_t t, typename Permutat
      * @brief Use the sponge to hash an input string
      *
      * @tparam out_len
-     * @tparam is_variable_length. Distinguishes between hashes where the preimage length is constant/not constant
      * @param input
      * @return std::array<FF, out_len>
      */
-    template <size_t out_len, bool is_variable_length>
-    static std::array<FF, out_len> hash_internal(std::span<const FF> input)
+    template <size_t out_len> static std::array<FF, out_len> hash_internal(std::span<const FF> input)
     {
         size_t in_len = input.size();
         const uint256_t iv = (static_cast<uint256_t>(in_len) << 64) + out_len - 1;
@@ -140,13 +138,6 @@ template <typename FF, size_t rate, size_t capacity, size_t t, typename Permutat
             sponge.absorb(input[i]);
         }
 
-        // In the case where the hash preimage is variable-length, we append `1` to the end of the input, to distinguish
-        // from fixed-length hashes. (the combination of this additional field element + the hash IV ensures
-        // fixed-length and variable-length hashes do not collide)
-        if constexpr (is_variable_length) {
-            sponge.absorb(1);
-        }
-
         std::array<FF, out_len> output;
         for (size_t i = 0; i < out_len; ++i) {
             output[i] = sponge.squeeze();
@@ -154,16 +145,6 @@ template <typename FF, size_t rate, size_t capacity, size_t t, typename Permutat
         return output;
     }
 
-    template <size_t out_len> static std::array<FF, out_len> hash_fixed_length(std::span<const FF> input)
-    {
-        return hash_internal<out_len, false>(input);
-    }
-    static FF hash_fixed_length(std::span<const FF> input) { return hash_fixed_length<1>(input)[0]; }
-
-    template <size_t out_len> static std::array<FF, out_len> hash_variable_length(std::span<FF> input)
-    {
-        return hash_internal<out_len, true>(input);
-    }
-    static FF hash_variable_length(std::span<FF> input) { return hash_variable_length<1>(input)[0]; }
+    static FF hash_internal(std::span<const FF> input) { return hash_internal<1>(input)[0]; }
 };
 } // namespace bb::crypto
\ No newline at end of file