Skip to content

Commit fb09d4e

Browse files
benesjanstevenplatt
authored andcommitted
refactor: token naming cleanup (#9904)
1 parent 1d1d21e commit fb09d4e

File tree

86 files changed

+730
-625
lines changed

Some content is hidden

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

86 files changed

+730
-625
lines changed

docs/docs/guides/developer_guides/getting_started.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ In the next step, let's mint some tokens!
139139
Call the public mint function like this:
140140
141141
```bash
142-
aztec-wallet send mint_public --from accounts:my-wallet --contract-address contracts:testtoken --args accounts:my-wallet 100
142+
aztec-wallet send mint_to_public --from accounts:my-wallet --contract-address contracts:testtoken --args accounts:my-wallet 100
143143
```
144144
145145
This takes
146146
147-
- the function name as the argument, which is `mint_public`
147+
- the function name as the argument, which is `mint_to_public`
148148
- the `from` account (caller) which is `accounts:my-wallet`
149149
- the contract address, which is aliased as `contracts:testtoken` (or simply `testtoken`)
150150
- the args that the function takes, which is the account to mint the tokens into (`my-wallet`), and `amount` (`100`).
@@ -165,7 +165,7 @@ Transaction has been mined
165165
Status: success
166166
Block number: 17
167167
Block hash: 1e27d200600bc45ab94d467c230490808d1e7d64f5ee6cee5e94a08ee9580809
168-
Transaction hash stored in database with aliases last & mint_public-9044
168+
Transaction hash stored in database with aliases last & mint_to_public-9044
169169
```
170170
171171
You can double-check by calling the function that checks your public account balance:

docs/docs/guides/developer_guides/js_apps/authwit.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ Then create the message hash by hashing the inner hash with the authwit receiver
6868

6969
## Create the authwit
7070

71-
There are slightly different interfaces depending on whether your contract is checking the authwit in private or public.
71+
There are slightly different interfaces depending on whether your contract is checking the authwit in private or public.
7272

73-
Public authwits are stored in the account contract and batched with the authwit action call, so a user must send a transaction to update their account contract, authorizing an action before the authorized contract's public call will succeed.
73+
Public authwits are stored in the account contract and batched with the authwit action call, so a user must send a transaction to update their account contract, authorizing an action before the authorized contract's public call will succeed.
7474

7575
Private execution uses oracles and are executed locally by the PXE, so the authwit needs to be created by the authwit giver and then added to the authwit receiver's PXE.
7676

@@ -107,7 +107,7 @@ Set a public authwit like this:
107107
Remember it is a transaction and calls a method in the account contract. In this example,
108108

109109
- `wallets[0]` is the authwit giver
110-
- `wallets[1]` is the authwit reciever and caller of the function
110+
- `wallets[1]` is the authwit receiver and caller of the function
111111
- `action` was [defined previously](#define-the-action)
112112
- `true` sets the `authorized` boolean (`false` would revoke this authwit)
113113

docs/docs/guides/developer_guides/smart_contracts/how_to_compile_contract.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ export class TokenContract extends ContractBase {
199199

200200
/** Type-safe wrappers for the public methods exposed by the contract. */
201201
public override methods!: {
202-
/** transfer_public(from: struct, to: struct, amount: field, nonce: field) */
203-
transfer_public: ((
202+
/** transfer_in_public(from: struct, to: struct, amount: field, nonce: field) */
203+
transfer_in_public: ((
204204
from: AztecAddressLike,
205205
to: AztecAddressLike,
206206
amount: FieldLike,

docs/docs/guides/developer_guides/smart_contracts/testing_contracts/testing.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ Our test environment is capable of utilizing the autogenerated contract interfac
118118

119119
For example, to call the private `transfer` function on the token contract:
120120

121-
#include_code txe_test_transfer_private /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer_private.nr rust
121+
#include_code txe_test_transfer_private /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer.nr rust
122122

123123
#### Public
124124

125-
To call the public `transfer_public` function:
125+
To call the public `transfer_in_public` function:
126126

127-
#include_code call_public /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer_public.nr rust
127+
#include_code call_public /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer_in_public.nr rust
128128

129129
#### Unconstrained
130130

@@ -178,11 +178,11 @@ Reading notes:
178178

179179
You can add [authwits](../writing_contracts/authwit.md) to the TXE. Here is an example of testing a private token transfer using authwits:
180180

181-
#include_code private_authwit /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer_private.nr rust
181+
#include_code private_authwit /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer_in_private.nr rust
182182

183183
#### Public
184184

185-
#include_code public_authwit /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer_public.nr rust
185+
#include_code public_authwit /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer_in_public.nr rust
186186

187187
### Storing notes in cache
188188

@@ -206,7 +206,7 @@ You can test functions that you expect to fail generically, with the `#[test(sho
206206

207207
For example:
208208

209-
#include_code fail_with_message /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer_private.nr rust
209+
#include_code fail_with_message /noir-projects/noir-contracts/contracts/token_contract/src/test/transfer_in_private.nr rust
210210

211211
You can also use the `assert_public_call_fails` or `assert_private_call_fails` methods on the `TestEnvironment` to check that a call fails.
212212

docs/docs/guides/developer_guides/smart_contracts/writing_contracts/authwit.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Then you will be able to import it into your contracts as follows.
141141

142142
Based on the diagram earlier on this page let's take a look at how we can implement the `transfer` function such that it checks if the tokens are to be transferred `from` the caller or needs to be authenticated with an authentication witness.
143143

144-
#include_code transfer_from /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
144+
#include_code transfer_in_private /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
145145

146146
The first thing we see in the snippet above, is that if `from` is not the call we are calling the `assert_current_call_valid_authwit` function from [earlier](#private-functions). If the call is not throwing, we are all good and can continue with the transfer.
147147

@@ -151,7 +151,7 @@ In the snippet we are constraining the `else` case such that only `nonce = 0` is
151151

152152
Cool, so we have a function that checks if the current call is authenticated, but how do we actually authenticate it? Well, assuming that we use a wallet that is following the spec, we import `computeAuthWitMessageHash` from `aztec.js` to help us compute the hash, and then we simply `addAuthWitness` to the wallet. Behind the scenes this will make the witness available to the oracle.
153153

154-
#include_code authwit_transfer_example /yarn-project/end-to-end/src/e2e_token_contract/transfer_private.test.ts typescript
154+
#include_code authwit_transfer_example /yarn-project/end-to-end/src/e2e_token_contract/transfer_in_private.test.ts typescript
155155

156156
Learn more about authwits in Aztec.js by [following this guide](../../js_apps/authwit.md).
157157

@@ -161,15 +161,15 @@ With private functions covered, how can we use this in a public function? Well,
161161

162162
#### Checking if the current call is authenticated
163163

164-
#include_code transfer_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
164+
#include_code transfer_in_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
165165

166166
#### Authenticating an action in TypeScript
167167

168168
Authenticating an action in the public domain is slightly different from the private domain, since we are executing a function on the auth registry contract to add the witness flag. As you might recall, this was to ensure that we don't need to call into the account contract from public, which is a potential DOS vector.
169169

170170
In the snippet below, this is done as a separate contract call, but can also be done as part of a batch as mentioned in the [Accounts concepts](../../../../aztec/concepts/accounts/authwit.md#what-about-public).
171171

172-
#include_code authwit_public_transfer_example /yarn-project/end-to-end/src/e2e_token_contract/transfer_public.test.ts typescript
172+
#include_code authwit_public_transfer_example /yarn-project/end-to-end/src/e2e_token_contract/transfer_in_public.test.ts typescript
173173

174174
#### Updating approval state in Noir
175175

docs/docs/guides/developer_guides/smart_contracts/writing_contracts/common_patterns/index.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ We call this the "authentication witness" pattern or authwit for short.
2121
Here you approve a contract to burn funds on your behalf.
2222

2323
- Approve in public domain:
24-
#include_code authwit_public_transfer_example /yarn-project/end-to-end/src/e2e_token_contract/transfer_public.test.ts typescript
24+
#include_code authwit_public_transfer_example /yarn-project/end-to-end/src/e2e_token_contract/transfer_in_public.test.ts typescript
2525

2626
Here you approve someone to transfer funds publicly on your behalf
2727

@@ -84,8 +84,6 @@ Let's say you have some storage in public and want to move them into the private
8484

8585
So you have to create a custom note in the public domain that is not encrypted by some owner - we call such notes a "TransparentNote" since it is created in public, anyone can see the amount and the note is not encrypted by some owner.
8686

87-
This pattern is discussed in detail in [the codealong token tutorial in the shield() method](../../../../../tutorials/codealong/contract_tutorials/token_contract.md#redeem_shield).
88-
8987
### Discovering my notes
9088

9189
When you send someone a note, the note hash gets added to the note hash tree. To spend the note, the receiver needs to get the note itself (the note hash preimage). There are two ways you can get a hold of your notes:

docs/docs/guides/developer_guides/smart_contracts/writing_contracts/portals/communicate_with_portal.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The `content_hash` is a sha256 truncated to a field element (~ 254 bits). In Azt
5353

5454
### Token portal hash library
5555

56-
#include_code mint_public_content_hash_nr /noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr rust
56+
#include_code mint_to_public_content_hash_nr /noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr rust
5757

5858
### Token Portal contract
5959

docs/docs/migration_notes.md

+15
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@ keywords: [sandbox, aztec, notes, migration, updating, upgrading]
66

77
Aztec is in full-speed development. Literally every version breaks compatibility with the previous ones. This page attempts to target errors and difficulties you might encounter when upgrading, and how to resolve them.
88

9+
## 0.63.0
10+
### [Token contract] Partial notes related refactor
11+
We've decided to replace the old "shield" flow with one leveraging partial notes.
12+
This led to a removal of `shield` and `redeem_shield` functions and an introduction of `transfer_to_private`.
13+
An advantage of the new approach is that only 1 tx is required and the API of partial notes is generally nicer.
14+
For more information on partial notes refer to docs.
15+
16+
### [Token contract] Function naming changes
17+
There have been a few naming changes done for improved consistency.
18+
These are the renamings:
19+
`transfer_public` --> `transfer_in_public`
20+
`transfer_from` --> `transfer_in_private`
21+
`mint_public` --> `mint_to_public`
22+
`burn` --> `burn_private`
23+
924
## 0.62.0
1025
### [TXE] Single execution environment
1126
Thanks to recent advancements in Brillig TXE performs every single call as if it was a nested call, spawning a new ACVM or AVM simulator without performance loss.

docs/docs/reference/developer_references/sandbox_reference/cli_wallet_reference.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ The authwit management in private is a two-step process: create and add. It's no
104104

105105
#### Example
106106

107-
An example for authorizing an operator (ex. a DeFi protocol) to call the transfer_from action (transfer on the user's behalf):
107+
An example for authorizing an operator (ex. a DeFi protocol) to call the transfer_in_private action (transfer on the user's behalf):
108108

109109
```bash
110-
aztec-wallet create-authwit transfer_from accounts:coruscant_trader -ca contracts:token --args accounts:jedi_master accounts:coruscant_trader 20 secrets:auth_nonce -f accounts:jedi_master -a secret_trade
110+
aztec-wallet create-authwit transfer_in_private accounts:coruscant_trader -ca contracts:token --args accounts:jedi_master accounts:coruscant_trader 20 secrets:auth_nonce -f accounts:jedi_master -a secret_trade
111111

112112
aztec-wallet add-authwit authwits:secret_trade accounts:jedi_master -f accounts:coruscant_trader
113113
```
@@ -117,7 +117,7 @@ aztec-wallet add-authwit authwits:secret_trade accounts:jedi_master -f accounts:
117117
A similar call to the above, but in public:
118118

119119
```bash
120-
aztec-wallet authorize-action transfer_public accounts:coruscant_trader -ca contracts:token --args accounts:jedi_master accounts:coruscant_trader 20 secrets:auth_nonce -f accounts:jedi_master
120+
aztec-wallet authorize-action transfer_in_public accounts:coruscant_trader -ca contracts:token --args accounts:jedi_master accounts:coruscant_trader 20 secrets:auth_nonce -f accounts:jedi_master
121121
```
122122

123123
### Simulate

docs/docs/tutorials/codealong/aztecjs-getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ Our output should now look like this:
283283
Here, we used the same contract abstraction as was previously used for reading Alice's balance. But this time we called `send()` generating and sending a transaction to the network. After waiting for the transaction to settle we were able to check the new balance values.
284284

285285
Finally, the contract has 2 `mint` functions that can be used to generate new tokens for an account.
286-
We will focus only on `mint_private`.
286+
We will focus only on `mint_to_private`.
287287
This function is public but it mints tokens privately.
288288
This function takes:
289289

docs/docs/tutorials/codealong/cli_wallet/faceid_wallet.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ You should get a prompt to sign this transaction. You can now mint, transfer, an
103103

104104
```bash
105105
aztec-wallet create-account -a new_recipient # creating a schnorr account
106-
aztec-wallet send mint_public -ca last --args accounts:my-wallet 10 -f accounts:my-wallet # minting some tokens in public
106+
aztec-wallet send mint_to_public -ca last --args accounts:my-wallet 10 -f accounts:my-wallet # minting some tokens in public
107107
aztec-wallet simulate balance_of_public -ca contracts:devtoken --args accounts:my-wallet -f my-wallet # checking that my-wallet has 10 tokens
108-
aztec-wallet send transfer_public -ca contracts:devtoken --args accounts:my-wallet accounts:new_recipient 10 0 -f accounts:my-wallet # transferring some tokens in public
108+
aztec-wallet send transfer_in_public -ca contracts:devtoken --args accounts:my-wallet accounts:new_recipient 10 0 -f accounts:my-wallet # transferring some tokens in public
109109
aztec-wallet simulate balance_of_public -ca contracts:devtoken --args accounts:new_recipient -f my-wallet # checking that new_recipient has 10 tokens
110110
```
111111

docs/docs/tutorials/codealong/contract_tutorials/advanced/token_bridge/1_depositing_to_aztec.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Here is an explanation of what it is doing:
5757
- The content is limited to a single field (~254 bits). So if the content is larger, we have to hash it and the hash can be passed along.
5858
- We use our utility method that creates a sha256 hash but truncates it to fit into a field
5959
- Since we want to mint tokens on Aztec publicly, the content here is the amount to mint and the address on Aztec who will receive the tokens.
60-
- We encode this message as a mint_public function call, to specify the exact intentions and parameters we want to execute on L2.
60+
- We encode this message as a mint_to_public function call, to specify the exact intentions and parameters we want to execute on L2.
6161
- In reality the content can be constructed in any manner as long as the sister contract on L2 can also create it. But for clarity, we are constructing the content like an ABI encoded function call.
6262
- It is good practice to include all parameters used by L2 into this content (like the amount and to) so that a malicious actor can’t change the to to themselves when consuming the message.
6363
3. The tokens are transferred from the user to the portal using `underlying.safeTransferFrom()`. This puts the funds under the portal's control.
@@ -78,7 +78,7 @@ Let’s do the similar for the private flow:
7878

7979
Here we want to send a message to mint tokens privately on Aztec! Some key differences from the previous method are:
8080

81-
- The content hash uses a different function name - `mint_private`. This is done to make it easy to separate concerns. If the contentHash between the public and private message was the same, then an attacker could consume a private message publicly!
81+
- The content hash uses a different function name - `mint_to_private`. This is done to make it easy to separate concerns. If the contentHash between the public and private message was the same, then an attacker could consume a private message publicly!
8282
- Since we want to mint tokens privately, we shouldn’t specify a `to` Aztec address (remember that Ethereum is completely public). Instead, we will use a secret hash - `secretHashForRedeemingMintedNotes`. Only he who knows the preimage to the secret hash can actually mint the notes. This is similar to the mechanism we use for message consumption on L2
8383
- Like with the public flow, we move the user’s funds to the portal
8484
- We now send the message to the inbox with the `recipient` (the sister contract on L2 along with the version of aztec the message is intended for) and the `secretHashForL2MessageConsumption` (such that on L2, the consumption of the message can be private).

0 commit comments

Comments
 (0)