Skip to content

chore: use external keccak256 lib #11954

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
TomAFrench merged 2 commits into from
Feb 13, 2025
Merged

chore: use external keccak256 lib #11954

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
c3440eb
chore: use external keccak256 lib
TomAFrench Feb 12, 2025
65b6a30
Merge branch 'master' into tf/use-external-keccak256
TomAFrench Feb 13, 2025
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
1 change: 1 addition & 0 deletions noir-projects/noir-contracts/contracts/avm_gadgets_test_contract/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ type = "contract"

[dependencies]
aztec = { path = "../../../aztec-nr/aztec" }
keccak256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/keccak256" }
sha256 = { tag = "v0.1.2", git = "https://github.com/noir-lang/sha256" }
2 changes: 1 addition & 1 deletion noir-projects/noir-contracts/contracts/avm_gadgets_test_contract/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ contract AvmGadgetsTest {

#[public]
fn keccak_hash(data: [u8; 10]) -> [u8; 32] {
std::hash::keccak256(data, data.len() as u32)
keccak256::keccak256(data, data.len())
}

#[public]
Expand Down
1 change: 1 addition & 0 deletions noir-projects/noir-contracts/contracts/avm_test_contract/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ type = "contract"
aztec = { path = "../../../aztec-nr/aztec" }
compressed_string = { path = "../../../aztec-nr/compressed-string" }
sha256 = { tag = "v0.1.2", git = "https://github.com/noir-lang/sha256" }
keccak256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/keccak256" }
2 changes: 1 addition & 1 deletion noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ pub contract AvmTest {
dep::aztec::oracle::debug_log::debug_log("read_storage_map");
let _ = read_storage_map(context.this_address());
dep::aztec::oracle::debug_log::debug_log("keccak_hash");
let _ = std::hash::keccak256(args_u8, args_u8.len());
let _ = keccak256::keccak256(args_u8, args_u8.len());
dep::aztec::oracle::debug_log::debug_log("sha256_hash");
let _ = sha256::sha256_var(args_u8, args_u8.len() as u64);
dep::aztec::oracle::debug_log::debug_log("poseidon2_hash");
Expand Down
1 change: 1 addition & 0 deletions noir-projects/noir-contracts/contracts/fee_juice_contract/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ aztec = { path = "../../../aztec-nr/aztec" }
authwit = { path = "../../../aztec-nr/authwit" }
deployer = { path = "../contract_instance_deployer_contract" }
registerer = { path = "../contract_class_registerer_contract" }
keccak256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/keccak256" }
2 changes: 1 addition & 1 deletion noir-projects/noir-contracts/contracts/fee_juice_contract/src/lib.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub fn get_bridge_gas_msg_hash(owner: AztecAddress, amount: U128) -> Field {

// The purpose of including the following selector is to make the message unique to that specific call. Note that
// it has nothing to do with calling the function.
let selector = comptime { std::hash::keccak256("claim(bytes32,uint256)".as_bytes(), 22) };
let selector = comptime { keccak256::keccak256("claim(bytes32,uint256)".as_bytes(), 22) };

for i in 0..4 {
hash_bytes[i] = selector[i];
Expand Down
1 change: 1 addition & 0 deletions noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ type = "lib"

[dependencies]
aztec = { path = "../../../aztec-nr/aztec" }
keccak256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/keccak256" }
6 changes: 3 additions & 3 deletions noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub fn get_mint_to_public_content_hash(owner: AztecAddress, amount: U128) -> Fie

// The purpose of including the following selector is to make the message unique to that specific call. Note that
// it has nothing to do with calling the function.
let selector = comptime { std::hash::keccak256("mint_to_public(bytes32,uint256)".as_bytes(), 31) };
let selector = comptime { keccak256::keccak256("mint_to_public(bytes32,uint256)".as_bytes(), 31) };

for i in 0..4 {
hash_bytes[i] = selector[i];
Expand All @@ -36,7 +36,7 @@ pub fn get_mint_to_private_content_hash(amount: U128) -> Field {

// The purpose of including the following selector is to make the message unique to that specific call. Note that
// it has nothing to do with calling the function.
let selector = comptime { std::hash::keccak256("mint_to_private(uint256)".as_bytes(), 24) };
let selector = comptime { keccak256::keccak256("mint_to_private(uint256)".as_bytes(), 24) };

for i in 0..4 {
hash_bytes[i] = selector[i];
Expand Down Expand Up @@ -65,7 +65,7 @@ pub fn get_withdraw_content_hash(recipient: EthAddress, amount: U128, caller_on_

// The purpose of including the following selector is to make the message unique to that specific call. Note that
// it has nothing to do with calling the function.
let selector = comptime { std::hash::keccak256("withdraw(address,uint256,address)".as_bytes(), 33) };
let selector = comptime { keccak256::keccak256("withdraw(address,uint256,address)".as_bytes(), 33) };

for i in 0..4 {
hash_bytes[i] = selector[i];
Expand Down
3 changes: 2 additions & 1 deletion noir-projects/noir-contracts/contracts/uniswap_contract/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ type = "contract"
aztec = { path = "../../../aztec-nr/aztec" }
authwit = { path = "../../../aztec-nr/authwit" }
token = { path = "../token_contract" }
token_bridge = { path = "../token_bridge_contract" }
token_bridge = { path = "../token_bridge_contract" }
keccak256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/keccak256" }
4 changes: 2 additions & 2 deletions noir-projects/noir-contracts/contracts/uniswap_contract/src/util.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub fn compute_swap_public_content_hash(
// The purpose of including the following selector is to make the message unique to that specific call. Note that
// it has nothing to do with calling the function.
let selector = comptime {
std::hash::keccak256(
keccak256::keccak256(
"swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,address)".as_bytes(),
75,
)
Expand Down Expand Up @@ -84,7 +84,7 @@ pub fn compute_swap_private_content_hash(
// The purpose of including the following selector is to make the message unique to that specific call. Note that
// it has nothing to do with calling the function.
let selector = comptime {
std::hash::keccak256(
keccak256::keccak256(
"swap_private(address,uint256,uint24,address,uint256,bytes32,address)".as_bytes(),
68,
)
Expand Down