Merge branch 'dev' into feat/403

Author: ilpepepig

src/escrow_contract/src/test/test_logic_contract/src/test/withdraw.nr

@@ -1,13 +1,10 @@
 use crate::test::utils as logic_utils;
 use crate::TestLogic;
+use aztec::test::helpers::test_environment::CallPrivateOptions;
 use escrow_contract::test::utils as escrow_utils;
 use token::{test::utils as token_utils, Token};
 
-// TODO (reenable test): TXE scope enforcement means only the `from` address's notes are accessible during
-// private execution. The escrow's token notes are not in scope when called from the logic contract.
-// The TS tests handle this via `additionalScopes: [escrow.address]`, but TXE doesn't support it yet.
-// See: https://github.com/AztecProtocol/aztec-packages/blob/v4.2.0-aztecnr-rc.2/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr#L953-L954
-#[allow(dead_code)]
+#[test]
 unconstrained fn withdraw_success() {
     let (mut env, token, _owner, recipient, minter) = token_utils::setup_with_minter(false);
 
@@ -23,7 +20,11 @@ unconstrained fn withdraw_success() {
     token_utils::check_private_balance(env, token, escrow, amount);
 
     let caller = env.create_light_account();
-    env.call_private(caller, TestLogic::at(logic).withdraw(escrow, recipient, token, amount));
+    env.call_private_opts(
+        caller,
+        CallPrivateOptions::new().with_additional_scopes([escrow]),
+        TestLogic::at(logic).withdraw(escrow, recipient, token, amount),
+    );
 
     // Check recipient got tokens
     token_utils::check_private_balance(env, token, recipient, amount);

src/escrow_contract/src/test/test_logic_contract/src/test/withdraw_nft.nr

@@ -1,14 +1,10 @@
 use crate::test::utils as logic_utils;
 use crate::TestLogic;
-use aztec::test::helpers::test_environment::TestEnvironment;
+use aztec::test::helpers::test_environment::{CallPrivateOptions, TestEnvironment};
 use escrow_contract::test::utils as escrow_utils;
 use nft::{NFT, test::utils as nft_utils};
 
-// TODO (reenable test): TXE scope enforcement means only the `from` address's notes are accessible during
-// private execution. The escrow's NFT notes are not in scope when called from the logic contract.
-// The TS tests handle this via `additionalScopes: [escrow.address]`, but TXE doesn't support it yet.
-// See: https://github.com/AztecProtocol/aztec-packages/blob/v4.2.0-aztecnr-rc.2/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr#L953-L954
-#[allow(dead_code)]
+#[test]
 unconstrained fn withdraw_nft_success() {
     let mut env = TestEnvironment::new();
     let owner = env.create_light_account();
@@ -29,7 +25,11 @@ unconstrained fn withdraw_nft_success() {
     nft_utils::assert_owns_private_nft(env, nft, escrow, token_id);
 
     let caller = env.create_light_account();
-    env.call_private(caller, TestLogic::at(logic).withdraw_nft(escrow, recipient, nft, token_id));
+    env.call_private_opts(
+        caller,
+        CallPrivateOptions::new().with_additional_scopes([escrow]),
+        TestLogic::at(logic).withdraw_nft(escrow, recipient, nft, token_id),
+    );
 
     // Check recipient got NFT
     nft_utils::assert_owns_private_nft(env, nft, recipient, token_id);

src/escrow_contract/src/test/withdraw.nr

@@ -1,12 +1,9 @@
 use crate::Escrow;
 use crate::test::utils as escrow_utils;
+use aztec::test::helpers::test_environment::CallPrivateOptions;
 use token::{test::utils as token_utils, Token};
 
-// TODO (reenable test): TXE scope enforcement means only the `from` address's notes are accessible during
-// private execution. The escrow's token notes are not in scope when called from logic_contract_address.
-// The TS tests handle this via `additionalScopes: [escrow.address]`, but TXE doesn't support it yet.
-// See: https://github.com/AztecProtocol/aztec-packages/blob/v4.2.0-aztecnr-rc.2/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr#L953-L954
-#[allow(dead_code)]
+#[test]
 unconstrained fn escrow_withdraw_success() {
     let escrow_secret: Field = 123456;
     let (mut env, escrow_contract_address, token_contract_address, _, _, recipient, minter, logic_contract_address) =
@@ -27,17 +24,17 @@ unconstrained fn escrow_withdraw_success() {
         amount,
     );
 
-    env.call_private(
+    env.call_private_opts(
         logic_contract_address,
+        CallPrivateOptions::new().with_additional_scopes([escrow_contract_address]),
         Escrow::at(escrow_contract_address).withdraw(token_contract_address, amount, recipient),
     );
 
     // Check recipient got tokens
     token_utils::check_private_balance(env, token_contract_address, recipient, amount);
 }
 
-// TODO (reenable test): same TXE scope enforcement issue as escrow_withdraw_success (see comment above).
-#[allow(dead_code)]
+#[test]
 unconstrained fn escrow_withdraw_twice_success() {
     let escrow_secret: Field = 123456;
     let (mut env, escrow_contract_address, token_contract_address, _, _, recipient, minter, logic_contract_address) =
@@ -60,8 +57,9 @@ unconstrained fn escrow_withdraw_twice_success() {
 
     let amount: u128 = token_utils::mint_amount;
     // Partial withdrawal
-    env.call_private(
+    env.call_private_opts(
         logic_contract_address,
+        CallPrivateOptions::new().with_additional_scopes([escrow_contract_address]),
         Escrow::at(escrow_contract_address).withdraw(token_contract_address, amount, recipient),
     );
 
@@ -75,8 +73,9 @@ unconstrained fn escrow_withdraw_twice_success() {
     );
 
     // Complete withdrawal
-    env.call_private(
+    env.call_private_opts(
         logic_contract_address,
+        CallPrivateOptions::new().with_additional_scopes([escrow_contract_address]),
         Escrow::at(escrow_contract_address).withdraw(token_contract_address, amount, recipient),
     );
 

src/escrow_contract/src/test/withdraw_nft.nr

@@ -1,12 +1,9 @@
 use crate::Escrow;
 use crate::test::utils as escrow_utils;
+use aztec::test::helpers::test_environment::CallPrivateOptions;
 use nft::{NFT, test::utils as nft_utils};
 
-// TODO (reenable test): TXE scope enforcement means only the `from` address's notes are accessible during
-// private execution. The escrow's NFT notes are not in scope when called from logic_contract_address.
-// The TS tests handle this via `additionalScopes: [escrow.address]`, but TXE doesn't support it yet.
-// See: https://github.com/AztecProtocol/aztec-packages/blob/v4.2.0-aztecnr-rc.2/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr#L953-L954
-#[allow(dead_code)]
+#[test]
 unconstrained fn escrow_withdraw_nft_success() {
     let escrow_secret: Field = 123456;
     let (mut env, escrow_contract_address, _, nft_contract_address, _, recipient, minter, logic_contract_address) =
@@ -27,8 +24,9 @@ unconstrained fn escrow_withdraw_nft_success() {
         token_id,
     );
 
-    env.call_private(
+    env.call_private_opts(
         logic_contract_address,
+        CallPrivateOptions::new().with_additional_scopes([escrow_contract_address]),
         Escrow::at(escrow_contract_address).withdraw_nft(nft_contract_address, token_id, recipient),
     );