Skip to content

Noir-friendly UltraPlonk changes #113

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
Rumata888 merged 5 commits into from
Mar 8, 2023
Merged

Noir-friendly UltraPlonk changes #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30a67aa
Several changes to UltraPlonk to make proofs more amenable to be veri…
zac-williamson Feb 1, 2023
56f3685
bonk
zac-williamson Feb 2, 2023
aea07d1
removed composer tests that use now-deleted fixed_group gates for sta…
zac-williamson Feb 2, 2023
f9ec1f2
fixed wasm build error
zac-williamson Feb 2, 2023
ea83092
fixed ultra recursive verifier to not use fixed base widget.
zac-williamson Feb 2, 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
78 changes: 61 additions & 17 deletions cpp/src/aztec/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,18 @@
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

# Enable the following warnings project wide.
# If any compilation issues arise in the future, they should not be silenced here but rather in the
# module's own CMakeLists.txt by adding conditional compilation flags like the following
# ```
# if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# target_compile_options(crypto_blake3s_full_objects PRIVATE -Wno-error=shorten-64-to-32)
# endif()
# ```
# Specifying `-Wno-${ERROR_NAME}` will silence the error completely.
# To preserve the warning, but prevent them from causing the build to fail,
# use the flag `-Wno-error=${ERROR_NAME}`
add_compile_options(-Werror -Wall -Wextra -Wconversion -Wsign-conversion -Wfatal-errors)
add_compile_options(-Werror -Wall -Wextra -Wconversion -Wsign-conversion -Wno-deprecated -Wno-tautological-compare -Wfatal-errors)

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-fconstexpr-steps=100000000)
add_compile_options(-Wno-unguarded-availability-new -Wno-c99-extensions -fconstexpr-steps=100000000)
if(MEMORY_CHECKS)
message(STATUS "Compiling with memory checks.")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
endif()
endif()

if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
add_compile_options(-fconstexpr-ops-limit=100000000)
add_compile_options(-Wno-deprecated-copy -fconstexpr-ops-limit=100000000)
endif()

include_directories(${CMAKE_CURRENT_SOURCE_DIR})
Expand Down Expand Up @@ -67,7 +57,6 @@ if(WASM)
$<TARGET_OBJECTS:crypto_sha256_objects>
$<TARGET_OBJECTS:crypto_aes128_objects>
$<TARGET_OBJECTS:crypto_blake2s_objects>
$<TARGET_OBJECTS:crypto_blake3s_objects>
$<TARGET_OBJECTS:crypto_keccak_objects>
$<TARGET_OBJECTS:crypto_schnorr_objects>
$<TARGET_OBJECTS:crypto_pedersen_objects>
Expand All @@ -78,7 +67,7 @@ if(WASM)
$<TARGET_OBJECTS:stdlib_schnorr_objects>
$<TARGET_OBJECTS:stdlib_pedersen_objects>
$<TARGET_OBJECTS:stdlib_blake2s_objects>
$<TARGET_OBJECTS:stdlib_blake3s_objects>
# TODO: remove all except those needed for testing (join_split)
$<TARGET_OBJECTS:rollup_proofs_inner_proof_data_objects>
$<TARGET_OBJECTS:rollup_proofs_notes_objects>
$<TARGET_OBJECTS:rollup_proofs_account_objects>
Expand Down Expand Up @@ -108,5 +97,60 @@ if(WASM)
barretenberg.wasm
DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/barretenberg.wasm
)
# For use when compiling dependent cpp projects for WASM
message(STATUS "Compiling all-in-one barretenberg WASM archive")
add_library(
barretenberg
STATIC
$<TARGET_OBJECTS:srs_objects>
$<TARGET_OBJECTS:numeric_objects>
$<TARGET_OBJECTS:crypto_sha256_objects>
$<TARGET_OBJECTS:crypto_aes128_objects>
$<TARGET_OBJECTS:crypto_blake2s_objects>
$<TARGET_OBJECTS:crypto_keccak_objects>
$<TARGET_OBJECTS:crypto_schnorr_objects>
$<TARGET_OBJECTS:crypto_pedersen_objects>
$<TARGET_OBJECTS:ecc_objects>
$<TARGET_OBJECTS:polynomials_objects>
$<TARGET_OBJECTS:plonk_objects>
$<TARGET_OBJECTS:stdlib_primitives_objects>
$<TARGET_OBJECTS:stdlib_schnorr_objects>
$<TARGET_OBJECTS:stdlib_pedersen_objects>
$<TARGET_OBJECTS:stdlib_blake2s_objects>
$<TARGET_OBJECTS:stdlib_sha256_objects>
$<TARGET_OBJECTS:stdlib_aes128_objects>
$<TARGET_OBJECTS:stdlib_merkle_tree_objects>
)

