diff --git a/noir-projects/aztec-nr/aztec/src/context/call_interfaces.nr b/noir-projects/aztec-nr/aztec/src/context/call_interfaces.nr index a42d80c8019..0c818e3ac7b 100644 --- a/noir-projects/aztec-nr/aztec/src/context/call_interfaces.nr +++ b/noir-projects/aztec-nr/aztec/src/context/call_interfaces.nr @@ -5,7 +5,7 @@ use dep::protocol_types::{ use crate::context::{ private_context::PrivateContext, public_context::PublicContext, gas::GasOpts, - public_context::FunctionReturns, inputs::{PrivateContextInputs, PublicContextInputs} + inputs::{PrivateContextInputs, PublicContextInputs} }; use crate::oracle::arguments::pack_arguments; diff --git a/noir-projects/aztec-nr/aztec/src/context/globals/public_global_variables.nr b/noir-projects/aztec-nr/aztec/src/context/globals/public_global_variables.nr index de68887afa8..c1f2bcb8f80 100644 --- a/noir-projects/aztec-nr/aztec/src/context/globals/public_global_variables.nr +++ b/noir-projects/aztec-nr/aztec/src/context/globals/public_global_variables.nr @@ -1,2 +1,2 @@ // protocl global vars are equal to the private ones so we just re-export them here under a different name -use dep::protocol_types::abis::global_variables::GlobalVariables as PublicGlobalVariables; +pub use dep::protocol_types::abis::global_variables::GlobalVariables as PublicGlobalVariables; diff --git a/noir-projects/aztec-nr/aztec/src/context/inputs/mod.nr b/noir-projects/aztec-nr/aztec/src/context/inputs/mod.nr index 0d7c56574d5..cb2a1eba4dd 100644 --- a/noir-projects/aztec-nr/aztec/src/context/inputs/mod.nr +++ b/noir-projects/aztec-nr/aztec/src/context/inputs/mod.nr @@ -1,5 +1,5 @@ mod private_context_inputs; mod public_context_inputs; -use crate::context::inputs::private_context_inputs::PrivateContextInputs; -use crate::context::inputs::public_context_inputs::PublicContextInputs; +pub use crate::context::inputs::private_context_inputs::PrivateContextInputs; +pub use crate::context::inputs::public_context_inputs::PublicContextInputs; diff --git a/noir-projects/aztec-nr/aztec/src/context/inputs/private_context_inputs.nr b/noir-projects/aztec-nr/aztec/src/context/inputs/private_context_inputs.nr index 7187cb542fb..b40bc974314 100644 --- a/noir-projects/aztec-nr/aztec/src/context/inputs/private_context_inputs.nr +++ b/noir-projects/aztec-nr/aztec/src/context/inputs/private_context_inputs.nr @@ -1,7 +1,4 @@ -use dep::protocol_types::{ - transaction::tx_context::TxContext, abis::{call_context::CallContext, gas_settings::GasSettings}, - header::Header, traits::Empty -}; +use dep::protocol_types::{transaction::tx_context::TxContext, abis::{call_context::CallContext}, header::Header, traits::Empty}; // PrivateContextInputs are expected to be provided to each private function // docs:start:private-context-inputs diff --git a/noir-projects/aztec-nr/aztec/src/context/private_context.nr b/noir-projects/aztec-nr/aztec/src/context/private_context.nr index 8ea2ddc9014..bb415cacd0d 100644 --- a/noir-projects/aztec-nr/aztec/src/context/private_context.nr +++ b/noir-projects/aztec-nr/aztec/src/context/private_context.nr @@ -18,7 +18,7 @@ use dep::protocol_types::{ max_block_number::MaxBlockNumber, validation_requests::{KeyValidationRequest, KeyValidationRequestAndGenerator}, private_call_request::PrivateCallRequest, private_circuit_public_inputs::PrivateCircuitPublicInputs, - public_call_request::PublicCallRequest, public_call_stack_item::PublicCallStackItem, + public_call_request::PublicCallRequest, public_call_stack_item_compressed::PublicCallStackItemCompressed, read_request::ReadRequest, note_hash::NoteHash, nullifier::Nullifier, log_hash::{LogHash, NoteLogHash, EncryptedLogHash} }, diff --git a/noir-projects/aztec-nr/aztec/src/context/unconstrained_context.nr b/noir-projects/aztec-nr/aztec/src/context/unconstrained_context.nr index c67cd74a3c3..8ce6591dd39 100644 --- a/noir-projects/aztec-nr/aztec/src/context/unconstrained_context.nr +++ b/noir-projects/aztec-nr/aztec/src/context/unconstrained_context.nr @@ -1,8 +1,5 @@ use dep::protocol_types::{address::AztecAddress, traits::Deserialize}; -use crate::oracle::{ - execution::{get_chain_id, get_version, get_contract_address, get_block_number}, - storage::{raw_storage_read, storage_read} -}; +use crate::oracle::{execution::{get_chain_id, get_version, get_contract_address, get_block_number}, storage::storage_read}; struct UnconstrainedContext { block_number: u32, diff --git a/noir-projects/aztec-nr/aztec/src/encrypted_logs/encrypted_note_emission.nr b/noir-projects/aztec-nr/aztec/src/encrypted_logs/encrypted_note_emission.nr index 542c0830e8d..acf40ee79ba 100644 --- a/noir-projects/aztec-nr/aztec/src/encrypted_logs/encrypted_note_emission.nr +++ b/noir-projects/aztec-nr/aztec/src/encrypted_logs/encrypted_note_emission.nr @@ -3,10 +3,7 @@ use crate::{ keys::{getters::get_current_public_keys, public_keys::{OvpkM, IvpkM}}, encrypted_logs::payload::compute_encrypted_note_log, oracle::logs_traits::LensForEncryptedLog }; -use dep::protocol_types::{ - hash::sha256_to_field, address::AztecAddress, point::Point, abis::note_hash::NoteHash, - constants::MAX_NOTE_HASHES_PER_CALL -}; +use dep::protocol_types::{hash::sha256_to_field, address::AztecAddress, abis::note_hash::NoteHash}; unconstrained fn compute_unconstrained( contract_address: AztecAddress, diff --git a/noir-projects/aztec-nr/aztec/src/encrypted_logs/incoming_body.nr b/noir-projects/aztec-nr/aztec/src/encrypted_logs/incoming_body.nr index eaa143772bc..3e17a64cfb5 100644 --- a/noir-projects/aztec-nr/aztec/src/encrypted_logs/incoming_body.nr +++ b/noir-projects/aztec-nr/aztec/src/encrypted_logs/incoming_body.nr @@ -1,6 +1,6 @@ use crate::note::note_interface::NoteInterface; use crate::event::event_interface::EventInterface; -use dep::protocol_types::{scalar::Scalar, point::Point}; +use dep::protocol_types::{scalar::Scalar}; use std::aes128::aes128_encrypt; use crate::keys::{point_to_symmetric_key::point_to_symmetric_key, public_keys::IvpkM}; diff --git a/noir-projects/aztec-nr/aztec/src/encrypted_logs/outgoing_body.nr b/noir-projects/aztec-nr/aztec/src/encrypted_logs/outgoing_body.nr index 6149584933c..64095b9ad03 100644 --- a/noir-projects/aztec-nr/aztec/src/encrypted_logs/outgoing_body.nr +++ b/noir-projects/aztec-nr/aztec/src/encrypted_logs/outgoing_body.nr @@ -59,14 +59,9 @@ impl EncryptedLogOutgoingBody { mod test { use crate::{encrypted_logs::outgoing_body::EncryptedLogOutgoingBody, keys::public_keys::IvpkM}; - use dep::protocol_types::{ - address::AztecAddress, traits::Empty, constants::GENERATOR_INDEX__NOTE_NULLIFIER, - scalar::Scalar, point::Point, hash::poseidon2_hash_with_separator - }; + use dep::protocol_types::{address::AztecAddress, scalar::Scalar}; use std::embedded_curve_ops::fixed_base_scalar_mul as derive_public_key; - use crate::context::PrivateContext; - #[test] fn test_encrypted_log_outgoing_body_matches_typescript() { let eph_sk = Scalar { diff --git a/noir-projects/aztec-nr/aztec/src/history/public_storage.nr b/noir-projects/aztec-nr/aztec/src/history/public_storage.nr index b1d833824fc..44708269b3f 100644 --- a/noir-projects/aztec-nr/aztec/src/history/public_storage.nr +++ b/noir-projects/aztec-nr/aztec/src/history/public_storage.nr @@ -4,7 +4,7 @@ use dep::protocol_types::{ }; use dep::protocol_types::merkle_tree::root::root_from_sibling_path; -use crate::{context::PrivateContext, oracle::get_public_data_witness::get_public_data_witness}; +use crate::{oracle::get_public_data_witness::get_public_data_witness}; trait PublicStorageHistoricalRead { fn public_storage_historical_read(header: Header, storage_slot: Field, contract_address: AztecAddress) -> Field; diff --git a/noir-projects/aztec-nr/aztec/src/keys/getters/mod.nr b/noir-projects/aztec-nr/aztec/src/keys/getters/mod.nr index ca4ceb86db7..55ec09951ab 100644 --- a/noir-projects/aztec-nr/aztec/src/keys/getters/mod.nr +++ b/noir-projects/aztec-nr/aztec/src/keys/getters/mod.nr @@ -1,19 +1,12 @@ use dep::protocol_types::{ - header::Header, abis::validation_requests::KeyValidationRequest, address::AztecAddress, - constants::CANONICAL_KEY_REGISTRY_ADDRESS, point::Point, storage::map::derive_storage_slot_in_map, - traits::is_empty + header::Header, address::AztecAddress, constants::CANONICAL_KEY_REGISTRY_ADDRESS, + storage::map::derive_storage_slot_in_map }; use crate::{ context::{PrivateContext, UnconstrainedContext}, oracle::{keys::get_public_keys_and_partial_address, key_validation_request::get_key_validation_request}, - keys::{ - public_keys::{PublicKeys, PUBLIC_KEYS_LENGTH}, stored_keys::StoredKeys, - constants::{NULLIFIER_INDEX, INCOMING_INDEX, OUTGOING_INDEX, TAGGING_INDEX} -}, - state_vars::{ - shared_mutable::shared_mutable_private_getter::SharedMutablePrivateGetter, - public_mutable::PublicMutable, map::Map -} + keys::{public_keys::{PublicKeys, PUBLIC_KEYS_LENGTH}, stored_keys::StoredKeys, constants::NULLIFIER_INDEX}, + state_vars::{public_mutable::PublicMutable, map::Map} }; mod test; diff --git a/noir-projects/aztec-nr/aztec/src/keys/getters/test.nr b/noir-projects/aztec-nr/aztec/src/keys/getters/test.nr index 41534e0de72..d83594e04f0 100644 --- a/noir-projects/aztec-nr/aztec/src/keys/getters/test.nr +++ b/noir-projects/aztec-nr/aztec/src/keys/getters/test.nr @@ -1,6 +1,5 @@ use crate::keys::getters::{get_current_public_keys, get_historical_public_keys, KEY_REGISTRY_UPDATE_BLOCKS}; use crate::context::PrivateContext; -use dep::protocol_types::address::AztecAddress; use crate::test::helpers::{cheatcodes, test_environment::TestEnvironment, utils::TestAccount}; use dep::std::test::OracleMock; diff --git a/noir-projects/aztec-nr/aztec/src/keys/mod.nr b/noir-projects/aztec-nr/aztec/src/keys/mod.nr index 485ab4a5b2c..12ee77b56f5 100644 --- a/noir-projects/aztec-nr/aztec/src/keys/mod.nr +++ b/noir-projects/aztec-nr/aztec/src/keys/mod.nr @@ -4,4 +4,4 @@ mod point_to_symmetric_key; mod public_keys; mod stored_keys; -use crate::keys::public_keys::{PublicKeys, PUBLIC_KEYS_LENGTH}; +pub use crate::keys::public_keys::{PublicKeys, PUBLIC_KEYS_LENGTH}; diff --git a/noir-projects/aztec-nr/aztec/src/keys/public_keys.nr b/noir-projects/aztec-nr/aztec/src/keys/public_keys.nr index 119396cfcb9..0cb4358fde0 100644 --- a/noir-projects/aztec-nr/aztec/src/keys/public_keys.nr +++ b/noir-projects/aztec-nr/aztec/src/keys/public_keys.nr @@ -3,7 +3,6 @@ use dep::protocol_types::{ hash::poseidon2_hash_with_separator, point::{Point, POINT_LENGTH}, traits::{Deserialize, Serialize, Empty, is_empty, Hash} }; -use crate::keys::constants::{NULLIFIER_INDEX, INCOMING_INDEX, OUTGOING_INDEX}; global PUBLIC_KEYS_LENGTH: u32 = 12; diff --git a/noir-projects/aztec-nr/aztec/src/lib.nr b/noir-projects/aztec-nr/aztec/src/lib.nr index af7f03c1f51..b699ecd2652 100644 --- a/noir-projects/aztec-nr/aztec/src/lib.nr +++ b/noir-projects/aztec-nr/aztec/src/lib.nr @@ -13,7 +13,7 @@ mod state_vars; mod prelude; mod encrypted_logs; mod unencrypted_logs; -use dep::protocol_types; +pub use dep::protocol_types; mod utils; mod test; diff --git a/noir-projects/aztec-nr/aztec/src/note/note_getter/mod.nr b/noir-projects/aztec-nr/aztec/src/note/note_getter/mod.nr index 25d66fe899d..8162c7002ac 100644 --- a/noir-projects/aztec-nr/aztec/src/note/note_getter/mod.nr +++ b/noir-projects/aztec-nr/aztec/src/note/note_getter/mod.nr @@ -1,7 +1,7 @@ use dep::protocol_types::{constants::{MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, GET_NOTES_ORACLE_RETURN_LENGTH}}; use crate::context::PrivateContext; use crate::note::{ - constants::{GET_NOTE_ORACLE_RETURN_LENGTH, MAX_NOTES_PER_PAGE, VIEW_NOTE_ORACLE_RETURN_LENGTH}, + constants::{GET_NOTE_ORACLE_RETURN_LENGTH, VIEW_NOTE_ORACLE_RETURN_LENGTH}, note_getter_options::{NoteGetterOptions, Select, Sort, SortOrder, NoteStatus, PropertySelector}, note_interface::NoteInterface, note_viewer_options::NoteViewerOptions, utils::compute_note_hash_for_read_request @@ -9,6 +9,8 @@ use crate::note::{ use crate::oracle; use crate::utils::comparison::compare; +pub use crate::note::constants::MAX_NOTES_PER_PAGE; + mod test; fn extract_property_value_from_selector( diff --git a/noir-projects/aztec-nr/aztec/src/note/note_header.nr b/noir-projects/aztec-nr/aztec/src/note/note_header.nr index 1568512273b..a2aca754461 100644 --- a/noir-projects/aztec-nr/aztec/src/note/note_header.nr +++ b/noir-projects/aztec-nr/aztec/src/note/note_header.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::{address::AztecAddress, traits::{Empty, Eq, Serialize}}; +use dep::protocol_types::{address::AztecAddress, traits::{Empty, Serialize}}; global NOTE_HEADER_LENGTH: Field = 4; diff --git a/noir-projects/aztec-nr/aztec/src/oracle/get_contract_instance.nr b/noir-projects/aztec-nr/aztec/src/oracle/get_contract_instance.nr index f9fcad78f38..392e85c189f 100644 --- a/noir-projects/aztec-nr/aztec/src/oracle/get_contract_instance.nr +++ b/noir-projects/aztec-nr/aztec/src/oracle/get_contract_instance.nr @@ -1,6 +1,6 @@ use dep::protocol_types::{ - address::AztecAddress, contract_instance::ContractInstance, utils::arr_copy_slice, - constants::CONTRACT_INSTANCE_LENGTH, utils::reader::Reader + address::AztecAddress, contract_instance::ContractInstance, constants::CONTRACT_INSTANCE_LENGTH, + utils::reader::Reader }; #[oracle(getContractInstance)] diff --git a/noir-projects/aztec-nr/aztec/src/oracle/get_sibling_path.nr b/noir-projects/aztec-nr/aztec/src/oracle/get_sibling_path.nr index 4788897dd08..db421c0641a 100644 --- a/noir-projects/aztec-nr/aztec/src/oracle/get_sibling_path.nr +++ b/noir-projects/aztec-nr/aztec/src/oracle/get_sibling_path.nr @@ -1,13 +1,11 @@ -use dep::protocol_types::constants::PUBLIC_DATA_TREE_HEIGHT; - #[oracle(getSiblingPath)] -unconstrained fn get_sibling_path_oracle(_block_number: u32, _tree_id: Field, _leaf_index: Field) -> [Field; N] {} +unconstrained fn get_sibling_path_oracle( + _block_number: u32, + _tree_id: Field, + _leaf_index: Field +) -> [Field; N] {} -unconstrained pub fn get_sibling_path( - block_number: u32, - tree_id: Field, - leaf_index: Field -) -> [Field; N] { +unconstrained pub fn get_sibling_path(block_number: u32, tree_id: Field, leaf_index: Field) -> [Field; N] { let value: [Field; N] = get_sibling_path_oracle(block_number, tree_id, leaf_index); value } diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/mod.nr b/noir-projects/aztec-nr/aztec/src/state_vars/mod.nr index cc6c48f14d8..127f35094f4 100644 --- a/noir-projects/aztec-nr/aztec/src/state_vars/mod.nr +++ b/noir-projects/aztec-nr/aztec/src/state_vars/mod.nr @@ -8,12 +8,12 @@ mod shared_immutable; mod shared_mutable; mod storage; -use crate::state_vars::map::Map; -use crate::state_vars::private_immutable::PrivateImmutable; -use crate::state_vars::private_mutable::PrivateMutable; -use crate::state_vars::public_immutable::PublicImmutable; -use crate::state_vars::public_mutable::PublicMutable; -use crate::state_vars::private_set::PrivateSet; -use crate::state_vars::shared_immutable::SharedImmutable; -use crate::state_vars::shared_mutable::SharedMutable; -use crate::state_vars::storage::Storage; +pub use crate::state_vars::map::Map; +pub use crate::state_vars::private_immutable::PrivateImmutable; +pub use crate::state_vars::private_mutable::PrivateMutable; +pub use crate::state_vars::public_immutable::PublicImmutable; +pub use crate::state_vars::public_mutable::PublicMutable; +pub use crate::state_vars::private_set::PrivateSet; +pub use crate::state_vars::shared_immutable::SharedImmutable; +pub use crate::state_vars::shared_mutable::SharedMutable; +pub use crate::state_vars::storage::Storage; diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable.nr index dcd219d9ad2..2a084b360a7 100644 --- a/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable.nr +++ b/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable.nr @@ -1,7 +1,4 @@ -use dep::protocol_types::{ - address::AztecAddress, constants::GENERATOR_INDEX__INITIALIZATION_NULLIFIER, - hash::poseidon2_hash_with_separator -}; +use dep::protocol_types::{constants::GENERATOR_INDEX__INITIALIZATION_NULLIFIER, hash::poseidon2_hash_with_separator}; use crate::context::{PrivateContext, UnconstrainedContext}; use crate::note::{ diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable/test.nr b/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable/test.nr index 2ba214cec65..49639eb0309 100644 --- a/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable/test.nr +++ b/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable/test.nr @@ -1,9 +1,8 @@ -use dep::protocol_types::{address::AztecAddress, point::Point}; use crate::{ context::PrivateContext, state_vars::private_mutable::PrivateMutable, oracle::execution::get_contract_address }; -use crate::test::{mocks::mock_note::MockNote, helpers::{cheatcodes, test_environment::TestEnvironment}}; +use crate::test::{mocks::mock_note::MockNote, helpers::{test_environment::TestEnvironment}}; use std::test::OracleMock; global storage_slot = 17; diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr index 6c300e7575f..72fce5d0b59 100644 --- a/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr +++ b/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr @@ -1,5 +1,4 @@ use crate::context::{PublicContext, UnconstrainedContext}; -use crate::oracle::storage::storage_read; use dep::protocol_types::traits::{Deserialize, Serialize}; use crate::state_vars::storage::Storage; diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable.nr index 13b726cc2af..618b06a675c 100644 --- a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable.nr +++ b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable.nr @@ -3,5 +3,5 @@ mod scheduled_delay_change; mod scheduled_value_change; mod shared_mutable_private_getter; -use shared_mutable::SharedMutable; -use shared_mutable_private_getter::SharedMutablePrivateGetter; +pub use shared_mutable::SharedMutable; +pub use shared_mutable_private_getter::SharedMutablePrivateGetter; diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/test.nr b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/test.nr index cf2b44f23b5..785ff8d2c41 100644 --- a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/test.nr +++ b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/test.nr @@ -7,7 +7,6 @@ use crate::{ test::helpers::test_environment::TestEnvironment }; -use dep::protocol_types::address::AztecAddress; use dep::std::{test::OracleMock, mem::zeroed}; global new_value = 17; diff --git a/noir-projects/aztec-nr/aztec/src/test/helpers/keys.nr b/noir-projects/aztec-nr/aztec/src/test/helpers/keys.nr index be040f256ab..9226b6e9854 100644 --- a/noir-projects/aztec-nr/aztec/src/test/helpers/keys.nr +++ b/noir-projects/aztec-nr/aztec/src/test/helpers/keys.nr @@ -1,6 +1,6 @@ use dep::protocol_types::{ address::AztecAddress, storage::map::derive_storage_slot_in_map, - constants::CANONICAL_KEY_REGISTRY_ADDRESS, point::Point + constants::CANONICAL_KEY_REGISTRY_ADDRESS }; use crate::{test::helpers::cheatcodes, keys::public_keys::ToPoint}; diff --git a/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr b/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr index b5b6c20a554..e39ac6bec5a 100644 --- a/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr +++ b/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr @@ -1,16 +1,15 @@ use dep::protocol_types::{ abis::{function_selector::FunctionSelector, private_circuit_public_inputs::PrivateCircuitPublicInputs}, - address::{AztecAddress, PartialAddress}, storage::map::derive_storage_slot_in_map, - constants::CANONICAL_KEY_REGISTRY_ADDRESS, traits::Deserialize + address::AztecAddress, traits::Deserialize }; use crate::context::inputs::{PublicContextInputs, PrivateContextInputs}; use crate::context::{packed_returns::PackedReturns, call_interfaces::CallInterface}; -use crate::context::{PrivateContext, PublicContext, UnconstrainedContext, PrivateVoidCallInterface}; -use crate::test::helpers::{cheatcodes, utils::{apply_side_effects_private, Deployer, TestAccount}, keys}; +use crate::context::{PrivateContext, PublicContext, UnconstrainedContext}; +use crate::test::helpers::{cheatcodes, utils::{apply_side_effects_private, Deployer}, keys}; use crate::keys::constants::{NULLIFIER_INDEX, INCOMING_INDEX, OUTGOING_INDEX, TAGGING_INDEX}; -use crate::hash::{hash_args, hash_args_array}; +use crate::hash::hash_args; use crate::note::{note_header::NoteHeader, note_interface::NoteInterface}; use crate::oracle::{execution::{get_block_number, get_contract_address}, notes::notify_created_note}; diff --git a/noir-projects/aztec-nr/aztec/src/test/helpers/utils.nr b/noir-projects/aztec-nr/aztec/src/test/helpers/utils.nr index ca87dd252f5..20661d24a8f 100644 --- a/noir-projects/aztec-nr/aztec/src/test/helpers/utils.nr +++ b/noir-projects/aztec-nr/aztec/src/test/helpers/utils.nr @@ -1,6 +1,6 @@ use dep::protocol_types::{ traits::{Deserialize, Serialize}, address::AztecAddress, - abis::{function_selector::FunctionSelector, private_circuit_public_inputs::PrivateCircuitPublicInputs}, + abis::{private_circuit_public_inputs::PrivateCircuitPublicInputs}, contract_instance::ContractInstance }; @@ -8,9 +8,8 @@ use crate::context::inputs::{PublicContextInputs, PrivateContextInputs}; use crate::context::call_interfaces::CallInterface; use crate::test::helpers::cheatcodes; use crate::keys::public_keys::{PUBLIC_KEYS_LENGTH, PublicKeys}; -use crate::hash::hash_args; -use crate::oracle::{execution::{get_block_number, get_contract_address}, notes::notify_nullified_note}; +use crate::oracle::{execution::{get_block_number, get_contract_address}}; pub fn apply_side_effects_private(contract_address: AztecAddress, public_inputs: PrivateCircuitPublicInputs) { let mut nullifiers = &[]; 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 fda3cc1be45..cb9cc5f91c2 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 @@ -3,7 +3,7 @@ use crate::{ note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_nullify} }; -use dep::protocol_types::{address::AztecAddress, constants::GENERATOR_INDEX__NOTE_NULLIFIER, point::Point, traits::Eq}; +use dep::protocol_types::{address::AztecAddress, constants::GENERATOR_INDEX__NOTE_NULLIFIER, point::Point}; use dep::std::{embedded_curve_ops::multi_scalar_mul, hash::from_field_unsafe}; global MOCK_NOTE_LENGTH = 1; diff --git a/noir-projects/aztec-nr/aztec/src/test/mocks/mock_struct.nr b/noir-projects/aztec-nr/aztec/src/test/mocks/mock_struct.nr index 1a0ed1a304e..8df0dd4cac3 100644 --- a/noir-projects/aztec-nr/aztec/src/test/mocks/mock_struct.nr +++ b/noir-projects/aztec-nr/aztec/src/test/mocks/mock_struct.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::traits::{Eq, Serialize, Deserialize}; +use dep::protocol_types::traits::{Serialize, Deserialize}; struct MockStruct { a: Field, diff --git a/noir-projects/aztec-nr/aztec/src/unencrypted_logs/unencrypted_event_emission.nr b/noir-projects/aztec-nr/aztec/src/unencrypted_logs/unencrypted_event_emission.nr index 8f977dc71ed..255c988737e 100644 --- a/noir-projects/aztec-nr/aztec/src/unencrypted_logs/unencrypted_event_emission.nr +++ b/noir-projects/aztec-nr/aztec/src/unencrypted_logs/unencrypted_event_emission.nr @@ -1,8 +1,5 @@ -use crate::{ - context::{PrivateContext, PublicContext}, event::event_interface::EventInterface, - encrypted_logs::payload::compute_encrypted_event_log, oracle::logs_traits::LensForEncryptedEvent -}; -use dep::protocol_types::{address::AztecAddress, traits::Serialize}; +use crate::{context::PublicContext, event::event_interface::EventInterface}; +use dep::protocol_types::{traits::Serialize}; fn emit( context: &mut PublicContext, diff --git a/noir-projects/aztec-nr/aztec/src/utils/collapse_array.nr b/noir-projects/aztec-nr/aztec/src/utils/collapse_array.nr index 9ce61ada28c..a8e879f2d54 100644 --- a/noir-projects/aztec-nr/aztec/src/utils/collapse_array.nr +++ b/noir-projects/aztec-nr/aztec/src/utils/collapse_array.nr @@ -1,5 +1,3 @@ -use dep::protocol_types::traits::Eq; - // Collapses an array of Options with sparse Some values into a BoundedVec, essentially unwrapping the Options and // removing the None values. For example, given: // input: [some(3), none(), some(1)] @@ -18,7 +16,7 @@ pub fn collapse_array(input: [Option; N]) -> BoundedVec collapsed } -fn verify_collapse_hints( +pub(crate) fn verify_collapse_hints( input: [Option; N], collapsed: BoundedVec, collapsed_to_input_index_mapping: BoundedVec diff --git a/noir-projects/aztec-nr/aztec/src/utils/mod.nr b/noir-projects/aztec-nr/aztec/src/utils/mod.nr index 6c7659da7bb..77d3a6531d2 100644 --- a/noir-projects/aztec-nr/aztec/src/utils/mod.nr +++ b/noir-projects/aztec-nr/aztec/src/utils/mod.nr @@ -3,4 +3,4 @@ mod comparison; mod point; mod test; -use crate::utils::collapse_array::collapse_array; +pub use crate::utils::collapse_array::collapse_array; diff --git a/noir-projects/aztec-nr/compressed-string/src/compressed_string.nr b/noir-projects/aztec-nr/compressed-string/src/compressed_string.nr index 134753e125b..408db8a47d9 100644 --- a/noir-projects/aztec-nr/compressed-string/src/compressed_string.nr +++ b/noir-projects/aztec-nr/compressed-string/src/compressed_string.nr @@ -1,4 +1,4 @@ -use dep::aztec::protocol_types::{utils::field::field_from_bytes, traits::{Eq, Serialize, Deserialize}}; +use dep::aztec::protocol_types::{utils::field::field_from_bytes, traits::{Serialize, Deserialize}}; // The general Compressed String. // Compresses M bytes into N fields. diff --git a/noir-projects/aztec-nr/compressed-string/src/lib.nr b/noir-projects/aztec-nr/compressed-string/src/lib.nr index 76b5ba5a62b..3195bb5177f 100644 --- a/noir-projects/aztec-nr/compressed-string/src/lib.nr +++ b/noir-projects/aztec-nr/compressed-string/src/lib.nr @@ -1,5 +1,5 @@ mod compressed_string; mod field_compressed_string; -use crate::compressed_string::CompressedString; -use crate::field_compressed_string::FieldCompressedString; +pub use crate::compressed_string::CompressedString; +pub use crate::field_compressed_string::FieldCompressedString; diff --git a/noir-projects/aztec-nr/easy-private-state/src/lib.nr b/noir-projects/aztec-nr/easy-private-state/src/lib.nr index ad5150bfbb0..4e9a4b0b741 100644 --- a/noir-projects/aztec-nr/easy-private-state/src/lib.nr +++ b/noir-projects/aztec-nr/easy-private-state/src/lib.nr @@ -1,3 +1,3 @@ mod easy_private_uint; -use crate::easy_private_uint::EasyPrivateUint; +pub use crate::easy_private_uint::EasyPrivateUint; diff --git a/noir-projects/aztec-nr/value-note/src/balance_utils.nr b/noir-projects/aztec-nr/value-note/src/balance_utils.nr index 0f4a6715f18..42491588dbf 100644 --- a/noir-projects/aztec-nr/value-note/src/balance_utils.nr +++ b/noir-projects/aztec-nr/value-note/src/balance_utils.nr @@ -1,14 +1,14 @@ -use dep::aztec::{ - context::UnconstrainedContext, state_vars::PrivateSet, - note::{note_getter::view_notes, note_viewer_options::NoteViewerOptions} -}; +use dep::aztec::{context::UnconstrainedContext, state_vars::PrivateSet, note::{note_viewer_options::NoteViewerOptions}}; use crate::value_note::ValueNote; unconstrained pub fn get_balance(set: PrivateSet) -> Field { get_balance_with_offset(set, 0) } -unconstrained pub fn get_balance_with_offset(set: PrivateSet, offset: u32) -> Field { +unconstrained pub fn get_balance_with_offset( + set: PrivateSet, + offset: u32 +) -> Field { let mut balance = 0; // docs:start:view_notes let mut options = NoteViewerOptions::new(); diff --git a/noir-projects/aztec-nr/value-note/src/value_note.nr b/noir-projects/aztec-nr/value-note/src/value_note.nr index 38809bc7e54..a5e190046a2 100644 --- a/noir-projects/aztec-nr/value-note/src/value_note.nr +++ b/noir-projects/aztec-nr/value-note/src/value_note.nr @@ -1,13 +1,14 @@ use dep::aztec::{ generators::{Ga1 as G_amt, Ga2 as G_npk, Ga3 as G_rnd, G_slot}, protocol_types::{ - address::AztecAddress, traits::{Deserialize, Serialize}, constants::GENERATOR_INDEX__NOTE_NULLIFIER, - hash::poseidon2_hash_with_separator, point::{Point, POINT_LENGTH} + traits::Serialize, constants::GENERATOR_INDEX__NOTE_NULLIFIER, hash::poseidon2_hash_with_separator, + point::{Point, POINT_LENGTH} }, note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_nullify}, oracle::unsafe_rand::unsafe_rand, keys::getters::get_nsk_app, context::PrivateContext }; -use dep::std::{embedded_curve_ops::multi_scalar_mul, hash::from_field_unsafe}; +use dep::std::{embedded_curve_ops::multi_scalar_mul}; +use std::hash::from_field_unsafe; global VALUE_NOTE_LEN: Field = 3; // 3 plus a header. // VALUE_NOTE_LEN * 32 + 32(storage_slot as bytes) + 32(note_type_id as bytes) diff --git a/noir-projects/noir-contracts/contracts/delegator_contract/src/main.nr b/noir-projects/noir-contracts/contracts/delegator_contract/src/main.nr index 27941e1d622..402230a2fb8 100644 --- a/noir-projects/noir-contracts/contracts/delegator_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/delegator_contract/src/main.nr @@ -1,6 +1,6 @@ // A contract used along with `Parent` contract to test nested calls. contract Delegator { - use dep::aztec::prelude::{AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, PublicMutable, PrivateSet, Deserialize, Map}; + use dep::aztec::prelude::{AztecAddress, NoteGetterOptions, PublicMutable, PrivateSet, Map}; use dep::value_note::value_note::ValueNote; use dep::delegated_on::DelegatedOn; use dep::aztec::utils::comparison::Comparator; diff --git a/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr b/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr index de88cf41960..7a84beae36f 100644 --- a/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr @@ -14,14 +14,13 @@ mod types; contract DocsExample { // how to import dependencies defined in your workspace use dep::aztec::prelude::{ - AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, NoteViewerOptions, - PrivateContext, Map, PublicMutable, PublicImmutable, PrivateMutable, PrivateImmutable, - PrivateSet, SharedImmutable, Deserialize + AztecAddress, NoteViewerOptions, PrivateContext, Map, PublicMutable, PublicImmutable, + PrivateMutable, PrivateImmutable, PrivateSet, SharedImmutable }; use dep::aztec::encrypted_logs::encrypted_note_emission::{encode_and_encrypt_note, encode_and_encrypt_note_with_keys}; use dep::aztec::keys::getters::get_current_public_keys; // how to import methods from other files/folders within your workspace - use crate::types::{card_note::{CardNote, CARD_NOTE_LEN}, leader::Leader}; + use crate::types::{card_note::CardNote, leader::Leader}; #[aztec(storage)] struct Storage { @@ -297,8 +296,6 @@ contract DocsExample { } /// Macro equivalence section - use dep::aztec::hash::hash_args; - use dep::aztec::protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs; use dep::aztec::context::inputs::PrivateContextInputs; diff --git a/noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr b/noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr index c1d16b33d52..b3a56d2cbdf 100644 --- a/noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr +++ b/noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr @@ -1,8 +1,8 @@ use crate::types::card_note::{CardNote, CARD_NOTE_LEN, CARD_NOTE_BYTES_LEN}; -use dep::aztec::prelude::{AztecAddress, NoteGetterOptions}; +use dep::aztec::prelude::NoteGetterOptions; use dep::aztec::protocol_types::constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL; -use dep::aztec::{note::note_getter_options::{Sort, SortOrder}, utils::comparison::Comparator}; +use dep::aztec::{note::note_getter_options::SortOrder, utils::comparison::Comparator}; // Shows how to use NoteGetterOptions and query for notes. diff --git a/noir-projects/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr b/noir-projects/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr index 043d4eab2bc..9a8353a1ca9 100644 --- a/noir-projects/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr +++ b/noir-projects/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr @@ -1,10 +1,7 @@ -use dep::aztec::prelude::{AztecAddress, NoteInterface, NoteHeader, PrivateContext}; +use dep::aztec::prelude::{NoteInterface, NoteHeader, PrivateContext}; use dep::aztec::{ note::{utils::compute_note_hash_for_nullify}, keys::getters::get_nsk_app, - protocol_types::{ - traits::{Empty, Eq, Serialize}, constants::GENERATOR_INDEX__NOTE_NULLIFIER, - hash::poseidon2_hash_with_separator -} + protocol_types::{traits::Serialize, constants::GENERATOR_INDEX__NOTE_NULLIFIER, hash::poseidon2_hash_with_separator} }; // Shows how to create a custom note diff --git a/noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr b/noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr index 91f7cf7a415..387e6b9fdf9 100644 --- a/noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr @@ -1,6 +1,6 @@ contract EasyPrivateVoting { // docs:start:imports - use dep::aztec::prelude::{AztecAddress, FunctionSelector, PrivateContext, Map, PublicMutable, SharedImmutable}; + use dep::aztec::prelude::{AztecAddress, Map, PublicMutable, SharedImmutable}; use dep::aztec::keys::getters::get_historical_public_keys; // docs:end:imports // docs:start:storage_struct diff --git a/noir-projects/noir-contracts/contracts/escrow_contract/src/main.nr b/noir-projects/noir-contracts/contracts/escrow_contract/src/main.nr index d56ab328825..9d17a6833fa 100644 --- a/noir-projects/noir-contracts/contracts/escrow_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/escrow_contract/src/main.nr @@ -1,6 +1,6 @@ // Sample escrow contract that stores a balance of a private token on behalf of an owner. contract Escrow { - use dep::aztec::prelude::{AztecAddress, EthAddress, FunctionSelector, NoteHeader, PrivateContext, PrivateImmutable}; + use dep::aztec::prelude::{AztecAddress, PrivateImmutable}; use dep::aztec::{ encrypted_logs::encrypted_note_emission::encode_and_encrypt_note_with_keys, keys::getters::get_current_public_keys diff --git a/noir-projects/noir-contracts/contracts/fee_juice_contract/src/main.nr b/noir-projects/noir-contracts/contracts/fee_juice_contract/src/main.nr index af51fff943c..a5d008e160e 100644 --- a/noir-projects/noir-contracts/contracts/fee_juice_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/fee_juice_contract/src/main.nr @@ -3,18 +3,17 @@ mod lib; contract FeeJuice { use dep::aztec::{ protocol_types::{ - contract_class_id::ContractClassId, abis::function_selector::FunctionSelector, - address::{AztecAddress, EthAddress}, + contract_class_id::ContractClassId, address::{AztecAddress, EthAddress}, constants::{DEPLOYER_CONTRACT_ADDRESS, REGISTERER_CONTRACT_ADDRESS, FEE_JUICE_INITIAL_MINT} }, state_vars::{SharedImmutable, PublicMutable, Map}, - oracle::get_contract_instance::get_contract_instance, deploy::deploy_contract + oracle::get_contract_instance::get_contract_instance }; use dep::deployer::ContractInstanceDeployer; use dep::registerer::ContractClassRegisterer; - use crate::lib::{calculate_fee, get_bridge_gas_msg_hash}; + use crate::lib::get_bridge_gas_msg_hash; #[aztec(storage)] struct Storage { diff --git a/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr b/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr index 823591a754c..7c301aa6b33 100644 --- a/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr @@ -2,8 +2,8 @@ mod lib; contract FPC { use dep::aztec::{ - protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::is_empty}, - state_vars::SharedImmutable, context::gas::GasOpts + protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress}, + state_vars::SharedImmutable }; use dep::token::Token; use crate::lib::compute_rebate; diff --git a/noir-projects/noir-contracts/contracts/import_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/import_test_contract/src/main.nr index d8dd2776a3a..6e125f3979a 100644 --- a/noir-projects/noir-contracts/contracts/import_test_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/import_test_contract/src/main.nr @@ -5,8 +5,6 @@ contract ImportTest { use dep::test::{Test, Test::DeepStruct, Test::DummyNote}; - use dep::test::Test::ValueNote; - // Calls the test_code_gen on the Test contract at the target address // Used for testing calling a function with arguments of multiple types // See yarn-project/simulator/src/client/private_execution.ts diff --git a/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr b/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr index 633e326f7ed..0d654b91c42 100644 --- a/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr @@ -1,15 +1,11 @@ // A demonstration of inclusion and non-inclusion proofs. contract InclusionProofs { - use dep::aztec::prelude::{ - AztecAddress, EthAddress, FunctionSelector, NoteHeader, NoteGetterOptions, PrivateContext, Map, - PrivateSet, PublicMutable - }; + use dep::aztec::prelude::{AztecAddress, NoteGetterOptions, Map, PrivateSet, PublicMutable}; use dep::aztec::{ encrypted_logs::encrypted_note_emission::encode_and_encrypt_note, keys::getters::get_current_public_keys }; - use dep::aztec::protocol_types::{contract_class_id::ContractClassId, header::Header}; use dep::aztec::{note::note_getter_options::NoteStatus}; // docs:start:value_note_imports use dep::value_note::value_note::ValueNote; diff --git a/noir-projects/noir-contracts/contracts/key_registry_contract/src/main.nr b/noir-projects/noir-contracts/contracts/key_registry_contract/src/main.nr index 8c010353775..d4ff344ed17 100644 --- a/noir-projects/noir-contracts/contracts/key_registry_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/key_registry_contract/src/main.nr @@ -3,8 +3,7 @@ contract KeyRegistry { use dep::aztec::{ keys::{PublicKeys, stored_keys::StoredKeys, public_keys::NpkM}, - state_vars::{PublicMutable, Map}, - protocol_types::{point::Point, address::{AztecAddress, PartialAddress}} + state_vars::{PublicMutable, Map}, protocol_types::address::{AztecAddress, PartialAddress} }; #[aztec(storage)] diff --git a/noir-projects/noir-contracts/contracts/lending_contract/src/helpers.nr b/noir-projects/noir-contracts/contracts/lending_contract/src/helpers.nr index 7cfba1fc667..750b6dff607 100644 --- a/noir-projects/noir-contracts/contracts/lending_contract/src/helpers.nr +++ b/noir-projects/noir-contracts/contracts/lending_contract/src/helpers.nr @@ -1,4 +1,3 @@ -use crate::interest_math::compute_multiplier; use dep::aztec::hash::pedersen_hash; // Utility used to easily get a "id" for a private user that sits in the same diff --git a/noir-projects/noir-contracts/contracts/lending_contract/src/position.nr b/noir-projects/noir-contracts/contracts/lending_contract/src/position.nr index 080f977e9c0..1c05dc274a6 100644 --- a/noir-projects/noir-contracts/contracts/lending_contract/src/position.nr +++ b/noir-projects/noir-contracts/contracts/lending_contract/src/position.nr @@ -1,4 +1,3 @@ -use dep::aztec::prelude::AztecAddress; use dep::aztec::protocol_types::traits::{Deserialize, Serialize}; struct Position { diff --git a/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/src/main.nr b/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/src/main.nr index d5c405c6c61..f14d751d344 100644 --- a/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/src/main.nr @@ -1,9 +1,6 @@ // An entrypoint contract that allows everything to go through. Only used for testing // Pair this with SignerlessWallet to perform multiple actions before any account contracts are deployed (and without authentication) contract MultiCallEntrypoint { - use dep::std; - - use dep::aztec::prelude::AztecAddress; use dep::authwit::entrypoint::app::AppPayload; #[aztec(private)] diff --git a/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/src/main.nr b/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/src/main.nr index 1fd805f2c2d..021c304c75f 100644 --- a/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/src/main.nr @@ -4,8 +4,8 @@ // be read/nullified before their creation etc. contract PendingNoteHashes { // Libs - use dep::aztec::prelude::{AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, PrivateContext, Map, PrivateSet}; - use dep::value_note::{balance_utils, filter::filter_notes_min_sum, value_note::{VALUE_NOTE_LEN, ValueNote}}; + use dep::aztec::prelude::{AztecAddress, FunctionSelector, NoteGetterOptions, PrivateContext, Map, PrivateSet}; + use dep::value_note::{filter::filter_notes_min_sum, value_note::ValueNote}; use dep::aztec::protocol_types::constants::{MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NOTE_HASHES_PER_CALL}; use dep::aztec::encrypted_logs::encrypted_note_emission::{encode_and_encrypt_note, encode_and_encrypt_note_with_keys}; use dep::aztec::note::note_emission::NoteEmission; diff --git a/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr b/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr index b9ecbe035d5..c1d85350827 100644 --- a/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr +++ b/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr @@ -1,4 +1,4 @@ -use dep::aztec::prelude::{AztecAddress, NoteHeader, NoteInterface, PrivateContext}; +use dep::aztec::prelude::{NoteHeader, NoteInterface, PrivateContext}; use dep::aztec::{ note::utils::compute_note_hash_for_nullify, keys::getters::get_nsk_app, protocol_types::{constants::GENERATOR_INDEX__NOTE_NULLIFIER, hash::poseidon2_hash_with_separator} diff --git a/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr index aa70e564fbb..ba8b82fee3e 100644 --- a/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr @@ -1,11 +1,8 @@ // A contract used for testing a random hodgepodge of small features from simulator and end-to-end tests. contract StatefulTest { - use dep::aztec::prelude::{PrivateContext, NoteHeader, Map, PublicMutable, PrivateSet, AztecAddress, FunctionSelector}; - use dep::value_note::{balance_utils, utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote}}; - use dep::aztec::{ - deploy::deploy_contract as aztec_deploy_contract, context::{PublicContext, gas::GasOpts}, - oracle::get_contract_instance::get_contract_instance, initializer::assert_is_initialized_private - }; + use dep::aztec::prelude::{Map, PublicMutable, PrivateSet, AztecAddress, FunctionSelector}; + use dep::value_note::{balance_utils, utils::{increment, decrement}, value_note::ValueNote}; + use dep::aztec::{initializer::assert_is_initialized_private}; #[aztec(storage)] struct Storage { diff --git a/noir-projects/noir-contracts/contracts/test_log_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test_log_contract/src/main.nr index e6c8f769b56..55384dd4b57 100644 --- a/noir-projects/noir-contracts/contracts/test_log_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/test_log_contract/src/main.nr @@ -1,10 +1,9 @@ contract TestLog { use dep::aztec::prelude::PrivateSet; - use dep::aztec::protocol_types::{traits::Serialize, point::Point, scalar::Scalar, address::AztecAddress}; + use dep::aztec::protocol_types::{scalar::Scalar, address::AztecAddress}; use dep::aztec::keys::public_keys::IvpkM; use dep::value_note::value_note::ValueNote; use dep::aztec::encrypted_logs::incoming_body::EncryptedLogIncomingBody; - use dep::aztec::event::event_interface::EventInterface; use dep::aztec::encrypted_logs::encrypted_event_emission::encode_and_encrypt_event_with_randomness; use dep::aztec::unencrypted_logs::unencrypted_event_emission::encode_event; diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr index 0b5e111a008..5ef31e0529d 100644 --- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr @@ -12,7 +12,7 @@ contract TokenBlacklist { // Libs use dep::aztec::{ hash::compute_secret_hash, - prelude::{AztecAddress, FunctionSelector, Map, NoteGetterOptions, PrivateSet, PublicMutable, SharedMutable}, + prelude::{AztecAddress, Map, NoteGetterOptions, PrivateSet, PublicMutable, SharedMutable}, encrypted_logs::encrypted_note_emission::encode_and_encrypt_note, utils::comparison::Comparator }; diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr index 99a642676c9..d0aeac1b7cf 100644 --- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr +++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr @@ -1,11 +1,10 @@ -use dep::aztec::prelude::{AztecAddress, NoteGetterOptions, NoteViewerOptions, NoteHeader, NoteInterface, PrivateSet, Map}; +use dep::aztec::prelude::{AztecAddress, NoteGetterOptions, NoteViewerOptions, NoteInterface, PrivateSet, Map}; use dep::aztec::{ context::{PrivateContext, UnconstrainedContext}, protocol_types::constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, - note::{note_getter::view_notes, note_getter_options::SortOrder, note_emission::OuterNoteEmission}, - keys::getters::get_current_public_keys + note::{note_emission::OuterNoteEmission}, keys::getters::get_current_public_keys }; -use crate::types::{token_note::{TokenNote, OwnedNote}}; +use crate::types::{token_note::OwnedNote}; struct BalancesMap { map: Map, Context> diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr index aebae804ec3..58fa036d35e 100644 --- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr +++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr @@ -1,5 +1,5 @@ use dep::aztec::{ - prelude::{AztecAddress, NoteHeader, NoteInterface, PrivateContext}, + prelude::{NoteHeader, NoteInterface, PrivateContext}, protocol_types::{constants::GENERATOR_INDEX__NOTE_NULLIFIER, hash::poseidon2_hash_with_separator}, note::utils::compute_note_hash_for_nullify, oracle::unsafe_rand::unsafe_rand, keys::getters::get_nsk_app 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 0619908c7d6..e31b47382cc 100644 --- a/noir-projects/noir-contracts/contracts/token_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/token_contract/src/main.nr @@ -649,7 +649,7 @@ contract Token { /// Unconstrained /// // docs:start:balance_of_private - unconstrained fn balance_of_private(owner: AztecAddress) -> pub Field { + unconstrained pub(crate) fn balance_of_private(owner: AztecAddress) -> pub Field { storage.balances.at(owner).balance_of().to_field() } // docs:end:balance_of_private diff --git a/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr b/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr index 1581da08f44..ed18788ebe0 100644 --- a/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr @@ -5,13 +5,9 @@ mod util; // Has two separate flows for private and public respectively // Uses the token bridge contract, which tells which input token we need to talk to and handles the exit funds to L1 contract Uniswap { - use dep::aztec::prelude::{FunctionSelector, AztecAddress, EthAddress, Map, PublicMutable, SharedImmutable}; - use dep::aztec::context::gas::GasOpts; + use dep::aztec::prelude::{FunctionSelector, AztecAddress, EthAddress, SharedImmutable}; - use dep::authwit::auth::{ - IS_VALID_SELECTOR, assert_current_call_valid_authwit_public, - compute_authwit_message_hash_from_call, compute_authwit_message_hash, set_authorized - }; + use dep::authwit::auth::{assert_current_call_valid_authwit_public, compute_authwit_message_hash_from_call, set_authorized}; use dep::token::Token; use dep::token_bridge::TokenBridge; diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/key_validation_request.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/key_validation_request.nr index eec4479a872..245c5fa0c8c 100644 --- a/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/key_validation_request.nr +++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/key_validation_request.nr @@ -1,4 +1,5 @@ -use crate::{constants::KEY_VALIDATION_REQUEST_LENGTH, traits::{Empty, Serialize, Deserialize}, point::Point}; +use crate::{traits::{Empty, Serialize, Deserialize}, point::Point}; +pub use crate::constants::KEY_VALIDATION_REQUEST_LENGTH; struct KeyValidationRequest { pk_m: Point,