refactor: final token cleanup #9864
Merged
+163
−655
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This stack of pull requests is managed by Graphite. Learn more about stacking. |
This was referenced Nov 9, 2024
benesjan
force-pushed
the
10-30-refactor_token_partial_notes_reefactor_pt._2_-_bridging
branch
from
c7e984b to
dcbcd38
Compare
benesjan
force-pushed
the
11-09-refactor_final_token_cleanup
branch
3 times, most recently
from
7267578 to
63bc42a
Compare
benesjan
force-pushed
the
10-30-refactor_token_partial_notes_reefactor_pt._2_-_bridging
branch
from
d1b498f to
0752c7a
Compare
benesjan
force-pushed
the
11-09-refactor_final_token_cleanup
branch
3 times, most recently
from
b72f38b to
1680e4f
Compare
benesjan
force-pushed
the
10-30-refactor_token_partial_notes_reefactor_pt._2_-_bridging
branch
from
3f31918 to
90ecd6f
Compare
benesjan
force-pushed
the
11-09-refactor_final_token_cleanup
branch
from
b2e3360 to
1ba2129
Compare
benesjan
commented
Nov 11, 2024
| @@ -111,6 +103,7 @@ contract Token { | |||
| // docs:end:initialize_decimals | |||
| } | |||
| // docs:end:constructor | |||
|
|
|||
There was a problem hiding this comment.
It was bothering me that there were no spaces between functions so I sneaked it in.
benesjan
commented
Nov 11, 2024
| @@ -472,8 +428,7 @@ contract Token { | |||
| // Transfers token `amount` from public balance of message sender to a private balance of `to`. | |||
| #[private] | |||
| fn transfer_to_private(to: AztecAddress, amount: Field) { | |||
| // We check the minter permissions in the enqueued call as that allows us to avoid the need for `SharedMutable` | |||
| // which is less efficient. | |||
| // `from` is the owner of the public balance from which we'll subtract the `amount`. | |||
There was a problem hiding this comment.
This comment was incorrectly copied by me in a previous PR.
benesjan
commented
Nov 11, 2024
| @@ -222,8 +222,7 @@ export class BlacklistTokenContractTest { | |||
| this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`); | |||
| expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address)); | |||
|
|
|||
| tokenSim.mintPrivate(amount); | |||
| tokenSim.redeemShield(address, amount); | |||
| tokenSim.mintPrivate(address, amount); | |||
There was a problem hiding this comment.
tokenSim.redeemShield was misused here and in other places as a way to increase a private balance of someone.
benesjan
commented
Nov 11, 2024
| @@ -83,21 +83,18 @@ describe('e2e_blacklist_token_contract mint', () => { | |||
| }); | |||
|
|
|||
| describe('Mint flow', () => { | |||
| it('mint_private as minter', async () => { | |||
| it('mint_private as minter and redeem as recipient', async () => { | |||
There was a problem hiding this comment.
Had to merge these 2 tests as now it's not supported by the token simulator to have the shield flow in 2 steps.
Changes to public function bytecode sizes
🧾 Summary (100% most significant diffs)
Full diff report 👇
|
Base automatically changed from
10-30-refactor_token_partial_notes_reefactor_pt._2_-_bridging
to
master
November 12, 2024 13:40
benesjan
force-pushed
the
11-09-refactor_final_token_cleanup
branch
from
8b3278a to
0b19ee1
Compare
Docs PreviewHey there! 👋 You can check your preview at https://6733c69cba91136a7aecf540--aztec-docs-dev.netlify.app |
benesjan
force-pushed
the
11-09-refactor_final_token_cleanup
branch
from
0b19ee1 to
d14b00e
Compare
benesjan
force-pushed
the
11-09-refactor_final_token_cleanup
branch
from
d14b00e to
955f2e0
Compare
sklppy88
approved these changes
Nov 12, 2024
benesjan
force-pushed
the
11-09-refactor_final_token_cleanup
branch
from
74ddb10 to
b8eb9ce
Compare
TomAFrench
added a commit
that referenced
this pull request
Nov 13, 2024
* master: git subrepo push --branch=master noir-projects/aztec-nr git_subrepo.sh: Fix parent in .gitrepo file. [skip ci] chore: replace relative paths to noir-protocol-circuits git subrepo push --branch=master barretenberg feat: mock data for IVC (#9893) refactor: final token cleanup (#9864) chore: delete accidentally added file (#9912)
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this PR I finally nuke the old shielding functionality of a token.