endif()
else()
# For use when compiling dependent cpp projects
message(STATUS "Compiling all-in-one barretenberg archive")
add_library(
barretenberg
STATIC
$<TARGET_OBJECTS:srs_objects>
$<TARGET_OBJECTS:numeric_objects>
$<TARGET_OBJECTS:crypto_sha256_objects>
$<TARGET_OBJECTS:crypto_aes128_objects>
$<TARGET_OBJECTS:crypto_blake2s_objects>
$<TARGET_OBJECTS:crypto_blake3s_objects>
$<TARGET_OBJECTS:crypto_keccak_objects>
$<TARGET_OBJECTS:crypto_schnorr_objects>
$<TARGET_OBJECTS:crypto_pedersen_objects>
$<TARGET_OBJECTS:ecc_objects>
$<TARGET_OBJECTS:polynomials_objects>
$<TARGET_OBJECTS:plonk_objects>
$<TARGET_OBJECTS:proof_system_objects>
$<TARGET_OBJECTS:transcript_objects>
$<TARGET_OBJECTS:honk_objects>
$<TARGET_OBJECTS:stdlib_primitives_objects>
$<TARGET_OBJECTS:stdlib_schnorr_objects>
$<TARGET_OBJECTS:stdlib_pedersen_objects>
$<TARGET_OBJECTS:stdlib_blake2s_objects>
$<TARGET_OBJECTS:stdlib_blake3s_objects>
$<TARGET_OBJECTS:stdlib_sha256_objects>
$<TARGET_OBJECTS:stdlib_aes128_objects>
$<TARGET_OBJECTS:stdlib_merkle_tree_objects>
$<TARGET_OBJECTS:env_objects>
)
endif()
167 changes: 0 additions & 167 deletions cpp/src/aztec/honk/circuit_constructors/standard_circuit_constructor.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,172 +417,5 @@ TEST(standard_circuit_constructor, test_check_circuit_broken)
EXPECT_EQ(result, false);
}

TEST(standard_circuit_constructor, test_fixed_group_add_gate_with_init)
{
StandardCircuitConstructor composer = StandardCircuitConstructor();
auto gen_data = crypto::pedersen::get_generator_data({ 0, 0 });

// 1. generate two origin points P, Q
// 2. derive gate constant values from P, Q
// 3. instantiate P as accumulator
// 4. generate accumulator initial value 1 and instantiate as circuit variable
// 5. use the above to call `create_fixed_group_add_gate_with_init`
// 6. validate proof passes
constexpr size_t num_bits = 63;
constexpr size_t initial_exponent = ((num_bits & 1) == 1) ? num_bits - 1 : num_bits;

const crypto::pedersen::fixed_base_ladder* ladder = gen_data.get_ladder(num_bits);
grumpkin::g1::affine_element generator = gen_data.aux_generator;

grumpkin::g1::element origin_points[2];
origin_points[0] = grumpkin::g1::element(ladder[0].one); // this is P
origin_points[1] = origin_points[0] + generator;
origin_points[1] = origin_points[1].normalize(); // this is Q

fr accumulator_offset = (fr::one() + fr::one()).pow(static_cast<uint64_t>(initial_exponent)).invert();
fr origin_accumulators[2]{ fr::one(), accumulator_offset + fr::one() };

for (size_t i = 0; i < 2; ++i) {
fr starting_accumulator = origin_accumulators[i]; // skew = 0

fixed_group_init_quad init_quad{ origin_points[0].x,
(origin_points[0].x - origin_points[1].x),
origin_points[0].y,
(origin_points[0].y - origin_points[1].y) };

fixed_group_add_quad round_quad{
.a = composer.add_variable(origin_points[i].x),
.b = composer.add_variable(origin_points[i].y),
.c = composer.add_variable(accumulator_offset),
.d = composer.add_variable(starting_accumulator),
.q_x_1 = 0,
.q_x_2 = 0,
.q_y_1 = 0,
.q_y_2 = 0,
};
composer.create_fixed_group_add_gate_with_init(round_quad, init_quad);
}

bool result = composer.check_circuit();

EXPECT_EQ(result, true);
}

TEST(standard_circuit_constructor, test_fixed_group_add_gate)
{
auto composer = StandardCircuitConstructor();
auto gen_data = crypto::pedersen::get_generator_data({ 0, 0 });

constexpr size_t num_bits = 63;
constexpr size_t num_quads_base = (num_bits - 1) >> 1;
constexpr size_t num_quads = ((num_quads_base << 1) + 1 < num_bits) ? num_quads_base + 1 : num_quads_base;
constexpr size_t num_wnaf_bits = (num_quads << 1) + 1;
constexpr size_t initial_exponent = ((num_bits & 1) == 1) ? num_bits - 1 : num_bits;
constexpr uint64_t bit_mask = (1ULL << num_bits) - 1UL;
const crypto::pedersen::fixed_base_ladder* ladder = gen_data.get_hash_ladder(num_bits);
grumpkin::g1::affine_element generator = gen_data.aux_generator; // also passes with aux_generator?

grumpkin::g1::element origin_points[2];
origin_points[0] = grumpkin::g1::element(ladder[0].one);
origin_points[1] = origin_points[0] + generator;
origin_points[1] = origin_points[1].normalize();

grumpkin::fr scalar_multiplier_entropy = grumpkin::fr::random_element();
grumpkin::fr scalar_multiplier_base{ scalar_multiplier_entropy.data[0] & bit_mask, 0, 0, 0 };
scalar_multiplier_base.data[0] = scalar_multiplier_base.data[0] & (~1ULL);

uint64_t wnaf_entries[num_quads + 1] = { 0 };
if ((scalar_multiplier_base.data[0] & 1) == 0) {
scalar_multiplier_base.data[0] -= 2;
}
bool skew = false;
barretenberg::wnaf::fixed_wnaf<num_wnaf_bits, 1, 2>(&scalar_multiplier_base.data[0], &wnaf_entries[0], skew, 0);

fr accumulator_offset = (fr::one() + fr::one()).pow(static_cast<uint64_t>(initial_exponent)).invert();
fr origin_accumulators[2]{ fr::one(), accumulator_offset + fr::one() };

grumpkin::g1::element* multiplication_transcript =
static_cast<grumpkin::g1::element*>(aligned_alloc(64, sizeof(grumpkin::g1::element) * (num_quads + 1)));
fr* accumulator_transcript = static_cast<fr*>(aligned_alloc(64, sizeof(fr) * (num_quads + 1)));

if (skew) {
multiplication_transcript[0] = origin_points[1];
accumulator_transcript[0] = origin_accumulators[1];
} else {
multiplication_transcript[0] = origin_points[0];
accumulator_transcript[0] = origin_accumulators[0];
}

fr one = fr::one();
fr three = ((one + one) + one);
for (size_t i = 0; i < num_quads; ++i) {
uint64_t entry = wnaf_entries[i + 1] & crypto::pedersen::WNAF_MASK;
fr prev_accumulator = accumulator_transcript[i] + accumulator_transcript[i];
prev_accumulator = prev_accumulator + prev_accumulator;

grumpkin::g1::affine_element point_to_add = (entry == 1) ? ladder[i + 1].three : ladder[i + 1].one;
fr scalar_to_add = (entry == 1) ? three : one;
uint64_t predicate = (wnaf_entries[i + 1] >> 31U) & 1U;
if (predicate) {
point_to_add = -point_to_add;
scalar_to_add.self_neg();
}
accumulator_transcript[i + 1] = prev_accumulator + scalar_to_add;
multiplication_transcript[i + 1] = multiplication_transcript[i] + point_to_add;
}
grumpkin::g1::element::batch_normalize(&multiplication_transcript[0], num_quads + 1);

fixed_group_init_quad init_quad{ origin_points[0].x,
(origin_points[0].x - origin_points[1].x),
origin_points[0].y,
(origin_points[0].y - origin_points[1].y) };

fr x_alpha = accumulator_offset;
for (size_t i = 0; i < 2; ++i) {
fixed_group_add_quad round_quad;
round_quad.d = composer.add_variable(accumulator_transcript[i]);
round_quad.a = composer.add_variable(multiplication_transcript[i].x);
round_quad.b = composer.add_variable(multiplication_transcript[i].y);

if (i == 0) {
// we need to ensure that the first value of x_alpha is a defined constant.
// However, repeated applications of the pedersen hash will use the same constant value.
// `put_constant_variable` will create a gate that fixes the value of x_alpha, but only once
round_quad.c = composer.put_constant_variable(x_alpha);
} else {
round_quad.c = composer.add_variable(x_alpha);
}

if ((wnaf_entries[i + 1] & 0xffffffU) == 0) {
x_alpha = ladder[i + 1].one.x;
} else {
x_alpha = ladder[i + 1].three.x;
}
round_quad.q_x_1 = ladder[i + 1].q_x_1;
round_quad.q_x_2 = ladder[i + 1].q_x_2;
round_quad.q_y_1 = ladder[i + 1].q_y_1;
round_quad.q_y_2 = ladder[i + 1].q_y_2;

if (i > 0) {
composer.create_fixed_group_add_gate(round_quad);
} else {
composer.create_fixed_group_add_gate_with_init(round_quad, init_quad);
}
}

add_quad add_quad{ composer.add_variable(multiplication_transcript[2].x),
composer.add_variable(multiplication_transcript[2].y),
composer.add_variable(x_alpha),
composer.add_variable(accumulator_transcript[2]),
fr::zero(),
fr::zero(),
fr::zero(),
fr::zero(),
fr::zero() };
composer.create_fixed_group_add_gate_final(add_quad);

bool result = composer.check_circuit();

EXPECT_EQ(result, true);
}
} // namespace standard_circuit_constructor_tests
Loading