Skip to content

fix: update function selector to be 4 bytes #293

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
PhilWindle merged 11 commits into from
Apr 19, 2023
Merged

fix: update function selector to be 4 bytes #293

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bbb6931
fix: update function selector to be 4 bytes
Apr 18, 2023
eb52495
fix: update snapshot
Apr 18, 2023
9a5076d
Merge branch 'master' into md/fix-func-selector
Apr 18, 2023
a1c6ca0
use LeafPreimage class instead of Buffer
spypsy Apr 18, 2023
4f55439
use FunctionLeafPreimage class in tests + verifyBufferSize as static fn
spypsy Apr 18, 2023
033a416
update snapshot for updated cpp
spypsy Apr 18, 2023
0589136
Merge branch 'master' into md/fix-func-selector
spypsy Apr 18, 2023
6daf833
clean: remove stale comment
Apr 19, 2023
55e7ace
fix: remove verify buffer bytes in favour of check
Apr 19, 2023
c3315d3
refactor: use single method to perform length check
Apr 19, 2023
d6350a3
fix: just use fnleaf
Apr 19, 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
2 changes: 1 addition & 1 deletion circuits/cpp/src/aztec3/circuits/abis/c_bind.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ TEST(abi_tests, compute_function_leaf)
{
// Construct FunctionLeafPreimage with some randomized fields
FunctionLeafPreimage<NT> preimage = FunctionLeafPreimage<NT>{
.function_selector = NT::fr::random_element(),
.function_selector = engine.get_random_uint32(),
.is_private = static_cast<bool>(engine.get_random_uint8() & 1),
.vk_hash = NT::fr::random_element(),
.acir_hash = NT::fr::random_element(),
Expand Down
3 changes: 2 additions & 1 deletion circuits/cpp/src/aztec3/circuits/abis/function_leaf_preimage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ template <typename NCT> struct FunctionLeafPreimage {

typedef typename NCT::boolean boolean;
typedef typename NCT::fr fr;
typedef typename NCT::uint32 uint32;

fr function_selector = 0;
uint32 function_selector = 0;
boolean is_private = false;
fr vk_hash = 0;
fr acir_hash = 0;
Expand Down
2 changes: 1 addition & 1 deletion circuits/cpp/src/aztec3/circuits/hash.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ typename NCT::fr root_from_sibling_path(typename NCT::fr const& leaf,
*/
template <typename NCT>
typename NCT::fr function_tree_root_from_siblings(
typename NCT::fr const& function_selector,
typename NCT::uint32 const& function_selector,
typename NCT::boolean const& is_private,
typename NCT::fr const& vk_hash,
typename NCT::fr const& acir_hash,
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/circuits.js/src/structs/__snapshots__/function_leaf_preimage.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`basic FunctionLeafPreimage serialization serializes a trivial Function Leaf Preimage and prints it 1`] = `
"function_selector: 0x7b01000000000000000000000000000000000000000000000000000000
is_private: 0
"function_selector: 123
is_private: 1
vk_hash: 0x0
acir_hash: 0x31000000082f1200f8e21100000000000000000000
Comment thread
Maddiaa0 marked this conversation as resolved.
acir_hash: 0x0
"
`;