feat: Aztec prelude

barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp

@@ -164,4 +164,4 @@ template class ExecutionTrace_<GoblinUltraFlavor>;
 template class ExecutionTrace_<plonk::flavor::Standard>;
 template class ExecutionTrace_<plonk::flavor::Ultra>;
 
-} // namespace bb
+} // namespace bb

barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.hpp

@@ -103,4 +103,4 @@ template <class Flavor> class ExecutionTrace_ {
         requires IsGoblinFlavor<Flavor>;
 };
 
-} // namespace bb
+} // namespace bb

barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp

@@ -297,4 +297,4 @@ void Poseidon2Permutation<Params, Builder>::matrix_multiplication_external(
 template class Poseidon2Permutation<crypto::Poseidon2Bn254ScalarFieldParams, GoblinUltraCircuitBuilder>;
 template class Poseidon2Permutation<crypto::Poseidon2Bn254ScalarFieldParams, UltraCircuitBuilder>;
 
-} // namespace bb::stdlib
+} // namespace bb::stdlib

docs/docs/developers/contracts/writing_contracts/events/emit_event.md

@@ -96,15 +96,9 @@ They can be emitted by both public and private functions.
 - Unencrypted events are currently **NOT** linked to the contract emitting them, so it is practically a [`debug_log`](../oracles/main.md#a-few-useful-inbuilt-oracles).
   :::
 
-### Import library
-
-To emit unencrypted logs first import the `emit_unencrypted_log` utility function inside your contract:
-
-#include_code unencrypted_import /noir-projects/noir-contracts/contracts/test_contract/src/main.nr rust
-
 ### Call emit_unencrypted_log
 
-After importing, you can call the function:
+To emit unencrypted log you can call:
 
 #include_code emit_unencrypted /noir-projects/noir-contracts/contracts/test_contract/src/main.nr rust
 

docs/docs/developers/tutorials/writing_private_voting_contract.md

@@ -64,10 +64,6 @@ contract Voting {
 
 This defines a contract called `Voter`. Everything will sit inside this block.
 
-Inside this, paste these imports:
-
-#include_code imports noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr rust
-
 We are using various utils within the Aztec library:
 
 - `context` - exposes things such as the contract address, msg_sender, etc

noir-projects/aztec-nr/aztec/src/lib.nr

@@ -10,5 +10,6 @@ mod log;
 mod messaging;
 mod note;
 mod oracle;
+mod prelude;
 mod state_vars;
 use dep::protocol_types;

noir-projects/aztec-nr/aztec/src/prelude.nr

@@ -0,0 +1,14 @@
+use dep::protocol_types::{address::{AztecAddress, EthAddress}, abis::function_selector::FunctionSelector};
+use crate::{
+    state_vars::{
+    map::Map, private_immutable::PrivateImmutable, private_mutable::PrivateMutable,
+    public_immutable::PublicImmutable, public_mutable::PublicMutable, private_set::PrivateSet,
+    shared_immutable::SharedImmutable
+},
+    log::{emit_unencrypted_log, emit_encrypted_log}, context::PrivateContext,
+    note::{
+    note_header::NoteHeader, note_interface::NoteInterface, note_getter_options::NoteGetterOptions,
+    note_viewer_options::NoteViewerOptions,
+    utils::compute_note_hash_and_nullifier as utils_compute_note_hash_and_nullifier
+}
+};

noir-projects/noir-contracts/contracts/app_subscription_contract/src/dapp_payload.nr

@@ -1,8 +1,4 @@
-use dep::aztec::context::PrivateContext;
-use dep::aztec::protocol_types::{
-    constants::GENERATOR_INDEX__SIGNATURE_PAYLOAD, hash::pedersen_hash, traits::{Hash, Serialize},
-    address::AztecAddress
-};
+use dep::aztec::protocol_types::{constants::GENERATOR_INDEX__SIGNATURE_PAYLOAD, hash::pedersen_hash, traits::{Hash, Serialize}};
 
 use dep::authwit::entrypoint::function_call::{FunctionCall, FUNCTION_CALL_SIZE_IN_BYTES};
 

noir-projects/noir-contracts/contracts/app_subscription_contract/src/main.nr

@@ -3,16 +3,9 @@ mod dapp_payload;
 
 contract AppSubscription {
     use dep::std;
-    use dep::std::option::Option;
     use crate::dapp_payload::DAppPayload;
 
-    use dep::aztec::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector};
-
-    use dep::aztec::{
-        context::{PrivateContext, Context}, note::{note_header::NoteHeader, utils as note_utils},
-        oracle::get_public_key::get_public_key,
-        state_vars::{Map, PrivateMutable, PublicMutable, SharedImmutable}
-    };
+    use dep::aztec::{context::Context, note::utils as note_utils, oracle::get_public_key::get_public_key};
     use dep::authwit::{account::AccountActions, auth_witness::get_auth_witness, auth::assert_current_call_valid_authwit};
 
     use crate::subscription_note::{SubscriptionNote, SUBSCRIPTION_NOTE_LEN};

noir-projects/noir-contracts/contracts/app_subscription_contract/src/subscription_note.nr

@@ -1,8 +1,6 @@
 use dep::aztec::{
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
-    hash::pedersen_hash,
-    oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key},
-    log::emit_encrypted_log, context::PrivateContext, protocol_types::{address::AztecAddress}
+    note::utils::compute_note_hash_for_consumption, hash::pedersen_hash,
+    oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key}
 };
 
 global SUBSCRIPTION_NOTE_LEN: Field = 3;

noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr

@@ -1,7 +1,4 @@
 contract AvmTest {
-    // Libs
-    use dep::aztec::protocol_types::address::{AztecAddress, EthAddress};
-
     // avm lib
     use dep::aztec::avm::hash::{keccak256, poseidon, sha256};
 

noir-projects/noir-contracts/contracts/benchmarking_contract/src/main.nr

@@ -7,12 +7,7 @@
 contract Benchmarking {
     use dep::value_note::{utils::{increment, decrement}, value_note::ValueNote};
 
-    use dep::aztec::{
-        protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress},
-        context::{Context},
-        note::{utils as note_utils, note_getter_options::NoteGetterOptions, note_header::NoteHeader},
-        log::emit_unencrypted_log, state_vars::{Map, PublicMutable, PrivateSet}
-    };
+    use dep::aztec::{context::Context, note::utils as note_utils};
 
     struct Storage {
         notes: Map<AztecAddress, PrivateSet<ValueNote>>,

noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr

@@ -1,11 +1,6 @@
 use dep::aztec::{
-    protocol_types::{address::AztecAddress, constants::{MAX_NOTES_PER_PAGE, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL}},
-    context::{PrivateContext, PublicContext, Context},
-    note::{
-    note_getter_options::NoteGetterOptions, note_viewer_options::NoteViewerOptions,
-    note_getter::view_notes
-},
-    state_vars::PrivateSet
+    protocol_types::constants::{MAX_NOTES_PER_PAGE, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL},
+    context::Context, note::note_getter::view_notes
 };
 use dep::std;
 use dep::std::{option::Option};

noir-projects/noir-contracts/contracts/card_game_contract/src/game.nr

@@ -1,4 +1,4 @@
-use dep::aztec::protocol_types::{address::AztecAddress, traits::{Serialize, Deserialize}};
+use dep::aztec::protocol_types::traits::{Serialize, Deserialize};
 use crate::cards::Card;
 
 global NUMBER_OF_PLAYERS = 2;

noir-projects/noir-contracts/contracts/card_game_contract/src/main.nr

@@ -2,13 +2,13 @@ mod cards;
 mod game;
 
 contract CardGame {
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress, constants::MAX_NOTES_PER_PAGE};
-    use dep::aztec::{context::Context, hash::pedersen_hash, state_vars::{Map, PublicMutable}};
+    use dep::aztec::protocol_types::constants::MAX_NOTES_PER_PAGE;
+    use dep::aztec::{context::Context, hash::pedersen_hash};
 
     use dep::std::option::Option;
     use dep::value_note::{balance_utils, value_note::{ValueNote, VALUE_NOTE_LEN}};
 
-    use dep::aztec::note::{note_header::NoteHeader, utils as note_utils};
+    use dep::aztec::note::utils as note_utils;
 
     use crate::cards::{PACK_CARDS, Deck, Card, get_pack_cards, compute_deck_strength};
     use crate::game::{NUMBER_OF_PLAYERS, NUMBER_OF_CARDS_DECK, PLAYABLE_CARDS, PlayerEntry, Game, GAME_SERIALIZED_LEN};

noir-projects/noir-contracts/contracts/child_contract/src/main.nr

@@ -2,12 +2,7 @@
 contract Child {
     use dep::std::option::Option;
 
-    use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context}, log::emit_unencrypted_log,
-        state_vars::{PublicMutable, PrivateSet},
-        protocol_types::{abis::{function_selector::FunctionSelector, call_context::CallContext}, address::AztecAddress},
-        note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader, utils as note_utils}
-    };
+    use dep::aztec::protocol_types::abis::call_context::CallContext;
     use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
 
     struct Storage {

noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/private_function_broadcasted.nr

@@ -1,6 +1,6 @@
 use dep::aztec::protocol_types;
 use dep::aztec::protocol_types::{
-    contract_class_id::ContractClassId, abis::function_selector::FunctionSelector,
+    contract_class_id::ContractClassId,
     constants::{
     FUNCTION_TREE_HEIGHT, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
     MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,

noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/unconstrained_function_broadcasted.nr

@@ -1,6 +1,6 @@
 use dep::aztec::protocol_types;
 use dep::aztec::protocol_types::{
-    contract_class_id::ContractClassId, abis::function_selector::FunctionSelector,
+    contract_class_id::ContractClassId,
     constants::{
     ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS,
     REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE

noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/main.nr

@@ -2,17 +2,16 @@ mod events;
 mod capsule;
 
 contract ContractClassRegisterer {
-    use dep::std::option::Option;
     use dep::aztec::protocol_types::{
-        address::{AztecAddress, EthAddress}, contract_class_id::ContractClassId,
+        contract_class_id::ContractClassId,
         constants::{
         ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, FUNCTION_TREE_HEIGHT,
         MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE
     },
         traits::{Serialize}
     };
 
-    use dep::aztec::log::{emit_unencrypted_log, emit_unencrypted_log_from_private};
+    use dep::aztec::log::emit_unencrypted_log_from_private;
 
     use crate::events::{
         class_registered::ContractClassRegistered,

noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/events/instance_deployed.nr

@@ -1,6 +1,5 @@
 use dep::aztec::protocol_types::{
-    contract_class_id::ContractClassId,
-    address::{AztecAddress, EthAddress, PublicKeysHash, PartialAddress},
+    contract_class_id::ContractClassId, address::{PublicKeysHash, PartialAddress},
     constants::{DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE}, traits::{Serialize}
 };
 

noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/interface/ContractInstanceDeployer.nr

@@ -1,8 +1,6 @@
 /* Autogenerated file, do not edit! */
 
-use dep::std;
-use dep::aztec::context::{PrivateContext, PublicContext};
-use dep::aztec::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector, constants::RETURN_VALUES_LENGTH};
+use dep::aztec::protocol_types::constants::RETURN_VALUES_LENGTH;
 
 struct ContractClassIdDeployStruct {
   inner: Field,

noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr

@@ -1,14 +1,12 @@
 mod events;
 
 contract ContractInstanceDeployer {
-    use dep::std::option::Option;
     use dep::aztec::protocol_types::{
-        address::{AztecAddress, EthAddress, PublicKeysHash, PartialAddress},
-        contract_class_id::ContractClassId,
+        address::{PublicKeysHash, PartialAddress}, contract_class_id::ContractClassId,
         constants::{DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE}, traits::{Serialize}
     };
 
-    use dep::aztec::log::{emit_unencrypted_log, emit_unencrypted_log_from_private};
+    use dep::aztec::log::emit_unencrypted_log_from_private;
 
     use crate::events::{instance_deployed::ContractInstanceDeployed};
 

noir-projects/noir-contracts/contracts/counter_contract/src/main.nr

@@ -1,11 +1,7 @@
 contract Counter {
     // docs:start:imports
-    use dep::aztec::protocol_types::address::AztecAddress;
-    use dep::aztec::{
-        context::{PrivateContext, Context}, note::{note_header::NoteHeader, utils as note_utils},
-        state_vars::Map
-    };
-    use dep::value_note::{balance_utils, value_note::{ValueNote, VALUE_NOTE_LEN}};
+    use dep::value_note::balance_utils;
+    use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
     use dep::easy_private_state::EasyPrivateUint;
     // docs:end:imports
 

noir-projects/noir-contracts/contracts/delegated_on_contract/src/main.nr

@@ -3,13 +3,8 @@ contract DelegatedOn {
     use dep::std::option::Option;
 
     use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context}, log::emit_unencrypted_log,
-        state_vars::{PublicMutable, PrivateSet},
-        protocol_types::{abis::{function_selector::FunctionSelector, call_context::CallContext}, address::AztecAddress},
-        note::{
-        note_getter_options::NoteGetterOptions, note_viewer_options::NoteViewerOptions,
-        utils as note_utils, note_header::NoteHeader
-    }
+        context::{PublicContext, Context}, protocol_types::abis::call_context::CallContext,
+        note::utils as note_utils
     };
     use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
 

noir-projects/noir-contracts/contracts/delegator_contract/src/main.nr

@@ -2,11 +2,7 @@
 contract Delegator {
     use dep::std::option::Option;
 
-    use dep::aztec::{
-        log::emit_unencrypted_log, state_vars::{PublicMutable, PrivateSet},
-        protocol_types::{abis::{function_selector::FunctionSelector}, address::AztecAddress},
-        note::{note_viewer_options::NoteViewerOptions, utils as note_utils, note_header::NoteHeader}
-    };
+    use dep::aztec::note::utils as note_utils;
     use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
 
     struct Storage {

noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr

@@ -13,18 +13,10 @@ mod types;
 
 contract DocsExample {
     // how to import dependencies defined in your workspace
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
-    use dep::aztec::{
-        note::{
-        note_header::NoteHeader, note_getter_options::{NoteGetterOptions, Comparator},
-        note_viewer_options::{NoteViewerOptions}, utils as note_utils
-    },
-        context::{PrivateContext, PublicContext, Context},
-        state_vars::{Map, PublicMutable, PublicImmutable, PrivateMutable, PrivateImmutable, PrivateSet, SharedImmutable}
-    };
+    use dep::aztec::context::Context;
     // how to import methods from other files/folders within your workspace
     use crate::options::create_account_card_getter_options;
-    use crate::types::{card_note::{CardNote, CARD_NOTE_LEN}, leader::Leader};
+    use crate::types::{card_note::CardNote, leader::Leader};
 
     struct Storage {
         // Shows how to create a custom struct in PublicMutable

noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr

@@ -1,6 +1,6 @@
 use crate::types::card_note::{CardNote, CARD_NOTE_LEN};
-use dep::aztec::protocol_types::{address::AztecAddress, constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL};
-use dep::aztec::note::note_getter_options::{NoteGetterOptions, Sort, SortOrder};
+use dep::aztec::protocol_types::constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL;
+use dep::aztec::note::note_getter_options::{Sort, SortOrder};
 use dep::std::option::Option;
 
 // Shows how to use NoteGetterOptions and query for notes.

noir-projects/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr

@@ -1,8 +1,8 @@
 use dep::aztec::{
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
+    note::utils::compute_note_hash_for_consumption,
     oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key},
-    log::emit_encrypted_log, hash::pedersen_hash, context::PrivateContext,
-    protocol_types::{address::AztecAddress, traits::Empty}
+    hash::pedersen_hash,
+    protocol_types::traits::Empty,
 };
 
 // Shows how to create a custom note

noir-projects/noir-contracts/contracts/docs_example_contract/src/types/leader.nr

@@ -1,4 +1,4 @@
-use dep::aztec::protocol_types::{address::AztecAddress, traits::{Serialize, Deserialize}};
+use dep::aztec::protocol_types::traits::{Serialize, Deserialize};
 
 // Shows how to create a custom struct in Public
 struct Leader {

noir-projects/noir-contracts/contracts/easy_private_token_contract/src/main.nr

@@ -1,8 +1,7 @@
 // docs:start:easy_private_token_contract
 contract EasyPrivateToken {
-    use dep::aztec::protocol_types::address::AztecAddress;
-    use dep::aztec::{note::{note_header::NoteHeader, utils as note_utils}, state_vars::Map};
-    use dep::value_note::{balance_utils, value_note::ValueNote};
+    use dep::value_note::balance_utils;
+    use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
     use dep::easy_private_state::EasyPrivateUint;
 
     struct Storage {

noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr

@@ -1,10 +1,4 @@
 contract EasyPrivateVoting {
-    // docs:start:imports
-    use dep::aztec::{
-        protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress},
-        context::{PrivateContext, Context}, state_vars::{Map, PublicMutable}
-    };
-    // docs:end:imports
     // docs:start:storage_struct
     struct Storage {
         admin: PublicMutable<AztecAddress>, // admin can end vote

noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr

@@ -1,8 +1,7 @@
-use dep::aztec::protocol_types::address::AztecAddress;
 use dep::aztec::{
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
+    note::utils::compute_note_hash_for_consumption,
     oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key},
-    log::emit_encrypted_log, hash::pedersen_hash, context::PrivateContext
+    hash::pedersen_hash,
 };
 
 global ECDSA_PUBLIC_KEY_NOTE_LEN: Field = 5;

noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/main.nr

@@ -3,14 +3,8 @@ mod ecdsa_public_key_note;
 // 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 EcdsaAccount {
-    use dep::aztec::protocol_types::{abis::{call_context::CallContext, function_selector::FunctionSelector}, address::AztecAddress};
     use dep::std;
-    use dep::std::option::Option;
-    use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context},
-        note::{note_header::NoteHeader, utils as note_utils}, oracle::get_public_key::get_public_key,
-        state_vars::PrivateImmutable
-    };
+    use dep::aztec::context::Context;
     use dep::authwit::{
         entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions,
         auth_witness::get_auth_witness