Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: nuking PublicToken and PrivateAirdropToken #2873

Merged
merged 12 commits into from
Oct 17, 2023
Merged

Conversation

benesjan
Copy link
Contributor

@benesjan benesjan commented Oct 16, 2023

Both tokens are no longer needed as the new Token is enough.

Note: I decided to not replace the private token airdrop contract in private execution test because the test was pretty much identical to the stateful test contract one.

Checklist:

Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge.

  • If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag.
  • I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code.
  • Every change is related to the PR description.
  • I have linked this pull request to relevant issues (if any exist).

@benesjan benesjan force-pushed the janb/nuking branch 2 times, most recently from 90c0190 to 34885ad Compare October 16, 2023 15:18
@AztecBot
Copy link
Collaborator

AztecBot commented Oct 16, 2023

Benchmark results

All benchmarks are run on txs on the Benchmarking contract on the repository. Each tx consists of a batch call to create_note and increment_balance, which guarantees that each tx has a private call, a nested private call, a public call, and a nested public call, as well as an emitted private note, an unencrypted log, and public storage read and write.

This benchmark source data is available in JSON format on S3 here.

Values are compared against data from master at commit b0915a8d and shown if the difference exceeds 1%.

L2 block published to L1

Each column represents the number of txs on an L2 block published to L1.

Metric 8 txs 32 txs 128 txs
l1_rollup_calldata_size_in_bytes 45,444 179,588 716,132
l1_rollup_calldata_gas 222,948 867,416 3,449,552
l1_rollup_execution_gas 842,035 3,594,524 22,204,921
l2_block_processing_time_in_ms ⚠️ 1,003 (-19%) ⚠️ 3,837 (-19%) ⚠️ 15,189 (-18%)
note_successful_decrypting_time_in_ms ⚠️ 321 (-17%) ⚠️ 976 (-21%) ⚠️ 3,601 (-22%)
note_trial_decrypting_time_in_ms ⚠️ 23.0 (-74%) ⚠️ 84.0 (-24%) 137 (-6%)
l2_block_building_time_in_ms ⚠️ 8,871 (-19%) ⚠️ 35,436 (-20%) ⚠️ 148,720 (-21%)
l2_block_rollup_simulation_time_in_ms ⚠️ 6,580 (-20%) ⚠️ 26,299 (-20%) ⚠️ 104,518 (-20%)
l2_block_public_tx_process_time_in_ms ⚠️ 2,250 (-17%) ⚠️ 9,013 (-18%) ⚠️ 43,593 (-22%)

L2 chain processing

Each column represents the number of blocks on the L2 chain where each block has 16 txs.

Metric 5 blocks 10 blocks
node_history_sync_time_in_ms 11,368 (-2%) 21,853 (-2%)
note_history_successful_decrypting_time_in_ms 2,279 (-2%) 4,643 (-2%)
note_history_trial_decrypting_time_in_ms 122 (-1%) 146 (-1%)
node_database_size_in_bytes 1,660,767 1,198,682
pxe_database_size_in_bytes 27,188 54,187

Circuits stats

Stats on running time and I/O sizes collected for every circuit run across all benchmarks.

Circuit circuit_simulation_time_in_ms circuit_input_size_in_bytes circuit_output_size_in_bytes
private-kernel-init ⚠️ 43.0 (-11%) 56,577 14,745
private-kernel-ordering ⚠️ 21.3 (-11%) 20,137 8,089
base-rollup 849 (-10%) 631,605 811
root-rollup ⚠️ 37.9 (-11%) 4,072 1,097
private-kernel-inner ⚠️ 35.6 (-11%) 72,288 14,745
public-kernel-private-input ⚠️ 46.8 (-11%) 37,359 14,745
public-kernel-non-first-iteration ⚠️ 27.8 (-12%) 37,401 14,745
merge-rollup ⚠️ 0.833 (-19%) 2,592 873

Miscellaneous

Transaction sizes based on how many contracts are deployed in the tx.

Metric 0 deployed contracts 1 deployed contracts
tx_size_in_bytes 8,723 27,094

Copy link
Contributor

@LHerskind LHerskind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like the unencrypted logs proposed in here 😬

Copy link
Contributor

@LHerskind LHerskind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, fix the failing test and then its good. Might just be timeout.

@benesjan benesjan enabled auto-merge (squash) October 17, 2023 13:00
@benesjan benesjan merged commit c74311d into master Oct 17, 2023
2 checks passed
@benesjan benesjan deleted the janb/nuking branch October 17, 2023 13:00
PhilWindle pushed a commit that referenced this pull request Oct 17, 2023
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-packages: 0.9.0</summary>

##
[0.9.0](aztec-packages-v0.8.14...aztec-packages-v0.9.0)
(2023-10-17)


### ⚠ BREAKING CHANGES

