Skip to content

Commit 19b1501

Browse files
dbanks12dbanks12
committed
feat(authwit, public-checks): introduce hand-written interface stubs for AuthRegistry and PublicChecks
1 parent 5b38b33 commit 19b1501

6 files changed

Lines changed: 140 additions & 42 deletions

File tree

‎noir-projects/aztec-nr/aztec/src/authwit/auth_registry_interface.nr‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
use crate::context::calls::{PublicCall, PublicStaticCall};
2+
use crate::protocol::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::ToField};
3+
4+
/// Hand-written interface stub for the `AuthRegistry` canonical contract.
5+
///
6+
/// The `AuthRegistry` contract records public authentication witnesses
7+
/// (`set_authorized`, `set_reject_all`) and atomically consumes them at
8+
/// the consumer (`consume`). Consumer code in aztec-nr's `authwit::public`
9+
/// module calls into the registry via this interface.
10+
///
11+
/// The selectors are derived with `comptime { FunctionSelector::from_signature(...) }`,
12+
/// which matches exactly what the `#[aztec]` macro generates for the real contract.
13+
pub struct AuthRegistryInterface {
14+
pub target_contract: AztecAddress,
15+
}
16+
17+
impl AuthRegistryInterface {
18+
pub fn at(target_contract: AztecAddress) -> Self {
19+
Self { target_contract }
20+
}
21+
22+
pub fn _set_authorized(
23+
self,
24+
approver: AztecAddress,
25+
message_hash: Field,
26+
authorize: bool,
27+
) -> PublicCall<15, 3, ()> {
28+
let selector = comptime { FunctionSelector::from_signature("_set_authorized((Field),Field,bool)") };
29+
PublicCall::new(
30+
self.target_contract,
31+
selector,
32+
"_set_authorized",
33+
[approver.to_field(), message_hash, authorize as Field],
34+
)
35+
}
36+
37+
pub fn consume(self, on_behalf_of: AztecAddress, inner_hash: Field) -> PublicCall<7, 2, Field> {
38+
let selector = comptime { FunctionSelector::from_signature("consume((Field),Field)") };
39+
PublicCall::new(
40+
self.target_contract,
41+
selector,
42+
"consume",
43+
[on_behalf_of.to_field(), inner_hash],
44+
)
45+
}
46+
47+
pub fn is_consumable(self, on_behalf_of: AztecAddress, message_hash: Field) -> PublicStaticCall<13, 2, bool> {
48+
let selector = comptime { FunctionSelector::from_signature("is_consumable((Field),Field)") };
49+
PublicStaticCall::new(
50+
self.target_contract,
51+
selector,
52+
"is_consumable",
53+
[on_behalf_of.to_field(), message_hash],
54+
)
55+
}
56+
57+
pub fn is_reject_all(self, on_behalf_of: AztecAddress) -> PublicStaticCall<13, 1, bool> {
58+
let selector = comptime { FunctionSelector::from_signature("is_reject_all((Field))") };
59+
PublicStaticCall::new(
60+
self.target_contract,
61+
selector,
62+
"is_reject_all",
63+
[on_behalf_of.to_field()],
64+
)
65+
}
66+
67+
pub fn set_authorized(self, message_hash: Field, authorize: bool) -> PublicCall<14, 2, ()> {
68+
let selector = comptime { FunctionSelector::from_signature("set_authorized(Field,bool)") };
69+
PublicCall::new(
70+
self.target_contract,
71+
selector,
72+
"set_authorized",
73+
[message_hash, authorize as Field],
74+
)
75+
}
76+
77+
pub fn set_reject_all(self, reject: bool) -> PublicCall<14, 1, ()> {
78+
let selector = comptime { FunctionSelector::from_signature("set_reject_all(bool)") };
79+
PublicCall::new(
80+
self.target_contract,
81+
selector,
82+
"set_reject_all",
83+
[reject as Field],
84+
)
85+
}
86+
}

‎noir-projects/aztec-nr/aztec/src/authwit/mod.nr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//! Authorization.
22

