From aec85a31564552ec6faca73686df6acf5e0a5d99 Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Wed, 26 Jul 2023 09:18:17 +0000 Subject: [PATCH 1/6] chore!: update codegened acir parser --- .../barretenberg/dsl/acir_format/serde/acir.hpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp index 01aef1ef9e..282ba81d51 100644 --- a/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp @@ -966,9 +966,10 @@ struct PublicInputs { struct Circuit { uint32_t current_witness_index; - std::vector opcodes; - PublicInputs public_parameters; - PublicInputs return_values; + std::vector opcodes; + std::vector private_parameters; + Circuit::PublicInputs public_parameters; + Circuit::PublicInputs return_values; friend bool operator==(const Circuit&, const Circuit&); std::vector bincodeSerialize() const; @@ -4459,6 +4460,9 @@ inline bool operator==(const Circuit& lhs, const Circuit& rhs) if (!(lhs.opcodes == rhs.opcodes)) { return false; } + if (!(lhs.private_parameters == rhs.private_parameters)) { + return false; + } if (!(lhs.public_parameters == rhs.public_parameters)) { return false; } @@ -4494,6 +4498,7 @@ void serde::Serializable::serialize(const Circuit::Circuit& ob serializer.increase_container_depth(); serde::Serializable::serialize(obj.current_witness_index, serializer); serde::Serializable::serialize(obj.opcodes, serializer); + serde::Serializable::serialize(obj.private_parameters, serializer); serde::Serializable::serialize(obj.public_parameters, serializer); serde::Serializable::serialize(obj.return_values, serializer); serializer.decrease_container_depth(); @@ -4507,6 +4512,7 @@ Circuit::Circuit serde::Deserializable::deserialize(Deserializ Circuit::Circuit obj; obj.current_witness_index = serde::Deserializable::deserialize(deserializer); obj.opcodes = serde::Deserializable::deserialize(deserializer); + obj.private_parameters = serde::Deserializable::deserialize(deserializer); obj.public_parameters = serde::Deserializable::deserialize(deserializer); obj.return_values = serde::Deserializable::deserialize(deserializer); deserializer.decrease_container_depth(); @@ -6426,4 +6432,4 @@ Circuit::Witness serde::Deserializable::deserialize(Deserializ obj.value = serde::Deserializable::deserialize(deserializer); deserializer.decrease_container_depth(); return obj; -} \ No newline at end of file +} From 9d22c642004ac213bdf817d89b3e17a12d28bd58 Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Wed, 26 Jul 2023 09:25:15 +0000 Subject: [PATCH 2/6] chore: point at `acvm-struct` branch --- acir_tests/run_acir_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acir_tests/run_acir_tests.sh b/acir_tests/run_acir_tests.sh index 6531a28b6b..d58f508cfc 100755 --- a/acir_tests/run_acir_tests.sh +++ b/acir_tests/run_acir_tests.sh @@ -7,7 +7,7 @@ set -e BB=$PWD/${BB:-../cpp/build/bin/bb} CRS_PATH=~/.bb-crs -BRANCH=master +BRANCH=acvm-struct # Pull down the test vectors from the noir repo, if we don't have the folder already. if [ ! -d acir_tests ]; then From 2f6afc4de09008aa8aa58276e3de0263a25d17e7 Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Wed, 26 Jul 2023 09:38:24 +0000 Subject: [PATCH 3/6] chore: remove unwanted changes --- cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp index 282ba81d51..74640d425f 100644 --- a/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp @@ -966,10 +966,10 @@ struct PublicInputs { struct Circuit { uint32_t current_witness_index; - std::vector opcodes; - std::vector private_parameters; - Circuit::PublicInputs public_parameters; - Circuit::PublicInputs return_values; + std::vector opcodes; + std::vector private_parameters; + PublicInputs public_parameters; + PublicInputs return_values; friend bool operator==(const Circuit&, const Circuit&); std::vector bincodeSerialize() const; From 546122ab16844188e5edc0ee595009ea4a059f87 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Wed, 26 Jul 2023 18:14:05 +0100 Subject: [PATCH 4/6] Update acir_tests/run_acir_tests.sh --- acir_tests/run_acir_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acir_tests/run_acir_tests.sh b/acir_tests/run_acir_tests.sh index d58f508cfc..1f87218928 100755 --- a/acir_tests/run_acir_tests.sh +++ b/acir_tests/run_acir_tests.sh @@ -7,7 +7,7 @@ set -e BB=$PWD/${BB:-../cpp/build/bin/bb} CRS_PATH=~/.bb-crs -BRANCH=acvm-struct +BRANCH=acvm-0.21.0 # Pull down the test vectors from the noir repo, if we don't have the folder already. if [ ! -d acir_tests ]; then From 3f5ef3d483330c2e9b119e839de4d6b22f105a9a Mon Sep 17 00:00:00 2001 From: guipublic <47281315+guipublic@users.noreply.github.com> Date: Thu, 27 Jul 2023 11:40:45 +0200 Subject: [PATCH 5/6] chore: Remove block/ram/rom opcodes (#633) Co-authored-by: TomAFrench --- .circleci/config.yml | 22 +- cpp/bin-test/target/main.json | 1 - cpp/bin-test/target/witness.tr | Bin 8258 -> 0 bytes .../acir_format/acir_to_constraint_buf.hpp | 37 +-- .../dsl/acir_format/serde/acir.hpp | 236 +----------------- ts/bin-test/target/main.json | 1 - ts/bin-test/target/witness.tr | Bin 8258 -> 0 bytes 7 files changed, 19 insertions(+), 278 deletions(-) delete mode 100644 cpp/bin-test/target/main.json delete mode 100644 cpp/bin-test/target/witness.tr delete mode 100644 ts/bin-test/target/main.json delete mode 100644 ts/bin-test/target/witness.tr diff --git a/.circleci/config.yml b/.circleci/config.yml index 2707d12eb5..ab6b49bfe0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -266,16 +266,16 @@ jobs: command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 3 join_split_example_proofs_join_split_tests --gtest_filter=-*full_proof* - *save_logs - bb-bin-tests: - docker: - - image: aztecprotocol/alpine-build-image - resource_class: small - steps: - - *checkout - - *setup_env - - run: - name: "Test" - command: cond_spot_run_test_script ./scripts/bin-test.sh barretenberg-x86_64-linux-clang-assert + # bb-bin-tests: + # docker: + # - image: aztecprotocol/alpine-build-image + # resource_class: small + # steps: + # - *checkout + # - *setup_env + # - run: + # name: "Test" + # command: cond_spot_run_test_script ./scripts/bin-test.sh barretenberg-x86_64-linux-clang-assert benchmark-aggregator: docker: @@ -439,7 +439,7 @@ workflows: - stdlib-recursion-turbo-tests: *bb_test - stdlib-recursion-ultra-tests: *bb_test - join-split-tests: *bb_test - - bb-bin-tests: *bb_test + # - bb-bin-tests: *bb_test - benchmark-aggregator: requires: - barretenberg-tests diff --git a/cpp/bin-test/target/main.json b/cpp/bin-test/target/main.json deleted file mode 100644 index 82e0528eb6..0000000000 --- a/cpp/bin-test/target/main.json +++ /dev/null @@ -1 +0,0 @@ -{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"verification_key","type":{"kind":"array","length":114,"type":{"kind":"field"}},"visibility":"private"},{"name":"proof","type":{"kind":"array","length":94,"type":{"kind":"field"}},"visibility":"private"},{"name":"public_inputs","type":{"kind":"array","length":1,"type":{"kind":"field"}},"visibility":"private"},{"name":"key_hash","type":{"kind":"field"},"visibility":"private"},{"name":"input_aggregation_object","type":{"kind":"array","length":16,"type":{"kind":"field"}},"visibility":"private"},{"name":"proof_b","type":{"kind":"array","length":94,"type":{"kind":"field"}},"visibility":"private"}],"param_witnesses":{"input_aggregation_object":[211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226],"key_hash":[210],"proof":[115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208],"proof_b":[227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320],"public_inputs":[209],"verification_key":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114]},"return_type":{"kind":"array","length":16,"type":{"kind":"field"}},"return_witnesses":[337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352]},"bytecode":"H4sIAAAAAAAA/+3V05ObbRjA4WytrW3bdrdr79bWZ6Ofbdu2jdq2+y/UtvmkuXZmp8c96ME+M7+5cieZzJtJ5r2nxEUixSKxEx5G4kNTC80XI7HXoxZnCZZkKZZmGZZlOZZnBcazIiuxMquwKquxOmuwJmuxNuuwLuuxPhuwIRuxMZuwKZuxOVuwJVuxNduwLduxPTuwIzuxM7uwK7uxO3uwJ3uxN/uwL/uxPwdwIAcxgYOZyCQmM4WpTGM6M5jJLGYzh7nMYz6HcCiHcThHcCRHcTTHcCzHcTwncCIncTKn8AbeyJt4M2/hrbyNt/MO3sm7eDfv4b28j/dzaqHrjJ4HzA/yIT7MR/goH+PjfIJP8ik+zWf4LJ/j83yBL/IlvsxX+Cpf4+t8g2/yLb7Nd/gu3+P7/IAf8iN+zE/4KT/j5/yCX/Irfs1v+C2/4/f8gT/yJ/7MX/grf+Pv/IN/8i/+zX/4L//j/5zG6ZzBmZzF2ZzDuZzH+VzAhVzExVzCpVzG5VzBlVzF1VzDtVzH9dzAjdzEzYzuoejZYt7KK4siegaHdySGkkLJoZRQaigtlB7KCGWGskLZoZxQbigvlB9XtPiKFl/MBBYtvpjX2+LbZt7OHdzJXdzNPdzLfdzPAzzIQzzMIzzKYzzOEzzJUzzNMzzLczzPCyzoEqM3oKhxLMbiLMGSLMXSLMOyLMfyrMB4VmQlVmYVVmU1VmcN1mQt1mYd1mU91mcDNmQjNmYTNmUzNmcLtmQrtmYbtmU7tmcHdmQndmYXdmU3dmcP9mQv9mYf9mU/9ucADuQgJhT8/pHYuXrxxRVefNEnEpnEZKYwlWlMZwYzmcVs5jCXecwv+KO4jiFhHhoaFhoeGhEaGRoVGh0aExobGhcaH5oQmhiaFJpc8C2v4eddBhwvtmjWDgAA","proving_key":null,"verification_key":null} \ No newline at end of file diff --git a/cpp/bin-test/target/witness.tr b/cpp/bin-test/target/witness.tr deleted file mode 100644 index 82e8cf3ff57ff728998a3c03148be7a7c94acc09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8258 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 init; - std::vector trace; - auto len = mem_block.len; - for (size_t i = 0; i < len; ++i) { - init.push_back(serialize_arithmetic_gate(mem_block.trace[i].value)); - } - for (size_t i = len; i < mem_block.trace.size(); ++i) { - auto index = serialize_arithmetic_gate(mem_block.trace[i].index); - auto value = serialize_arithmetic_gate(mem_block.trace[i].value); - auto op = mem_block.trace[i].operation; - if (!(op.mul_terms.empty() && op.linear_combinations.empty())) { - throw_or_abort("Expected constant."); - } - bool access_type(uint256_t(op.q_c)); - trace.push_back(MemOp{ - .access_type = static_cast(access_type), - .index = index, - .value = value, - }); - } - af.block_constraints.push_back(BlockConstraint{ .init = init, .trace = trace, .type = (BlockType)is_ram }); -} - BlockConstraint handle_memory_init(Circuit::Opcode::MemoryInit const& mem_init) { BlockConstraint block{ .init = {}, .trace = {}, .type = BlockType::ROM }; @@ -256,10 +231,16 @@ BlockConstraint handle_memory_init(Circuit::Opcode::MemoryInit const& mem_init) return block; } +bool is_rom(Circuit::MemOp const& mem_op) +{ + return mem_op.operation.mul_terms.size() == 0 && mem_op.operation.linear_combinations.size() == 0 && + uint256_t(mem_op.operation.q_c) == 0; +} + void handle_memory_op(Circuit::Opcode::MemoryOp const& mem_op, BlockConstraint& block) { uint8_t access_type = 1; - if (mem_op.op.is_rom()) { + if (is_rom(mem_op.op)) { access_type = 0; } if (block.type == BlockType::ROM && access_type == 1) { @@ -289,10 +270,6 @@ acir_format circuit_buf_to_acir_format(std::vector const& buf) handle_arithmetic(arg, af); } else if constexpr (std::is_same_v) { handle_blackbox_func_call(arg, af); - } else if constexpr (std::is_same_v) { - handle_memory(arg.value, true, af); - } else if constexpr (std::is_same_v) { - handle_memory(arg.value, false, af); } else if constexpr (std::is_same_v) { auto block = handle_memory_init(arg); uint32_t block_id = arg.block_id.value; diff --git a/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp index 74640d425f..34e87c391d 100644 --- a/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp @@ -855,22 +855,6 @@ struct MemOp { friend bool operator==(const MemOp&, const MemOp&); std::vector bincodeSerialize() const; static MemOp bincodeDeserialize(std::vector); - - bool is_rom() const - { - return this->operation.mul_terms.size() == 0 && this->operation.linear_combinations.size() == 0 && - uint256_t(this->operation.q_c) == 0; - } -}; - -struct MemoryBlock { - Circuit::BlockId id; - uint32_t len; - std::vector trace; - - friend bool operator==(const MemoryBlock&, const MemoryBlock&); - std::vector bincodeSerialize() const; - static MemoryBlock bincodeDeserialize(std::vector); }; struct Opcode { @@ -899,30 +883,6 @@ struct Opcode { static Directive bincodeDeserialize(std::vector); }; - struct Block { - Circuit::MemoryBlock value; - - friend bool operator==(const Block&, const Block&); - std::vector bincodeSerialize() const; - static Block bincodeDeserialize(std::vector); - }; - - struct ROM { - Circuit::MemoryBlock value; - - friend bool operator==(const ROM&, const ROM&); - std::vector bincodeSerialize() const; - static ROM bincodeDeserialize(std::vector); - }; - - struct RAM { - Circuit::MemoryBlock value; - - friend bool operator==(const RAM&, const RAM&); - std::vector bincodeSerialize() const; - static RAM bincodeDeserialize(std::vector); - }; - struct Brillig { Circuit::Brillig value; @@ -949,7 +909,7 @@ struct Opcode { static MemoryInit bincodeDeserialize(std::vector); }; - std::variant value; + std::variant value; friend bool operator==(const Opcode&, const Opcode&); std::vector bincodeSerialize() const; @@ -5449,65 +5409,6 @@ Circuit::MemOp serde::Deserializable::deserialize(Deserializer& namespace Circuit { -inline bool operator==(const MemoryBlock& lhs, const MemoryBlock& rhs) -{ - if (!(lhs.id == rhs.id)) { - return false; - } - if (!(lhs.len == rhs.len)) { - return false; - } - if (!(lhs.trace == rhs.trace)) { - return false; - } - return true; -} - -inline std::vector MemoryBlock::bincodeSerialize() const -{ - auto serializer = serde::BincodeSerializer(); - serde::Serializable::serialize(*this, serializer); - return std::move(serializer).bytes(); -} - -inline MemoryBlock MemoryBlock::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 Circuit - -template <> -template -void serde::Serializable::serialize(const Circuit::MemoryBlock& obj, Serializer& serializer) -{ - serializer.increase_container_depth(); - serde::Serializable::serialize(obj.id, serializer); - serde::Serializable::serialize(obj.len, serializer); - serde::Serializable::serialize(obj.trace, serializer); - serializer.decrease_container_depth(); -} - -template <> -template -Circuit::MemoryBlock serde::Deserializable::deserialize(Deserializer& deserializer) -{ - deserializer.increase_container_depth(); - Circuit::MemoryBlock obj; - obj.id = serde::Deserializable::deserialize(deserializer); - obj.len = serde::Deserializable::deserialize(deserializer); - obj.trace = serde::Deserializable::deserialize(deserializer); - deserializer.decrease_container_depth(); - return obj; -} - -namespace Circuit { - inline bool operator==(const Opcode& lhs, const Opcode& rhs) { if (!(lhs.value == rhs.value)) { @@ -5696,141 +5597,6 @@ Circuit::Opcode::Directive serde::Deserializable::de namespace Circuit { -inline bool operator==(const Opcode::Block& lhs, const Opcode::Block& rhs) -{ - if (!(lhs.value == rhs.value)) { - return false; - } - return true; -} - -inline std::vector Opcode::Block::bincodeSerialize() const -{ - auto serializer = serde::BincodeSerializer(); - serde::Serializable::serialize(*this, serializer); - return std::move(serializer).bytes(); -} - -inline Opcode::Block Opcode::Block::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 Circuit - -template <> -template -void serde::Serializable::serialize(const Circuit::Opcode::Block& obj, Serializer& serializer) -{ - serde::Serializable::serialize(obj.value, serializer); -} - -template <> -template -Circuit::Opcode::Block serde::Deserializable::deserialize(Deserializer& deserializer) -{ - Circuit::Opcode::Block obj; - obj.value = serde::Deserializable::deserialize(deserializer); - return obj; -} - -namespace Circuit { - -inline bool operator==(const Opcode::ROM& lhs, const Opcode::ROM& rhs) -{ - if (!(lhs.value == rhs.value)) { - return false; - } - return true; -} - -inline std::vector Opcode::ROM::bincodeSerialize() const -{ - auto serializer = serde::BincodeSerializer(); - serde::Serializable::serialize(*this, serializer); - return std::move(serializer).bytes(); -} - -inline Opcode::ROM Opcode::ROM::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 Circuit - -template <> -template -void serde::Serializable::serialize(const Circuit::Opcode::ROM& obj, Serializer& serializer) -{ - serde::Serializable::serialize(obj.value, serializer); -} - -template <> -template -Circuit::Opcode::ROM serde::Deserializable::deserialize(Deserializer& deserializer) -{ - Circuit::Opcode::ROM obj; - obj.value = serde::Deserializable::deserialize(deserializer); - return obj; -} - -namespace Circuit { - -inline bool operator==(const Opcode::RAM& lhs, const Opcode::RAM& rhs) -{ - if (!(lhs.value == rhs.value)) { - return false; - } - return true; -} - -inline std::vector Opcode::RAM::bincodeSerialize() const -{ - auto serializer = serde::BincodeSerializer(); - serde::Serializable::serialize(*this, serializer); - return std::move(serializer).bytes(); -} - -inline Opcode::RAM Opcode::RAM::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 Circuit - -template <> -template -void serde::Serializable::serialize(const Circuit::Opcode::RAM& obj, Serializer& serializer) -{ - serde::Serializable::serialize(obj.value, serializer); -} - -template <> -template -Circuit::Opcode::RAM serde::Deserializable::deserialize(Deserializer& deserializer) -{ - Circuit::Opcode::RAM obj; - obj.value = serde::Deserializable::deserialize(deserializer); - return obj; -} - -namespace Circuit { - inline bool operator==(const Opcode::Brillig& lhs, const Opcode::Brillig& rhs) { if (!(lhs.value == rhs.value)) { diff --git a/ts/bin-test/target/main.json b/ts/bin-test/target/main.json deleted file mode 100644 index e0c75229a3..0000000000 --- a/ts/bin-test/target/main.json +++ /dev/null @@ -1 +0,0 @@ -{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"verification_key","type":{"kind":"array","length":114,"type":{"kind":"field"}},"visibility":"private"},{"name":"proof","type":{"kind":"array","length":94,"type":{"kind":"field"}},"visibility":"private"},{"name":"public_inputs","type":{"kind":"array","length":1,"type":{"kind":"field"}},"visibility":"private"},{"name":"key_hash","type":{"kind":"field"},"visibility":"private"},{"name":"input_aggregation_object","type":{"kind":"array","length":16,"type":{"kind":"field"}},"visibility":"private"},{"name":"proof_b","type":{"kind":"array","length":94,"type":{"kind":"field"}},"visibility":"private"}],"param_witnesses":{"input_aggregation_object":[211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226],"key_hash":[210],"proof":[115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208],"proof_b":[227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320],"public_inputs":[209],"verification_key":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114]},"return_type":{"kind":"array","length":16,"type":{"kind":"field"}},"return_witnesses":[337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352]},"bytecode":"H4sIAAAAAAAA/+3V05ObbRjA4WytrW3bdrdr79bWZ6Ofbdu2jdq2+y/UtvmkuXZmp8c96ME+M7+5cieZzJtJ5r2nxEUixSKxEx5G4kNTC80XI7HXoxZnCZZkKZZmGZZlOZZnBcazIiuxMquwKquxOmuwJmuxNuuwLuuxPhuwIRuxMZuwKZuxOVuwJVuxNduwLduxPTuwIzuxM7uwK7uxO3uwJ3uxN/uwL/uxPwdwIAcxgYOZyCQmM4WpTGM6M5jJLGYzh7nMYz6HcCiHcThHcCRHcTTHcCzHcTwncCIncTKn8AbeyJt4M2/hrbyNt/MO3sm7eDfv4b28j/dzaqHrjJ4HzA/yIT7MR/goH+PjfIJP8ik+zWf4LJ/j83yBL/IlvsxX+Cpf4+t8g2/yLb7Nd/gu3+P7/IAf8iN+zE/4KT/j5/yCX/Irfs1v+C2/4/f8gT/yJ/7MX/grf+Pv/IN/8i/+zX/4L//j/5zG6ZzBmZzF2ZzDuZzH+VzAhVzExVzCpVzG5VzBlVzF1VzDtVzH9dzAjdzEzYzuoejZYt7KK4siegaHdySGkkLJoZRQaigtlB7KCGWGskLZoZxQbigvlB9XtPiKFl/MBBYtvpjX2+LbZt7OHdzJXdzNPdzLfdzPAzzIQzzMIzzKYzzOEzzJUzzNMzzLczzPCyzoEqM3oKhxLMbiLMGSLMXSLMOyLMfyrMB4VmQlVmYVVmU1VmcN1mQt1mYd1mU91mcDNmQjNmYTNmUzNmcLtmQrtmYbtmU7tmcHdmQndmYXdmU3dmcP9mQv9mYf9mU/9ucADuQgJhT8/pHYuXrxxRVefNEnEpnEZKYwlWlMZwYzmcVs5jCXecwv+KO4jiFhHhoaFhoeGhEaGRoVGh0aExobGhcaH5oQmhiaFJpc8C2v4eddBhwvtmjWDgAA","proving_key":null,"verification_key":null,"gates":505505} \ No newline at end of file diff --git a/ts/bin-test/target/witness.tr b/ts/bin-test/target/witness.tr deleted file mode 100644 index 82e8cf3ff57ff728998a3c03148be7a7c94acc09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8258 zcmXBXV^}2a*TC_bY+D;P+x+FWcGI@mwrv}e+cvv48&i{OYO`%OVY9b?&-I+^{=E9W zy5F5c6^9J-e*<{0$@$UD_AMh4+U(FdR?GRvVeP_rt<~ZGAK6yVv&DJa_)L{;JgDtL z%6Ub3XVMRUUbZeP%NIe$M4IBrC__JH4+-wb6 zHI1ZqO$+6sTa(YhL1bB>@~Gv@F^*OtESmjq`+ znsON{l^OYP*Y=Kf;O%!p5#H)K={v&8^En|s?et5Yp6O9Hcd?9Sxz*gRQ=6=PG8?T~ z`Kt&l2r2dI{M&Np-N8}jnO3IInf4x|XQuO(+lz&Rb6>^^ZlBl0{13+BDG8kL7Yd`F zRpEcke@^(FYcNDKSsA#kX-aL~{X06HnJA&+Fu6~co|;L;9a=UvZNd`VWH5E;?v(3i zpyVFpcU|-8Y?b5mgMa9Cd(n84Pk`g3BVpQNbXCy+{7SXK63%-l4!4#f4&(J|Qubsd zHnPD^Wwxymdt47}IJza$@~ZJ;<-@q9`)qW$c|i?%kr~a-<(|Z_Bm2C4W9(tpvCW{- zvmvc=ztFoAMe5)fa@U;hTjEnaFUO1}(p@VoZLkLDzG42X*NHUI+Q`oM)v-+URbR|k zz@a+(wwm56m35;kQ#YM!2PevGg_mVwDq|k9+ToL>Man|f<4Y{&`7o0DB#V*FC%uP% zY8W=NBc?*(8?*Nva??HcTEwwXg?Ls3zpn4*cpnFBU2gdJVx&=rJ*nH37|8yYyF~i0&nq6uZt(n{T?7@Gj_z! z3ElP?D8K(k54E=EGR3!Ie-ZQojwcQkvs=3;i_Q5Vy0B=ZoyJF*&A_qk&D>9{=MPj@ zOzINFXxN&&(C6xDQL)$UWGF4x99mCA;waSKHXHm$UR5WPa=~ff&gPcMI_g|mgEdSy zZJv=D00^GlW5&Z@I-V7Q?+f8=tSY307?m}QiL@UI^~=c(rhB^g_D@S6I8z1S9@Wpq zAlb9mU`D#~PwAXASG$WJI#-uDB(Ctb#;`FXPQV|_$d_3lTn<9=^t9q9&a6+cf6d-z zmu)p6J){^uxj?44B6_<E$-{j9hiE zie3{XOn-{hK@OW5A8ba`T>)UCzZ4zaR~d1pl6Z1eAvLbDN`x7T&b5J;uewjwoEp|f zX(zaU9G#3G3eu+njgn5|^7V+0n}M@GF#iI@hCk^*iF4m7p`S4!f0&*#ngmLD2?f=V zI1VWMnhD+uUPt-YKA~o(qxWJs9S~q?I_F6AId9ef$?Z-sICwi) zs1-K%NK*W^_ibjI{~rNx?--uzhI3{?I~STa2r9tS6*uR8d5k@}XQ@*)a1D5t5(3%4 zMCZN1DW|=Ch1}R#I?pctN=UFY91YVorRbFYMt!@Nu5w+tW5@sZ`>A!cj4ix&r!VoZ zcV-AQnQ6jQ-cyZ7N}sf58B87 zqU>MOZ{1^Dk=FBomSgwClCGiA{Zh%xWmRj%$&RhbMP6`;;MRuT}}ZP3Sfhk{l|*W0L@%mQO3a;=tkC~RA3hH*$ck7L)sc~{3h5Yo|4 zGq7Ts_F2nE21_K)+ccOFZHbhvdv4SanP1UF{~ElbITYQ6syC;U_B07`3zg+kTd{Br zQC_T(-4AY5X)KYV-{{Oa6C#*Eg^|Fx4JG9KHerH5hrRu;lX5ANW|kJWQCqy0R?JHE z8z#8TIqx>-%8|j%qkK>$^y=hwdm?lMb+~-C@b_gPz^q?qnUPnH)CMQjLSMU=V~Edx z`CM!=w^(+^c`^x`tSKE11%o`{J*4W_=1uq#K0h&v15=@~rmBK8!LqlTbfb070a)3T zz8=NUl7nf8Q@60YjSm0zT7B!qdy~gYUotwc>QBz*_LihD%#%rATzNo#YL*7aV_5zE zCys<>snp0h?&RgJ2eC<$#}g12L&c}Rr62{+s3o!KE-ux^#u482F*0RRL3Uj0L0 z(W7{y5^ac*>A*)?!OQ??8CMQr39V@12{9|w_F;8Nba-o&e=Rqn^3}&1vZaBfoWuS_ zH-d4~Ov^!2OZ)_VH94A0PL?;4@PM_U0WgZ`x|t?QbYh7Y#vCf&p+EIBd$Bw$QGbzY z)iE?)`)_w$Xc3`^i>KYO7rTU|LbN1J%eB;hA0=T*PMzngPEKoNgQ@DpAOCp=JaO^U z^}y0B_?_Mf>idyy2H02IA;f_%`I(8Hyd}H*h@J#I8M^SaW%1d+ztMOEj(2zza%I5u z#VLycs+%>hOa!HKo0|Ne{OmT>L$V@3#jweA%?b~)^Cw={kZoE&}a zkC6G{FtUp`%fQbp*p@oL`L+(#F5S~kmGjo8ETUXFVDyGtvCbr=*N68S z14Qr|E}SXt$$+^I`_iX%E+0o{etun$dO)Q@g1>m01*b^T-=(c(WaRu7FXeCjij0%z zTPOioMs3*oF%+^Hn+H?&?N z$=EqDY#f*N3cyJEp@ZgGCe)mD#T7K;QGEhPVANHdSEZj|5;Efcf%8UXG=R)K<4%_( zO*(d9T1fob+q{d^^C-MXT*%e@3^>Gib>euBx51i&5Jfc>*Wr!%=E4RcV_3lSR;LEH zZ2Z(8a&=W9(dEyEIoHi9CG-nx9#)dFgx4ZXL`Bl4pzCrw2HO&6yGEe|p4@>JCB}Nc zd>&AZV<}GBZ5ir)<8c*J3FTG3E@d`rndA3vgs%u=-SG)pxdXN83y`8zWg90jlR25( z^b72neiLlVi5wDM{7rK^gAkSyMI$BpehtkjfE7?xl>IZpDqcN7uC!{ES7u@%3qgF$vpX1RxKq>aXtzPVul8eB2D3-3yQX z>lK}3^?+RBju+H3LOD#wV9l zWK?S!n9*B)hAs`+EViyL8AASm;0Dj&>P$G*b_pIgSG>!K{Jp>afn8LAE5cBYaj7>$ zR{J7%M(@9oYXwj8DA99}c9Mq3k^8wp-!iOEhoEsVx-7z&pV}3gN27uXH+Xn+0j)FJ zxecTF{ajB2hUMGfkF00{)qv3`l7gb(qo&(?L373@P{Nf0Tw}T|=K!E$XPV4F>d!Qp zpVKX{BS*|4-@P%OK~?C)t$k2eMl?Ea=fB07-B*)5G=XqN{_gWdo+Y4e1Uf`RjY2JB zO4`sOK<~0Zuk)-bD@+Cw^jvI;YQZKBqAWnMDcsHXCds{e+G?dTHTNx7 zu#q-(6_>Vob6Ug#t~Cp6p3_>cMpI@9u7G;m0HPw#TRSVGYv1H(Nq zkDDGC1CqLw5+t6#92$mQqSc6D&Wvpuo}LH@3-399CV>{&*Tcs7^3ujzt3wc+zhfo< z!4xM*8F;^98D-Uuk52`+>i3;`=8741Vd#A$S(1~+IhI7r|6t8IC+*zJB}v1>UFy=i zCRqY$qHF;YzqedA&`z!q2atf2pAdN(eP_vQhENOCP^?LLBl2&BbMRm=b>@>hD$S>YUy({yyQyWjT7Jgdjk-&;i|73miLet@S=B zj-P+kmKy^h5IM-#R4I83mUoJ&IRZ{%LXzDbPN^*d^(OWQ;@HY^+72B$#i?K2L!9CG zA9>h+cii9H6l~F+YdNRV`u8)%T!V3Rzke1^&bW|0@ko9RSbB*to_ATSLF%a(J>9g} z3M+&wDm(ZLf^+mWupEv;N{C}+2bhRKRyaOT?Wwy z#BxJdn4`ZDt?}>1gFGjy ziPr4jp*UG^14{d*F(Qqgt3TY^c*mgfT;%TkNP;xI@8CC&P=U@E0c;IC6(m9+F&PYya{OD_4YagT1&Jf@+kZ9(7=P&rx`_O5Yig^nTd}OMO1g`)Su9h^ z@_ImklhvntfeYLlt;ZqvTS!Tm2QDTOGmh+n$gz$6CQcy!?%Rj44=f+5KG=PLejxjh z{Xy@;+6R#joge%@ynH|sII9ZsUjO2GTJjgY-O)bb$srl>TBZVqZD4+#D)&}4B(6Zx zU~IkxMHKPqB>-_Wp1$)}7Bp}L4i$p)YJSswjOMR{^H^E0$yNs3I% z!nc5vPhLjC{&{Yo!B>Vyx^X(;Cro+xOebLY_BdqPHLXHiq|FF9dqDol>6l=Qp&6%a zBMmCHm{0W(^?Jy!4XGzxp ztA)T`q;n7?*iwr&*aUlc^d0|ET%O$XQ$}Y-*gIsPp*0<07uyatcG-6MaeD(6E7aOl zxcy3n;YH>uT6vxyff7gjbXbq=mJ;~s_2$Zr9Ar*F*R`EqY&5E6k}Vt?RZ>g%en8$P zwICA)57irW@U@U!LZdG66}UG_bR%A7k}_)Wn`QsYI(?spE=0P_VPXF7yu@h;$1*Lm znQmX#MtRyI-ajh#^%7#{56PBn8`eZ=Ycug>i*Ix|+jw(X#bUMF%2nj2da zm;SFO@n!ARi@_hBBLafS8+yS@CLOL8sX6eTqxUmBCX!g+L(8v-u{d^xTwa?_HlP{0 z9f&cg$;!G{P@V$zsAR#G17LJnC zlJI$svZK5dafUMJpiJ}$>~@3WhFhVrZ~6(xtm+f`S0yP{PZbwILR;@2WJBDuEd-=D zu_R!)??R-9PCyl(%XN`B1uw=Bnt&5}TvX05`TXV)#rASxa+a}IX&4LO$pLK~jk-(y zfwCJ6D`17@`|$@Xjh&u&K* zbr>Ox(F7)K1i}j zo>!$!m^%4&X<*kPXvEr9Fky;k()S`KGx!aiLXRff2`7N#4N1}$UWPrarAjN%nru&} z*34wB5X%Z=rL9b)Z;grq19S)%1MXo&O33qZ@}lZfv6_}fCV2y>Tdcsq(x35?ehyG! zg0M&~92=hN@EStY9@EGL*o>u@lXjLE-<;=*QHg+{R_GgdRjn|_b=mld?Yxi6*0T6w zK_~ID%Q&z7FDXk^6cW3_y$k{S&4s)-VL~&K&X7Z)+gK-bR^uYx#loy%bPBwDI41{0 zUDva?4fk|lq9dAr<&?`?d|sLkK|A6?ns}Ny84VtUU+XuT6Lx&+Es(c!v|t{MkD{{R z;g3sD{*7=Cu05wopO0Xlyf?7j19OY$G_1&I{|A>N8nb9UXQ|qOzae^b1w}xu$WsJ> zOc!ZM?J2W7OOT{I8_A-6*9!yu&5&f3_jm-zajVC3CBi{<>~jIt&iv0g+xclVrHiTa z?j?>Lw7gkd%V@0VxMPTEgYk*uzbGni<*=<6(WNPCgCq@LM3?}U#N?Xq#?vrt|J9J4 zosJtpdmM#>)~t{*z0empZaeYIJCG%uxv>Tj+8R1hnCmQ`0f+ArHI!ZvwRbaKe5}1p zSlCa>M;#_@WyyWB9%X5?JHTKrijCUNf|z72cwrvmG3QX{xjSaJeSX;mcN0vzQQ5TEC#sz znN}w2@U@so-(O9$F7{#;o!}6VoL!CO|3$`Dz>Z;b0Bv&=1zh{^@?s^f-fEXLJm4-& zLnMbhceHf4X~wN0B~M~B83Xq9e#2q^4FIhXb+eFT7*!rhUka8VpHexIFTj{6->CD@4=WM32ip&BRVaz$Z(VZP31?Zo1Q1xj7?ruNg;nXy$h%Dv%bjeu~GPE5?p9G9k#J(Tk6Y{zHl zX&nR#22F94h5p4+hsm2vo)Y$+u+?^?@LS@ zJ1C zMmxHbRWhEs0gHM;Cu(FKsvbRc`~h@Bm`Q-S=%#8-W}A67g35Pc!cW#bpwKj&tXoYY zcr<-dq9B5Kvo+%agEnpL)dM|86KYrKL%VKZ%dvBF$*`x?POIb2)u5xg8lf}nKbKG7 zN~ooECajN%rW3fciyZ3L5r&4O*8ZQPJeTGMZVNAK)r%&xe>uLrLG|4xW;)guC{!zaf z5MoMLy?n Date: Thu, 27 Jul 2023 11:58:26 +0100 Subject: [PATCH 6/6] Update acir_tests/run_acir_tests.sh --- acir_tests/run_acir_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acir_tests/run_acir_tests.sh b/acir_tests/run_acir_tests.sh index 1f87218928..6531a28b6b 100755 --- a/acir_tests/run_acir_tests.sh +++ b/acir_tests/run_acir_tests.sh @@ -7,7 +7,7 @@ set -e BB=$PWD/${BB:-../cpp/build/bin/bb} CRS_PATH=~/.bb-crs -BRANCH=acvm-0.21.0 +BRANCH=master # Pull down the test vectors from the noir repo, if we don't have the folder already. if [ ! -d acir_tests ]; then