diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp index eebb644e3..7b08678ad 100644 --- a/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp @@ -156,14 +156,6 @@ void build_constraints(Builder& builder, constraint_system.original_opcode_indices.keccak_permutations[i]); } - // Add pedersen constraints - for (size_t i = 0; i < constraint_system.pedersen_constraints.size(); ++i) { - const auto& constraint = constraint_system.pedersen_constraints.at(i); - create_pedersen_constraint(builder, constraint); - gate_counter.track_diff(constraint_system.gates_per_opcode, - constraint_system.original_opcode_indices.pedersen_constraints.at(i)); - } - for (size_t i = 0; i < constraint_system.poseidon2_constraints.size(); ++i) { const auto& constraint = constraint_system.poseidon2_constraints.at(i); create_poseidon2_permutations(builder, constraint); diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp index 29046a8d1..79a750b2e 100644 --- a/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp @@ -19,7 +19,6 @@ #include "keccak_constraint.hpp" #include "logic_constraint.hpp" #include "multi_scalar_mul.hpp" -#include "pedersen.hpp" #include "poseidon2_constraint.hpp" #include "range_constraint.hpp" #include "recursion_constraint.hpp" @@ -48,7 +47,6 @@ struct AcirFormatOriginalOpcodeIndices { std::vector blake2s_constraints; std::vector blake3_constraints; std::vector keccak_permutations; - std::vector pedersen_constraints; std::vector poseidon2_constraints; std::vector multi_scalar_mul_constraints; std::vector ec_add_constraints; @@ -94,7 +92,6 @@ struct AcirFormat { std::vector blake2s_constraints; std::vector blake3_constraints; std::vector keccak_permutations; - std::vector pedersen_constraints; std::vector poseidon2_constraints; std::vector multi_scalar_mul_constraints; std::vector ec_add_constraints; @@ -144,7 +141,6 @@ struct AcirFormat { blake2s_constraints, blake3_constraints, keccak_permutations, - pedersen_constraints, poseidon2_constraints, multi_scalar_mul_constraints, ec_add_constraints, diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp index 0c2855652..199bfac3c 100644 --- a/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp @@ -52,7 +52,6 @@ TEST_F(AcirFormatTests, TestASingleConstraintNoPubInputs) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -174,7 +173,6 @@ TEST_F(AcirFormatTests, TestLogicGateFromNoirCircuit) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -255,7 +253,6 @@ TEST_F(AcirFormatTests, TestSchnorrVerifyPass) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -362,7 +359,6 @@ TEST_F(AcirFormatTests, TestSchnorrVerifySmallRange) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -421,6 +417,7 @@ TEST_F(AcirFormatTests, TestSchnorrVerifySmallRange) auto verifier = composer.create_ultra_with_keccak_verifier(builder); EXPECT_EQ(verifier.verify_proof(proof), true); } + TEST_F(AcirFormatTests, TestKeccakPermutation) { Keccakf1600 @@ -471,7 +468,6 @@ TEST_F(AcirFormatTests, TestKeccakPermutation) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = { keccak_permutation }, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -546,7 +542,6 @@ TEST_F(AcirFormatTests, TestCollectsGateCounts) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -673,7 +668,6 @@ TEST_F(AcirFormatTests, TestBigAdd) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format_mocks.cpp b/cpp/src/barretenberg/dsl/acir_format/acir_format_mocks.cpp index 0e1471506..fdf5a3635 100644 --- a/cpp/src/barretenberg/dsl/acir_format/acir_format_mocks.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/acir_format_mocks.cpp @@ -13,7 +13,6 @@ acir_format::AcirFormatOriginalOpcodeIndices create_empty_original_opcode_indice .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -64,9 +63,6 @@ void mock_opcode_indices(acir_format::AcirFormat& constraint_system) for (size_t i = 0; i < constraint_system.keccak_permutations.size(); i++) { constraint_system.original_opcode_indices.keccak_permutations.push_back(current_opcode++); } - for (size_t i = 0; i < constraint_system.pedersen_constraints.size(); i++) { - constraint_system.original_opcode_indices.pedersen_constraints.push_back(current_opcode++); - } for (size_t i = 0; i < constraint_system.poseidon2_constraints.size(); i++) { constraint_system.original_opcode_indices.poseidon2_constraints.push_back(current_opcode++); } diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp b/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp index cb6ff105e..bf7eb2dd8 100644 --- a/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp @@ -572,16 +572,6 @@ void handle_blackbox_func_call(Program::Opcode::BlackBoxFuncCall const& arg, }); af.original_opcode_indices.schnorr_constraints.push_back(opcode_index); af.constrained_witness.insert(af.schnorr_constraints.back().result); - } else if constexpr (std::is_same_v) { - af.pedersen_constraints.push_back(PedersenConstraint{ - .scalars = map(arg.inputs, [](auto& e) { return get_witness_from_function_input(e); }), - .hash_index = arg.domain_separator, - .result_x = arg.outputs[0].value, - .result_y = arg.outputs[1].value, - }); - af.constrained_witness.insert(af.pedersen_constraints.back().result_x); - af.constrained_witness.insert(af.pedersen_constraints.back().result_y); - af.original_opcode_indices.pedersen_constraints.push_back(opcode_index); } else if constexpr (std::is_same_v) { af.ecdsa_k1_constraints.push_back(EcdsaSecp256k1Constraint{ .hashed_message = diff --git a/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp b/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp index 029af4828..295b66cdb 100644 --- a/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp @@ -185,7 +185,6 @@ TEST_F(BigIntTests, TestBigIntConstraintMultiple) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -259,7 +258,6 @@ TEST_F(BigIntTests, TestBigIntConstraintSimple) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -317,7 +315,6 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -380,7 +377,6 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse2) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -464,7 +460,6 @@ TEST_F(BigIntTests, TestBigIntDIV) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp b/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp index e9688e613..8aec43aa6 100644 --- a/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp @@ -153,7 +153,6 @@ TEST_F(UltraPlonkRAM, TestBlockConstraint) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -205,7 +204,6 @@ TEST_F(MegaHonk, Databus) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -312,7 +310,6 @@ TEST_F(MegaHonk, DatabusReturn) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp b/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp index da3797330..193388efb 100644 --- a/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp @@ -75,7 +75,6 @@ TEST_F(EcOperations, TestECOperations) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = { ec_add_constraint }, @@ -212,7 +211,6 @@ TEST_F(EcOperations, TestECMultiScalarMul) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = { msm_constrain }, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp index d035aae8c..041c92512 100644 --- a/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp @@ -107,7 +107,6 @@ TEST_F(ECDSASecp256k1, TestECDSAConstraintSucceed) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -162,7 +161,6 @@ TEST_F(ECDSASecp256k1, TestECDSACompilesForVerifier) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -212,7 +210,6 @@ TEST_F(ECDSASecp256k1, TestECDSAConstraintFail) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp index d86dab894..b6d29989d 100644 --- a/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp @@ -141,7 +141,6 @@ TEST(ECDSASecp256r1, test_hardcoded) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -198,7 +197,6 @@ TEST(ECDSASecp256r1, TestECDSAConstraintSucceed) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -253,7 +251,6 @@ TEST(ECDSASecp256r1, TestECDSACompilesForVerifier) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -304,7 +301,6 @@ TEST(ECDSASecp256r1, TestECDSAConstraintFail) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.test.cpp b/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.test.cpp index 467c1b4c4..3914ef1c3 100644 --- a/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.test.cpp @@ -103,7 +103,6 @@ class AcirHonkRecursionConstraint : public ::testing::Test { .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/multi_scalar_mul.test.cpp b/cpp/src/barretenberg/dsl/acir_format/multi_scalar_mul.test.cpp index 6326d7a7d..bc8dd7d8c 100644 --- a/cpp/src/barretenberg/dsl/acir_format/multi_scalar_mul.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/multi_scalar_mul.test.cpp @@ -75,7 +75,6 @@ TEST_F(MSMTests, TestMSM) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = { msm_constrain }, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp b/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp deleted file mode 100644 index 183ef5e69..000000000 --- a/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "pedersen.hpp" -#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" -#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" -#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp" -#include "barretenberg/stdlib/primitives/field/field.hpp" - -namespace acir_format { - -using namespace bb; - -template void create_pedersen_constraint(Builder& builder, const PedersenConstraint& input) -{ - using field_ct = stdlib::field_t; - - std::vector scalars; - - for (const auto& scalar : input.scalars) { - // convert input indices to field_ct - field_ct scalar_as_field = field_ct::from_witness_index(&builder, scalar); - scalars.push_back(scalar_as_field); - } - - auto point = stdlib::pedersen_commitment::commit(scalars, input.hash_index); - - builder.assert_equal(point.x.witness_index, input.result_x); - builder.assert_equal(point.y.witness_index, input.result_y); -} - -template void create_pedersen_constraint(UltraCircuitBuilder& builder, - const PedersenConstraint& input); -template void create_pedersen_constraint(MegaCircuitBuilder& builder, - const PedersenConstraint& input); -} // namespace acir_format diff --git a/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp b/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp deleted file mode 100644 index dcef6bfa1..000000000 --- a/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once -#include "barretenberg/common/serialize.hpp" -#include -#include - -namespace acir_format { - -// P = xG + bH -struct PedersenConstraint { - std::vector scalars; - uint32_t hash_index; - - uint32_t result_x; - uint32_t result_y; - - friend bool operator==(PedersenConstraint const& lhs, PedersenConstraint const& rhs) = default; -}; - -template void create_pedersen_constraint(Builder& builder, const PedersenConstraint& input); - -template inline void read(B& buf, PedersenConstraint& constraint) -{ - using serialize::read; - read(buf, constraint.scalars); - read(buf, constraint.hash_index); - read(buf, constraint.result_x); - read(buf, constraint.result_y); -} - -template inline void write(B& buf, PedersenConstraint const& constraint) -{ - using serialize::write; - write(buf, constraint.scalars); - write(buf, constraint.hash_index); - write(buf, constraint.result_x); - write(buf, constraint.result_y); -} - -} // namespace acir_format diff --git a/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.test.cpp b/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.test.cpp index 14a05a2f3..9c07431ab 100644 --- a/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.test.cpp @@ -55,7 +55,6 @@ TEST_F(Poseidon2Tests, TestPoseidon2Permutation) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = { poseidon2_constraint }, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp b/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp index 3446cfd50..301bd9150 100644 --- a/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp @@ -100,7 +100,6 @@ Builder create_inner_circuit() .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, @@ -262,7 +261,6 @@ Builder create_outer_circuit(std::vector& inner_circuits) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {}, diff --git a/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp index f4bacef6c..7fc66d2af 100644 --- a/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp @@ -330,16 +330,6 @@ struct BlackBoxOp { static SchnorrVerify bincodeDeserialize(std::vector); }; - struct PedersenCommitment { - Program::HeapVector inputs; - Program::MemoryAddress domain_separator; - Program::HeapArray output; - - friend bool operator==(const PedersenCommitment&, const PedersenCommitment&); - std::vector bincodeSerialize() const; - static PedersenCommitment bincodeDeserialize(std::vector); - }; - struct MultiScalarMul { Program::HeapVector points; Program::HeapVector scalars; @@ -461,7 +451,6 @@ struct BlackBoxOp { EcdsaSecp256k1, EcdsaSecp256r1, SchnorrVerify, - PedersenCommitment, MultiScalarMul, EmbeddedCurveAdd, BigIntAdd, @@ -879,16 +868,6 @@ struct BlackBoxFuncCall { static SchnorrVerify bincodeDeserialize(std::vector); }; - struct PedersenCommitment { - std::vector inputs; - uint32_t domain_separator; - std::array outputs; - - friend bool operator==(const PedersenCommitment&, const PedersenCommitment&); - std::vector bincodeSerialize() const; - static PedersenCommitment bincodeDeserialize(std::vector); - }; - struct EcdsaSecp256k1 { std::array public_key_x; std::array public_key_y; @@ -1040,7 +1019,6 @@ struct BlackBoxFuncCall { Blake2s, Blake3, SchnorrVerify, - PedersenCommitment, EcdsaSecp256k1, EcdsaSecp256r1, MultiScalarMul, @@ -3041,64 +3019,6 @@ Program::BlackBoxFuncCall::SchnorrVerify serde::Deserializable BlackBoxFuncCall::PedersenCommitment::bincodeSerialize() const -{ - auto serializer = serde::BincodeSerializer(); - serde::Serializable::serialize(*this, serializer); - return std::move(serializer).bytes(); -} - -inline BlackBoxFuncCall::PedersenCommitment BlackBoxFuncCall::PedersenCommitment::bincodeDeserialize( - std::vector input) -{ - auto deserializer = serde::BincodeDeserializer(input); - auto value = serde::Deserializable::deserialize(deserializer); - if (deserializer.get_buffer_offset() < input.size()) { - throw_or_abort("Some input bytes were not read"); - } - return value; -} - -} // end of namespace Program - -template <> -template -void serde::Serializable::serialize( - const Program::BlackBoxFuncCall::PedersenCommitment& obj, Serializer& serializer) -{ - serde::Serializable::serialize(obj.inputs, serializer); - serde::Serializable::serialize(obj.domain_separator, serializer); - serde::Serializable::serialize(obj.outputs, serializer); -} - -template <> -template -Program::BlackBoxFuncCall::PedersenCommitment serde::Deserializable< - Program::BlackBoxFuncCall::PedersenCommitment>::deserialize(Deserializer& deserializer) -{ - Program::BlackBoxFuncCall::PedersenCommitment obj; - obj.inputs = serde::Deserializable::deserialize(deserializer); - obj.domain_separator = serde::Deserializable::deserialize(deserializer); - obj.outputs = serde::Deserializable::deserialize(deserializer); - return obj; -} - -namespace Program { - inline bool operator==(const BlackBoxFuncCall::EcdsaSecp256k1& lhs, const BlackBoxFuncCall::EcdsaSecp256k1& rhs) { if (!(lhs.public_key_x == rhs.public_key_x)) { @@ -4392,63 +4312,6 @@ Program::BlackBoxOp::SchnorrVerify serde::Deserializable BlackBoxOp::PedersenCommitment::bincodeSerialize() const -{ - auto serializer = serde::BincodeSerializer(); - serde::Serializable::serialize(*this, serializer); - return std::move(serializer).bytes(); -} - -inline BlackBoxOp::PedersenCommitment BlackBoxOp::PedersenCommitment::bincodeDeserialize(std::vector input) -{ - auto deserializer = serde::BincodeDeserializer(input); - auto value = serde::Deserializable::deserialize(deserializer); - if (deserializer.get_buffer_offset() < input.size()) { - throw_or_abort("Some input bytes were not read"); - } - return value; -} - -} // end of namespace Program - -template <> -template -void serde::Serializable::serialize( - const Program::BlackBoxOp::PedersenCommitment& obj, Serializer& serializer) -{ - serde::Serializable::serialize(obj.inputs, serializer); - serde::Serializable::serialize(obj.domain_separator, serializer); - serde::Serializable::serialize(obj.output, serializer); -} - -template <> -template -Program::BlackBoxOp::PedersenCommitment serde::Deserializable::deserialize( - Deserializer& deserializer) -{ - Program::BlackBoxOp::PedersenCommitment obj; - obj.inputs = serde::Deserializable::deserialize(deserializer); - obj.domain_separator = serde::Deserializable::deserialize(deserializer); - obj.output = serde::Deserializable::deserialize(deserializer); - return obj; -} - -namespace Program { - inline bool operator==(const BlackBoxOp::MultiScalarMul& lhs, const BlackBoxOp::MultiScalarMul& rhs) { if (!(lhs.points == rhs.points)) { diff --git a/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.test.cpp b/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.test.cpp index e85f59274..b057ee174 100644 --- a/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.test.cpp @@ -50,7 +50,6 @@ TEST_F(Sha256Tests, TestSha256Compression) .blake2s_constraints = {}, .blake3_constraints = {}, .keccak_permutations = {}, - .pedersen_constraints = {}, .poseidon2_constraints = {}, .multi_scalar_mul_constraints = {}, .ec_add_constraints = {},