Skip to content

Enable lookup [SyncWith:zkllvm#340] #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 4, 2023
Merged

Enable lookup [SyncWith:zkllvm#340] #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
604da5e
Enable lookup
Nov 20, 2023
9ea5f45
Static definition of constant/selector columns amount
Nov 30, 2023
e983c10
Submodules assigner, blueprint and zk updated to master to support lo…
nkaskov Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
207 changes: 112 additions & 95 deletions bin/assigner/src/main.cpp
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bin/transpiler/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ int main(int argc, char *argv[]) {
using BlueprintFieldType = typename curve_type::base_field_type;
constexpr std::size_t WitnessColumns = 15;
constexpr std::size_t PublicInputColumns = 1;
constexpr std::size_t ConstantColumns = 5;
constexpr std::size_t SelectorColumns = 35;
constexpr std::size_t ConstantColumns = 35;
constexpr std::size_t SelectorColumns = 36;

using ArithmetizationParams =
nil::crypto3::zk::snark::plonk_arithmetization_params<WitnessColumns, PublicInputColumns, ConstantColumns,
Expand Down
6 changes: 3 additions & 3 deletions examples/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ add_example_with_proving(arithmetics_cpp_example SOURCES arithmetics.cpp INPUT a
add_example_with_proving(integer_arithmetics_cpp_example SOURCES integer_arithmetics.cpp INPUT integer_arithmetics.inp)
add_example_with_proving(poseidon_cpp_example SOURCES poseidon.cpp INPUT poseidon.inp)
add_example_with_proving(merkle_tree_poseidon_cpp_example SOURCES merkle_tree_poseidon.cpp INPUT merkle_tree_poseidon.inp)
add_example_with_proving(merkle_tree_sha2_256_cpp_example SOURCES merkle_tree_sha2_256.cpp INPUT merkle_tree_sha2_256.inp)
add_example_with_proving(validate_merkle_path_sha2_256_cpp_example SOURCES validate_merkle_path_sha2_256.cpp INPUT validate_merkle_path_sha2_256.inp)
add_example_with_proving(sha256_cpp_example SOURCES sha2_256.cpp INPUT sha2_256.inp)
add_example_without_proving(merkle_tree_sha2_256_cpp_example SOURCES merkle_tree_sha2_256.cpp INPUT merkle_tree_sha2_256.inp)
add_example_without_proving(validate_merkle_path_sha2_256_cpp_example SOURCES validate_merkle_path_sha2_256.cpp INPUT validate_merkle_path_sha2_256.inp)
add_example_without_proving(sha256_cpp_example SOURCES sha2_256.cpp INPUT sha2_256.inp)
add_example_with_proving(balance_cpp_example SOURCES balance.cpp INPUT balance.inp)
add_example_with_proving(memory_cpp_example SOURCES memory.cpp INPUT memory.inp)
add_example_with_proving(polynomial_cpp_example SOURCES polynomial.cpp INPUT polynomial.inp COMPILER_OPTIONS -std=c++20)
Expand Down
4 changes: 2 additions & 2 deletions examples/rust/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ add_rust_example(arithmetics_arkworks_rust_example EXAMPLE_NAME arithmetics_arkw
add_rust_example(ed25519_curve_add_rust_example EXAMPLE_NAME ed25519_curve_add INPUT ed25519_curve_add.inp)
add_rust_example(eddsa_signature_verification_rust_example EXAMPLE_NAME eddsa_signature_verification INPUT eddsa_signature_verification_rust.inp)
add_rust_example(eddsa_signature_verification_builtins_rust_example EXAMPLE_NAME eddsa_signature_verification_builtins INPUT eddsa_signature_verification_rust.inp)
add_rust_example(merkle_tree_sha2_256_rust_example EXAMPLE_NAME merkle_tree_sha2_256 INPUT merkle_tree_sha2_256_rust.inp)
add_rust_example(sha2_256_rust_example EXAMPLE_NAME sha2_256 INPUT sha2_256_rust.inp)
#add_rust_example(merkle_tree_sha2_256_rust_example EXAMPLE_NAME merkle_tree_sha2_256 INPUT merkle_tree_sha2_256_rust.inp)
#add_rust_example(sha2_256_rust_example EXAMPLE_NAME sha2_256 INPUT sha2_256_rust.inp)
add_rust_example(sha2_512_rust_example EXAMPLE_NAME sha2_512 INPUT sha2_512_rust.inp)
2 changes: 1 addition & 1 deletion libs/assigner
Open in desktop
Submodule assigner updated 12 files
+7 −0 include/nil/blueprint/boolean/logic_ops.hpp
+14 −0 include/nil/blueprint/curves/addition.hpp
+14 −0 include/nil/blueprint/curves/multiplication.hpp
+14 −0 include/nil/blueprint/fields/addition.hpp
+7 −0 include/nil/blueprint/fields/division.hpp
+14 −0 include/nil/blueprint/fields/multiplication.hpp
+14 −0 include/nil/blueprint/fields/subtraction.hpp
+7 −0 include/nil/blueprint/hashes/sha2_256.hpp
+14 −0 include/nil/blueprint/hashes/sha2_512.hpp
+6 −0 include/nil/blueprint/integers/bit_shift.hpp
+7 −0 include/nil/blueprint/integers/division_remainder.hpp
+12 −1 include/nil/blueprint/parser.hpp
2 changes: 1 addition & 1 deletion libs/blueprint
Open in desktop
Submodule blueprint updated 47 files
+10 −0 .github/workflows/run_tests.yml
+4 −1 CMakeLists.txt
+2 −2 docs/concepts.md
+45 −0 include/nil/blueprint/blueprint/plonk/assignment.hpp
+108 −19 include/nil/blueprint/blueprint/plonk/assignment_proxy.hpp
+19 −4 include/nil/blueprint/blueprint/plonk/circuit.hpp
+63 −9 include/nil/blueprint/blueprint/plonk/circuit_proxy.hpp
+10 −10 include/nil/blueprint/components/algebra/curves/pasta/plonk/variable_base_scalar_mul.hpp
+224 −0 include/nil/blueprint/components/algebra/fields/plonk/linear_interpolation.hpp
+7 −8 include/nil/blueprint/components/algebra/fields/plonk/non_native/detail/boolean_lookup_op_component.hpp
+11 −35 include/nil/blueprint/components/algebra/fields/plonk/non_native/lookup_logic_ops.hpp
+259 −0 include/nil/blueprint/components/algebra/fields/plonk/quadratic_interpolation.hpp
+65,537 −0 include/nil/blueprint/components/hashes/sha2/plonk/detail/8_split_4.txt
+43,905 −0 include/nil/blueprint/components/hashes/sha2/plonk/detail/8_split_7.txt
+417 −0 include/nil/blueprint/components/hashes/sha2/plonk/detail/sha_table_generators.hpp
+72 −62 include/nil/blueprint/components/hashes/sha2/plonk/detail/split_functions.hpp
+41 −0 include/nil/blueprint/components/hashes/sha2/plonk/sha256.hpp
+707 −344 include/nil/blueprint/components/hashes/sha2/plonk/sha256_process.hpp
+614 −0 include/nil/blueprint/components/systems/snark/plonk/placeholder/detail/f1_loop.hpp
+413 −0 include/nil/blueprint/components/systems/snark/plonk/placeholder/detail/f3_loop.hpp
+421 −0 include/nil/blueprint/components/systems/snark/plonk/placeholder/detail/gate_component.hpp
+313 −0 include/nil/blueprint/components/systems/snark/plonk/placeholder/fri_array_swap.hpp
+202 −132 include/nil/blueprint/components/systems/snark/plonk/placeholder/fri_cosets.hpp
+216 −0 include/nil/blueprint/components/systems/snark/plonk/placeholder/fri_lin_inter.hpp
+438 −0 include/nil/blueprint/components/systems/snark/plonk/placeholder/gate_argument_verifier.hpp
+924 −0 include/nil/blueprint/components/systems/snark/plonk/placeholder/lookup_argument_verifier.hpp
+359 −0 include/nil/blueprint/components/systems/snark/plonk/placeholder/permutation_argument_verifier.hpp
+208 −34 include/nil/blueprint/lookup_library.hpp
+2 −2 include/nil/blueprint/manifest.hpp
+73 −2 include/nil/blueprint/utils/satisfiability_check.hpp
+12 −0 test/CMakeLists.txt
+216 −0 test/algebra/fields/plonk/interpolation.cpp
+55 −0 test/hashes/plonk/detail/sha_table_generators_base4.cpp
+54 −0 test/hashes/plonk/detail/sha_table_generators_base7.cpp
+3 −3 test/hashes/plonk/sha256.cpp
+2 −3 test/hashes/plonk/sha256_process.cpp
+424 −0 test/proxy.cpp
+15 −16 test/test_plonk_component.hpp
+295 −0 test/verifiers/placeholder/f1_loop.cpp
+190 −0 test/verifiers/placeholder/f3_loop.cpp
+145 −0 test/verifiers/placeholder/fri_array_swap.cpp
+8 −9 test/verifiers/placeholder/fri_cosets.cpp
+121 −0 test/verifiers/placeholder/fri_lin_inter.cpp
+213 −0 test/verifiers/placeholder/gate_argument_verifier.cpp
+187 −0 test/verifiers/placeholder/gate_component.cpp
+735 −0 test/verifiers/placeholder/lookup_argument_verifier.cpp
+172 −0 test/verifiers/placeholder/permutation_argument_verifier.cpp
2 changes: 1 addition & 1 deletion libs/crypto3
Open in desktop
Submodule crypto3 updated 2 files
+1 −1 libs/marshalling/zk
+1 −1 libs/zk