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: Add pending reorg chain resistance in contracts #7926

Merged
merged 4 commits into from
Aug 15, 2024
Merged

Conversation

LHerskind
Copy link
Contributor

@LHerskind LHerskind commented Aug 12, 2024

Fixes #7592 and #7616.

Wait merging this until #7860 is in so we don't cause pain to @spalladino and co 🫡

Copy link
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @LHerskind and the rest of your teammates on Graphite Graphite

@LHerskind LHerskind changed the title feat: Add pending reorg resistance in contracts feat: Add pending reorg chain resistance in contracts Aug 12, 2024
@AztecBot
Copy link
Collaborator

AztecBot commented Aug 12, 2024

Benchmark results

Metrics with a significant change:

  • avm_simulation_time_ms (FeeJuice:set_portal): 13.5 (+35%)
  • avm_simulation_time_ms (Token:mint_public): 71.1 (+69%)
  • avm_simulation_time_ms (Token:assert_minter_and_mint): 38.9 (-42%)
  • avm_simulation_time_ms (Token:transfer_public): 30.1 (+35%)
Detailed 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.

Proof generation

Each column represents the number of threads used in proof generation.

Metric 1 threads 4 threads 16 threads 32 threads 64 threads
proof_construction_time_sha256_ms 5,764 1,560 701 739 (-3%) 765
proof_construction_time_sha256_30_ms 11,837 3,184 (+1%) 1,408 1,439 1,458 (-1%)
proof_construction_time_sha256_100_ms 45,559 11,993 (-1%) 5,424 5,422 5,361
proof_construction_time_poseidon_hash_ms 78.0 34.0 34.0 58.0 (-2%) 87.0 (-2%)
proof_construction_time_poseidon_hash_30_ms 1,529 422 202 226 267 (-1%)
proof_construction_time_poseidon_hash_100_ms 5,648 1,514 674 739 (+1%) 746

L2 block published to L1

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

Metric 4 txs 8 txs 16 txs
l1_rollup_calldata_size_in_bytes 4,324 7,844 14,852
l1_rollup_calldata_gas 49,660 92,478 177,500
l1_rollup_execution_gas 1,383,109 (+7%) 2,130,895 (+4%) 3,957,956 (+2%)
l2_block_processing_time_in_ms 240 (-6%) 443 (+1%) 797 (-1%)
l2_block_building_time_in_ms 9,229 (-1%) 18,106 36,138 (-1%)
l2_block_rollup_simulation_time_in_ms 9,229 (-1%) 18,105 36,138 (-1%)
l2_block_public_tx_process_time_in_ms 7,805 (-1%) 16,564 34,561 (-1%)

L2 chain processing

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

Metric 3 blocks 5 blocks
node_history_sync_time_in_ms 2,879 (+2%) 3,842 (+1%)
node_database_size_in_bytes 12,648,528 16,740,432
pxe_database_size_in_bytes 16,254 26,813

Circuits stats

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

Circuit simulation_time_in_ms witness_generation_time_in_ms input_size_in_bytes output_size_in_bytes proving_time_in_ms
private-kernel-init 101 (-1%) 392 (+1%) 21,846 44,858 N/A
private-kernel-inner 169 (+1%) 691 (-1%) 72,545 45,005 N/A
private-kernel-reset-tiny 508 1,228 (+3%) 69,614 44,844 N/A
private-kernel-tail 271 194 50,760 52,256 N/A
base-parity 5.50 (-1%) N/A 160 96.0 N/A
root-parity 33.1 N/A 69,084 96.0 N/A
base-rollup 2,847 (-1%) N/A 187,817 664 N/A
root-rollup 38.5 N/A 54,525 716 N/A
public-kernel-setup 100 (+1%) N/A 103,760 71,222 N/A
public-kernel-app-logic 106 N/A 103,599 71,222 N/A
public-kernel-tail 570 N/A 409,190 16,414 N/A
private-kernel-reset-small 484 N/A 66,533 45,629 N/A
private-kernel-tail-to-public 1,519 (+3%) 706 507,554 1,697 N/A
public-kernel-teardown 94.3 N/A 104,005 71,222 N/A
merge-rollup 19.2 (+1%) N/A 35,742 664 N/A
undefined N/A N/A N/A N/A 66,324 (-2%)

Stats on running time collected for app circuits

Function input_size_in_bytes output_size_in_bytes witness_generation_time_in_ms
ContractClassRegisterer:register 1,344 11,731 346
ContractInstanceDeployer:deploy 1,408 11,731 18.3 (+1%)
MultiCallEntrypoint:entrypoint 1,920 11,731 425
FeeJuice:deploy 1,376 11,731 387 (-1%)
SchnorrAccount:constructor 1,312 11,731 105
SchnorrAccount:entrypoint 2,304 11,731 432 (-1%)
Token:privately_mint_private_note 1,280 11,731 139 (+1%)
FPC:fee_entrypoint_public 1,344 11,731 26.0 (+3%)
Token:transfer 1,312 11,731 294 (+2%)
Benchmarking:create_note 1,344 11,731 103 (-1%)
SchnorrAccount:verify_private_authwit 1,280 11,731 27.6
Token:unshield 1,376 11,731 555 (-1%)
FPC:fee_entrypoint_private 1,376 11,731 755 (+1%)

