From faede7fc4c93ccf2c261e5dd4ba1dd13eb7b9749 Mon Sep 17 00:00:00 2001 From: masaun Date: Mon, 29 Sep 2025 10:01:29 +0900 Subject: [PATCH 1/5] [SC test]: Modify the import source of the 'AztecAddress' from the 'prelude::AztecAddress' to the 'protocol_types::address::AztecAddress' --- src/dripper/src/tests/token_helper.nr | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/dripper/src/tests/token_helper.nr b/src/dripper/src/tests/token_helper.nr index db88e2e..e200f8a 100644 --- a/src/dripper/src/tests/token_helper.nr +++ b/src/dripper/src/tests/token_helper.nr @@ -8,8 +8,11 @@ use aztec::{ random::random, storage::storage_read, }, - prelude::{AztecAddress, NoteViewerOptions}, - protocol_types::storage::map::derive_storage_slot_in_map, + //prelude::{AztecAddress, NoteViewerOptions}, + protocol_types::{ + address::AztecAddress, // @dev - aztec v2.0.3 + storage::map::derive_storage_slot_in_map + }, test::helpers::{test_environment::TestEnvironment}, }; use aztec::test::helpers::authwit as thwit_cheatcodes; From 34017fc29f6316783b39a55fba55c2fe6cc3109e Mon Sep 17 00:00:00 2001 From: masaun Date: Mon, 29 Sep 2025 10:13:12 +0900 Subject: [PATCH 2/5] [SC test]: Remove the extra arg from the env.create_light_account() and env.create_contract_account() --- src/dripper/src/tests/token_helper.nr | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/dripper/src/tests/token_helper.nr b/src/dripper/src/tests/token_helper.nr index e200f8a..aa41ff9 100644 --- a/src/dripper/src/tests/token_helper.nr +++ b/src/dripper/src/tests/token_helper.nr @@ -29,12 +29,12 @@ pub unconstrained fn setup_with_initial_supply( // Setup env, generate keys let mut env = TestEnvironment::new(); let (owner, recipient) = if with_account_contracts { - let owner = env.create_contract_account(1); - let recipient = env.create_contract_account(2); + let owner = env.create_contract_account(); + let recipient = env.create_contract_account(); (owner, recipient) } else { - let owner = env.create_light_account(1); - let recipient = env.create_light_account(2); + let owner = env.create_light_account(); + let recipient = env.create_light_account(); (owner, recipient) }; @@ -50,14 +50,14 @@ pub unconstrained fn setup_with_minter( // Setup env, generate keys let mut env = TestEnvironment::new(); let (owner, recipient, minter) = if with_account_contracts { - let owner = env.create_contract_account(1); - let recipient = env.create_contract_account(2); - let minter = env.create_contract_account(3); + let owner = env.create_contract_account(); + let recipient = env.create_contract_account(); + let minter = env.create_contract_account(); (owner, recipient, minter) } else { - let owner = env.create_light_account(1); - let recipient = env.create_light_account(2); - let minter = env.create_light_account(3); + let owner = env.create_light_account(); + let recipient = env.create_light_account(); + let minter = env.create_light_account(); (owner, recipient, minter) }; @@ -72,12 +72,12 @@ pub unconstrained fn setup_with_asset( // Setup env, generate keys let mut env = TestEnvironment::new(); let (owner, recipient) = if with_account_contracts { - let owner = env.create_contract_account(1); - let recipient = env.create_contract_account(2)au; + let owner = env.create_contract_account(); + let recipient = env.create_contract_account()au; (owner, recipient) } else { - let owner = env.create_light_account(1); - let recipient = env.create_light_account(2); + let owner = env.create_light_account(); + let recipient = env.create_light_account(); (owner, recipient) }; From 0082db5769856b018c4cd14ce5ef679029c1efa8 Mon Sep 17 00:00:00 2001 From: masaun Date: Mon, 29 Sep 2025 10:22:09 +0900 Subject: [PATCH 3/5] [SC test]: Modify the import source of the 'authwit' to the 'aztec::authwit' --- src/dripper/src/tests/token_helper.nr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dripper/src/tests/token_helper.nr b/src/dripper/src/tests/token_helper.nr index aa41ff9..1e2c47d 100644 --- a/src/dripper/src/tests/token_helper.nr +++ b/src/dripper/src/tests/token_helper.nr @@ -15,7 +15,10 @@ use aztec::{ }, test::helpers::{test_environment::TestEnvironment}, }; -use aztec::test::helpers::authwit as thwit_cheatcodes; + +use aztec::authwit as authwit_cheatcodes; // @dev - aztec v2.0.3 +//use aztec::test::helpers::authwit as authwit_cheatcodes; + use std::ops::WrappingSub; use std::test::OracleMock; use uint_note::uint_note::UintNote; From e22c3c2d9ab4a62e6f5183e041211bfd1a6d4160 Mon Sep 17 00:00:00 2001 From: masaun Date: Mon, 29 Sep 2025 10:35:46 +0900 Subject: [PATCH 4/5] [SC test]: Add the 'env' as an arg of the authwit_cheatcodes::add_public_authwit_from_call_interface(), which is created from the TestEnvironment::new() --- src/dripper/src/tests/token_helper.nr | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/dripper/src/tests/token_helper.nr b/src/dripper/src/tests/token_helper.nr index 1e2c47d..fcfc14c 100644 --- a/src/dripper/src/tests/token_helper.nr +++ b/src/dripper/src/tests/token_helper.nr @@ -16,8 +16,8 @@ use aztec::{ test::helpers::{test_environment::TestEnvironment}, }; -use aztec::authwit as authwit_cheatcodes; // @dev - aztec v2.0.3 -//use aztec::test::helpers::authwit as authwit_cheatcodes; +//use aztec::authwit as authwit_cheatcodes; // @dev - aztec v2.0.3 +use aztec::test::helpers::authwit as authwit_cheatcodes; // @dev - Both aztec v1.2.1 and v2.0.3 use std::ops::WrappingSub; use std::test::OracleMock; @@ -373,6 +373,7 @@ pub unconstrained fn authorize_transfer_private_to_public( ) { let transfer_private_to_public_call_interface = Token::at(token).transfer_private_to_public(from, caller, amount, nonce); + authwit_cheatcodes::add_private_authwit_from_call_interface( from, caller, @@ -388,12 +389,16 @@ pub unconstrained fn authorize_transfer_public_to_public( amount: u128, nonce: Field, ) { + let mut env = TestEnvironment::new(); + let transfer_public_to_public_call_interface = Token::at(token).transfer_public_to_public(from, caller, amount, nonce); + authwit_cheatcodes::add_public_authwit_from_call_interface( + env, from, caller, - transfer_public_to_public_call_interface, + transfer_public_to_public_call_interface ); } From 263c66cd2204fa55f0fa18231224ff1daa13ca8f Mon Sep 17 00:00:00 2001 From: masaun Date: Mon, 29 Sep 2025 12:02:43 +0900 Subject: [PATCH 5/5] [SC test]: Modify the import source of the 'NoteViewerOptions' from 'prelude::xxx' to 'note::note_viewer_options::xxx' --- src/dripper/src/tests/token_helper.nr | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/dripper/src/tests/token_helper.nr b/src/dripper/src/tests/token_helper.nr index fcfc14c..cd311a6 100644 --- a/src/dripper/src/tests/token_helper.nr +++ b/src/dripper/src/tests/token_helper.nr @@ -2,7 +2,10 @@ use dep::token::Token; use aztec::{ - note::{constants::MAX_NOTES_PER_PAGE, note_getter::view_notes}, + note::{ + constants::MAX_NOTES_PER_PAGE, note_getter::view_notes, + note_viewer_options::NoteViewerOptions // @dev - aztec v2.0.3 + }, oracle::{ execution::{get_block_number, get_contract_address}, random::random, @@ -328,11 +331,18 @@ pub unconstrained fn add_token_note( let balances_owner_slot = derive_storage_slot_in_map(Token::storage_layout().private_balances.slot, owner); - env.add_note( - UintNote { value: amount, owner: owner, randomness: note_randomness }, - balances_owner_slot, - token_contract_address, + let make_tx_hybrid = false; + let contract = Token::at(token_contract_address); + + env.call_private( + owner, + contract.call_create_note(amount, owner, balances_owner_slot, make_tx_hybrid), ); + // env.add_note( + // UintNote { value: amount, owner: owner, randomness: note_randomness }, + // balances_owner_slot, + // token_contract_address, + // ); } pub unconstrained fn get_private_balance_notes(