Skip to content

fix: unconstraining authwit lib method #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xorsal merged 1 commit into from
Mar 21, 2025
Merged

fix: unconstraining authwit lib method #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions src/token_contract/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,7 @@ pub contract Token {

#[public]
fn transfer_public_to_public(from: AztecAddress, to: AztecAddress, amount: u128, nonce: Field) {
// _validate_from_public(from, nonce);
// TODO(#34): we cannot call `assert_current_call_valid_authwit_public` from library methods
if (!from.eq(context.msg_sender())) {
assert_current_call_valid_authwit_public(&mut context, from);
} else {
assert(nonce == 0, "invalid nonce");
}
_validate_from_public(&mut context, from, nonce);
_decrease_public_balance(storage.public_balances, from, amount);
_increase_public_balance(storage.public_balances, to, amount);
}
Expand All @@ -225,13 +219,7 @@ pub contract Token {
partial_note: PartialUintNote,
nonce: Field,
) {
// _validate_from_public(from, nonce);
// TODO(#34): we cannot call `assert_current_call_valid_authwit_public` from library methods
if (!from.eq(context.msg_sender())) {
assert_current_call_valid_authwit_public(&mut context, from);
} else {
assert(nonce == 0, "invalid nonce");
}
_validate_from_public(&mut context, from, nonce);
_finalize_transfer_public_to_private(
&mut context,
storage.public_balances,
Expand Down Expand Up @@ -285,8 +273,7 @@ pub contract Token {
* ===================== UNCONSTRAINED =======================
* ======================================================== */

// TODO(#32): unconstrained fns cannot be injected in macros
pub(crate) unconstrained fn balance_of_private(owner: AztecAddress) -> pub u128 {
unconstrained fn balance_of_private(owner: AztecAddress) -> pub u128 {
storage.private_balances.at(owner).balance_of()
}

Expand Down Expand Up @@ -362,13 +349,7 @@ pub contract Token {

#[public]
fn burn_public(from: AztecAddress, amount: u128, nonce: Field) {
// _validate_from_public(from, nonce);
// TODO(#34): we cannot call `assert_current_call_valid_authwit_public` from library methods
if (!from.eq(context.msg_sender())) {
assert_current_call_valid_authwit_public(&mut context, from);
} else {
assert(nonce == 0, "invalid nonce");
}
_validate_from_public(&mut context, from, nonce);
_decrease_public_balance(storage.public_balances, from, amount);
_decrease_total_supply(storage.total_supply, amount);
}
Expand Down Expand Up @@ -546,10 +527,13 @@ pub contract Token {
}

#[contract_library_method]
fn _validate_from_public(context: &mut PublicContext, from: AztecAddress, nonce: Field) {
unconstrained fn _validate_from_public(
context: &mut PublicContext,
from: AztecAddress,
nonce: Field,
) {
if (!from.eq(context.msg_sender())) {
// TODO(#34): uncomment assert_current_call_valid_authwit_public
// assert_current_call_valid_authwit_public(&mut context, from);
assert_current_call_valid_authwit_public(context, from);
} else {
assert(nonce == 0, "invalid nonce");
}
Expand Down
6 changes: 4 additions & 2 deletions src/token_contract/src/test/mint_to_public.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,16 @@ unconstrained fn mint_to_public_failures() {

Token::at(token_contract_address).mint_to_public(recipient, max_u128).call(&mut env.public());

let mint_to_public_call_interface = Token::at(token_contract_address).mint_to_public(owner, 1 as u128);
let mint_to_public_call_interface =
Token::at(token_contract_address).mint_to_public(owner, 1 as u128);
env.assert_public_call_fails(mint_to_public_call_interface);

utils::check_public_balance(token_contract_address, owner, 0);
utils::check_total_supply(token_contract_address, max_u128);

// Overflow total supply
let mint_to_public_call_interface = Token::at(token_contract_address).mint_to_public(owner, max_u128);
let mint_to_public_call_interface =
Token::at(token_contract_address).mint_to_public(owner, max_u128);
env.assert_public_call_fails(mint_to_public_call_interface);

utils::check_public_balance(token_contract_address, owner, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/token_contract/src/test/transfer_private_to_public.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use crate::test::utils;
use crate::Token;
use authwit::cheatcodes as authwit_cheatcodes;
use aztec::{note::constants::MAX_NOTES_PER_PAGE, oracle::random::random};
use uint_note::uint_note::UintNote;
use aztec::protocol_types::traits::ToField;
use uint_note::uint_note::UintNote;

#[test]
unconstrained fn transfer_private_to_public_on_behalf_of_self() {
Expand Down