AVM Simulation

Time to simulate various public functions in the AVM.

Function time_ms bytecode_size_in_bytes
FeeJuice:_increase_public_balance 54.3 (+4%) 8,139
FeeJuice:set_portal ⚠️ 13.5 (+35%) 2,362
Token:constructor 89.3 (+8%) 31,107
FPC:constructor 54.3 (-2%) 22,380
FeeJuice:mint_public 38.1 (+1%) 6,150
Token:mint_public ⚠️ 71.1 (+69%) 11,720
Token:assert_minter_and_mint ⚠️ 38.9 (-42%) 8,028
AuthRegistry:set_authorized 35.3 (-7%) 4,537
FPC:prepare_fee 229 (-2%) 8,812
Token:transfer_public ⚠️ 30.1 (+35%) 47,374
FPC:pay_refund 56.0 (+5%) 12,114
Benchmarking:increment_balance 971 7,450
Token:_increase_public_balance 39.6 (-2%) 8,960
FPC:pay_refund_with_shielded_rebate 66.6 (+1%) 12,663

Public DB Access

Time to access various public DBs.

Function time_ms
get-nullifier-index 0.165 (+2%)

Tree insertion stats

The duration to insert a fixed batch of leaves into each tree type.

Metric 1 leaves 16 leaves 64 leaves 128 leaves 256 leaves 512 leaves 1024 leaves
batch_insert_into_append_only_tree_16_depth_ms 2.21 (+2%) 3.81 N/A N/A N/A N/A N/A
batch_insert_into_append_only_tree_16_depth_hash_count 16.8 31.7 N/A N/A N/A N/A N/A
batch_insert_into_append_only_tree_16_depth_hash_ms 0.115 (+3%) 0.108 N/A N/A N/A N/A N/A
batch_insert_into_append_only_tree_32_depth_ms N/A N/A 11.5 18.1 (+2%) 31.5 (+3%) 59.4 (+1%) 110 (-1%)
batch_insert_into_append_only_tree_32_depth_hash_count N/A N/A 95.9 159 287 543 1,055
batch_insert_into_append_only_tree_32_depth_hash_ms N/A N/A 0.110 (-1%) 0.105 (+2%) 0.102 (+2%) 0.102 (+1%) 0.100 (-1%)
batch_insert_into_indexed_tree_20_depth_ms N/A N/A 14.4 25.8 43.2 (-1%) 83.8 (+2%) 162 (-1%)
batch_insert_into_indexed_tree_20_depth_hash_count N/A N/A 109 207 355 691 1,363
batch_insert_into_indexed_tree_20_depth_hash_ms N/A N/A 0.109 (-1%) 0.104 0.105 (-1%) 0.103 (+2%) 0.103 (-1%)
batch_insert_into_indexed_tree_40_depth_ms N/A N/A 16.3 (+1%) N/A N/A N/A N/A
batch_insert_into_indexed_tree_40_depth_hash_count N/A N/A 132 N/A N/A N/A N/A
batch_insert_into_indexed_tree_40_depth_hash_ms N/A N/A 0.105 (+1%) N/A N/A N/A N/A

Miscellaneous

Transaction sizes based on how many contract classes are registered in the tx.

Metric 0 registered classes 1 registered classes
tx_size_in_bytes 64,779 668,997

Transaction size based on fee payment method

| Metric | |
| - | |

@LHerskind LHerskind marked this pull request as ready for review August 12, 2024 23:19
@LHerskind LHerskind requested a review from Maddiaa0 August 12, 2024 23:19
@LHerskind LHerskind marked this pull request as draft August 13, 2024 12:49
@spalladino
Copy link
Collaborator

@LHerskind #7860 is now in, thanks!!

@LHerskind LHerskind requested a review from just-mitch August 14, 2024 13:23
@LHerskind LHerskind marked this pull request as ready for review August 14, 2024 15:43
@@ -37,6 +37,10 @@ contract Rollup is Leonidas, IRollup, ITestRollup {
bool isProven;
}

// @note The number of slots within which a block must be proven
Copy link
Member

Choose a reason for hiding this comment

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

issue

Copy link
Collaborator

Choose a reason for hiding this comment

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

So we've dropped the tests for the inbox?

Is there a followup issue to re-enable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This did never really tested the inbox. The inbox is tested with the Rollup.t.sol and Inbox.t.sol files. Also it is not something we can re-enable, because the value that was read does not exist anymore 😎.

rollup.prune();
}