* nuking `PublicToken` and `PrivateAirdropToken`
([#2873](#2873))
* Change blake3 to blake2 in private kernel
([#2861](#2861))
* nuking private token
([#2822](#2822))

### Features

* Contract ts interface to use only aztec.js imports
([#2876](#2876))
([6952a1a](6952a1a))
* Faucet
([#2856](#2856))
([5bad35f](5bad35f))
* Nuking `PublicToken` and `PrivateAirdropToken`
([#2873](#2873))
([c74311d](c74311d))
* Nuking private token
([#2822](#2822))
([5d93a47](5d93a47)),
closes
[#2350](#2350)


### Bug Fixes

* Aztec node to save outbox adddress to config
([#2867](#2867))
([b6418a6](b6418a6))
* Create data dir on node boot
([#2864](#2864))
([2d498b3](2d498b3))
* Don't repeatedly scan for missing messages
([#2886](#2886))
([3fe1cc8](3fe1cc8))
* Fix trailing pipe causing everything to rebuild. Sorry...
([d13ba75](d13ba75))
* Pad L1 to L2 messages upon retrieval from L1
([#2879](#2879))
([457669e](457669e))
* Sequencer aborts in-progress block
([#2883](#2883))
([b0915a8](b0915a8))


### Miscellaneous

* Change blake3 to blake2 in private kernel
([#2861](#2861))
([d629940](d629940))
* Making anvil silent again
([#2866](#2866))
([90ae5dc](90ae5dc))
* Spell check on forbidden words.
([#2887](#2887))
([06bc4f9](06bc4f9))


### Documentation

* Initial 'protocol description' toc
([#2844](#2844))
([cb18f45](cb18f45))
</details>

<details><summary>barretenberg.js: 0.9.0</summary>

##
[0.9.0](barretenberg.js-v0.8.14...barretenberg.js-v0.9.0)
(2023-10-17)


### Miscellaneous

* **barretenberg.js:** Synchronize aztec-packages versions
</details>

<details><summary>barretenberg: 0.9.0</summary>

##
[0.9.0](barretenberg-v0.8.14...barretenberg-v0.9.0)
(2023-10-17)


### Miscellaneous

* **barretenberg:** Synchronize aztec-packages versions
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
AztecBot added a commit to AztecProtocol/barretenberg that referenced this pull request Oct 18, 2023
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-packages: 0.9.0</summary>

##
[0.9.0](AztecProtocol/aztec-packages@aztec-packages-v0.8.14...aztec-packages-v0.9.0)
(2023-10-17)


### ⚠ BREAKING CHANGES

* nuking `PublicToken` and `PrivateAirdropToken`
([#2873](AztecProtocol/aztec-packages#2873))
* Change blake3 to blake2 in private kernel
([#2861](AztecProtocol/aztec-packages#2861))
* nuking private token
([#2822](AztecProtocol/aztec-packages#2822))

### Features

* Contract ts interface to use only aztec.js imports
([#2876](AztecProtocol/aztec-packages#2876))
([6952a1a](AztecProtocol/aztec-packages@6952a1a))
* Faucet
([#2856](AztecProtocol/aztec-packages#2856))
([5bad35f](AztecProtocol/aztec-packages@5bad35f))
* Nuking `PublicToken` and `PrivateAirdropToken`
([#2873](AztecProtocol/aztec-packages#2873))
([c74311d](AztecProtocol/aztec-packages@c74311d))
* Nuking private token
([#2822](AztecProtocol/aztec-packages#2822))
([5d93a47](AztecProtocol/aztec-packages@5d93a47)),
closes
[#2350](AztecProtocol/aztec-packages#2350)


### Bug Fixes

* Aztec node to save outbox adddress to config
([#2867](AztecProtocol/aztec-packages#2867))
([b6418a6](AztecProtocol/aztec-packages@b6418a6))
* Create data dir on node boot
([#2864](AztecProtocol/aztec-packages#2864))
([2d498b3](AztecProtocol/aztec-packages@2d498b3))
* Don't repeatedly scan for missing messages
([#2886](AztecProtocol/aztec-packages#2886))
([3fe1cc8](AztecProtocol/aztec-packages@3fe1cc8))
* Fix trailing pipe causing everything to rebuild. Sorry...
([d13ba75](AztecProtocol/aztec-packages@d13ba75))
* Pad L1 to L2 messages upon retrieval from L1
([#2879](AztecProtocol/aztec-packages#2879))
([457669e](AztecProtocol/aztec-packages@457669e))
* Sequencer aborts in-progress block
([#2883](AztecProtocol/aztec-packages#2883))
([b0915a8](AztecProtocol/aztec-packages@b0915a8))


### Miscellaneous

* Change blake3 to blake2 in private kernel
([#2861](AztecProtocol/aztec-packages#2861))
([d629940](AztecProtocol/aztec-packages@d629940))
* Making anvil silent again
([#2866](AztecProtocol/aztec-packages#2866))
([90ae5dc](AztecProtocol/aztec-packages@90ae5dc))
* Spell check on forbidden words.
([#2887](AztecProtocol/aztec-packages#2887))
([06bc4f9](AztecProtocol/aztec-packages@06bc4f9))


### Documentation

* Initial 'protocol description' toc
([#2844](AztecProtocol/aztec-packages#2844))
([cb18f45](AztecProtocol/aztec-packages@cb18f45))
</details>

<details><summary>barretenberg.js: 0.9.0</summary>

##
[0.9.0](AztecProtocol/aztec-packages@barretenberg.js-v0.8.14...barretenberg.js-v0.9.0)
(2023-10-17)


### Miscellaneous

* **barretenberg.js:** Synchronize aztec-packages versions
</details>

<details><summary>barretenberg: 0.9.0</summary>

##
[0.9.0](AztecProtocol/aztec-packages@barretenberg-v0.8.14...barretenberg-v0.9.0)
(2023-10-17)


### Miscellaneous

* **barretenberg:** Synchronize aztec-packages versions
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants