refactor(public_checks): move caller helpers into aztec-nr

Author: dbanks12

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

@@ -46,6 +46,7 @@ pub use protocol_types as protocol;
 pub(crate) mod logging;
 pub mod utils;
 pub mod authwit;
+pub mod public_checks;
 pub mod macros;
 
 pub mod test;

…ocol/public_checks_contract/src/utils.nr …ects/aztec-nr/aztec/src/public_checks.nrnoir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/utils.nr renamed to noir-projects/aztec-nr/aztec/src/public_checks.nr noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/utils.nr renamed to noir-projects/aztec-nr/aztec/src/public_checks.nr

@@ -1,6 +1,7 @@
-use crate::PublicChecks;
-use aztec::context::PrivateContext;
-use aztec::protocol::constants::PUBLIC_CHECKS_ADDRESS;
+use crate::context::calls::PublicStaticCall;
+use crate::context::PrivateContext;
+use crate::protocol::abis::function_selector::FunctionSelector;
+use crate::protocol::constants::PUBLIC_CHECKS_ADDRESS;
 
 // docs:start:helper_public_checks_functions
 /// Asserts that the current timestamp in the enqueued public call enqueued by `check_timestamp` satisfies
@@ -9,7 +10,14 @@ use aztec::protocol::constants::PUBLIC_CHECKS_ADDRESS;
 /// This conceals an address of the calling contract by setting `context.msg_sender` to the public checks contract
 /// address.
 pub fn privately_check_timestamp(operation: u8, value: u64, context: &mut PrivateContext) {
-    PublicChecks::at(PUBLIC_CHECKS_ADDRESS).check_timestamp(operation, value).enqueue_view_incognito(context);
+    let selector = comptime { FunctionSelector::from_signature("check_timestamp(u8,u64)") };
+    PublicStaticCall::<15, 2, ()>::new(
+        PUBLIC_CHECKS_ADDRESS,
+        selector,
+        "check_timestamp",
+        [operation as Field, value as Field],
+    )
+        .enqueue_view_incognito(context);
 }
 
 /// Asserts that the current block number in the enqueued public call enqueued by `check_block_number` satisfies
@@ -19,7 +27,14 @@ pub fn privately_check_timestamp(operation: u8, value: u64, context: &mut Privat
 /// address.
 pub fn privately_check_block_number(operation: u8, value: u32, context: &mut PrivateContext) {
     // docs:start:enqueueing
-    PublicChecks::at(PUBLIC_CHECKS_ADDRESS).check_block_number(operation, value).enqueue_view_incognito(context);
+    let selector = comptime { FunctionSelector::from_signature("check_block_number(u8,u32)") };
+    PublicStaticCall::<18, 2, ()>::new(
+        PUBLIC_CHECKS_ADDRESS,
+        selector,
+        "check_block_number",
+        [operation as Field, value as Field],
+    )
+        .enqueue_view_incognito(context);
     // docs:end:enqueueing
 }
 // docs:end:helper_public_checks_functions

noir-projects/noir-contracts/contracts/app/app_subscription_contract/Nargo.toml

@@ -7,4 +7,3 @@ type = "contract"
 [dependencies]
 aztec = { path = "../../../../aztec-nr/aztec" }
 token = { path = "../token_contract" }
-public_checks = { path = "../../protocol/public_checks_contract" }

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

@@ -52,7 +52,7 @@ pub contract AppSubscription {
         state_vars::{Owned, PrivateMutable, PublicImmutable},
         utils::comparison::Comparator,
     };
-    use public_checks::utils::privately_check_block_number;
+    use aztec::public_checks::privately_check_block_number;
     use token::Token;
 
     #[storage]

noir-projects/noir-contracts/contracts/app/crowdfunding_contract/Nargo.toml

@@ -8,4 +8,3 @@ type = "contract"
 aztec = { path = "../../../../aztec-nr/aztec" }
 uint_note = { path = "../../../../aztec-nr/uint-note" }
 token = { path = "../token_contract" }
-public_checks = { path = "../../protocol/public_checks_contract" }

noir-projects/noir-contracts/contracts/app/crowdfunding_contract/src/main.nr

@@ -13,7 +13,7 @@ pub contract Crowdfunding {
         utils::{array, comparison::Comparator},
     };
     use aztec::note::{constants::MAX_NOTES_PER_PAGE, HintedNote, note_getter_options::NoteStatus};
-    use public_checks::utils::privately_check_timestamp;
+    use aztec::public_checks::privately_check_timestamp;
     use token::Token;
     use uint_note::UintNote;
 

noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/main.nr

@@ -1,5 +1,4 @@
 mod test;
-pub mod utils;
 
 use aztec::macros::aztec;