feat: Aztec prelude

boxes/token/src/contracts/src/main.nr

@@ -17,17 +17,9 @@ contract Token {
     use dep::compressed_string::FieldCompressedString;
 
     use dep::aztec::{
-        note::{
-            note_getter_options::NoteGetterOptions,
-            note_header::NoteHeader,
-            utils as note_utils,
-        },
+        note::utils as note_utils,
         hash::{compute_secret_hash},
-        state_vars::{map::Map, public_state::PublicState, stable_public_state::StablePublicState,  set::Set},
-        protocol_types::{
-            abis::function_selector::FunctionSelector,
-            address::AztecAddress
-        }
+        protocol_types::abis::function_selector::FunctionSelector,
     };
 
     // docs:start:import_authwit

boxes/token/src/contracts/src/types/balances_map.nr

@@ -2,20 +2,10 @@ use dep::std::option::Option;
 use dep::safe_math::SafeU120;
 use dep::aztec::{
     context::Context,
-    protocol_types::{
-        address::AztecAddress,
-        constants::MAX_READ_REQUESTS_PER_CALL,
-    },
-    state_vars::{
-        set::Set,
-        map::Map
-    },
+    protocol_types::constants::MAX_READ_REQUESTS_PER_CALL,
     note::{
         note_getter::view_notes,
-        note_getter_options::{NoteGetterOptions, SortOrder},
-        note_viewer_options::NoteViewerOptions,
-        note_header::NoteHeader,
-        note_interface::NoteInterface,
+        note_getter_options::SortOrder,
     }
 };
 use crate::types::token_note::{TokenNote, OwnedNote};

boxes/token/src/contracts/src/types/token_note.nr

@@ -1,16 +1,6 @@
 use dep::aztec::{
-    protocol_types::{
-        address::AztecAddress,
-        constants::MAX_READ_REQUESTS_PER_CALL
-    },
-    note::{
-        note_header::NoteHeader,
-        note_interface::NoteInterface,
-        utils::compute_note_hash_for_consumption,
-    },
-    context::PrivateContext,
-    state_vars::set::Set,
-    log::emit_encrypted_log,
+    protocol_types::constants::MAX_READ_REQUESTS_PER_CALL,
+    note::utils::compute_note_hash_for_consumption,
     hash::pedersen_hash,
 };
 use dep::aztec::oracle::{

boxes/token/src/contracts/src/types/transparent_note.nr

@@ -1,12 +1,7 @@
 // docs:start:token_types_all
 use dep::aztec::{
-    note::{
-        note_header::NoteHeader,
-        note_interface::NoteInterface,
-        utils::compute_note_hash_for_consumption,
-    },
+    note::utils::compute_note_hash_for_consumption,
     hash::{compute_secret_hash, pedersen_hash},
-    context::PrivateContext,
 };
 
 global TRANSPARENT_NOTE_LEN: Field = 2;

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

@@ -8,5 +8,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,27 @@
+use dep::protocol_types::{
+    address::{
+        AztecAddress, 
+        EthAddress,
+    },
+};
+use crate::{
+    state_vars::{
+        map::Map, 
+        public_state::PublicState, 
+        singleton::Singleton,
+        immutable_singleton::ImmutableSingleton,
+        set::Set,
+        stable_public_state::StablePublicState,
+    },
+    log::{
+        emit_unencrypted_log,
+        emit_encrypted_log,
+    },
+    context::PrivateContext,
+    note::{
+        note_header::NoteHeader,
+        note_interface::NoteInterface,
+        note_getter_options::NoteGetterOptions, 
+        note_viewer_options::NoteViewerOptions,
+    }
+};

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

@@ -1,9 +1,6 @@
 //
 
 contract AvmTest {
-    // Libs
-    use dep::aztec::protocol_types::address::{AztecAddress, EthAddress};
-
     // avm lib
     use dep::aztec::avm::context::AvmContext;
 

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

@@ -8,10 +8,9 @@ contract Benchmarking {
     use dep::value_note::{utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, 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::Map, public_state::PublicState, set::Set}
+        protocol_types::abis::function_selector::FunctionSelector,
+        context::Context,
+        note::utils as note_utils,
     };
 
     struct Storage {

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

@@ -6,13 +6,12 @@ use dep::aztec::{
             MAX_READ_REQUESTS_PER_CALL,
         },
     },
-    context::{PrivateContext, PublicContext, Context},
+    context::{PublicContext, Context},
     note::{
         note_getter_options::NoteGetterOptions,
         note_viewer_options::NoteViewerOptions,
         note_getter::view_notes,
     },
-    state_vars::set::Set,
 };
 use dep::std;
 use dep::std::{

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

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

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::Map, public_state::PublicState}};
+    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, 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

@@ -3,10 +3,8 @@ contract Child {
     use dep::std::option::Option;
 
     use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context}, log::emit_unencrypted_log,
-        state_vars::{public_state::PublicState, set::Set},
-        protocol_types::{abis::{function_selector::FunctionSelector, call_context::CallContext}, address::AztecAddress},
-        note::{note_getter_options::NoteGetterOptions}
+        context::{PublicContext, Context},
+        protocol_types::abis::{function_selector::FunctionSelector, call_context::CallContext},
     };
     use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
 

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

@@ -1,13 +1,8 @@
 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::Map,
+        context::Context,
+        note::utils as note_utils,
     };
     use dep::value_note::{
             balance_utils,

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

@@ -15,17 +15,13 @@ 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},
+            note_getter_options::Comparator,
             utils as note_utils,
         },
