Skip to content

Commit ddbd0bd

Browse files
authored
feat: pass scopes from wallets to PXE (#20229)
We started with #20041, and we now want to enforce scopes on PXE. PXE already supports scopes, we just want to make wallets use the parameters correctly to enforce them In order to make this work, we had to make contract sync scope-aware
2 parents c45580a + 851d6cc commit ddbd0bd

File tree

61 files changed

+456
-340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+456
-340
lines changed

noir-projects/noir-contracts/Nargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ members = [
3535
"contracts/protocol_interface/auth_registry_interface",
3636
"contracts/protocol_interface/contract_instance_registry_interface",
3737
"contracts/protocol_interface/fee_juice_interface",
38-
"contracts/test/generic_proxy",
38+
"contracts/test/generic_proxy_contract",
3939
"contracts/test/auth_wit_test_contract",
4040
"contracts/test/avm_gadgets_test_contract",
4141
"contracts/test/avm_initializer_test_contract",

noir-projects/noir-contracts/contracts/app/nft_contract/Nargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ type = "contract"
77
[dependencies]
88
aztec = { path = "../../../../aztec-nr/aztec" }
99
compressed_string = { path = "../../../../aztec-nr/compressed-string" }
10-
generic_proxy = { path = "../../test/generic_proxy" }
10+
generic_proxy_contract = { path = "../../test/generic_proxy_contract" }
1111

noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_in_private.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::NFT;
22
use crate::test::utils;
33
use aztec::{oracle::random::random, test::helpers::authwit::add_private_authwit_from_call};
4-
use generic_proxy::GenericProxy;
4+
use generic_proxy_contract::GenericProxy;
55

66
#[test]
77
unconstrained fn transfer_in_private() {

noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_to_public.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::NFT;
22
use crate::test::utils;
33
use aztec::{oracle::random::random, test::helpers::authwit::add_private_authwit_from_call};
4-
use generic_proxy::GenericProxy;
4+
use generic_proxy_contract::GenericProxy;
55

66
#[test]
77
unconstrained fn transfer_to_public() {

noir-projects/noir-contracts/contracts/app/nft_contract/src/test/utils.nr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ pub unconstrained fn assert_owns_private_nft(
9292
// this, since different scopes are enforced by TXE.
9393
pub unconstrained fn setup_with_proxy() -> (TestEnvironment, AztecAddress, AztecAddress, AztecAddress, AztecAddress) {
9494
let (mut env, nft_contract_address, owner, recipient) = setup(/* with_account_contracts */ true);
95-
let proxy = env.deploy("@generic_proxy/GenericProxy").without_initializer();
95+
let proxy = env.deploy("@generic_proxy_contract/GenericProxy").without_initializer();
9696
(env, nft_contract_address, owner, recipient, proxy)
9797
}
9898

9999
pub unconstrained fn setup_mint_and_transfer_to_private_with_proxy() -> (TestEnvironment, AztecAddress, AztecAddress, AztecAddress, Field, AztecAddress) {
100100
let (mut env, nft_contract_address, owner, recipient, token_id) =
101101
setup_mint_and_transfer_to_private(/* with_account_contracts */ true);
102-
let proxy = env.deploy("@generic_proxy/GenericProxy").without_initializer();
102+
let proxy = env.deploy("@generic_proxy_contract/GenericProxy").without_initializer();
103103
(env, nft_contract_address, owner, recipient, token_id, proxy)
104104
}

noir-projects/noir-contracts/contracts/app/token_contract/Nargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ aztec = { path = "../../../../aztec-nr/aztec" }
99
uint_note = { path = "../../../../aztec-nr/uint-note" }
1010
compressed_string = { path = "../../../../aztec-nr/compressed-string" }
1111
balance_set = { path = "../../../../aztec-nr/balance-set" }
12-
generic_proxy = { path = "../../test/generic_proxy" }
12+
generic_proxy_contract = { path = "../../test/generic_proxy_contract" }

noir-projects/noir-contracts/contracts/app/token_contract/src/test/burn_private.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::test::utils;
22
use crate::Token;
33
use aztec::test::helpers::authwit::add_private_authwit_from_call;
4-
use generic_proxy::GenericProxy;
4+
use generic_proxy_contract::GenericProxy;
55

66
global AUTHWIT_NONCE: Field = 7;
77

noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_private.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::test::utils;
22
use crate::Token;
33
use aztec::test::helpers::authwit::add_private_authwit_from_call;
4-
use generic_proxy::GenericProxy;
4+
use generic_proxy_contract::GenericProxy;
55

66
#[test]
77
unconstrained fn transfer_private_on_behalf_of_other() {

noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::test::utils;
22
use crate::Token;
33
use aztec::{oracle::random::random, test::helpers::authwit::add_private_authwit_from_call};
4-
use generic_proxy::GenericProxy;
4+
use generic_proxy_contract::GenericProxy;
55

66
#[test]
77
unconstrained fn transfer_to_public_on_behalf_of_self() {

noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public_and_prepare_private_balance_increase.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use aztec::{
44
oracle::random::random, protocol::traits::Deserialize,
55
test::helpers::authwit::add_private_authwit_from_call,
66
};
7-
use generic_proxy::GenericProxy;
7+
use generic_proxy_contract::GenericProxy;
88
use uint_note::PartialUintNote;
99

1010
// Tests the typical scenario in which transfer_to_public_and_prepare_private_balance_increase is to be used:

0 commit comments

Comments
 (0)