function testPrune() public setUpFor("mixed_block_1") {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nice test!

@LHerskind LHerskind merged commit f769f84 into master Aug 15, 2024
99 checks passed
@LHerskind LHerskind deleted the lh/7592-reorgs branch August 15, 2024 15:46
rahul-kothari pushed a commit that referenced this pull request Aug 15, 2024
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-package: 0.49.1</summary>

##
[0.49.1](aztec-package-v0.49.0...aztec-package-v0.49.1)
(2024-08-15)


### Miscellaneous

* Sync alphanet back to master
([#7970](#7970))
([523724d](523724d))
</details>

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

##
[0.49.1](barretenberg.js-v0.49.0...barretenberg.js-v0.49.1)
(2024-08-15)


### Miscellaneous

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

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

##
[0.49.1](aztec-packages-v0.49.0...aztec-packages-v0.49.1)
(2024-08-15)


### Features

* Add pending reorg chain resistance in contracts
([#7926](#7926))
([f769f84](f769f84))
* **avm:** Base and dynamic gas in TS and CPP (part 2)
([#8016](#8016))
([5801732](5801732))


### Bug Fixes

* Docker.dockerignore file can be huge.
([#8023](#8023))
([cee9d9a](cee9d9a))
* Forking world state in prover-node
([#7995](#7995))
([ebffe96](ebffe96))


### Miscellaneous

* **avm:** Separate binary and bytes finalization
([#8010](#8010))
([3ad6dd9](3ad6dd9))
* Private reset kernel
([#7984](#7984))
([0d82c79](0d82c79))
* Sync alphanet back to master
([#7970](#7970))
([523724d](523724d))
</details>

<details><summary>barretenberg: 0.49.1</summary>

##
[0.49.1](barretenberg-v0.49.0...barretenberg-v0.49.1)
(2024-08-15)


### Features

* **avm:** Base and dynamic gas in TS and CPP (part 2)
([#8016](#8016))
([5801732](5801732))


### Miscellaneous

* **avm:** Separate binary and bytes finalization
([#8010](#8010))
([3ad6dd9](3ad6dd9))
</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 Aug 16, 2024
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-package: 0.49.1</summary>

##
[0.49.1](AztecProtocol/aztec-packages@aztec-package-v0.49.0...aztec-package-v0.49.1)
(2024-08-15)


### Miscellaneous

* Sync alphanet back to master
([#7970](AztecProtocol/aztec-packages#7970))
([523724d](AztecProtocol/aztec-packages@523724d))
</details>

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

##
[0.49.1](AztecProtocol/aztec-packages@barretenberg.js-v0.49.0...barretenberg.js-v0.49.1)
(2024-08-15)


### Miscellaneous

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

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

##
[0.49.1](AztecProtocol/aztec-packages@aztec-packages-v0.49.0...aztec-packages-v0.49.1)
(2024-08-15)


### Features

* Add pending reorg chain resistance in contracts
([#7926](AztecProtocol/aztec-packages#7926))
([f769f84](AztecProtocol/aztec-packages@f769f84))
* **avm:** Base and dynamic gas in TS and CPP (part 2)
([#8016](AztecProtocol/aztec-packages#8016))
([5801732](AztecProtocol/aztec-packages@5801732))


### Bug Fixes

* Docker.dockerignore file can be huge.
([#8023](AztecProtocol/aztec-packages#8023))
([cee9d9a](AztecProtocol/aztec-packages@cee9d9a))
* Forking world state in prover-node
([#7995](AztecProtocol/aztec-packages#7995))
([ebffe96](AztecProtocol/aztec-packages@ebffe96))


### Miscellaneous

* **avm:** Separate binary and bytes finalization
([#8010](AztecProtocol/aztec-packages#8010))
([3ad6dd9](AztecProtocol/aztec-packages@3ad6dd9))
* Private reset kernel
([#7984](AztecProtocol/aztec-packages#7984))
([0d82c79](AztecProtocol/aztec-packages@0d82c79))
* Sync alphanet back to master
([#7970](AztecProtocol/aztec-packages#7970))
([523724d](AztecProtocol/aztec-packages@523724d))
</details>

<details><summary>barretenberg: 0.49.1</summary>

##
[0.49.1](AztecProtocol/aztec-packages@barretenberg-v0.49.0...barretenberg-v0.49.1)
(2024-08-15)


### Features

* **avm:** Base and dynamic gas in TS and CPP (part 2)
([#8016](AztecProtocol/aztec-packages#8016))
([5801732](AztecProtocol/aztec-packages@5801732))


### Miscellaneous

* **avm:** Separate binary and bytes finalization
([#8010](AztecProtocol/aztec-packages#8010))
([3ad6dd9](AztecProtocol/aztec-packages@3ad6dd9))
</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
None yet
Development

Successfully merging this pull request may close these issues.

refactor: Update messages boxes to account for L2 reorgs
5 participants