33
pub mod account;
4+
pub mod auth_registry_interface;
45
pub mod authorization_interface;
56
mod authorization_selector;
67
pub use authorization_selector::AuthorizationSelector;

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

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
use crate::{authwit::utils::{compute_inner_authwit_hash, IS_VALID_SELECTOR}, context::{gas::GasOpts, PublicContext}};
2-
use crate::protocol::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::ToField};
1+
use crate::authwit::auth_registry_interface::AuthRegistryInterface;
2+
use crate::authwit::utils::{compute_inner_authwit_hash, IS_VALID_SELECTOR};
3+
use crate::context::PublicContext;
4+
use crate::protocol::{address::AztecAddress, traits::ToField};
35
use crate::standard_addresses::STANDARD_AUTH_REGISTRY_ADDRESS;
46

57
/// Public-flow authwit helpers.
@@ -86,14 +88,8 @@ pub unconstrained fn assert_inner_hash_valid_authwit_public(
8688
on_behalf_of: AztecAddress,
8789
inner_hash: Field,
8890
) {
89-
let results: [Field] = context.call_public_function(
90-
STANDARD_AUTH_REGISTRY_ADDRESS,
91-
comptime { FunctionSelector::from_signature("consume((Field),Field)") },
92-
[on_behalf_of.to_field(), inner_hash],
93-
GasOpts::default(),
94-
);
95-
assert(results.len() == 1, "Invalid response from registry");
96-
assert(results[0] == IS_VALID_SELECTOR, "Message not authorized by account");
91+
let result = AuthRegistryInterface::at(STANDARD_AUTH_REGISTRY_ADDRESS).consume(on_behalf_of, inner_hash).call(context);
92+
assert(result == IS_VALID_SELECTOR, "Message not authorized by account");
9793
}
9894

