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

fix: bad contract txs publishing contract data #2673

Merged
merged 10 commits into from
Oct 26, 2023

Conversation

alexghr
Copy link
Contributor

@alexghr alexghr commented Oct 4, 2023

This PR fixes an issue where a failed transaction's contract still had its contract data published on chain by the sequencer.

The issue only happens in blocks that have more than one transaction where one of the transaction's contracts fails to deploy due to a bad public call. In order to get into this state the PXE must not simulate the public call (otherwise the tx wouldn't be added to the mempool).

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).

@alexghr alexghr force-pushed the alexg/fix/bad-contracts-deploy branch 3 times, most recently from 9e78aad to 56afacc Compare October 4, 2023 09:45
@@ -111,4 +111,25 @@ describe('e2e_deploy_contract', () => {
);
}
}, 30_000);

it('it should not deploy a bad contract', async () => {
const goodDeploy = new ContractDeployer(TestAssertContractAbi, wallet).deploy(0);
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 test needs a good transaction to go through in the same block as the bad one. I deployed the same contract again but it could really be any valid transaction here.

@alexghr alexghr force-pushed the alexg/fix/bad-contracts-deploy branch from 56afacc to 176f1c3 Compare October 4, 2023 10:22
@alexghr alexghr marked this pull request as ready for review October 4, 2023 10:32
@alexghr alexghr force-pushed the alexg/fix/bad-contracts-deploy branch 2 times, most recently from 8c003c0 to 1fb1ae9 Compare October 10, 2023 12:15
Copy link
Collaborator

@spalladino spalladino left a comment

Choose a reason for hiding this comment

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

Looks good! The only think I'd request is an assertion that both txs landed on the same block. All other comments are just suggestions, feel free to ignore them.

@alexghr alexghr force-pushed the alexg/fix/bad-contracts-deploy branch from b7de347 to 7690719 Compare October 12, 2023 07:15
@alexghr alexghr requested a review from spalladino October 12, 2023 07:16
@AztecBot
Copy link
Collaborator

AztecBot commented Oct 12, 2023

Benchmark results

Metrics with a significant change:

  • l2_block_building_time_in_ms (8): 14,555 (-19%)
  • l2_block_building_time_in_ms (32): 57,882 (-19%)
  • l2_block_building_time_in_ms (128): 231,933 (-18%)
  • l2_block_rollup_simulation_time_in_ms (8): 13,233 (-19%)
  • l2_block_rollup_simulation_time_in_ms (32): 52,623 (-19%)
  • l2_block_rollup_simulation_time_in_ms (128): 210,567 (-18%)
  • l2_block_public_tx_process_time_in_ms (8): 1,283 (-18%)
  • l2_block_public_tx_process_time_in_ms (32): 5,132 (-17%)
  • l2_block_public_tx_process_time_in_ms (128): 20,898 (-16%)
  • l2_block_processing_time_in_ms (8): 2,288 (-18%)
  • l2_block_processing_time_in_ms (32): 8,713 (-17%)
  • l2_block_processing_time_in_ms (128): 34,487 (-16%)
  • note_successful_decrypting_time_in_ms (32): 818 (-23%)
  • note_successful_decrypting_time_in_ms (128): 3,010 (-24%)
  • note_trial_decrypting_time_in_ms (8): 96.0 (+96%)
  • note_trial_decrypting_time_in_ms (32): 29.0 (-74%)
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.

Values are compared against data from master at commit 9b6be227 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,888 867,452 3,449,396
l1_rollup_execution_gas 841,975 3,594,560 22,204,765
l2_block_processing_time_in_ms ⚠️ 2,288 (-18%) ⚠️ 8,713 (-17%) ⚠️ 34,487 (-16%)
note_successful_decrypting_time_in_ms 295 (-15%) ⚠️ 818 (-23%) ⚠️ 3,010 (-24%)
note_trial_decrypting_time_in_ms ⚠️ 96.0 (+96%) ⚠️ 29.0 (-74%) 136 (-8%)
l2_block_building_time_in_ms ⚠️ 14,555 (-19%) ⚠️ 57,882 (-19%) ⚠️ 231,933 (-18%)
l2_block_rollup_simulation_time_in_ms ⚠️ 13,233 (-19%) ⚠️ 52,623 (-19%) ⚠️ 210,567 (-18%)
l2_block_public_tx_process_time_in_ms ⚠️ 1,283 (-18%) ⚠️ 5,132 (-17%) ⚠️ 20,898 (-16%)

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 25,236 (+1%) 49,437 (+1%)
note_history_successful_decrypting_time_in_ms 1,941 3,768 (-1%)
note_history_trial_decrypting_time_in_ms 123 (+1%) 145 (-1%)
node_database_size_in_bytes 1,630,382 1,099,304
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 82.4 (-8%) 61,697 18,841
private-kernel-ordering 50.9 (-9%) 24,233 8,089
base-rollup 2,085 (-8%) 656,309 811
root-rollup 89.8 (-6%) 4,072 1,097
private-kernel-inner 59.6 (-9%) 81,504 18,841
public-kernel-private-input 46.8 (-9%) 41,455 18,841
public-kernel-non-first-iteration 29.2 (-9%) 41,497 18,841
merge-rollup 0.877 (-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,240

@alexghr alexghr force-pushed the alexg/fix/bad-contracts-deploy branch from 7690719 to b886a9d Compare October 16, 2023 10:38
Comment on lines +170 to +174
} finally {
sequencer?.updateSequencerConfig({
minTxsPerBlock: 1,
});
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

You don't really need to restore the sequencer config, since you're creating a new one for each test due to the beforeEach, right?

@alexghr alexghr force-pushed the alexg/fix/bad-contracts-deploy branch from 425666d to d96c945 Compare October 26, 2023 16:16
@alexghr alexghr enabled auto-merge (squash) October 26, 2023 16:52
@alexghr alexghr merged commit ccd4611 into master Oct 26, 2023
2 checks passed
@alexghr alexghr deleted the alexg/fix/bad-contracts-deploy branch October 26, 2023 16:55
rahul-kothari pushed a commit that referenced this pull request Oct 31, 2023
🤖 I have created a release *beep* *boop*
---


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

##
[0.13.0](aztec-packages-v0.12.0...aztec-packages-v0.13.0)
(2023-10-31)


### ⚠ BREAKING CHANGES

* PXE.getNotes(...) + refactor of note types
([#3051](#3051))

### Features

* `FieldNote`
([#3037](#3037))
([3d1ffd0](3d1ffd0))
* Add Aztec Boxes page to docs
([#2569](#2569))
([997c15c](997c15c))
* Adding structure to Transcript
([#2937](#2937))
([db67aa1](db67aa1))
* Compile noir contracts with noir_wasm
([#2737](#2737))
([524cecf](524cecf))
* Dockerize aztec-cli
([#3031](#3031))
([ec2e3c2](ec2e3c2))
* Efficient ZM quotient computation
([#3016](#3016))
([ebda5fc](ebda5fc))
* **feature_branch:** Private Kernel Circuit
([#2740](#2740))
([f800a36](f800a36))
* Measure plonk rounds
([#3065](#3065))
([c8e1d8b](c8e1d8b))
* Migrate the init kernel CPP tests to noir
([#3091](#3091))
([906429f](906429f))
* New script to output table of benchmarks for README pasting.
([#2780](#2780))
([6c20b45](6c20b45))
* Pedersen in typescript.
([#3111](#3111))
([933f1b2](933f1b2))
* Protogalaxy folding of challenges
([#2935](#2935))
([7ed30e8](7ed30e8))
* PXE.getNotes(...) + refactor of note types
([#3051](#3051))
([16abb5a](16abb5a))
* Zeromorph with concatenation (Goblin Translator part 10)
([#3006](#3006))
([70b0f17](70b0f17))


### Bug Fixes

* Bad contract txs publishing contract data
([#2673](#2673))
([ccd4611](ccd4611))
* Better error message for compute_note_hash_and_nullifier.
([#3097](#3097))
([57bec53](57bec53))
* Broken `FieldNote` test
([#3135](#3135))
([fe78ecf](fe78ecf))
* Docker-compose up, rather than run.
([#3081](#3081))
([242f780](242f780))
* Formatting
([#3070](#3070))
([e1633d3](e1633d3))
* Minor stale naming fix
([#3117](#3117))
([a6786ae](a6786ae))
* Push cli docker image to docker hub
([#3120](#3120))
([ccad50f](ccad50f))
* Remove duplicate terraform resource definition
([#3066](#3066))
([d5abadb](d5abadb))
* Retry request spot
([#3116](#3116))
([82de5f1](82de5f1))


### Miscellaneous

* Add stdlib tests for pedersen commitment
([#3075](#3075))
([87fa621](87fa621))
* Automatic c_binds for commit should return a point instead of an Fr
element
([#3072](#3072))
([2e289a5](2e289a5))
* Cleanup remaining mentions of `compress` with pedersen in cpp and ts
([#3074](#3074))
([52cf383](52cf383))
* E2e on spots [ci rebuild]
([#3068](#3068))
([15db6bf](15db6bf))
* Fix dapp_testing e2e race condition
([#3094](#3094))
([89e7c21](89e7c21))
* Remove docs mirror
([#3122](#3122))
([3fa51e2](3fa51e2))
* Remove endomorphism coefficient from ecc_add_gate
([#3115](#3115))
([d294987](d294987))
* Remove unecessary calls to `pedersen__init`
([#3079](#3079))
([84f8db2](84f8db2))
* Remove unused pedersen c_binds
([#3058](#3058))
([e71e5f9](e71e5f9))
* Removes pedersen commit native pairs method
([#3073](#3073))
([69a34c7](69a34c7))
* Rename private-kernel subpackage to protocol-circuits
([#3134](#3134))
([3e07104](3e07104))


### Documentation

* Initial keys spec
([#3035](#3035))
([4b24c58](4b24c58))
</details>

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

##
[0.13.0](barretenberg.js-v0.12.0...barretenberg.js-v0.13.0)
(2023-10-31)


### Features

* New script to output table of benchmarks for README pasting.
([#2780](#2780))
([6c20b45](6c20b45))


### Miscellaneous

* Automatic c_binds for commit should return a point instead of an Fr
element
([#3072](#3072))
([2e289a5](2e289a5))
* Remove unecessary calls to `pedersen__init`
([#3079](#3079))
([84f8db2](84f8db2))
* Remove unused pedersen c_binds
([#3058](#3058))
([e71e5f9](e71e5f9))
</details>

<details><summary>barretenberg: 0.13.0</summary>

##
[0.13.0](barretenberg-v0.12.0...barretenberg-v0.13.0)
(2023-10-31)


### Features

* Adding structure to Transcript
([#2937](#2937))
([db67aa1](db67aa1))
* Efficient ZM quotient computation
([#3016](#3016))
([ebda5fc](ebda5fc))
* Measure plonk rounds
([#3065](#3065))
([c8e1d8b](c8e1d8b))
* New script to output table of benchmarks for README pasting.
([#2780](#2780))
([6c20b45](6c20b45))
* Pedersen in typescript.
([#3111](#3111))
([933f1b2](933f1b2))
* Protogalaxy folding of challenges
([#2935](#2935))
([7ed30e8](7ed30e8))
* Zeromorph with concatenation (Goblin Translator part 10)
([#3006](#3006))
([70b0f17](70b0f17))


### Miscellaneous

* Add stdlib tests for pedersen commitment
([#3075](#3075))
([87fa621](87fa621))
* Automatic c_binds for commit should return a point instead of an Fr
element
([#3072](#3072))
([2e289a5](2e289a5))
* Cleanup remaining mentions of `compress` with pedersen in cpp and ts
([#3074](#3074))
([52cf383](52cf383))
* Remove endomorphism coefficient from ecc_add_gate
([#3115](#3115))
([d294987](d294987))
* Remove unecessary calls to `pedersen__init`
([#3079](#3079))
([84f8db2](84f8db2))
* Remove unused pedersen c_binds
([#3058](#3058))
([e71e5f9](e71e5f9))
* Removes pedersen commit native pairs method
([#3073](#3073))
([69a34c7](69a34c7))
</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 Nov 7, 2023
🤖 I have created a release *beep* *boop*
---


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

##
[0.13.0](AztecProtocol/aztec-packages@aztec-packages-v0.12.0...aztec-packages-v0.13.0)
(2023-10-31)


### ⚠ BREAKING CHANGES

* PXE.getNotes(...) + refactor of note types
([#3051](AztecProtocol/aztec-packages#3051))

### Features

* `FieldNote`
([#3037](AztecProtocol/aztec-packages#3037))
([3d1ffd0](AztecProtocol/aztec-packages@3d1ffd0))
* Add Aztec Boxes page to docs
([#2569](AztecProtocol/aztec-packages#2569))
([997c15c](AztecProtocol/aztec-packages@997c15c))
* Adding structure to Transcript
([#2937](AztecProtocol/aztec-packages#2937))
([db67aa1](AztecProtocol/aztec-packages@db67aa1))
* Compile noir contracts with noir_wasm
([#2737](AztecProtocol/aztec-packages#2737))
([524cecf](AztecProtocol/aztec-packages@524cecf))
* Dockerize aztec-cli
([#3031](AztecProtocol/aztec-packages#3031))
([ec2e3c2](AztecProtocol/aztec-packages@ec2e3c2))
* Efficient ZM quotient computation
([#3016](AztecProtocol/aztec-packages#3016))
([ebda5fc](AztecProtocol/aztec-packages@ebda5fc))
* **feature_branch:** Private Kernel Circuit
([#2740](AztecProtocol/aztec-packages#2740))
([f800a36](AztecProtocol/aztec-packages@f800a36))
* Measure plonk rounds
([#3065](AztecProtocol/aztec-packages#3065))
([c8e1d8b](AztecProtocol/aztec-packages@c8e1d8b))
* Migrate the init kernel CPP tests to noir
([#3091](AztecProtocol/aztec-packages#3091))
([906429f](AztecProtocol/aztec-packages@906429f))
* New script to output table of benchmarks for README pasting.
([#2780](AztecProtocol/aztec-packages#2780))
([6c20b45](AztecProtocol/aztec-packages@6c20b45))
* Pedersen in typescript.
([#3111](AztecProtocol/aztec-packages#3111))
([933f1b2](AztecProtocol/aztec-packages@933f1b2))
* Protogalaxy folding of challenges
([#2935](AztecProtocol/aztec-packages#2935))
([7ed30e8](AztecProtocol/aztec-packages@7ed30e8))
* PXE.getNotes(...) + refactor of note types
([#3051](AztecProtocol/aztec-packages#3051))
([16abb5a](AztecProtocol/aztec-packages@16abb5a))
* Zeromorph with concatenation (Goblin Translator part 10)
([#3006](AztecProtocol/aztec-packages#3006))
([70b0f17](AztecProtocol/aztec-packages@70b0f17))


### Bug Fixes

* Bad contract txs publishing contract data
([#2673](AztecProtocol/aztec-packages#2673))
([ccd4611](AztecProtocol/aztec-packages@ccd4611))
* Better error message for compute_note_hash_and_nullifier.
([#3097](AztecProtocol/aztec-packages#3097))
([57bec53](AztecProtocol/aztec-packages@57bec53))
* Broken `FieldNote` test
([#3135](AztecProtocol/aztec-packages#3135))
([fe78ecf](AztecProtocol/aztec-packages@fe78ecf))
* Docker-compose up, rather than run.
([#3081](AztecProtocol/aztec-packages#3081))
([242f780](AztecProtocol/aztec-packages@242f780))
* Formatting
([#3070](AztecProtocol/aztec-packages#3070))
([e1633d3](AztecProtocol/aztec-packages@e1633d3))
* Minor stale naming fix
([#3117](AztecProtocol/aztec-packages#3117))
([a6786ae](AztecProtocol/aztec-packages@a6786ae))
* Push cli docker image to docker hub
([#3120](AztecProtocol/aztec-packages#3120))
([ccad50f](AztecProtocol/aztec-packages@ccad50f))
* Remove duplicate terraform resource definition
([#3066](AztecProtocol/aztec-packages#3066))
([d5abadb](AztecProtocol/aztec-packages@d5abadb))
* Retry request spot
([#3116](AztecProtocol/aztec-packages#3116))
([82de5f1](AztecProtocol/aztec-packages@82de5f1))


### Miscellaneous

* Add stdlib tests for pedersen commitment
([#3075](AztecProtocol/aztec-packages#3075))
([87fa621](AztecProtocol/aztec-packages@87fa621))
* Automatic c_binds for commit should return a point instead of an Fr
element
([#3072](AztecProtocol/aztec-packages#3072))
([2e289a5](AztecProtocol/aztec-packages@2e289a5))
* Cleanup remaining mentions of `compress` with pedersen in cpp and ts
([#3074](AztecProtocol/aztec-packages#3074))
([52cf383](AztecProtocol/aztec-packages@52cf383))
* E2e on spots [ci rebuild]
([#3068](AztecProtocol/aztec-packages#3068))
([15db6bf](AztecProtocol/aztec-packages@15db6bf))
* Fix dapp_testing e2e race condition
([#3094](AztecProtocol/aztec-packages#3094))
([89e7c21](AztecProtocol/aztec-packages@89e7c21))
* Remove docs mirror
([#3122](AztecProtocol/aztec-packages#3122))
([3fa51e2](AztecProtocol/aztec-packages@3fa51e2))
* Remove endomorphism coefficient from ecc_add_gate
([#3115](AztecProtocol/aztec-packages#3115))
([d294987](AztecProtocol/aztec-packages@d294987))
* Remove unecessary calls to `pedersen__init`
([#3079](AztecProtocol/aztec-packages#3079))
([84f8db2](AztecProtocol/aztec-packages@84f8db2))
* Remove unused pedersen c_binds
([#3058](AztecProtocol/aztec-packages#3058))
([e71e5f9](AztecProtocol/aztec-packages@e71e5f9))
* Removes pedersen commit native pairs method
([#3073](AztecProtocol/aztec-packages#3073))
([69a34c7](AztecProtocol/aztec-packages@69a34c7))
* Rename private-kernel subpackage to protocol-circuits
([#3134](AztecProtocol/aztec-packages#3134))
([3e07104](AztecProtocol/aztec-packages@3e07104))


### Documentation

* Initial keys spec
([#3035](AztecProtocol/aztec-packages#3035))
([4b24c58](AztecProtocol/aztec-packages@4b24c58))
</details>

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

##
[0.13.0](AztecProtocol/aztec-packages@barretenberg.js-v0.12.0...barretenberg.js-v0.13.0)
(2023-10-31)


### Features

* New script to output table of benchmarks for README pasting.
([#2780](AztecProtocol/aztec-packages#2780))
([6c20b45](AztecProtocol/aztec-packages@6c20b45))


### Miscellaneous

* Automatic c_binds for commit should return a point instead of an Fr
element
([#3072](AztecProtocol/aztec-packages#3072))
([2e289a5](AztecProtocol/aztec-packages@2e289a5))
* Remove unecessary calls to `pedersen__init`
([#3079](AztecProtocol/aztec-packages#3079))
([84f8db2](AztecProtocol/aztec-packages@84f8db2))
* Remove unused pedersen c_binds
([#3058](AztecProtocol/aztec-packages#3058))
([e71e5f9](AztecProtocol/aztec-packages@e71e5f9))
</details>

<details><summary>barretenberg: 0.13.0</summary>

##
[0.13.0](AztecProtocol/aztec-packages@barretenberg-v0.12.0...barretenberg-v0.13.0)
(2023-10-31)


### Features

* Adding structure to Transcript
([#2937](AztecProtocol/aztec-packages#2937))
([db67aa1](AztecProtocol/aztec-packages@db67aa1))
* Efficient ZM quotient computation
([#3016](AztecProtocol/aztec-packages#3016))
([ebda5fc](AztecProtocol/aztec-packages@ebda5fc))
* Measure plonk rounds
([#3065](AztecProtocol/aztec-packages#3065))
([c8e1d8b](AztecProtocol/aztec-packages@c8e1d8b))
* New script to output table of benchmarks for README pasting.
([#2780](AztecProtocol/aztec-packages#2780))
([6c20b45](AztecProtocol/aztec-packages@6c20b45))
* Pedersen in typescript.
([#3111](AztecProtocol/aztec-packages#3111))
([933f1b2](AztecProtocol/aztec-packages@933f1b2))
* Protogalaxy folding of challenges
([#2935](AztecProtocol/aztec-packages#2935))
([7ed30e8](AztecProtocol/aztec-packages@7ed30e8))
* Zeromorph with concatenation (Goblin Translator part 10)
([#3006](AztecProtocol/aztec-packages#3006))
([70b0f17](AztecProtocol/aztec-packages@70b0f17))


### Miscellaneous

* Add stdlib tests for pedersen commitment
([#3075](AztecProtocol/aztec-packages#3075))
([87fa621](AztecProtocol/aztec-packages@87fa621))
* Automatic c_binds for commit should return a point instead of an Fr
element
([#3072](AztecProtocol/aztec-packages#3072))
([2e289a5](AztecProtocol/aztec-packages@2e289a5))
* Cleanup remaining mentions of `compress` with pedersen in cpp and ts
([#3074](AztecProtocol/aztec-packages#3074))
([52cf383](AztecProtocol/aztec-packages@52cf383))
* Remove endomorphism coefficient from ecc_add_gate
([#3115](AztecProtocol/aztec-packages#3115))
([d294987](AztecProtocol/aztec-packages@d294987))
* Remove unecessary calls to `pedersen__init`
([#3079](AztecProtocol/aztec-packages#3079))
([84f8db2](AztecProtocol/aztec-packages@84f8db2))
* Remove unused pedersen c_binds
([#3058](AztecProtocol/aztec-packages#3058))
([e71e5f9](AztecProtocol/aztec-packages@e71e5f9))
* Removes pedersen commit native pairs method
([#3073](AztecProtocol/aztec-packages#3073))
([69a34c7](AztecProtocol/aztec-packages@69a34c7))
</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.

3 participants