fix(authwit): update split-time consumer imports

- schnorr/simulated_schnorr account contracts and uniswap_contract still imported authwit::common::*; rename the path to authwit::utils::* to match the split.
- app_subscription_contract: revert the spurious 'use public_checks::utils::privately_check_block_number' (the public_checks crate is no longer a separate crate after #23215 moved the helpers into aztec-nr) back to 'use aztec::public_checks::privately_check_block_number'.

Author: dbanks12

noir-projects/aztec-nr/aztec/src/authwit/public.nr

@@ -1,6 +1,6 @@
 use crate::{authwit::utils::{compute_inner_authwit_hash, IS_VALID_SELECTOR}, context::{gas::GasOpts, PublicContext}};
 use crate::protocol::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::ToField};
-use crate::standard_addresses::AUTH_REGISTRY_ADDRESS;
+use crate::standard_addresses::STANDARD_AUTH_REGISTRY_ADDRESS;
 
 /// Public-flow authwit helpers.
 ///
@@ -87,7 +87,7 @@ pub unconstrained fn assert_inner_hash_valid_authwit_public(
     inner_hash: Field,
 ) {
     let results: [Field] = context.call_public_function(
-        AUTH_REGISTRY_ADDRESS,
+        STANDARD_AUTH_REGISTRY_ADDRESS,
         comptime { FunctionSelector::from_signature("consume((Field),Field)") },
         [on_behalf_of.to_field(), inner_hash],
         GasOpts::default(),
@@ -104,7 +104,7 @@ pub unconstrained fn assert_inner_hash_valid_authwit_public(
 /// false if it should be revoked
 pub unconstrained fn set_authorized(context: PublicContext, message_hash: Field, authorize: bool) {
     let res = context.call_public_function(
-        AUTH_REGISTRY_ADDRESS,
+        STANDARD_AUTH_REGISTRY_ADDRESS,
         comptime { FunctionSelector::from_signature("set_authorized(Field,bool)") },
         [message_hash, authorize as Field],
         GasOpts::default(),
@@ -119,7 +119,7 @@ pub unconstrained fn set_authorized(context: PublicContext, message_hash: Field,
 /// @param reject True if all authwits should be rejected, false otherwise
 pub unconstrained fn set_reject_all(context: PublicContext, reject: bool) {
     let res = context.call_public_function(
-        AUTH_REGISTRY_ADDRESS,
+        STANDARD_AUTH_REGISTRY_ADDRESS,
         comptime { FunctionSelector::from_signature("set_reject_all(bool)") },
         [reject as Field],
         GasOpts::default(),

noir-projects/noir-contracts/contracts/account/schnorr_account_contract/src/main.nr

@@ -9,8 +9,8 @@ pub contract SchnorrAccount {
     use aztec::{
         authwit::{
             account::AccountActions,
-            common::{compute_authwit_message_hash, compute_authwit_nullifier},
             entrypoint::app::AppPayload,
+            utils::{compute_authwit_message_hash, compute_authwit_nullifier},
         },
         context::PrivateContext,
         hash::compute_siloed_nullifier,

noir-projects/noir-contracts/contracts/account/simulated_ecdsa_account_contract/src/main.nr

@@ -8,7 +8,7 @@ use aztec::macros::aztec;
 #[aztec]
 pub contract SimulatedEcdsaAccount {
     use aztec::{
-        authwit::{account::AccountActions, common::IS_VALID_SELECTOR, entrypoint::app::AppPayload},
+        authwit::{account::AccountActions, entrypoint::app::AppPayload, utils::IS_VALID_SELECTOR},
         context::PrivateContext,
         macros::{functions::{allow_phase_change, external, view}, storage::storage},
         messages::encoding::MESSAGE_CIPHERTEXT_LEN,

noir-projects/noir-contracts/contracts/account/simulated_schnorr_account_contract/src/main.nr

@@ -10,7 +10,7 @@ use aztec::macros::aztec;
 #[aztec]
 pub contract SimulatedSchnorrAccount {
     use aztec::{
-        authwit::{account::AccountActions, common::IS_VALID_SELECTOR, entrypoint::app::AppPayload},
+        authwit::{account::AccountActions, entrypoint::app::AppPayload, utils::IS_VALID_SELECTOR},
         context::PrivateContext,
         macros::{functions::{allow_phase_change, external, view}, storage::storage},
         messages::encoding::MESSAGE_CIPHERTEXT_LEN,

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

@@ -9,8 +9,8 @@ use aztec::macros::aztec;
 pub contract Uniswap {
     use aztec::{
         authwit::{
-            common::compute_authwit_message_hash_from_call,
             public::{assert_current_call_valid_authwit_public, set_authorized},
+            utils::compute_authwit_message_hash_from_call,
         },
         macros::{functions::{external, initializer, only_self}, storage::storage},
         protocol::{abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress}, traits::ToField},