From 11e97b934bc78b7a8affb2d8073bf66ef977916a Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jan 2024 16:52:01 +0000 Subject: [PATCH 01/12] feat: reexport `protocol_types` from `aztec-nr` --- yarn-project/aztec-nr/address-note/Nargo.toml | 1 - yarn-project/aztec-nr/address-note/src/address_note.nr | 2 +- yarn-project/aztec-nr/authwit/Nargo.toml | 1 - yarn-project/aztec-nr/authwit/src/entrypoint.nr | 2 +- yarn-project/aztec-nr/aztec/src/lib.nr | 1 + yarn-project/aztec-nr/compressed-string/Nargo.toml | 1 - .../aztec-nr/compressed-string/src/compressed_string.nr | 2 +- yarn-project/aztec-nr/easy-private-state/Nargo.toml | 1 - .../aztec-nr/easy-private-state/src/easy_private_state.nr | 2 +- yarn-project/aztec-nr/value-note/Nargo.toml | 1 - yarn-project/aztec-nr/value-note/src/value_note.nr | 2 +- 11 files changed, 6 insertions(+), 10 deletions(-) diff --git a/yarn-project/aztec-nr/address-note/Nargo.toml b/yarn-project/aztec-nr/address-note/Nargo.toml index a9de5de99d65..6e1ee8bfbc0c 100644 --- a/yarn-project/aztec-nr/address-note/Nargo.toml +++ b/yarn-project/aztec-nr/address-note/Nargo.toml @@ -6,4 +6,3 @@ type = "lib" [dependencies] aztec = { path = "../aztec" } -protocol_types = { path = "../../noir-protocol-circuits/src/crates/types" } diff --git a/yarn-project/aztec-nr/address-note/src/address_note.nr b/yarn-project/aztec-nr/address-note/src/address_note.nr index 314a862c727b..dc5e0fa47d6e 100644 --- a/yarn-project/aztec-nr/address-note/src/address_note.nr +++ b/yarn-project/aztec-nr/address-note/src/address_note.nr @@ -1,8 +1,8 @@ // docs:start:encrypted_import use dep::aztec::log::emit_encrypted_log; // docs:end:encrypted_import -use dep::protocol_types::address::AztecAddress; use dep::aztec::{ + protocol_types::address::AztecAddress, note::{ note_header::NoteHeader, note_interface::NoteInterface, diff --git a/yarn-project/aztec-nr/authwit/Nargo.toml b/yarn-project/aztec-nr/authwit/Nargo.toml index e22599432518..a6f248859f12 100644 --- a/yarn-project/aztec-nr/authwit/Nargo.toml +++ b/yarn-project/aztec-nr/authwit/Nargo.toml @@ -6,4 +6,3 @@ type = "lib" [dependencies] aztec = { path = "../aztec" } -protocol_types = { path = "../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/aztec-nr/authwit/src/entrypoint.nr b/yarn-project/aztec-nr/authwit/src/entrypoint.nr index 5f22a8e79b03..82c3f5f6e2f3 100644 --- a/yarn-project/aztec-nr/authwit/src/entrypoint.nr +++ b/yarn-project/aztec-nr/authwit/src/entrypoint.nr @@ -1,7 +1,7 @@ use dep::aztec::abi; use dep::aztec::types::vec::BoundedVec; use dep::aztec::context::PrivateContext; -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ abis::{ call_stack_item::{ PrivateCallStackItem, diff --git a/yarn-project/aztec-nr/aztec/src/lib.nr b/yarn-project/aztec-nr/aztec/src/lib.nr index 46f548d4305c..39c5b6c290ed 100644 --- a/yarn-project/aztec-nr/aztec/src/lib.nr +++ b/yarn-project/aztec-nr/aztec/src/lib.nr @@ -9,3 +9,4 @@ mod oracle; mod state_vars; mod types; mod utils; +use dep::protocol_types; diff --git a/yarn-project/aztec-nr/compressed-string/Nargo.toml b/yarn-project/aztec-nr/compressed-string/Nargo.toml index 431e8d343950..238766acf664 100644 --- a/yarn-project/aztec-nr/compressed-string/Nargo.toml +++ b/yarn-project/aztec-nr/compressed-string/Nargo.toml @@ -6,4 +6,3 @@ type = "lib" [dependencies] aztec = {path = "../aztec"} -protocol_types = {path = "../../noir-protocol-circuits/src/crates/types"} diff --git a/yarn-project/aztec-nr/compressed-string/src/compressed_string.nr b/yarn-project/aztec-nr/compressed-string/src/compressed_string.nr index b81d86648eb0..0cf51b8edb2a 100644 --- a/yarn-project/aztec-nr/compressed-string/src/compressed_string.nr +++ b/yarn-project/aztec-nr/compressed-string/src/compressed_string.nr @@ -1,5 +1,5 @@ use dep::aztec::types::type_serialization::TypeSerializationInterface; -use dep::protocol_types::utils::field::field_from_bytes; +use dep::aztec::protocol_types::utils::field::field_from_bytes; use dep::std; // A Fixedsize Compressed String. diff --git a/yarn-project/aztec-nr/easy-private-state/Nargo.toml b/yarn-project/aztec-nr/easy-private-state/Nargo.toml index 55ac93c33765..31c96165af58 100644 --- a/yarn-project/aztec-nr/easy-private-state/Nargo.toml +++ b/yarn-project/aztec-nr/easy-private-state/Nargo.toml @@ -7,4 +7,3 @@ type = "lib" [dependencies] aztec = { path = "../aztec" } value_note = { path = "../value-note" } -protocol_types = { path = "../../noir-protocol-circuits/src/crates/types" } diff --git a/yarn-project/aztec-nr/easy-private-state/src/easy_private_state.nr b/yarn-project/aztec-nr/easy-private-state/src/easy_private_state.nr index 504686d13748..29feeeb26b0d 100644 --- a/yarn-project/aztec-nr/easy-private-state/src/easy_private_state.nr +++ b/yarn-project/aztec-nr/easy-private-state/src/easy_private_state.nr @@ -1,5 +1,5 @@ -use dep::protocol_types::address::AztecAddress; use dep::aztec::{ + protocol_types::address::AztecAddress, context::Context, note::note_getter_options::NoteGetterOptions, state_vars::set::Set, diff --git a/yarn-project/aztec-nr/value-note/Nargo.toml b/yarn-project/aztec-nr/value-note/Nargo.toml index 7f87db94351a..01f5ee19619b 100644 --- a/yarn-project/aztec-nr/value-note/Nargo.toml +++ b/yarn-project/aztec-nr/value-note/Nargo.toml @@ -6,4 +6,3 @@ type = "lib" [dependencies] aztec = { path = "../aztec" } -protocol_types = { path = "../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/aztec-nr/value-note/src/value_note.nr b/yarn-project/aztec-nr/value-note/src/value_note.nr index 7e7e2db39d8f..d02037e49982 100644 --- a/yarn-project/aztec-nr/value-note/src/value_note.nr +++ b/yarn-project/aztec-nr/value-note/src/value_note.nr @@ -1,5 +1,5 @@ -use dep::protocol_types::address::AztecAddress; use dep::aztec::{ + protocol_types::address::AztecAddress, note::{ note_header::NoteHeader, note_interface::NoteInterface, From 4ae11a1ae5ad8e231b2c28d961b9ff5ecde66128 Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jan 2024 16:57:35 +0000 Subject: [PATCH 02/12] chore: handle missed imports --- yarn-project/aztec-nr/value-note/src/filter.nr | 2 +- yarn-project/aztec-nr/value-note/src/utils.nr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/aztec-nr/value-note/src/filter.nr b/yarn-project/aztec-nr/value-note/src/filter.nr index 46d3d4ecb2f0..56dd89a5ca90 100644 --- a/yarn-project/aztec-nr/value-note/src/filter.nr +++ b/yarn-project/aztec-nr/value-note/src/filter.nr @@ -1,5 +1,5 @@ use dep::std::option::Option; -use dep::protocol_types::constants::MAX_READ_REQUESTS_PER_CALL; +use dep::aztec::protocol_types::constants::MAX_READ_REQUESTS_PER_CALL; use crate::value_note::ValueNote; pub fn filter_notes_min_sum( diff --git a/yarn-project/aztec-nr/value-note/src/utils.nr b/yarn-project/aztec-nr/value-note/src/utils.nr index 76fcfd217b44..277e0b114c3b 100644 --- a/yarn-project/aztec-nr/value-note/src/utils.nr +++ b/yarn-project/aztec-nr/value-note/src/utils.nr @@ -7,7 +7,7 @@ use crate::{ filter::filter_notes_min_sum, value_note::{ValueNote, VALUE_NOTE_LEN}, }; -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; // Sort the note values (0th field) in descending order. // Pick the fewest notes whose sum is equal to or greater than `amount`. From 9050ef54890ee23995bdc42ebf92d8f32ffe70ba Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jan 2024 17:04:03 +0000 Subject: [PATCH 03/12] chore: more missed imports --- yarn-project/aztec-nr/authwit/src/auth.nr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/aztec-nr/authwit/src/auth.nr b/yarn-project/aztec-nr/authwit/src/auth.nr index 5279aa53d2f5..45dd5963f64f 100644 --- a/yarn-project/aztec-nr/authwit/src/auth.nr +++ b/yarn-project/aztec-nr/authwit/src/auth.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, constants::{ @@ -82,4 +82,4 @@ pub fn compute_authwit_message_hash( GENERATOR_INDEX__SIGNATURE_PAYLOAD ) } -// docs:end:compute_authwit_message_hash \ No newline at end of file +// docs:end:compute_authwit_message_hash From 8d62342e77482d191672d05fb9bff4cd9a32ec3e Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 10 Jan 2024 17:35:03 +0000 Subject: [PATCH 04/12] chore: nargo fmt --- yarn-project/aztec-nr/authwit/src/auth.nr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yarn-project/aztec-nr/authwit/src/auth.nr b/yarn-project/aztec-nr/authwit/src/auth.nr index 45dd5963f64f..d9dababda413 100644 --- a/yarn-project/aztec-nr/authwit/src/auth.nr +++ b/yarn-project/aztec-nr/authwit/src/auth.nr @@ -22,7 +22,11 @@ global IS_VALID_PUBLIC_SELECTOR = 0xf3661153; // docs:start:assert_valid_authwit // Assert that `on_behalf_of` have authorized `message_hash` with a valid authentication witness -pub fn assert_valid_authwit(context: &mut PrivateContext, on_behalf_of: AztecAddress, message_hash: Field) { +pub fn assert_valid_authwit( + context: &mut PrivateContext, + on_behalf_of: AztecAddress, + message_hash: Field +) { let is_valid_selector = FunctionSelector::from_field(IS_VALID_SELECTOR); let result = context.call_private_function(on_behalf_of, is_valid_selector, [message_hash])[0]; context.push_new_nullifier(message_hash, 0); From d336b72d8438e9ac03064e57b19331657a5aa822 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 12 Jan 2024 11:53:42 +0000 Subject: [PATCH 05/12] chore: use reexported `protocol_types` in `noir-contracts` --- .../contracts/benchmarking_contract/Nargo.toml | 1 - .../contracts/benchmarking_contract/src/main.nr | 9 ++++----- .../contracts/card_game_contract/Nargo.toml | 2 +- .../contracts/card_game_contract/src/cards.nr | 14 +++++++------- .../contracts/card_game_contract/src/game.nr | 2 +- .../contracts/card_game_contract/src/main.nr | 2 +- .../contracts/child_contract/Nargo.toml | 2 +- .../contracts/child_contract/src/main.nr | 2 +- .../contracts/counter_contract/Nargo.toml | 1 - .../contracts/counter_contract/src/main.nr | 2 +- .../contracts/docs_example_contract/Nargo.toml | 1 - .../contracts/docs_example_contract/src/actions.nr | 2 +- .../contracts/docs_example_contract/src/main.nr | 2 +- .../contracts/docs_example_contract/src/options.nr | 2 +- .../docs_example_contract/src/types/card_note.nr | 2 +- .../src/types/profile_note.nr | 2 +- .../docs_example_contract/src/types/queen.nr | 4 ++-- .../docs_example_contract/src/types/rules_note.nr | 2 +- .../easy_private_token_contract/Nargo.toml | 1 - .../easy_private_token_contract/src/main.nr | 2 +- .../easy_private_voting_contract/Nargo.toml | 1 - .../easy_private_voting_contract/src/main.nr | 8 ++++---- .../contracts/ecdsa_account_contract/Nargo.toml | 1 - .../src/ecdsa_public_key_note.nr | 2 +- .../contracts/ecdsa_account_contract/src/main.nr | 2 +- .../contracts/escrow_contract/Nargo.toml | 1 - .../contracts/escrow_contract/src/main.nr | 2 +- .../contracts/import_test_contract/Nargo.toml | 1 - .../contracts/import_test_contract/src/main.nr | 2 +- .../contracts/inclusion_proofs_contract/Nargo.toml | 1 - .../inclusion_proofs_contract/src/main.nr | 2 +- .../contracts/lending_contract/Nargo.toml | 1 - .../contracts/lending_contract/src/asset.nr | 2 +- .../contracts/lending_contract/src/interfaces.nr | 2 +- .../contracts/lending_contract/src/main.nr | 2 +- .../contracts/parent_contract/Nargo.toml | 2 +- .../contracts/parent_contract/src/main.nr | 2 +- .../pending_commitments_contract/Nargo.toml | 2 +- .../pending_commitments_contract/src/main.nr | 2 +- .../contracts/price_feed_contract/Nargo.toml | 2 +- .../contracts/price_feed_contract/src/main.nr | 2 +- .../contracts/reader_contract/Nargo.toml | 3 +-- .../contracts/reader_contract/src/main.nr | 2 +- .../contracts/schnorr_account_contract/Nargo.toml | 2 +- .../contracts/schnorr_account_contract/src/main.nr | 2 +- .../src/public_key_note.nr | 2 +- .../schnorr_single_key_account_contract/Nargo.toml | 1 - .../src/auth_oracle.nr | 2 +- .../src/util.nr | 2 +- .../contracts/slow_tree_contract/Nargo.toml | 1 - .../contracts/slow_tree_contract/src/main.nr | 2 +- .../contracts/stateful_test_contract/Nargo.toml | 1 - .../contracts/stateful_test_contract/src/main.nr | 2 +- .../contracts/test_contract/Nargo.toml | 1 - .../contracts/test_contract/src/interface.nr | 2 +- .../contracts/test_contract/src/main.nr | 4 ++-- .../contracts/token_blacklist_contract/Nargo.toml | 1 - .../token_blacklist_contract/src/interfaces.nr | 2 +- .../contracts/token_blacklist_contract/src/main.nr | 2 +- .../src/types/balance_set.nr | 4 ++-- .../src/types/balances_map.nr | 2 +- .../src/types/token_note.nr | 4 ++-- .../contracts/token_bridge_contract/Nargo.toml | 1 - .../contracts/token_bridge_contract/src/main.nr | 2 +- .../token_bridge_contract/src/token_interface.nr | 2 +- .../contracts/token_contract/Nargo.toml | 1 - .../contracts/token_contract/src/main.nr | 2 +- .../token_contract/src/types/balance_set.nr | 2 +- .../token_contract/src/types/balances_map.nr | 2 +- .../token_contract/src/types/token_note.nr | 2 +- .../token_portal_content_hash_lib/Nargo.toml | 1 - .../token_portal_content_hash_lib/src/lib.nr | 2 +- .../contracts/uniswap_contract/Nargo.toml | 2 +- .../contracts/uniswap_contract/src/interfaces.nr | 2 +- .../contracts/uniswap_contract/src/main.nr | 2 +- .../contracts/uniswap_contract/src/util.nr | 4 ++-- 76 files changed, 75 insertions(+), 95 deletions(-) diff --git a/yarn-project/noir-contracts/contracts/benchmarking_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/benchmarking_contract/Nargo.toml index c7c751b7c6e2..1e56d7285e82 100644 --- a/yarn-project/noir-contracts/contracts/benchmarking_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/benchmarking_contract/Nargo.toml @@ -7,4 +7,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } value_note = { path = "../../../aztec-nr/value-note" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/benchmarking_contract/src/main.nr b/yarn-project/noir-contracts/contracts/benchmarking_contract/src/main.nr index e27e1dfb7bb7..3cae32124efd 100644 --- a/yarn-project/noir-contracts/contracts/benchmarking_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/benchmarking_contract/src/main.nr @@ -11,6 +11,10 @@ contract Benchmarking { }; 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, @@ -18,11 +22,6 @@ contract Benchmarking { types::type_serialization::field_serialization::{FieldSerializationMethods, FIELD_SERIALIZED_LEN}, }; - use dep::protocol_types::{ - abis::function_selector::FunctionSelector, - address::AztecAddress, - }; - struct Storage { notes: Map>, balances: Map>, diff --git a/yarn-project/noir-contracts/contracts/card_game_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/card_game_contract/Nargo.toml index af822821e2fc..c425ae39426f 100644 --- a/yarn-project/noir-contracts/contracts/card_game_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/card_game_contract/Nargo.toml @@ -7,4 +7,4 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } value_note = { path = "../../../aztec-nr/value-note"} -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } + diff --git a/yarn-project/noir-contracts/contracts/card_game_contract/src/cards.nr b/yarn-project/noir-contracts/contracts/card_game_contract/src/cards.nr index 255834dbeb6f..6672ad559bc4 100644 --- a/yarn-project/noir-contracts/contracts/card_game_contract/src/cards.nr +++ b/yarn-project/noir-contracts/contracts/card_game_contract/src/cards.nr @@ -1,11 +1,11 @@ -use dep::protocol_types::{ - address::AztecAddress, - constants::{ - MAX_NOTES_PER_PAGE, - MAX_READ_REQUESTS_PER_CALL, - }, -}; use dep::aztec::{ + protocol_types::{ + address::AztecAddress, + constants::{ + MAX_NOTES_PER_PAGE, + MAX_READ_REQUESTS_PER_CALL, + }, + }, context::{PrivateContext, PublicContext, Context}, note::{ note_getter_options::NoteGetterOptions, diff --git a/yarn-project/noir-contracts/contracts/card_game_contract/src/game.nr b/yarn-project/noir-contracts/contracts/card_game_contract/src/game.nr index a6b61fa7db42..63b50bcf783d 100644 --- a/yarn-project/noir-contracts/contracts/card_game_contract/src/game.nr +++ b/yarn-project/noir-contracts/contracts/card_game_contract/src/game.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::types::type_serialization::TypeSerializationInterface; use crate::cards::Card; diff --git a/yarn-project/noir-contracts/contracts/card_game_contract/src/main.nr b/yarn-project/noir-contracts/contracts/card_game_contract/src/main.nr index b28d27c625be..96f63921110d 100644 --- a/yarn-project/noir-contracts/contracts/card_game_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/card_game_contract/src/main.nr @@ -2,7 +2,7 @@ mod cards; mod game; contract CardGame { - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, constants::MAX_NOTES_PER_PAGE, diff --git a/yarn-project/noir-contracts/contracts/child_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/child_contract/Nargo.toml index 007e868a4858..c3cd82257770 100644 --- a/yarn-project/noir-contracts/contracts/child_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/child_contract/Nargo.toml @@ -6,4 +6,4 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } + diff --git a/yarn-project/noir-contracts/contracts/child_contract/src/main.nr b/yarn-project/noir-contracts/contracts/child_contract/src/main.nr index 92203904a128..49caabe92cff 100644 --- a/yarn-project/noir-contracts/contracts/child_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/child_contract/src/main.nr @@ -9,7 +9,7 @@ contract Child { state_vars::public_state::PublicState, types::type_serialization::field_serialization::{FieldSerializationMethods, FIELD_SERIALIZED_LEN}, }; - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, }; diff --git a/yarn-project/noir-contracts/contracts/counter_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/counter_contract/Nargo.toml index b0e31e855ad6..abaa2f0011b4 100644 --- a/yarn-project/noir-contracts/contracts/counter_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/counter_contract/Nargo.toml @@ -8,4 +8,3 @@ type = "contract" aztec = { path = "../../../aztec-nr/aztec" } value_note = { path = "../../../aztec-nr/value-note" } easy_private_state = { path = "../../../aztec-nr/easy-private-state"} -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/counter_contract/src/main.nr b/yarn-project/noir-contracts/contracts/counter_contract/src/main.nr index ec4367bfa10b..72601166b1e2 100644 --- a/yarn-project/noir-contracts/contracts/counter_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/counter_contract/src/main.nr @@ -1,6 +1,6 @@ contract Counter { // docs:start:imports - use dep::protocol_types::address::AztecAddress; + use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::{ context::{PrivateContext, Context}, note::{ diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/docs_example_contract/Nargo.toml index f6f38543c43a..665ac0a98f03 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/Nargo.toml @@ -6,4 +6,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/src/actions.nr b/yarn-project/noir-contracts/contracts/docs_example_contract/src/actions.nr index 88f7a9422a16..d4c070aa67e0 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/src/actions.nr +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/src/actions.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ address::AztecAddress, constants::{MAX_NOTES_PER_PAGE, MAX_READ_REQUESTS_PER_CALL}, }; diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/src/main.nr b/yarn-project/noir-contracts/contracts/docs_example_contract/src/main.nr index 6c4f8a65a743..ac0e322b884a 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/src/main.nr @@ -4,7 +4,7 @@ mod options; mod types; contract DocsExample { - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ address::AztecAddress, abis::function_selector::FunctionSelector, }; diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/src/options.nr b/yarn-project/noir-contracts/contracts/docs_example_contract/src/options.nr index c389ed1a7f11..8fb26e6e7d73 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/src/options.nr +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/src/options.nr @@ -1,5 +1,5 @@ use crate::types::card_note::{CardNote, CARD_NOTE_LEN}; -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ address::AztecAddress, constants::MAX_READ_REQUESTS_PER_CALL, }; diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr index 03ecfa5545f3..97da78e65192 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::{ note::{ note_header::NoteHeader, diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/profile_note.nr b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/profile_note.nr index 9d4eea39b09f..a30e4540d0fd 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/profile_note.nr +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/profile_note.nr @@ -1,6 +1,6 @@ -use dep::protocol_types::address::AztecAddress; use dep::std::option::Option; use dep::aztec::{ + protocol_types::address::AztecAddress; note::{ note_header::NoteHeader, note_interface::NoteInterface, diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/queen.nr b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/queen.nr index 645d39f89247..acd4ed0f7caf 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/queen.nr +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/queen.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::types::type_serialization::TypeSerializationInterface; // docs:start:state_vars-CustomStruct @@ -23,4 +23,4 @@ global QueenSerializationMethods = TypeSerializationInterface { deserialize, serialize, }; -// docs:end:state_vars-PublicStateCustomStruct \ No newline at end of file +// docs:end:state_vars-PublicStateCustomStruct diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/rules_note.nr b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/rules_note.nr index aae5dba13fed..3ca5b5732191 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/rules_note.nr +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/rules_note.nr @@ -1,6 +1,6 @@ -use dep::protocol_types::address::AztecAddress; use dep::std::option::Option; use dep::aztec::{ + protocol_types::address::AztecAddress note::{ note_header::NoteHeader, note_interface::NoteInterface, diff --git a/yarn-project/noir-contracts/contracts/easy_private_token_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/easy_private_token_contract/Nargo.toml index 6e0cb1a8064b..cac909c93038 100644 --- a/yarn-project/noir-contracts/contracts/easy_private_token_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/easy_private_token_contract/Nargo.toml @@ -8,4 +8,3 @@ type = "contract" aztec = { path = "../../../aztec-nr/aztec" } value_note = { path = "../../../aztec-nr/value-note"} easy_private_state = { path = "../../../aztec-nr/easy-private-state"} -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/easy_private_token_contract/src/main.nr b/yarn-project/noir-contracts/contracts/easy_private_token_contract/src/main.nr index c1541833c5fe..a17d0f00f70d 100644 --- a/yarn-project/noir-contracts/contracts/easy_private_token_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/easy_private_token_contract/src/main.nr @@ -1,6 +1,6 @@ // docs:start:easy_private_token_contract contract EasyPrivateToken { - use dep::protocol_types::address::AztecAddress; + use dep::aztec::protocol_types::address::AztecAddress; use dep::std::option::Option; use dep::aztec::{ context::{PrivateContext, PublicContext, Context}, diff --git a/yarn-project/noir-contracts/contracts/easy_private_voting_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/easy_private_voting_contract/Nargo.toml index eb6543e6be7d..80449c6b5883 100644 --- a/yarn-project/noir-contracts/contracts/easy_private_voting_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/easy_private_voting_contract/Nargo.toml @@ -6,4 +6,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/easy_private_voting_contract/src/main.nr b/yarn-project/noir-contracts/contracts/easy_private_voting_contract/src/main.nr index c3200a928aa4..19ec461332f1 100644 --- a/yarn-project/noir-contracts/contracts/easy_private_voting_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/easy_private_voting_contract/src/main.nr @@ -1,10 +1,10 @@ contract EasyPrivateVoting { // docs:start:imports - use dep::protocol_types::{ - abis::function_selector::FunctionSelector, - address::AztecAddress, - }; use dep::aztec::{ + protocol_types::{ + abis::function_selector::FunctionSelector, + address::AztecAddress, + }, context::{PrivateContext, Context}, oracle::get_secret_key::get_secret_key, // used to compute nullifier state_vars::{ map::Map, public_state::PublicState,}, diff --git a/yarn-project/noir-contracts/contracts/ecdsa_account_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/ecdsa_account_contract/Nargo.toml index 0893f3d6b566..7efb28657cc9 100644 --- a/yarn-project/noir-contracts/contracts/ecdsa_account_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/ecdsa_account_contract/Nargo.toml @@ -7,4 +7,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } authwit = { path = "../../../aztec-nr/authwit" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr b/yarn-project/noir-contracts/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr index da1c72d8f6fd..c0aea096b20b 100644 --- a/yarn-project/noir-contracts/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr +++ b/yarn-project/noir-contracts/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::{ note::{ note_header::NoteHeader, diff --git a/yarn-project/noir-contracts/contracts/ecdsa_account_contract/src/main.nr b/yarn-project/noir-contracts/contracts/ecdsa_account_contract/src/main.nr index aeadc761dc39..a12e0c02600f 100644 --- a/yarn-project/noir-contracts/contracts/ecdsa_account_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/ecdsa_account_contract/src/main.nr @@ -3,7 +3,7 @@ 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::protocol_types::address::AztecAddress; + use dep::aztec::protocol_types::address::AztecAddress; use dep::std; use dep::std::option::Option; use dep::aztec::{ diff --git a/yarn-project/noir-contracts/contracts/escrow_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/escrow_contract/Nargo.toml index f3b1251bff91..eb586ad28b05 100644 --- a/yarn-project/noir-contracts/contracts/escrow_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/escrow_contract/Nargo.toml @@ -7,4 +7,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } address_note = { path = "../../../aztec-nr/address-note"} -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/escrow_contract/src/main.nr b/yarn-project/noir-contracts/contracts/escrow_contract/src/main.nr index 5fa92bd1fb4e..cf7500c7fa63 100644 --- a/yarn-project/noir-contracts/contracts/escrow_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/escrow_contract/src/main.nr @@ -2,7 +2,7 @@ contract Escrow { use dep::std::option::Option; - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, }; diff --git a/yarn-project/noir-contracts/contracts/import_test_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/import_test_contract/Nargo.toml index 4de350b8f204..1f0ecfad8415 100644 --- a/yarn-project/noir-contracts/contracts/import_test_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/import_test_contract/Nargo.toml @@ -6,4 +6,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/import_test_contract/src/main.nr b/yarn-project/noir-contracts/contracts/import_test_contract/src/main.nr index d13468f75a5c..82ac8a1bd2e1 100644 --- a/yarn-project/noir-contracts/contracts/import_test_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/import_test_contract/src/main.nr @@ -3,7 +3,7 @@ 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::protocol_types::address::AztecAddress; + use dep::aztec::protocol_types::address::AztecAddress; use crate::test_contract_interface::{ TestPrivateContextInterface, TestPublicContextInterface, diff --git a/yarn-project/noir-contracts/contracts/inclusion_proofs_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/inclusion_proofs_contract/Nargo.toml index 470903576ca0..1c72286c335d 100644 --- a/yarn-project/noir-contracts/contracts/inclusion_proofs_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/inclusion_proofs_contract/Nargo.toml @@ -7,4 +7,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } value_note = { path = "../../../aztec-nr/value-note" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr b/yarn-project/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr index 6b5f635b2455..d9da9626fa1e 100644 --- a/yarn-project/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr @@ -1,6 +1,6 @@ // A demonstration of inclusion and non-inclusion proofs. contract InclusionProofs { - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::{ AztecAddress, diff --git a/yarn-project/noir-contracts/contracts/lending_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/lending_contract/Nargo.toml index 6cd91f3fdbca..dba6d5627158 100644 --- a/yarn-project/noir-contracts/contracts/lending_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/lending_contract/Nargo.toml @@ -7,4 +7,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } safe_math = { path = "../../../aztec-nr/safe-math" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/lending_contract/src/asset.nr b/yarn-project/noir-contracts/contracts/lending_contract/src/asset.nr index 5a33ff263322..b71696a3a5fb 100644 --- a/yarn-project/noir-contracts/contracts/lending_contract/src/asset.nr +++ b/yarn-project/noir-contracts/contracts/lending_contract/src/asset.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::types::type_serialization::TypeSerializationInterface; // Struct to be used to represent "totals". Generally, there should be one per asset. diff --git a/yarn-project/noir-contracts/contracts/lending_contract/src/interfaces.nr b/yarn-project/noir-contracts/contracts/lending_contract/src/interfaces.nr index 3f48bed4156a..22af86c6457a 100644 --- a/yarn-project/noir-contracts/contracts/lending_contract/src/interfaces.nr +++ b/yarn-project/noir-contracts/contracts/lending_contract/src/interfaces.nr @@ -4,7 +4,7 @@ use dep::aztec::context::{ }; use crate::asset::Asset; -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, constants::RETURN_VALUES_LENGTH, diff --git a/yarn-project/noir-contracts/contracts/lending_contract/src/main.nr b/yarn-project/noir-contracts/contracts/lending_contract/src/main.nr index f81555ae9906..c8ff9302afe1 100644 --- a/yarn-project/noir-contracts/contracts/lending_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/lending_contract/src/main.nr @@ -11,7 +11,7 @@ mod interfaces; // - A way to repay all debt at once // - Liquidations contract Lending { - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, }; diff --git a/yarn-project/noir-contracts/contracts/parent_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/parent_contract/Nargo.toml index d76d2eb3471b..52fa9b5f455b 100644 --- a/yarn-project/noir-contracts/contracts/parent_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/parent_contract/Nargo.toml @@ -6,4 +6,4 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } + diff --git a/yarn-project/noir-contracts/contracts/parent_contract/src/main.nr b/yarn-project/noir-contracts/contracts/parent_contract/src/main.nr index 785aac2e03ba..7992b1b83e8c 100644 --- a/yarn-project/noir-contracts/contracts/parent_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/parent_contract/src/main.nr @@ -1,6 +1,6 @@ // A contract used along with `Child` contract to test nested calls. contract Parent { - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ address::AztecAddress, abis::function_selector::FunctionSelector, }; diff --git a/yarn-project/noir-contracts/contracts/pending_commitments_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/pending_commitments_contract/Nargo.toml index 61f8d0dc7fa7..9b6cde292434 100644 --- a/yarn-project/noir-contracts/contracts/pending_commitments_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/pending_commitments_contract/Nargo.toml @@ -7,4 +7,4 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } value_note = { path = "../../../aztec-nr/value-note"} -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } + diff --git a/yarn-project/noir-contracts/contracts/pending_commitments_contract/src/main.nr b/yarn-project/noir-contracts/contracts/pending_commitments_contract/src/main.nr index f274a545dc77..fbfda720d422 100644 --- a/yarn-project/noir-contracts/contracts/pending_commitments_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/pending_commitments_contract/src/main.nr @@ -20,7 +20,7 @@ contract PendingCommitments { }, state_vars::{map::Map, set::Set}, }; - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ address::AztecAddress, abis::function_selector::FunctionSelector, }; diff --git a/yarn-project/noir-contracts/contracts/price_feed_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/price_feed_contract/Nargo.toml index 95b4055a8eaf..8d8c331fc1ce 100644 --- a/yarn-project/noir-contracts/contracts/price_feed_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/price_feed_contract/Nargo.toml @@ -6,4 +6,4 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } + diff --git a/yarn-project/noir-contracts/contracts/price_feed_contract/src/main.nr b/yarn-project/noir-contracts/contracts/price_feed_contract/src/main.nr index 298f82f829c5..c74e36f0088c 100644 --- a/yarn-project/noir-contracts/contracts/price_feed_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/price_feed_contract/src/main.nr @@ -9,7 +9,7 @@ contract PriceFeed { public_state::PublicState, }, }; - use dep::protocol_types::address::AztecAddress; + use dep::aztec::protocol_types::address::AztecAddress; use crate::asset::{ASSET_SERIALIZED_LEN, Asset, AssetSerializationMethods}; // Storage structure, containing all storage, and specifying what slots they use. diff --git a/yarn-project/noir-contracts/contracts/reader_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/reader_contract/Nargo.toml index 5dcaa989be82..e6ed36490123 100644 --- a/yarn-project/noir-contracts/contracts/reader_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/reader_contract/Nargo.toml @@ -6,5 +6,4 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } -compressed_string = {path = "../../../aztec-nr/compressed-string"} \ No newline at end of file +compressed_string = {path = "../../../aztec-nr/compressed-string"} diff --git a/yarn-project/noir-contracts/contracts/reader_contract/src/main.nr b/yarn-project/noir-contracts/contracts/reader_contract/src/main.nr index cd98eab82b13..931a5e255011 100644 --- a/yarn-project/noir-contracts/contracts/reader_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/reader_contract/src/main.nr @@ -1,5 +1,5 @@ contract Reader { - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ address::AztecAddress, abis::function_selector::FunctionSelector, }; diff --git a/yarn-project/noir-contracts/contracts/schnorr_account_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/schnorr_account_contract/Nargo.toml index 91c398753efc..d1830a40e996 100644 --- a/yarn-project/noir-contracts/contracts/schnorr_account_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/schnorr_account_contract/Nargo.toml @@ -7,4 +7,4 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } authwit = { path = "../../../aztec-nr/authwit" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } + diff --git a/yarn-project/noir-contracts/contracts/schnorr_account_contract/src/main.nr b/yarn-project/noir-contracts/contracts/schnorr_account_contract/src/main.nr index 5777b63bc7dc..77203a70388a 100644 --- a/yarn-project/noir-contracts/contracts/schnorr_account_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/schnorr_account_contract/src/main.nr @@ -6,7 +6,7 @@ contract SchnorrAccount { use dep::std; use dep::std::option::Option; - use dep::protocol_types::address::AztecAddress; + use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::{ context::{PrivateContext, Context}, diff --git a/yarn-project/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr b/yarn-project/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr index 86bf2dbf10d4..3d3eb1ecfa1a 100644 --- a/yarn-project/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr +++ b/yarn-project/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr @@ -12,7 +12,7 @@ use dep::aztec::{ log::emit_encrypted_log, context::PrivateContext, }; -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; global PUBLIC_KEY_NOTE_LEN: Field = 3; diff --git a/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/Nargo.toml index c8864dad5f5c..704cfa5bd869 100644 --- a/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/Nargo.toml @@ -7,4 +7,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } authwit = { path = "../../../aztec-nr/authwit" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/auth_oracle.nr b/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/auth_oracle.nr index 35aff5d7cca8..1d43cb0816a2 100644 --- a/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/auth_oracle.nr +++ b/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/auth_oracle.nr @@ -1,5 +1,5 @@ use dep::authwit::auth_witness; -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ address::PartialAddress, grumpkin_point::GrumpkinPoint, }; diff --git a/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr b/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr index 963b721f71dd..89b328dcabe9 100644 --- a/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr +++ b/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; use dep::std::{schnorr::verify_signature}; use crate::auth_oracle::{AuthWitness}; diff --git a/yarn-project/noir-contracts/contracts/slow_tree_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/slow_tree_contract/Nargo.toml index dc4118019eda..6d8ba138a34c 100644 --- a/yarn-project/noir-contracts/contracts/slow_tree_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/slow_tree_contract/Nargo.toml @@ -8,4 +8,3 @@ type = "contract" aztec = { path = "../../../aztec-nr/aztec" } value_note = { path = "../../../aztec-nr/value-note"} slow_updates_tree = { path = "../../../aztec-nr/slow-updates-tree"} -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/slow_tree_contract/src/main.nr b/yarn-project/noir-contracts/contracts/slow_tree_contract/src/main.nr index a95cb1218dfc..87c1a0988f99 100644 --- a/yarn-project/noir-contracts/contracts/slow_tree_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/slow_tree_contract/src/main.nr @@ -6,7 +6,7 @@ mod types; // https://github.com/AztecProtocol/aztec-packages/issues/1291 // This is made as a separate contract for one thing mainly. Making it simpler to use. contract SlowTree { - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, }; diff --git a/yarn-project/noir-contracts/contracts/stateful_test_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/stateful_test_contract/Nargo.toml index 1a46f682f62a..008324701b0d 100644 --- a/yarn-project/noir-contracts/contracts/stateful_test_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/stateful_test_contract/Nargo.toml @@ -7,4 +7,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } value_note = { path = "../../../aztec-nr/value-note"} -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/stateful_test_contract/src/main.nr b/yarn-project/noir-contracts/contracts/stateful_test_contract/src/main.nr index 6bd292271ea7..5c4fed1d87bd 100644 --- a/yarn-project/noir-contracts/contracts/stateful_test_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/stateful_test_contract/src/main.nr @@ -1,6 +1,6 @@ // A contract used for testing a random hodgepodge of small features from simulator and end-to-end tests. contract StatefulTest { - use dep::protocol_types::address::AztecAddress; + use dep::aztec::protocol_types::address::AztecAddress; use dep::std::option::Option; use dep::value_note::{ balance_utils, diff --git a/yarn-project/noir-contracts/contracts/test_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/test_contract/Nargo.toml index 48eea69c7d75..80a59556c0a6 100644 --- a/yarn-project/noir-contracts/contracts/test_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/test_contract/Nargo.toml @@ -8,4 +8,3 @@ type = "contract" aztec = { path = "../../../aztec-nr/aztec" } field_note = { path = "../../../aztec-nr/field-note" } token_portal_content_hash_lib = { path = "../token_portal_content_hash_lib" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/test_contract/src/interface.nr b/yarn-project/noir-contracts/contracts/test_contract/src/interface.nr index cf1657905c20..0a42157be18c 100644 --- a/yarn-project/noir-contracts/contracts/test_contract/src/interface.nr +++ b/yarn-project/noir-contracts/contracts/test_contract/src/interface.nr @@ -2,7 +2,7 @@ use dep::std; use dep::aztec::context::{ PrivateContext, PublicContext }; -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ address::AztecAddress, abis::function_selector::FunctionSelector, constants::RETURN_VALUES_LENGTH, diff --git a/yarn-project/noir-contracts/contracts/test_contract/src/main.nr b/yarn-project/noir-contracts/contracts/test_contract/src/main.nr index 90b2b6b3d2aa..aac608c1bd82 100644 --- a/yarn-project/noir-contracts/contracts/test_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/test_contract/src/main.nr @@ -1,7 +1,7 @@ // A contract used for testing a random hodgepodge of small features from simulator and end-to-end tests. contract Test { use dep::std::option::Option; - use dep::protocol_types::address::{ + use dep::aztec::protocol_types::address::{ AztecAddress, EthAddress, }; @@ -9,7 +9,7 @@ contract Test { // It doesn't add the import because in the future we will re-export all the types via aztec-nr and aztec-nr is // already auto-imported by the macros. // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3590): Remove this once the issue is fixed. - use dep::protocol_types; + use dep::aztec::protocol_types; // docs:start:unencrypted_import use dep::aztec::log::emit_unencrypted_log; // docs:end:unencrypted_import diff --git a/yarn-project/noir-contracts/contracts/token_blacklist_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/token_blacklist_contract/Nargo.toml index 7b157482941b..a742335f1efb 100644 --- a/yarn-project/noir-contracts/contracts/token_blacklist_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/token_blacklist_contract/Nargo.toml @@ -9,4 +9,3 @@ aztec = { path = "../../../aztec-nr/aztec" } safe_math = { path = "../../../aztec-nr/safe-math" } field_note = { path = "../../../aztec-nr/field-note" } authwit = { path = "../../../aztec-nr/authwit" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr index 0ff60371f710..713bf20a4a5e 100644 --- a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr +++ b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, }; diff --git a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/main.nr b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/main.nr index aa64ec956fc1..880b946315f2 100644 --- a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/main.nr @@ -17,7 +17,7 @@ contract TokenBlacklist { use dep::std::option::Option; use dep::safe_math::SafeU120; - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, }; diff --git a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/balance_set.nr b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/balance_set.nr index 10d4228b0e5e..f0ecb0797296 100644 --- a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/balance_set.nr +++ b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/balance_set.nr @@ -1,7 +1,7 @@ use dep::std::option::Option; use dep::safe_math::SafeU120; -use dep::protocol_types::constants::MAX_READ_REQUESTS_PER_CALL; -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::constants::MAX_READ_REQUESTS_PER_CALL; +use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::{ context::Context, state_vars::set::Set, diff --git a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr index 946be8412210..ed3c8c3fd93c 100644 --- a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr +++ b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::context::{PrivateContext, PublicContext, Context}; use dep::std::option::Option; use crate::types::balance_set::BalanceSet; diff --git a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr index 88c086c4be3b..8a2275361911 100644 --- a/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr +++ b/yarn-project/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr @@ -1,5 +1,5 @@ -use dep::protocol_types::constants::MAX_READ_REQUESTS_PER_CALL; -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::constants::MAX_READ_REQUESTS_PER_CALL; +use dep::aztec::protocol_types::address::AztecAddress; use dep::aztec::{ note::{ note_header::NoteHeader, diff --git a/yarn-project/noir-contracts/contracts/token_bridge_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/token_bridge_contract/Nargo.toml index 3e3658c42b60..c01d8689f818 100644 --- a/yarn-project/noir-contracts/contracts/token_bridge_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/token_bridge_contract/Nargo.toml @@ -7,4 +7,3 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } token_portal_content_hash_lib = { path = "../token_portal_content_hash_lib" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/token_bridge_contract/src/main.nr b/yarn-project/noir-contracts/contracts/token_bridge_contract/src/main.nr index 2fc7382cad30..ebf6c279a95a 100644 --- a/yarn-project/noir-contracts/contracts/token_bridge_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/token_bridge_contract/src/main.nr @@ -7,7 +7,7 @@ mod token_interface; // Bridge has to be set as a minter on the token before it can be used contract TokenBridge { - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::{ AztecAddress, diff --git a/yarn-project/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr b/yarn-project/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr index 721016bc305b..130083d4b1d6 100644 --- a/yarn-project/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr +++ b/yarn-project/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr @@ -1,5 +1,5 @@ // docs:start:token_bridge_token_interface -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::{ AztecAddress, diff --git a/yarn-project/noir-contracts/contracts/token_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/token_contract/Nargo.toml index 45bee129e850..322c8c882caf 100644 --- a/yarn-project/noir-contracts/contracts/token_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/token_contract/Nargo.toml @@ -9,4 +9,3 @@ aztec = { path = "../../../aztec-nr/aztec" } safe_math = { path = "../../../aztec-nr/safe-math" } compressed_string = {path = "../../../aztec-nr/compressed-string"} authwit = { path = "../../../aztec-nr/authwit" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/token_contract/src/main.nr b/yarn-project/noir-contracts/contracts/token_contract/src/main.nr index be8d77bdde65..78e006aec534 100644 --- a/yarn-project/noir-contracts/contracts/token_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/token_contract/src/main.nr @@ -32,7 +32,7 @@ contract Token { u8_serialization::{U8SerializationMethods, U8_SERIALIZED_LEN}, }, }; - use dep::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::AztecAddress, }; diff --git a/yarn-project/noir-contracts/contracts/token_contract/src/types/balance_set.nr b/yarn-project/noir-contracts/contracts/token_contract/src/types/balance_set.nr index d9273f976825..80b6a2ceeddd 100644 --- a/yarn-project/noir-contracts/contracts/token_contract/src/types/balance_set.nr +++ b/yarn-project/noir-contracts/contracts/token_contract/src/types/balance_set.nr @@ -1,6 +1,6 @@ use dep::std::option::Option; use dep::safe_math::SafeU120; -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ constants::MAX_READ_REQUESTS_PER_CALL, address::AztecAddress, }; diff --git a/yarn-project/noir-contracts/contracts/token_contract/src/types/balances_map.nr b/yarn-project/noir-contracts/contracts/token_contract/src/types/balances_map.nr index 04a595e9a8fe..c8a43f11d553 100644 --- a/yarn-project/noir-contracts/contracts/token_contract/src/types/balances_map.nr +++ b/yarn-project/noir-contracts/contracts/token_contract/src/types/balances_map.nr @@ -2,7 +2,7 @@ use dep::aztec::context::{PrivateContext, PublicContext, Context}; use dep::std::option::Option; use crate::types::balance_set::BalanceSet; use dep::aztec::hash::pedersen_hash; -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; struct BalancesMap { context: Context, diff --git a/yarn-project/noir-contracts/contracts/token_contract/src/types/token_note.nr b/yarn-project/noir-contracts/contracts/token_contract/src/types/token_note.nr index b55ebdd76b77..d2d9ef68f1fb 100644 --- a/yarn-project/noir-contracts/contracts/token_contract/src/types/token_note.nr +++ b/yarn-project/noir-contracts/contracts/token_contract/src/types/token_note.nr @@ -1,4 +1,4 @@ -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ address::AztecAddress, constants::{ MAX_READ_REQUESTS_PER_CALL diff --git a/yarn-project/noir-contracts/contracts/token_portal_content_hash_lib/Nargo.toml b/yarn-project/noir-contracts/contracts/token_portal_content_hash_lib/Nargo.toml index 951be3ceac26..9dcea17f79fd 100644 --- a/yarn-project/noir-contracts/contracts/token_portal_content_hash_lib/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/token_portal_content_hash_lib/Nargo.toml @@ -6,4 +6,3 @@ type = "lib" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/yarn-project/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr b/yarn-project/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr index e76dd8b5ad82..2106b0a585d7 100644 --- a/yarn-project/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr +++ b/yarn-project/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr @@ -1,5 +1,5 @@ // docs:start:mint_public_content_hash_nr -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ address::{ AztecAddress, EthAddress, diff --git a/yarn-project/noir-contracts/contracts/uniswap_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/uniswap_contract/Nargo.toml index b711a082a7f7..a35fa2c903d3 100644 --- a/yarn-project/noir-contracts/contracts/uniswap_contract/Nargo.toml +++ b/yarn-project/noir-contracts/contracts/uniswap_contract/Nargo.toml @@ -7,4 +7,4 @@ type = "contract" [dependencies] aztec = { path = "../../../aztec-nr/aztec" } authwit = { path = "../../../aztec-nr/authwit" } -protocol_types = { path = "../../../noir-protocol-circuits/src/crates/types" } + diff --git a/yarn-project/noir-contracts/contracts/uniswap_contract/src/interfaces.nr b/yarn-project/noir-contracts/contracts/uniswap_contract/src/interfaces.nr index f59cc94284ad..1d9c2985eb91 100644 --- a/yarn-project/noir-contracts/contracts/uniswap_contract/src/interfaces.nr +++ b/yarn-project/noir-contracts/contracts/uniswap_contract/src/interfaces.nr @@ -1,5 +1,5 @@ // docs:start:interfaces -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::{ AztecAddress, diff --git a/yarn-project/noir-contracts/contracts/uniswap_contract/src/main.nr b/yarn-project/noir-contracts/contracts/uniswap_contract/src/main.nr index 7e9e230bbc90..162834b4b5e6 100644 --- a/yarn-project/noir-contracts/contracts/uniswap_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/uniswap_contract/src/main.nr @@ -6,7 +6,7 @@ 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::protocol_types::{ + use dep::aztec::protocol_types::{ abis::function_selector::FunctionSelector, address::{ AztecAddress, diff --git a/yarn-project/noir-contracts/contracts/uniswap_contract/src/util.nr b/yarn-project/noir-contracts/contracts/uniswap_contract/src/util.nr index 7e19a7173aee..d4e7399fad7a 100644 --- a/yarn-project/noir-contracts/contracts/uniswap_contract/src/util.nr +++ b/yarn-project/noir-contracts/contracts/uniswap_contract/src/util.nr @@ -1,5 +1,5 @@ // docs:start:uniswap_public_content_hash -use dep::protocol_types::{ +use dep::aztec::protocol_types::{ address::{ AztecAddress, EthAddress, @@ -107,4 +107,4 @@ pub fn compute_swap_private_content_hash( let content_hash = sha256_to_field(hash_bytes); content_hash } -// docs:end:compute_swap_private_content_hash \ No newline at end of file +// docs:end:compute_swap_private_content_hash From a4a74cdf30d7bcee22695945ade080c65b1c0a06 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 12 Jan 2024 11:57:23 +0000 Subject: [PATCH 06/12] chore: use reexport in `aztec_macros` --- noir/aztec_macros/src/lib.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/noir/aztec_macros/src/lib.rs b/noir/aztec_macros/src/lib.rs index 3aa92c033888..6db81832b737 100644 --- a/noir/aztec_macros/src/lib.rs +++ b/noir/aztec_macros/src/lib.rs @@ -483,12 +483,11 @@ const SIGNATURE_PLACEHOLDER: &str = "SIGNATURE_PLACEHOLDER"; /// Generates the impl for an event selector /// -/// TODO(https://github.com/AztecProtocol/aztec-packages/issues/3590): Make this point to aztec-nr once the issue is fixed. /// Inserts the following code: /// ```noir /// impl SomeStruct { /// fn selector() -> FunctionSelector { -/// protocol_types::abis::function_selector::FunctionSelector::from_signature("SIGNATURE_PLACEHOLDER") +/// aztec::protocol_types::abis::function_selector::FunctionSelector::from_signature("SIGNATURE_PLACEHOLDER") /// } /// } /// ``` @@ -499,9 +498,8 @@ const SIGNATURE_PLACEHOLDER: &str = "SIGNATURE_PLACEHOLDER"; fn generate_selector_impl(structure: &NoirStruct) -> TypeImpl { let struct_type = make_type(UnresolvedTypeData::Named(path(structure.name.clone()), vec![])); - // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3590): Make this point to aztec-nr once the issue is fixed. let selector_path = - chained_path!("protocol_types", "abis", "function_selector", "FunctionSelector"); + chained_path!("aztec", "protocol_types", "abis", "function_selector", "FunctionSelector"); let mut from_signature_path = selector_path.clone(); from_signature_path.segments.push(ident("from_signature")); From fa7e63141129a1169b723f49d9c2e95801386953 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 12 Jan 2024 12:00:36 +0000 Subject: [PATCH 07/12] chore: use reexport in boxes --- boxes/blank-react/src/contracts/Nargo.toml | 1 - boxes/blank-react/src/contracts/src/main.nr | 4 ++-- boxes/blank/src/contracts/Nargo.toml | 1 - boxes/blank/src/contracts/src/main.nr | 6 +++--- boxes/token/src/contracts/Nargo.toml | 1 - boxes/token/src/contracts/src/main.nr | 10 +++++----- boxes/token/src/contracts/src/types/balance_set.nr | 8 ++++---- boxes/token/src/contracts/src/types/balances_map.nr | 2 +- boxes/token/src/contracts/src/types/token_note.nr | 12 ++++++------ noir/tooling/nargo_fmt/tests/expected/contract.nr | 2 +- noir/tooling/nargo_fmt/tests/input/contract.nr | 2 +- 11 files changed, 23 insertions(+), 26 deletions(-) diff --git a/boxes/blank-react/src/contracts/Nargo.toml b/boxes/blank-react/src/contracts/Nargo.toml index 2463e4d641c3..66986b634b54 100644 --- a/boxes/blank-react/src/contracts/Nargo.toml +++ b/boxes/blank-react/src/contracts/Nargo.toml @@ -6,4 +6,3 @@ type = "contract" [dependencies] aztec = { path = "../../../../yarn-project/aztec-nr/aztec" } -protocol_types = { path = "../../../../yarn-project/noir-protocol-circuits/src/crates/types" } diff --git a/boxes/blank-react/src/contracts/src/main.nr b/boxes/blank-react/src/contracts/src/main.nr index 847af9b59d49..84750a2da700 100644 --- a/boxes/blank-react/src/contracts/src/main.nr +++ b/boxes/blank-react/src/contracts/src/main.nr @@ -4,9 +4,9 @@ contract Blank { oracle::{ get_public_key::get_public_key, }, + protocol_types::address::AztecAddress }; - use dep::protocol_types::address::AztecAddress; - + #[aztec(private)] fn constructor() {} diff --git a/boxes/blank/src/contracts/Nargo.toml b/boxes/blank/src/contracts/Nargo.toml index be5cb64ca69d..66986b634b54 100644 --- a/boxes/blank/src/contracts/Nargo.toml +++ b/boxes/blank/src/contracts/Nargo.toml @@ -6,4 +6,3 @@ type = "contract" [dependencies] aztec = { path = "../../../../yarn-project/aztec-nr/aztec" } -protocol_types = { path = "../../../../yarn-project/noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/boxes/blank/src/contracts/src/main.nr b/boxes/blank/src/contracts/src/main.nr index f99ec1512ee3..28647415a6bc 100644 --- a/boxes/blank/src/contracts/src/main.nr +++ b/boxes/blank/src/contracts/src/main.nr @@ -3,10 +3,10 @@ contract Blank { abi, oracle::{ get_public_key::get_public_key, - } + }, + protocol_types::address::AztecAddress }; - use dep::protocol_types::address::AztecAddress; - + #[aztec(private)] fn constructor() {} diff --git a/boxes/token/src/contracts/Nargo.toml b/boxes/token/src/contracts/Nargo.toml index 4e1f32fe55c5..f5e1cc74cf61 100644 --- a/boxes/token/src/contracts/Nargo.toml +++ b/boxes/token/src/contracts/Nargo.toml @@ -9,4 +9,3 @@ value_note = { path = "../../../../yarn-project/aztec-nr/value-note"} safe_math = { path = "../../../../yarn-project/aztec-nr/safe-math" } authwit = { path = "../../../../yarn-project/aztec-nr/authwit" } aztec = { path = "../../../../yarn-project/aztec-nr/aztec" } -protocol_types = { path = "../../../../yarn-project/noir-protocol-circuits/src/crates/types" } \ No newline at end of file diff --git a/boxes/token/src/contracts/src/main.nr b/boxes/token/src/contracts/src/main.nr index 686871f1661d..94a125212fb4 100644 --- a/boxes/token/src/contracts/src/main.nr +++ b/boxes/token/src/contracts/src/main.nr @@ -29,12 +29,12 @@ contract Token { bool_serialization::{BoolSerializationMethods, BOOL_SERIALIZED_LEN}, address_serialization::{AddressSerializationMethods, AZTEC_ADDRESS_SERIALIZED_LEN}, }, + protocol_types::{ + abis::function_selector::FunctionSelector, + address::AztecAddress, + } }; - use dep::protocol_types::{ - abis::function_selector::FunctionSelector, - address::AztecAddress, - }; - + // docs:start:import_authwit use dep::authwit::{ auth::{ diff --git a/boxes/token/src/contracts/src/types/balance_set.nr b/boxes/token/src/contracts/src/types/balance_set.nr index a5c00d819678..0924da494434 100644 --- a/boxes/token/src/contracts/src/types/balance_set.nr +++ b/boxes/token/src/contracts/src/types/balance_set.nr @@ -1,13 +1,13 @@ use dep::std::option::Option; use dep::safe_math::SafeU120; -use dep::protocol_types::{ - constants::MAX_READ_REQUESTS_PER_CALL, - address::AztecAddress, -}; use dep::aztec::{ context::Context, state_vars::set::Set, }; +use dep::aztec::protocol_types::{ + constants::MAX_READ_REQUESTS_PER_CALL, + address::AztecAddress, +}; use dep::aztec::note::{ note_getter::view_notes, note_getter_options::{NoteGetterOptions, SortOrder}, diff --git a/boxes/token/src/contracts/src/types/balances_map.nr b/boxes/token/src/contracts/src/types/balances_map.nr index 04a595e9a8fe..c8a43f11d553 100644 --- a/boxes/token/src/contracts/src/types/balances_map.nr +++ b/boxes/token/src/contracts/src/types/balances_map.nr @@ -2,7 +2,7 @@ use dep::aztec::context::{PrivateContext, PublicContext, Context}; use dep::std::option::Option; use crate::types::balance_set::BalanceSet; use dep::aztec::hash::pedersen_hash; -use dep::protocol_types::address::AztecAddress; +use dep::aztec::protocol_types::address::AztecAddress; struct BalancesMap { context: Context, diff --git a/boxes/token/src/contracts/src/types/token_note.nr b/boxes/token/src/contracts/src/types/token_note.nr index b55ebdd76b77..9b30cbc4f4b3 100644 --- a/boxes/token/src/contracts/src/types/token_note.nr +++ b/boxes/token/src/contracts/src/types/token_note.nr @@ -1,10 +1,10 @@ -use dep::protocol_types::{ - address::AztecAddress, - constants::{ - MAX_READ_REQUESTS_PER_CALL - }, -}; use dep::aztec::{ + protocol_types::{ + address::AztecAddress, + constants::{ + MAX_READ_REQUESTS_PER_CALL + }, + } note::{ note_header::NoteHeader, note_interface::NoteInterface, diff --git a/noir/tooling/nargo_fmt/tests/expected/contract.nr b/noir/tooling/nargo_fmt/tests/expected/contract.nr index 0313da832a89..cffc01275013 100644 --- a/noir/tooling/nargo_fmt/tests/expected/contract.nr +++ b/noir/tooling/nargo_fmt/tests/expected/contract.nr @@ -3,7 +3,7 @@ // Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. // Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. contract Benchmarking { - use dep::protocol_types::abis::function_selector::FunctionSelector; + use dep::aztec::protocol_types::abis::function_selector::FunctionSelector; use dep::value_note::{ utils::{increment, decrement}, diff --git a/noir/tooling/nargo_fmt/tests/input/contract.nr b/noir/tooling/nargo_fmt/tests/input/contract.nr index 58ae0e909a1f..db2528f57009 100644 --- a/noir/tooling/nargo_fmt/tests/input/contract.nr +++ b/noir/tooling/nargo_fmt/tests/input/contract.nr @@ -3,7 +3,7 @@ // Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. // Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. contract Benchmarking { - use dep::protocol_types::abis::function_selector::FunctionSelector; + use dep::aztec::protocol_types::abis::function_selector::FunctionSelector; use dep::value_note::{ utils::{increment, decrement}, From bbe88baf12a5d85014fafb91cbf5c2af49b928ba Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 12 Jan 2024 12:01:30 +0000 Subject: [PATCH 08/12] chore: remove references to `protocol_types` from docs --- docs/docs/dev_docs/contracts/setup.md | 1 - docs/docs/dev_docs/getting_started/aztecnr-getting-started.md | 1 - docs/docs/dev_docs/tutorials/token_portal/setup.md | 1 - docs/docs/dev_docs/tutorials/uniswap/setup.md | 1 - docs/docs/dev_docs/tutorials/writing_dapp/contract_deployment.md | 1 - docs/docs/dev_docs/tutorials/writing_private_voting_contract.md | 1 - docs/docs/dev_docs/tutorials/writing_token_contract.md | 1 - 7 files changed, 7 deletions(-) diff --git a/docs/docs/dev_docs/contracts/setup.md b/docs/docs/dev_docs/contracts/setup.md index ed97c3ae705a..1779e4deb3d4 100644 --- a/docs/docs/dev_docs/contracts/setup.md +++ b/docs/docs/dev_docs/contracts/setup.md @@ -71,7 +71,6 @@ type = "contract" [dependencies] # Framework import aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" } -protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/noir-protocol-circuits/src/crates/types"} # Utility dependencies value_note = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/value-note"} diff --git a/docs/docs/dev_docs/getting_started/aztecnr-getting-started.md b/docs/docs/dev_docs/getting_started/aztecnr-getting-started.md index a0e4b2f6f473..fe1b59cd6c8b 100644 --- a/docs/docs/dev_docs/getting_started/aztecnr-getting-started.md +++ b/docs/docs/dev_docs/getting_started/aztecnr-getting-started.md @@ -53,7 +53,6 @@ compiler_version = ">=0.18.0" aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" } value_note = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/value-note"} easy_private_state = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/easy-private-state"} -protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/noir-protocol-circuits/src/crates/types"} ``` ## Define the functions diff --git a/docs/docs/dev_docs/tutorials/token_portal/setup.md b/docs/docs/dev_docs/tutorials/token_portal/setup.md index 40541565c888..941531ad4465 100644 --- a/docs/docs/dev_docs/tutorials/token_portal/setup.md +++ b/docs/docs/dev_docs/tutorials/token_portal/setup.md @@ -63,7 +63,6 @@ type = "contract" [dependencies] aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" } token_portal_content_hash_lib = { git="https://github.com/AztecProtocol/aztec-packages/", tag="aztec-packages-v0.16.9", directory="yarn-project/noir-contracts/contracts/token_portal_content_hash_lib" } -protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/noir-protocol-circuits/src/crates/types"} ``` We will also be writing some helper functions that should exist elsewhere so we don't overcomplicated our contract. In `src` create two more files - one called `util.nr` and one called `token_interface` - so your dir structure should now look like this: diff --git a/docs/docs/dev_docs/tutorials/uniswap/setup.md b/docs/docs/dev_docs/tutorials/uniswap/setup.md index 13e7a1fae660..6a918d224b51 100644 --- a/docs/docs/dev_docs/tutorials/uniswap/setup.md +++ b/docs/docs/dev_docs/tutorials/uniswap/setup.md @@ -50,7 +50,6 @@ Inside `uniswap/Nargo.toml` paste this in `[dependencies]`: [dependencies] aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" } authwit = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/authwit"} -protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/noir-protocol-circuits/src/crates/types"} ``` ## L2 contracts diff --git a/docs/docs/dev_docs/tutorials/writing_dapp/contract_deployment.md b/docs/docs/dev_docs/tutorials/writing_dapp/contract_deployment.md index 18345d701350..d15d12279be9 100644 --- a/docs/docs/dev_docs/tutorials/writing_dapp/contract_deployment.md +++ b/docs/docs/dev_docs/tutorials/writing_dapp/contract_deployment.md @@ -22,7 +22,6 @@ Then, open the `contracts/token/Nargo.toml` configuration file, and add the `azt aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" } authwit = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/authwit"} safe_math = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/safe-math"} -protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/noir-protocol-circuits/src/crates/types"} ``` Last, copy-paste the code from the `Token` contract into `contracts/token/main.nr`: diff --git a/docs/docs/dev_docs/tutorials/writing_private_voting_contract.md b/docs/docs/dev_docs/tutorials/writing_private_voting_contract.md index e28815fc6bd7..4683798346e4 100644 --- a/docs/docs/dev_docs/tutorials/writing_private_voting_contract.md +++ b/docs/docs/dev_docs/tutorials/writing_private_voting_contract.md @@ -50,7 +50,6 @@ compiler_version = ">=0.18.0" [dependencies] aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" } -protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/noir-protocol-circuits/src/crates/types"} ``` ## Initiate the contract and define imports diff --git a/docs/docs/dev_docs/tutorials/writing_token_contract.md b/docs/docs/dev_docs/tutorials/writing_token_contract.md index 345ed20a7993..e3380713e8e0 100644 --- a/docs/docs/dev_docs/tutorials/writing_token_contract.md +++ b/docs/docs/dev_docs/tutorials/writing_token_contract.md @@ -61,7 +61,6 @@ type = "contract" aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" } safe_math = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/safe-math"} authwit={ git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/authwit"} -protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/noir-protocol-circuits/src/crates/types"} ``` ## Contract Interface From fe0eba9338a4bcb0c570ad6cd7bbd40ff99b7758 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 12 Jan 2024 12:07:33 +0000 Subject: [PATCH 09/12] chore: add migration note to remove `protocol_types` dep --- docs/docs/misc/migration_notes.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/docs/misc/migration_notes.md b/docs/docs/misc/migration_notes.md index 6c20da38de8a..55dd40c8dc7e 100644 --- a/docs/docs/misc/migration_notes.md +++ b/docs/docs/misc/migration_notes.md @@ -6,6 +6,16 @@ keywords: [sandbox, cli, aztec, notes, migration, updating, upgrading] Aztec is in full-speed development. Literally every version breaks compatibility with the previous ones. This page attempts to target errors and difficulties you might encounter when upgrading, and how to resolve them. +## 0.18.0 + +### [Aztec.nr] Remove `protocol_types` from Nargo.toml + +The `protocol_types` package is now being reexported from `aztec`. It can be accessed through `dep::aztec::protocol_types` + +```toml +aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" } +``` + ## 0.17.0 ### [js] New `@aztec/accounts` package From 387bcfe130ba8c2301ff5e1818d98e3e5a6c9495 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 12 Jan 2024 12:08:30 +0000 Subject: [PATCH 10/12] chore: full stop --- docs/docs/misc/migration_notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/misc/migration_notes.md b/docs/docs/misc/migration_notes.md index 55dd40c8dc7e..6fcd0f65619f 100644 --- a/docs/docs/misc/migration_notes.md +++ b/docs/docs/misc/migration_notes.md @@ -10,7 +10,7 @@ Aztec is in full-speed development. Literally every version breaks compatibility ### [Aztec.nr] Remove `protocol_types` from Nargo.toml -The `protocol_types` package is now being reexported from `aztec`. It can be accessed through `dep::aztec::protocol_types` +The `protocol_types` package is now being reexported from `aztec`. It can be accessed through `dep::aztec::protocol_types`. ```toml aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" } From 0e5eb85df9cb2d60c15313d0160bbb4e4f170864 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 12 Jan 2024 13:37:28 +0000 Subject: [PATCH 11/12] chore: add missing comma --- .../noir-contracts/contracts/benchmarking_contract/src/main.nr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn-project/noir-contracts/contracts/benchmarking_contract/src/main.nr b/yarn-project/noir-contracts/contracts/benchmarking_contract/src/main.nr index 3cae32124efd..5165c29666ee 100644 --- a/yarn-project/noir-contracts/contracts/benchmarking_contract/src/main.nr +++ b/yarn-project/noir-contracts/contracts/benchmarking_contract/src/main.nr @@ -14,7 +14,7 @@ contract Benchmarking { 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, From 44da26987c0b71e16863ebadb151f000d09967b5 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 12 Jan 2024 13:40:14 +0000 Subject: [PATCH 12/12] chore: fix imports --- .../contracts/docs_example_contract/src/types/profile_note.nr | 2 +- .../contracts/docs_example_contract/src/types/rules_note.nr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/profile_note.nr b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/profile_note.nr index a30e4540d0fd..201c796c8052 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/profile_note.nr +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/profile_note.nr @@ -1,6 +1,6 @@ use dep::std::option::Option; use dep::aztec::{ - protocol_types::address::AztecAddress; + protocol_types::address::AztecAddress, note::{ note_header::NoteHeader, note_interface::NoteInterface, diff --git a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/rules_note.nr b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/rules_note.nr index 3ca5b5732191..d3abaecb5d18 100644 --- a/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/rules_note.nr +++ b/yarn-project/noir-contracts/contracts/docs_example_contract/src/types/rules_note.nr @@ -1,6 +1,6 @@ use dep::std::option::Option; use dep::aztec::{ - protocol_types::address::AztecAddress + protocol_types::address::AztecAddress, note::{ note_header::NoteHeader, note_interface::NoteInterface,