Skip to content

fix: naming inconsistency in private kernel #3384

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
benesjan merged 2 commits into from
Nov 21, 2023
Merged

fix: naming inconsistency in private kernel #3384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a598bbf
naming inconsistency fix
benesjan Nov 21, 2023
5dd988f
Merge branch 'master' into janb/naming-inconsistency-fix
benesjan Nov 21, 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
12 changes: 6 additions & 6 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 @@ -130,14 +130,14 @@ template <typename NCT> typename NCT::fr compute_block_hash(typename NCT::fr con
typename NCT::fr const& note_hash_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& l1_to_l2_messages_tree_root,
typename NCT::fr const& public_data_tree_root)
{
using fr = typename NCT::fr;

std::vector<fr> const inputs = {
globals_hash, note_hash_tree_root, nullifier_tree_root,
contract_tree_root, l1_to_l2_data_tree_root, public_data_tree_root,
globals_hash, note_hash_tree_root, nullifier_tree_root,
contract_tree_root, l1_to_l2_messages_tree_root, public_data_tree_root,
};

return NCT::hash(inputs, aztec3::GeneratorIndex::BLOCK_HASH);
Expand All @@ -148,14 +148,14 @@ typename NCT::fr compute_block_hash_with_globals(abis::GlobalVariables<NCT> cons
typename NCT::fr const& note_hash_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& l1_to_l2_messages_tree_root,
typename NCT::fr const& public_data_tree_root)
{
using fr = typename NCT::fr;

std::vector<fr> const inputs = {
globals.hash(), note_hash_tree_root, nullifier_tree_root,
contract_tree_root, l1_to_l2_data_tree_root, public_data_tree_root,
globals.hash(), note_hash_tree_root, nullifier_tree_root,
contract_tree_root, l1_to_l2_messages_tree_root, public_data_tree_root,
};

return NCT::hash(inputs, aztec3::GeneratorIndex::BLOCK_HASH);
Expand Down
4 changes: 2 additions & 2 deletions circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,14 @@ void perform_historical_blocks_tree_membership_checks(DummyBuilder& builder, Bas
auto note_hash_tree_root = historic_block.note_hash_tree_root;
auto nullifier_tree_root = historic_block.nullifier_tree_root;
auto contract_tree_root = historic_block.contract_tree_root;
auto l1_to_l2_data_tree_root = historic_block.l1_to_l2_messages_tree_root;
auto l1_to_l2_messages_tree_root = historic_block.l1_to_l2_messages_tree_root;
auto public_data_tree_root = historic_block.public_data_tree_root;

auto previous_block_hash = compute_block_hash<NT>(historic_block.global_variables_hash,
note_hash_tree_root,
nullifier_tree_root,
contract_tree_root,
l1_to_l2_data_tree_root,
l1_to_l2_messages_tree_root,
public_data_tree_root);

abis::MembershipWitness<NT, HISTORIC_BLOCKS_TREE_HEIGHT> const historic_root_witness =
Expand Down
4 changes: 2 additions & 2 deletions yarn-project/noir-protocol-circuits/src/crates/rollup-lib/src/hash.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ pub fn compute_block_hash_with_globals(
note_hash_tree_root : Field,
nullifier_tree_root : Field,
contract_tree_root : Field,
l1_to_l2_data_tree_root : Field,
l1_to_l2_messages_tree_root : Field,
public_data_tree_root : Field) -> Field {

let inputs = [globals.hash(), note_hash_tree_root, nullifier_tree_root, contract_tree_root, l1_to_l2_data_tree_root, public_data_tree_root];
let inputs = [globals.hash(), note_hash_tree_root, nullifier_tree_root, contract_tree_root, l1_to_l2_messages_tree_root, public_data_tree_root];

dep::std::hash::pedersen_hash_with_separator(inputs, constants_gen::GENERATOR_INDEX__BLOCK_HASH)
}
2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/crates/types/src/abis/historical_block_data.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ impl HistoricalBlockData {
self.block.note_hash_tree_root,
self.block.nullifier_tree_root,
self.block.contract_tree_root,
self.block.l1_to_l2_data_tree_root,
self.block.l1_to_l2_messages_tree_root,
self.blocks_tree_root,
self.block.public_data_tree_root,
self.block.global_variables_hash
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/noir-protocol-circuits/src/crates/types/src/block.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ struct Block {
note_hash_tree_root : Field,
nullifier_tree_root : Field,
contract_tree_root : Field,
l1_to_l2_data_tree_root : Field,
l1_to_l2_messages_tree_root : Field,

// Public data
public_data_tree_root : Field,
Expand All @@ -19,7 +19,7 @@ impl Block {
assert(self.note_hash_tree_root == 0);
assert(self.nullifier_tree_root == 0);
assert(self.contract_tree_root == 0);
assert(self.l1_to_l2_data_tree_root == 0);
assert(self.l1_to_l2_messages_tree_root == 0);
assert(self.public_data_tree_root == 0);
}

Expand All @@ -29,7 +29,7 @@ impl Block {
self.note_hash_tree_root,
self.nullifier_tree_root,
self.contract_tree_root,
self.l1_to_l2_data_tree_root,
self.l1_to_l2_messages_tree_root,
self.public_data_tree_root,
], constants_gen::GENERATOR_INDEX__BLOCK_HASH)
}
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ global HISTORICAL_BLOCK_DATA = HistoricalBlockData {
note_hash_tree_root: fixtures::note_hash_tree::ROOT,
nullifier_tree_root: 0,
contract_tree_root: fixtures::contract_tree::ROOT,
l1_to_l2_data_tree_root: 0,
l1_to_l2_messages_tree_root: 0,
public_data_tree_root: 0,
global_variables_hash: 0,
},
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/private_kernel_init.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/private_kernel_init_simulated.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/private_kernel_inner.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/private_kernel_inner_simulated.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/private_kernel_ordering.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/private_kernel_ordering_simulated.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/public_kernel_private_previous.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/public_kernel_private_previous_simulated.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/public_kernel_public_previous.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/public_kernel_public_previous_simulated.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/target/rollup_base.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions yarn-project/noir-protocol-circuits/src/type_conversion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ export function mapHistoricalBlockDataToNoir(historicalBlockData: HistoricBlockD
note_hash_tree_root: mapFieldToNoir(historicalBlockData.noteHashTreeRoot),
nullifier_tree_root: mapFieldToNoir(historicalBlockData.nullifierTreeRoot),
contract_tree_root: mapFieldToNoir(historicalBlockData.contractTreeRoot),
l1_to_l2_data_tree_root: mapFieldToNoir(historicalBlockData.l1ToL2MessagesTreeRoot),
l1_to_l2_messages_tree_root: mapFieldToNoir(historicalBlockData.l1ToL2MessagesTreeRoot),
public_data_tree_root: mapFieldToNoir(historicalBlockData.publicDataTreeRoot),
global_variables_hash: mapFieldToNoir(historicalBlockData.globalVariablesHash),
},
Expand All @@ -374,7 +374,7 @@ export function mapHistoricalBlockDataFromNoir(historicalBlockData: HistoricalBl
mapFieldFromNoir(historicalBlockData.block.note_hash_tree_root),
mapFieldFromNoir(historicalBlockData.block.nullifier_tree_root),
mapFieldFromNoir(historicalBlockData.block.contract_tree_root),
mapFieldFromNoir(historicalBlockData.block.l1_to_l2_data_tree_root),
mapFieldFromNoir(historicalBlockData.block.l1_to_l2_messages_tree_root),
mapFieldFromNoir(historicalBlockData.blocks_tree_root),
mapFieldFromNoir(historicalBlockData.private_kernel_vk_tree_root),
mapFieldFromNoir(historicalBlockData.block.public_data_tree_root),
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export interface Block {
note_hash_tree_root: Field;
nullifier_tree_root: Field;
contract_tree_root: Field;
l1_to_l2_data_tree_root: Field;
l1_to_l2_messages_tree_root: Field;
public_data_tree_root: Field;
global_variables_hash: Field;
}
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export interface Block {
note_hash_tree_root: Field;
nullifier_tree_root: Field;
contract_tree_root: Field;
l1_to_l2_data_tree_root: Field;
l1_to_l2_messages_tree_root: Field;
public_data_tree_root: Field;
global_variables_hash: Field;
}
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export interface Block {
note_hash_tree_root: Field;
nullifier_tree_root: Field;
contract_tree_root: Field;
l1_to_l2_data_tree_root: Field;
l1_to_l2_messages_tree_root: Field;
public_data_tree_root: Field;
global_variables_hash: Field;
}
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export interface Block {
note_hash_tree_root: Field;
nullifier_tree_root: Field;
contract_tree_root: Field;
l1_to_l2_data_tree_root: Field;
l1_to_l2_messages_tree_root: Field;
public_data_tree_root: Field;
global_variables_hash: Field;
}
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export interface Block {
note_hash_tree_root: Field;
nullifier_tree_root: Field;
contract_tree_root: Field;
l1_to_l2_data_tree_root: Field;
l1_to_l2_messages_tree_root: Field;
public_data_tree_root: Field;
global_variables_hash: Field;
}
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export interface Block {
note_hash_tree_root: Field;
nullifier_tree_root: Field;
contract_tree_root: Field;
l1_to_l2_data_tree_root: Field;
l1_to_l2_messages_tree_root: Field;
public_data_tree_root: Field;
global_variables_hash: Field;
}
Expand Down