9995
/// Helper function to set the authorization status of a message hash
@@ -103,13 +99,7 @@ pub unconstrained fn assert_inner_hash_valid_authwit_public(
10399
/// @param message_hash The hash of the message to authorize @param authorize True if the message should be authorized,
104100
/// false if it should be revoked
105101
pub unconstrained fn set_authorized(context: PublicContext, message_hash: Field, authorize: bool) {
106-
let res = context.call_public_function(
107-
STANDARD_AUTH_REGISTRY_ADDRESS,
108-
comptime { FunctionSelector::from_signature("set_authorized(Field,bool)") },
109-
[message_hash, authorize as Field],
110-
GasOpts::default(),
111-
);
112-
assert(res.len() == 0);
102+
AuthRegistryInterface::at(STANDARD_AUTH_REGISTRY_ADDRESS).set_authorized(message_hash, authorize).call(context);
113103
}
114104

115105
/// Helper function to reject all authwits
@@ -118,11 +108,5 @@ pub unconstrained fn set_authorized(context: PublicContext, message_hash: Field,
118108
///
119109
/// @param reject True if all authwits should be rejected, false otherwise
120110
pub unconstrained fn set_reject_all(context: PublicContext, reject: bool) {
121-
let res = context.call_public_function(
122-
STANDARD_AUTH_REGISTRY_ADDRESS,
123-
comptime { FunctionSelector::from_signature("set_reject_all(bool)") },
124-
[reject as Field],
125-
GasOpts::default(),
126-
);
127-
assert(res.len() == 0);
111+
AuthRegistryInterface::at(STANDARD_AUTH_REGISTRY_ADDRESS).set_reject_all(reject).call(context);
128112
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ pub(crate) mod logging;
4747
pub mod utils;
4848
pub mod authwit;
4949
pub mod public_checks;
50+
pub mod public_checks_interface;
5051
pub mod macros;
5152
pub mod standard_addresses;
5253

‎noir-projects/aztec-nr/aztec/src/public_checks.nr‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use crate::context::calls::PublicStaticCall;
21
use crate::context::PrivateContext;
3-
use crate::protocol::abis::function_selector::FunctionSelector;
2+
use crate::public_checks_interface::PublicChecksInterface;
43
use crate::standard_addresses::STANDARD_PUBLIC_CHECKS_ADDRESS;
54

65
// docs:start:helper_public_checks_functions
@@ -10,14 +9,7 @@ use crate::standard_addresses::STANDARD_PUBLIC_CHECKS_ADDRESS;
109
/// This conceals an address of the calling contract by setting `context.msg_sender` to the public checks contract
1110
/// address.
1211
pub fn privately_check_timestamp(operation: u8, value: u64, context: &mut PrivateContext) {
13-
let selector = comptime { FunctionSelector::from_signature("check_timestamp(u8,u64)") };
14-
PublicStaticCall::<15, 2, ()>::new(
15-
STANDARD_PUBLIC_CHECKS_ADDRESS,
16-
selector,
17-
"check_timestamp",
18-
[operation as Field, value as Field],
19-
)
20-
.enqueue_view_incognito(context);
12+
PublicChecksInterface::at(STANDARD_PUBLIC_CHECKS_ADDRESS).check_timestamp(operation, value).enqueue_view_incognito(context);
2113
}
2214

2315
/// Asserts that the current block number in the enqueued public call enqueued by `check_block_number` satisfies
@@ -27,14 +19,7 @@ pub fn privately_check_timestamp(operation: u8, value: u64, context: &mut Privat
2719
/// address.
2820
pub fn privately_check_block_number(operation: u8, value: u32, context: &mut PrivateContext) {
2921
// docs:start:enqueueing
30-
let selector = comptime { FunctionSelector::from_signature("check_block_number(u8,u32)") };
31-
PublicStaticCall::<18, 2, ()>::new(
32-
STANDARD_PUBLIC_CHECKS_ADDRESS,
33-
selector,
34-
"check_block_number",
35-
[operation as Field, value as Field],
36-
)
37-
.enqueue_view_incognito(context);
22+
PublicChecksInterface::at(STANDARD_PUBLIC_CHECKS_ADDRESS).check_block_number(operation, value).enqueue_view_incognito(context);
3823
// docs:end:enqueueing
3924
}
4025
// docs:end:helper_public_checks_functions

‎noir-projects/aztec-nr/aztec/src/public_checks_interface.nr‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
use crate::context::calls::PublicStaticCall;
2+
use crate::protocol::abis::function_selector::FunctionSelector;
3+
use crate::protocol::address::AztecAddress;
4+
5+
/// Hand-written interface stub for the `PublicChecks` standard contract.
6+
///
7+
/// The `PublicChecks` contract exposes two view functions that can be enqueued
8+
/// from private context via `enqueue_view_incognito` to assert timestamp or
9+
/// block-number constraints without revealing the calling contract address.
10+
///
11+
/// The selectors are derived with `comptime { FunctionSelector::from_signature(...) }`,
12+
/// which matches exactly what the `#[aztec]` macro generates for the real contract.
13+
pub struct PublicChecksInterface {
14+
pub target_contract: AztecAddress,
15+
}
16+
17+
impl PublicChecksInterface {
18+
pub fn at(target_contract: AztecAddress) -> Self {
19+
Self { target_contract }
20+
}
21+
22+
pub fn check_timestamp(self, operation: u8, value: u64) -> PublicStaticCall<15, 2, ()> {
23+
let selector = comptime { FunctionSelector::from_signature("check_timestamp(u8,u64)") };
24+
PublicStaticCall::new(
25+
self.target_contract,
26+
selector,
27+
"check_timestamp",
28+
[operation as Field, value as Field],
29+
)
30+
}
31+
32+
pub fn check_block_number(self, operation: u8, value: u32) -> PublicStaticCall<18, 2, ()> {
33+
let selector = comptime { FunctionSelector::from_signature("check_block_number(u8,u32)") };
34+
PublicStaticCall::new(
35+
self.target_contract,
36+
selector,
37+
"check_block_number",
38+
[operation as Field, value as Field],
39+
)
40+
}
41+
}

0 commit comments

Comments
 (0)