From c4600c490563361e6ffcc26a55ead8a797db529e Mon Sep 17 00:00:00 2001 From: Tom French Date: Mon, 2 Sep 2024 18:40:15 +0100 Subject: [PATCH 1/3] chore: delete more unwanted stuff from noir code --- .../aztec-nr/aztec/src/test/mocks/mock_note.nr | 4 ++-- .../src/dapp_payload.nr | 2 +- .../contracts/avm_test_contract/src/main.nr | 6 +++--- .../contracts/card_game_contract/src/cards.nr | 6 +++--- .../src/main.nr | 18 +++++++----------- .../ecdsa_k_account_contract/src/main.nr | 4 +--- .../ecdsa_r_account_contract/src/main.nr | 5 +---- .../contracts/fee_juice_contract/src/lib.nr | 2 +- .../schnorr_account_contract/src/main.nr | 4 ++-- .../src/main.nr | 2 +- .../contracts/token_contract/src/main.nr | 8 ++++---- .../crates/blob/src/main.nr | 2 +- .../parity-lib/src/utils/sha256_merkle_tree.nr | 4 ++-- .../rollup-lib/src/base/base_rollup_inputs.nr | 8 ++++---- 14 files changed, 33 insertions(+), 42 deletions(-) diff --git a/noir-projects/aztec-nr/aztec/src/test/mocks/mock_note.nr b/noir-projects/aztec-nr/aztec/src/test/mocks/mock_note.nr index c23a3ac80cbc..83654a8352c7 100644 --- a/noir-projects/aztec-nr/aztec/src/test/mocks/mock_note.nr +++ b/noir-projects/aztec-nr/aztec/src/test/mocks/mock_note.nr @@ -47,7 +47,7 @@ impl NoteInterface for MockNote { 4135 } - fn compute_nullifier(self, context: &mut PrivateContext, note_hash_for_nullify: Field) -> Field { + fn compute_nullifier(_self: Self, _context: &mut PrivateContext, note_hash_for_nullify: Field) -> Field { // We don't use any kind of secret here since this is only a mock note and having it here would make tests // more cumbersome poseidon2_hash_with_separator([note_hash_for_nullify], GENERATOR_INDEX__NOTE_NULLIFIER as Field) @@ -85,7 +85,7 @@ impl NoteInterface for MockNote { impl Eq for MockNote { fn eq(self, other: Self) -> bool { - (self.header == other.header) & + (self.header == other.header) & (self.value == other.value) } } diff --git a/noir-projects/noir-contracts/contracts/app_subscription_contract/src/dapp_payload.nr b/noir-projects/noir-contracts/contracts/app_subscription_contract/src/dapp_payload.nr index 538ea7df988d..674c0699ffb6 100644 --- a/noir-projects/noir-contracts/contracts/app_subscription_contract/src/dapp_payload.nr +++ b/noir-projects/noir-contracts/contracts/app_subscription_contract/src/dapp_payload.nr @@ -4,7 +4,7 @@ use dep::aztec::protocol_types::{ traits::{Hash, Serialize} }; -use dep::authwit::entrypoint::function_call::{FunctionCall, FUNCTION_CALL_SIZE_IN_BYTES}; +use dep::authwit::entrypoint::function_call::FunctionCall; global DAPP_MAX_CALLS: u64 = 1; // FUNCTION_CALL_SIZE * DAPP_MAX_CALLS + 1 diff --git a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr index 235d83bfddbc..9d06db785bb3 100644 --- a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr @@ -26,9 +26,9 @@ contract AvmTest { // Libs use std::embedded_curve_ops::{multi_scalar_mul, EmbeddedCurvePoint}; use dep::aztec::protocol_types::constants::CONTRACT_INSTANCE_LENGTH; - use dep::aztec::prelude::{Map, Deserialize}; + use dep::aztec::prelude::Map; use dep::aztec::state_vars::PublicMutable; - use dep::aztec::protocol_types::{address::{AztecAddress, EthAddress}, constants::L1_TO_L2_MESSAGE_LENGTH, point::Point, scalar::Scalar}; + use dep::aztec::protocol_types::{address::{AztecAddress, EthAddress}, point::Point, scalar::Scalar}; use dep::aztec::oracle::get_contract_instance::{get_contract_instance_avm, get_contract_instance_internal_avm}; use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, storage::map::derive_storage_slot_in_map}; use dep::aztec::context::gas::GasOpts; @@ -160,7 +160,7 @@ contract AvmTest { } /************************************************************************ - * Misc + * Misc ************************************************************************/ #[aztec(public)] diff --git a/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr b/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr index 69e87d9cdafd..7765cc7789e5 100644 --- a/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr +++ b/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr @@ -1,13 +1,13 @@ -use dep::aztec::prelude::{AztecAddress, FunctionSelector, PrivateContext, NoteHeader, NoteGetterOptions, NoteViewerOptions}; +use dep::aztec::prelude::{AztecAddress, PrivateContext, NoteGetterOptions, NoteViewerOptions}; use dep::aztec::{ context::UnconstrainedContext, protocol_types::{traits::{ToField, Serialize, FromField}, constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL}, encrypted_logs::encrypted_note_emission::encode_and_encrypt_note_with_keys, - keys::getters::get_current_public_keys, note::note_getter::view_notes, state_vars::PrivateSet, + keys::getters::get_current_public_keys, state_vars::PrivateSet, note::constants::MAX_NOTES_PER_PAGE }; -use dep::value_note::{value_note::{ValueNote, VALUE_NOTE_LEN}}; +use dep::value_note::value_note::ValueNote; struct Card { // We use u32s since u16s are unsupported diff --git a/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr b/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr index 27e7c717bdcc..6f340a009b91 100644 --- a/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr @@ -1,23 +1,19 @@ contract ContractInstanceDeployer { use dep::aztec::protocol_types::{ - address::{AztecAddress, EthAddress, PublicKeysHash, PartialAddress}, - contract_class_id::ContractClassId, constants::DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE, - traits::Serialize, abis::log_hash::LogHash - }; - use dep::aztec::{ - context::PrivateContext, hash::compute_unencrypted_log_hash, - oracle::logs::emit_unencrypted_log_private_internal + address::{AztecAddress, PublicKeysHash, PartialAddress}, contract_class_id::ContractClassId, + constants::DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE, abis::log_hash::LogHash }; + use dep::aztec::{hash::compute_unencrypted_log_hash, oracle::logs::emit_unencrypted_log_private_internal}; #[aztec(event)] struct ContractInstanceDeployed { DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE: Field, address: AztecAddress, version: u8, - salt: Field, - contract_class_id: ContractClassId, - initialization_hash: Field, - public_keys_hash: PublicKeysHash, + salt: Field, + contract_class_id: ContractClassId, + initialization_hash: Field, + public_keys_hash: PublicKeysHash, deployer: AztecAddress, } diff --git a/noir-projects/noir-contracts/contracts/ecdsa_k_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/ecdsa_k_account_contract/src/main.nr index b125e6bbb150..517586c71642 100644 --- a/noir-projects/noir-contracts/contracts/ecdsa_k_account_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/ecdsa_k_account_contract/src/main.nr @@ -1,14 +1,12 @@ // Account contract that uses ECDSA signatures for authentication on the same curve as Ethereum. // The signing key is stored in an immutable private note and should be different from the signing key. contract EcdsaKAccount { - use dep::aztec::prelude::{AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, PrivateContext, PrivateImmutable}; + use dep::aztec::prelude::{PrivateContext, PrivateImmutable}; use dep::aztec::{ encrypted_logs::encrypted_note_emission::encode_and_encrypt_note_with_keys, keys::getters::get_current_public_keys }; - use dep::aztec::protocol_types::abis::call_context::CallContext; - use dep::std; use dep::authwit::{ entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions, diff --git a/noir-projects/noir-contracts/contracts/ecdsa_r_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/ecdsa_r_account_contract/src/main.nr index 600184a9904d..535bc6219a2d 100644 --- a/noir-projects/noir-contracts/contracts/ecdsa_r_account_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/ecdsa_r_account_contract/src/main.nr @@ -1,14 +1,11 @@ // Account contract that uses ECDSA signatures for authentication on random version of the p256 curve (to use with touchID). contract EcdsaRAccount { - use dep::aztec::prelude::{AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, PrivateContext, PrivateImmutable}; + use dep::aztec::prelude::{PrivateContext, PrivateImmutable}; use dep::aztec::{ encrypted_logs::encrypted_note_emission::encode_and_encrypt_note_with_keys, keys::getters::get_current_public_keys }; - use dep::aztec::protocol_types::abis::call_context::CallContext; - use dep::std; - use dep::authwit::{ entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions, auth_witness::get_auth_witness diff --git a/noir-projects/noir-contracts/contracts/fee_juice_contract/src/lib.nr b/noir-projects/noir-contracts/contracts/fee_juice_contract/src/lib.nr index d8b059b4755c..64142e283007 100644 --- a/noir-projects/noir-contracts/contracts/fee_juice_contract/src/lib.nr +++ b/noir-projects/noir-contracts/contracts/fee_juice_contract/src/lib.nr @@ -1,4 +1,4 @@ -use dep::aztec::prelude::{AztecAddress, EthAddress}; +use dep::aztec::prelude::AztecAddress; use dep::aztec::context::PublicContext; use dep::aztec::protocol_types::hash::sha256_to_field; diff --git a/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr index 6535db06dc8f..7c9751f842d5 100644 --- a/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr @@ -5,7 +5,7 @@ mod public_key_note; contract SchnorrAccount { use dep::std; - use dep::aztec::prelude::{AztecAddress, FunctionSelector, NoteHeader, PrivateContext, PrivateImmutable}; + use dep::aztec::prelude::{AztecAddress, PrivateContext, PrivateImmutable}; use dep::aztec::encrypted_logs::encrypted_note_emission::encode_and_encrypt_note_with_keys; use dep::authwit::{ entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions, @@ -14,7 +14,7 @@ contract SchnorrAccount { use dep::aztec::{hash::compute_siloed_nullifier, keys::getters::get_current_public_keys}; use dep::aztec::oracle::get_nullifier_membership_witness::get_low_nullifier_membership_witness; - use crate::public_key_note::{PublicKeyNote, PUBLIC_KEY_NOTE_LEN}; + use crate::public_key_note::PublicKeyNote; #[aztec(storage)] struct Storage { diff --git a/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr index 5268b67fea6f..e2f5b43a2b60 100644 --- a/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr @@ -2,7 +2,7 @@ // Account contract that uses Schnorr signatures for authentication using a hardcoded public key. contract SchnorrHardcodedAccount { use dep::std; - use dep::aztec::prelude::{AztecAddress, FunctionSelector, PrivateContext}; + use dep::aztec::prelude::PrivateContext; use dep::authwit::{ entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions, diff --git a/noir-projects/noir-contracts/contracts/token_contract/src/main.nr b/noir-projects/noir-contracts/contracts/token_contract/src/main.nr index 2d058ed5c79f..cfed8a531895 100644 --- a/noir-projects/noir-contracts/contracts/token_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/token_contract/src/main.nr @@ -19,11 +19,11 @@ contract Token { context::{PrivateContext, PrivateCallInterface}, hash::compute_secret_hash, prelude::{ NoteGetterOptions, Map, PublicMutable, SharedImmutable, PrivateSet, AztecAddress, - FunctionSelector, NoteHeader, Point + FunctionSelector, NoteHeader }, encrypted_logs::{ encrypted_note_emission::{encode_and_encrypt_note_with_keys, encode_and_encrypt_note_with_keys_unconstrained}, - encrypted_event_emission::{encode_and_encrypt_event, encode_and_encrypt_event_with_keys_unconstrained} + encrypted_event_emission::encode_and_encrypt_event_with_keys_unconstrained }, keys::getters::get_current_public_keys }; @@ -33,8 +33,8 @@ contract Token { // docs:end:import_authwit use crate::types::{ - transparent_note::TransparentNote, - token_note::{TokenNote, TOKEN_NOTE_LEN, TokenNoteHidingPoint}, balance_set::BalanceSet + transparent_note::TransparentNote, token_note::{TokenNote, TokenNoteHidingPoint}, + balance_set::BalanceSet }; // docs:end::imports diff --git a/noir-projects/noir-protocol-circuits/crates/blob/src/main.nr b/noir-projects/noir-protocol-circuits/crates/blob/src/main.nr index 316db6a464a3..ac1f57510b47 100644 --- a/noir-projects/noir-protocol-circuits/crates/blob/src/main.nr +++ b/noir-projects/noir-protocol-circuits/crates/blob/src/main.nr @@ -18,7 +18,7 @@ mod negative_roots; use crate::{ config::{ - BigNum, BLS12_381_Fr_Params, F, FIELDS_PER_BLOB, LOG_FIELDS_PER_BLOB, NOIR_FIELDS_PER_BLOB, + BigNum, F, FIELDS_PER_BLOB, LOG_FIELDS_PER_BLOB, NOIR_FIELDS_PER_BLOB, FIELDS_CARRYING_AN_EXTRA_BIT_PER_BLOB, D, D_INV, ROOTS }, negative_roots::NEGATIVE_ROOTS diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils/sha256_merkle_tree.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils/sha256_merkle_tree.nr index 7a96e7c5d108..318cf1c9511a 100644 --- a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils/sha256_merkle_tree.nr +++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils/sha256_merkle_tree.nr @@ -4,12 +4,12 @@ use dep::types::{hash::accumulate_sha256}; // hash functions. // TODO(Miranda): This is an interim version with 1 field sha256 - ideally we remove this and use accumulate_sha256 inside // the general MT -struct Sha256MerkleTree { +struct Sha256MerkleTree { leaves: [Field; N], nodes: [Field; N], } -impl Sha256MerkleTree { +impl Sha256MerkleTree { pub fn new(leaves: [Field; N]) -> Self { let mut nodes = [0; N]; diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/base_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/base_rollup_inputs.nr index 0f30eabfed14..a9b8418ec095 100644 --- a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/base_rollup_inputs.nr +++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/base_rollup_inputs.nr @@ -210,7 +210,7 @@ impl BaseRollupInputs { ) } - fn create_nullifier_subtree(leaves: [NullifierLeafPreimage; N]) -> Field { + fn create_nullifier_subtree(leaves: [NullifierLeafPreimage; N]) -> Field { calculate_subtree_root(leaves.map(|leaf:NullifierLeafPreimage| leaf.hash())) } @@ -506,7 +506,7 @@ mod tests { global MAX_nullifiers_PER_TEST = 4; global MAX_PUBLIC_DATA_READS_PER_TEST = 2; - fn update_public_data_tree( + fn update_public_data_tree( public_data_tree: &mut NonEmptyMerkleTree, kernel_data: &mut KernelData, snapshot: AppendOnlyTreeSnapshot, @@ -615,7 +615,7 @@ mod tests { fee_payer_fee_juice_balance_pre_existing_public_data_index: Option } - fn test_compute_empty_root(size: [Field; N]) -> Field { + fn test_compute_empty_root(size: [Field; N]) -> Field { compute_zero_hashes(size)[N - 1] } @@ -653,7 +653,7 @@ mod tests { ) } - fn extract_subtree_sibling_path( + fn extract_subtree_sibling_path( path: [Field; FULL_HEIGHT], mut sibling_path: [Field; SIBLING_PATH_LENGTH] ) -> [Field; SIBLING_PATH_LENGTH] { From 47ed48e4b98735c516c0b74fa7db33c643dc9cfc Mon Sep 17 00:00:00 2001 From: Tom French Date: Mon, 2 Sep 2024 18:53:05 +0100 Subject: [PATCH 2/3] . --- .../noir-contracts/contracts/card_game_contract/src/cards.nr | 3 +-- .../contracts/ecdsa_k_account_contract/src/main.nr | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr b/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr index 7765cc7789e5..75ed3d803983 100644 --- a/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr +++ b/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr @@ -4,8 +4,7 @@ use dep::aztec::{ context::UnconstrainedContext, protocol_types::{traits::{ToField, Serialize, FromField}, constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL}, encrypted_logs::encrypted_note_emission::encode_and_encrypt_note_with_keys, - keys::getters::get_current_public_keys, state_vars::PrivateSet, - note::constants::MAX_NOTES_PER_PAGE + keys::getters::get_current_public_keys, state_vars::PrivateSet, note::constants::MAX_NOTES_PER_PAGE }; use dep::value_note::value_note::ValueNote; diff --git a/noir-projects/noir-contracts/contracts/ecdsa_k_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/ecdsa_k_account_contract/src/main.nr index 517586c71642..ef28824bf08a 100644 --- a/noir-projects/noir-contracts/contracts/ecdsa_k_account_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/ecdsa_k_account_contract/src/main.nr @@ -7,7 +7,6 @@ contract EcdsaKAccount { keys::getters::get_current_public_keys }; - use dep::authwit::{ entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions, auth_witness::get_auth_witness From 49d78ecac44cda594511da66cf4a05c542e798ba Mon Sep 17 00:00:00 2001 From: Tom French Date: Mon, 2 Sep 2024 21:58:10 +0100 Subject: [PATCH 3/3] . --- .../noir-contracts/contracts/parent_contract/src/main.nr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr b/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr index fb6181311417..b8638f670c92 100644 --- a/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr @@ -1,7 +1,7 @@ // A contract used along with `Child` contract to test nested calls. contract Parent { - use dep::aztec::prelude::{AztecAddress, FunctionSelector, Deserialize}; + use dep::aztec::prelude::{AztecAddress, FunctionSelector}; use dep::aztec::context::gas::GasOpts; // Private function to call another private function in the target_contract using the provided selector #[aztec(private)] @@ -56,7 +56,7 @@ contract Parent { context.call_public_function(target_contract, target_selector, [target_value]); } - // Private function that enqueues two calls to a child contract: + // Private function that enqueues two calls to a child contract: // - one through a nested call to enqueue_call_to_child with value 10, // - followed by one issued directly from this function with value 20. #[aztec(private)] @@ -73,7 +73,7 @@ contract Parent { context.call_public_function(target_contract, target_selector, [20]); } - // Private function that enqueues two calls to a child contract: + // Private function that enqueues two calls to a child contract: // - one issued directly from this function with value 20, // - followed by one through a nested call to enqueue_call_to_child with value 10. #[aztec(private)]