feat: reexport protocol_types from aztec-nr (#3926)

This PR rexports `protocol_types` from `aztec-nr` so that users of `aztec-nr` don't need to have a direct dependency on `protocol_types` Closes AztecProtocol/aztec-packages#3590
superstar0402 · Jan 18, 2024 · 33841a2 · 33841a2
1 parent 69fc33f
commit 33841a2
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/address-note/Nargo.toml b/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/address-note/src/address_note.nr b/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/authwit/Nargo.toml b/authwit/Nargo.toml
@@ -6,4 +6,3 @@ type = "lib"
 
 [dependencies]
 aztec = { path = "../aztec" }
-protocol_types = { path = "../../noir-protocol-circuits/src/crates/types" }
diff --git a/authwit/src/auth.nr b/authwit/src/auth.nr
@@ -1,4 +1,4 @@
-use dep::protocol_types::{
+use dep::aztec::protocol_types::{
     abis::function_selector::FunctionSelector,
     address::AztecAddress,
     constants::{
@@ -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);
@@ -82,4 +86,4 @@ pub fn compute_authwit_message_hash<N>(
         GENERATOR_INDEX__SIGNATURE_PAYLOAD
     )
 }
-// docs:end:compute_authwit_message_hash
+// docs:end:compute_authwit_message_hash
diff --git a/authwit/src/entrypoint.nr b/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/aztec/src/lib.nr b/aztec/src/lib.nr
@@ -9,3 +9,4 @@ mod oracle;
 mod state_vars;
 mod types;
 mod utils;
+use dep::protocol_types;
diff --git a/compressed-string/Nargo.toml b/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/compressed-string/src/compressed_string.nr b/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/easy-private-state/Nargo.toml b/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/easy-private-state/src/easy_private_state.nr b/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/value-note/Nargo.toml b/value-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/value-note/src/filter.nr b/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/value-note/src/utils.nr b/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`.

diff --git a/value-note/src/value_note.nr b/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,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,3 @@ type = "lib"

		[dependencies]
		aztec = { path = "../aztec" }
		protocol_types = { path = "../../noir-protocol-circuits/src/crates/types" }