Skip to content
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

chore: refactor hash.hpp to use const& #1578

Merged
merged 7 commits into from
Aug 16, 2023
Merged

chore: refactor hash.hpp to use const& #1578

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8fd7b31
feat: use FrOf to simplify
ludamad Aug 15, 2023
ebe85d0
feat: constification
ludamad Aug 15, 2023
f0fde3b
Reverts
ludamad Aug 16, 2023
6cc9ab9
Revert XOf template helpers
ludamad Aug 16, 2023
5684c2e
Consistency
ludamad Aug 16, 2023
3123031
Consistency
ludamad Aug 16, 2023
bfd61c2
Merge branch 'master' into ad/chore/refactor-nct-fr-in-hash-cpp
ludamad Aug 16, 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
84 changes: 41 additions & 43 deletions circuits/cpp/src/aztec3/circuits/hash.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using aztec3::circuits::abis::FunctionLeafPreimage;
using MemoryStore = stdlib::merkle_tree::MemoryStore;
using MerkleTree = stdlib::merkle_tree::MerkleTree<MemoryStore>;

template <typename NCT> typename NCT::fr compute_var_args_hash(std::vector<typename NCT::fr> args)
template <typename NCT> typename NCT::fr compute_var_args_hash(std::vector<typename NCT::fr> const& args)
{
auto const MAX_ARGS = 32;
if (args.size() > MAX_ARGS) {
Expand All @@ -31,9 +31,9 @@ template <typename NCT> typename NCT::fr compute_var_args_hash(std::vector<typen
return NCT::hash(args, FUNCTION_ARGS);
}

template <typename NCT> typename NCT::fr compute_constructor_hash(FunctionData<NCT> function_data,
typename NCT::fr args_hash,
typename NCT::fr constructor_vk_hash)
template <typename NCT> typename NCT::fr compute_constructor_hash(FunctionData<NCT> const& function_data,
typename NCT::fr const& args_hash,
typename NCT::fr const& constructor_vk_hash)
{
using fr = typename NCT::fr;

Expand All @@ -48,35 +48,32 @@ template <typename NCT> typename NCT::fr compute_constructor_hash(FunctionData<N
return NCT::compress(inputs, aztec3::GeneratorIndex::CONSTRUCTOR);
}

template <typename NCT> typename NCT::fr compute_partial_address(typename NCT::fr contract_address_salt,
typename NCT::fr function_tree_root,
typename NCT::fr constructor_hash)
template <typename NCT> typename NCT::fr compute_partial_address(typename NCT::fr const& contract_address_salt,
typename NCT::fr const& function_tree_root,
typename NCT::fr const& constructor_hash)
{
using fr = typename NCT::fr;
std::vector<fr> const inputs = {
fr(0), fr(0), contract_address_salt, function_tree_root, constructor_hash,
std::vector<typename NCT::fr> const inputs = {
typename NCT::fr(0), typename NCT::fr(0), contract_address_salt, function_tree_root, constructor_hash,
};
return NCT::hash(inputs, aztec3::GeneratorIndex::PARTIAL_ADDRESS);
}

template <typename NCT>
typename NCT::address compute_contract_address_from_partial(Point<NCT> const& point, typename NCT::fr partial_address)
typename NCT::address compute_contract_address_from_partial(Point<NCT> const& point,
typename NCT::fr const& partial_address)
{
using fr = typename NCT::fr;
using address = typename NCT::address;

std::vector<fr> const inputs = {
std::vector<typename NCT::fr> const inputs = {
point.x,
point.y,
partial_address,
};
return address(NCT::hash(inputs, aztec3::GeneratorIndex::CONTRACT_ADDRESS));
return { NCT::hash(inputs, aztec3::GeneratorIndex::CONTRACT_ADDRESS) };
}

template <typename NCT> typename NCT::address compute_contract_address(Point<NCT> const& point,
typename NCT::fr contract_address_salt,
typename NCT::fr function_tree_root,
typename NCT::fr constructor_hash)
typename NCT::fr const& contract_address_salt,
typename NCT::fr const& function_tree_root,
typename NCT::fr const& constructor_hash)
{
using fr = typename NCT::fr;

Expand All @@ -86,8 +83,8 @@ template <typename NCT> typename NCT::address compute_contract_address(Point<NCT
return compute_contract_address_from_partial(point, partial_address);
}

template <typename NCT>
typename NCT::fr compute_commitment_nonce(typename NCT::fr first_nullifier, typename NCT::fr commitment_index)
template <typename NCT> typename NCT::fr compute_commitment_nonce(typename NCT::fr const& first_nullifier,
typename NCT::fr const& commitment_index)
{
using fr = typename NCT::fr;

Expand All @@ -99,8 +96,8 @@ typename NCT::fr compute_commitment_nonce(typename NCT::fr first_nullifier, type
return NCT::hash(inputs, aztec3::GeneratorIndex::COMMITMENT_NONCE);
}

template <typename NCT>
typename NCT::fr silo_commitment(typename NCT::address contract_address, typename NCT::fr inner_commitment)
template <typename NCT> typename NCT::fr silo_commitment(typename NCT::address const& contract_address,
typename NCT::fr const& inner_commitment)
{
using fr = typename NCT::fr;

Expand All @@ -126,7 +123,7 @@ typename NCT::fr compute_unique_commitment(typename NCT::fr nonce, typename NCT:
}

template <typename NCT>
typename NCT::fr silo_nullifier(typename NCT::address contract_address, typename NCT::fr nullifier)
typename NCT::fr silo_nullifier(typename NCT::address const& contract_address, typename NCT::fr nullifier)
{
using fr = typename NCT::fr;

Expand All @@ -140,12 +137,12 @@ typename NCT::fr silo_nullifier(typename NCT::address contract_address, typename
}


template <typename NCT> typename NCT::fr compute_block_hash(typename NCT::fr globals_hash,
typename NCT::fr private_data_tree_root,
typename NCT::fr nullifier_tree_root,
typename NCT::fr contract_tree_root,
typename NCT::fr l1_to_l2_data_tree_root,
typename NCT::fr public_data_tree_root)
template <typename NCT> typename NCT::fr compute_block_hash(typename NCT::fr const& globals_hash,
typename NCT::fr const& private_data_tree_root,
typename NCT::fr const& nullifier_tree_root,
typename NCT::fr const& contract_tree_root,
typename NCT::fr const& l1_to_l2_data_tree_root,
typename NCT::fr const& public_data_tree_root)
{
using fr = typename NCT::fr;

Expand All @@ -157,12 +154,13 @@ template <typename NCT> typename NCT::fr compute_block_hash(typename NCT::fr glo
return NCT::compress(inputs, aztec3::GeneratorIndex::BLOCK_HASH);
}

template <typename NCT> typename NCT::fr compute_block_hash_with_globals(typename abis::GlobalVariables<NCT> globals,
typename NCT::fr private_data_tree_root,
typename NCT::fr nullifier_tree_root,
typename NCT::fr contract_tree_root,
typename NCT::fr l1_to_l2_data_tree_root,
typename NCT::fr public_data_tree_root)
template <typename NCT>
typename NCT::fr compute_block_hash_with_globals(abis::GlobalVariables<NCT> const& globals,
typename NCT::fr const& private_data_tree_root,
typename NCT::fr const& nullifier_tree_root,
typename NCT::fr const& contract_tree_root,
typename NCT::fr const& l1_to_l2_data_tree_root,
typename NCT::fr const& public_data_tree_root)
{
using fr = typename NCT::fr;

Expand All @@ -174,7 +172,7 @@ template <typename NCT> typename NCT::fr compute_block_hash_with_globals(typenam
return NCT::compress(inputs, aztec3::GeneratorIndex::BLOCK_HASH);
}

template <typename NCT> typename NCT::fr compute_globals_hash(typename abis::GlobalVariables<NCT> globals)
template <typename NCT> typename NCT::fr compute_globals_hash(abis::GlobalVariables<NCT> const& globals)
{
return globals.hash();
}
Expand Down Expand Up @@ -400,11 +398,11 @@ template <typename NCT> typename NCT::fr compute_public_data_tree_index(typename
return NCT::compress({ contract_address, storage_slot }, GeneratorIndex::PUBLIC_LEAF_INDEX);
}

template <typename NCT> typename NCT::fr compute_l2_to_l1_hash(typename NCT::address contract_address,
typename NCT::fr rollup_version_id,
typename NCT::fr portal_contract_address,
typename NCT::fr chain_id,
typename NCT::fr content)
template <typename NCT> typename NCT::fr compute_l2_to_l1_hash(typename NCT::address const& contract_address,
typename NCT::fr const& rollup_version_id,
typename NCT::fr const& portal_contract_address,
typename NCT::fr const& chain_id,
typename NCT::fr const& content)
{
using fr = typename NCT::fr;

Expand Down Expand Up @@ -435,7 +433,7 @@ template <typename NCT> typename NCT::fr compute_l2_to_l1_hash(typename NCT::add
* @return Resulting sha256 hash stored in 2 fields.
*/
template <typename NCT> std::array<typename NCT::fr, NUM_FIELDS_PER_SHA256> accumulate_sha256(
std::array<typename NCT::fr, NUM_FIELDS_PER_SHA256 * 2> hashes)
std::array<typename NCT::fr, NUM_FIELDS_PER_SHA256 * 2> const& hashes)
{
using fr = typename NCT::fr;

Expand Down