-        context::{PrivateContext, PublicContext, Context},
-        state_vars::{map::Map, public_state::PublicState,singleton::Singleton, immutable_singleton::ImmutableSingleton, set::Set, stable_public_state::StablePublicState},
+        context::{PublicContext, Context},
     };
     // how to import methods from other files/folders within your workspace
     use crate::options::create_account_card_getter_options;

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/easy_private_token_contract/src/main.nr

@@ -1,15 +1,10 @@
 // docs:start:easy_private_token_contract
 contract EasyPrivateToken {
-    use dep::aztec::protocol_types::address::AztecAddress;
-    use dep::std::option::Option;
     use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context},
-        note::{
-            note_header::NoteHeader,
-            utils as note_utils,
-        },
-        state_vars::map::Map,
+        context::{PublicContext, Context},
+        note::utils as note_utils,
     };
+    use dep::std::option::Option;
     use dep::value_note::{
             balance_utils,
             value_note::{

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

@@ -1,8 +1,8 @@
 contract EasyPrivateVoting {
     // docs:start:imports
     use dep::aztec::{
-        protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress},
-        context::{PrivateContext, Context}, state_vars::{map::Map, public_state::PublicState}
+        protocol_types::abis::function_selector::FunctionSelector,
+        context::Context,
     };
     // docs:end:imports
     // docs:start:storage_struct

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,13 +3,12 @@ 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, address::AztecAddress};
+    use dep::aztec::protocol_types::abis::call_context::CallContext;
     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::immutable_singleton::ImmutableSingleton
+        context::{PublicContext, Context},
+        note::utils as note_utils, oracle::get_public_key::get_public_key,
     };
     use dep::authwit::{
         entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions,

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

@@ -2,12 +2,12 @@
 contract Escrow {
     use dep::std::option::Option;
 
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
+    use dep::aztec::protocol_types::abis::function_selector::FunctionSelector;
 
     use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context},
-        note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader, utils as note_utils},
-        oracle::get_public_key::get_public_key, state_vars::set::Set
+        context::{PublicContext, Context},
+        note::utils as note_utils,
+        oracle::get_public_key::get_public_key,
     };
 
     use dep::address_note::address_note::{AddressNote, ADDRESS_NOTE_LEN};

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

@@ -3,7 +3,6 @@ mod test_contract_interface;
 // Contract that uses the autogenerated interface of the Test contract for calling its functions.
 // Used for testing calling into other contracts via autogenerated interfaces.
 contract ImportTest {
-    use dep::aztec::protocol_types::address::AztecAddress;
     use crate::test_contract_interface::{
         TestPrivateContextInterface, TestPublicContextInterface, AStructTestCodeGenStruct,
         ADeepStructTestCodeGenStruct, ANoteADeepStructTestCodeGenStruct,

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

@@ -1,14 +1,14 @@
 // A demonstration of inclusion and non-inclusion proofs.
 contract InclusionProofs {
     use dep::aztec::protocol_types::{
-        abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress},
+        abis::function_selector::FunctionSelector,
         grumpkin_point::GrumpkinPoint, contract_class::ContractClassId
     };
     use dep::aztec::{
-        state_vars::{map::Map, set::Set, public_state::PublicState}, context::Context,
+        context::Context,
         note::{
-        note_getter_options::NoteGetterOptions, note_getter_options::NoteStatus,
-        note_header::NoteHeader, utils as note_utils
+            note_getter_options::NoteStatus,
+            utils as note_utils,
     }
     };
     // docs:start:imports

noir-projects/noir-contracts/contracts/lending_contract/src/asset.nr

@@ -1,5 +1,4 @@
 use dep::aztec::protocol_types::{
-    address::AztecAddress,
     traits::{Deserialize, Serialize}
 };
 

noir-projects/noir-contracts/contracts/lending_contract/src/interfaces.nr

@@ -1,12 +1,9 @@
 use dep::aztec::context::{
-    PrivateContext,
     PublicContext
 };
-
 use crate::asset::Asset;
 use dep::aztec::protocol_types::{
     abis::function_selector::FunctionSelector,
-    address::AztecAddress,
     constants::RETURN_VALUES_LENGTH,
 };
 

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

@@ -13,16 +13,11 @@ mod interfaces;
 contract Lending {
     use dep::aztec::protocol_types::{
         abis::function_selector::FunctionSelector,
-        address::AztecAddress,
     };
     use dep::safe_math::SafeU120;
     use dep::std::option::Option;
     use dep::aztec::{
         context::{PrivateContext, PublicContext, Context},
-        state_vars::{
-            map::Map,
-            public_state::PublicState,
-        }
     };
     use crate::asset::Asset;
     use crate::interest_math::compute_multiplier;

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

@@ -7,11 +7,10 @@ contract PendingCommitments {
     use dep::std::option::Option;
     use dep::value_note::{balance_utils, filter::filter_notes_min_sum, value_note::{VALUE_NOTE_LEN, ValueNote}};
     use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context}, log::emit_encrypted_log,
-        note::{note_getter::NoteGetterOptions, note_header::NoteHeader, utils as note_utils},
-        state_vars::{map::Map, set::Set}
+        context::{PublicContext, Context},
+        note::utils as note_utils,
     };
-    use dep::aztec::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector};
+    use dep::aztec::protocol_types::abis::function_selector::FunctionSelector;
 
     struct Storage {
         balances: Map<AztecAddress, Set<ValueNote>>,