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(witness-generator): Witness generator oracle with cached storage refunds #274

Merged
merged 4 commits into from
Oct 23, 2023

Conversation

perekopskiy
Copy link
Contributor

@perekopskiy perekopskiy commented Oct 20, 2023

What ❔

During VM run in state keeper we save all storage refunds that are returned by oracle. Later in basic witness generation these refunds are reused.
Also, zk_evm is updated so that it now passes correct timestamps for estimate_refunds_for_write queries. Correct timestamps are necessary for VM storage oracle to rollback returned_refunds

Why ❔

With new VM, pubdata tracer mutates oracle affecting storage refunds. As this tracer is only run in state keeper and not in witness generator we must save refunds from state keeper and use them in wit-gen.

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.
  • Code has been formatted via zk fmt and zk lint.

@perekopskiy perekopskiy requested a review from a team as a code owner October 20, 2023 13:31
Deniallugo
Deniallugo previously approved these changes Oct 20, 2023
@codecov
Copy link

codecov bot commented Oct 20, 2023

Codecov Report

Attention: 30 lines in your changes are missing coverage. Please review.

Comparison is base (4a5c54c) 34.40% compared to head (501542d) 34.36%.
Report is 4 commits behind head on main.

❗ Current head 501542d differs from pull request most recent head 57bc5fe. Consider uploading reports for the commit 57bc5fe to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #274      +/-   ##
==========================================
- Coverage   34.40%   34.36%   -0.04%     
==========================================
  Files         519      520       +1     
  Lines       28086    28127      +41     
==========================================
+ Hits         9662     9667       +5     
- Misses      18424    18460      +36     
Files Coverage Δ
core/lib/dal/src/storage_logs_dal.rs 79.01% <ø> (-0.13%) ⬇️
...e/lib/multivm/src/glue/types/vm/vm_block_result.rs 0.00% <ø> (ø)
core/lib/zksync_core/src/genesis.rs 95.00% <100.00%> (+1.66%) ⬆️
.../lib/zksync_core/src/state_keeper/io/seal_logic.rs 81.45% <ø> (+0.47%) ⬆️
core/lib/zksync_core/src/witness_generator/mod.rs 0.00% <ø> (ø)
core/lib/multivm/src/versions/vm_latest/vm.rs 46.80% <0.00%> (-1.02%) ⬇️
...e/lib/multivm/src/versions/vm_virtual_blocks/vm.rs 29.78% <0.00%> (-0.65%) ⬇️
.../multivm/src/versions/vm_latest/oracles/storage.rs 45.56% <75.00%> (+1.18%) ⬆️
...ksync_core/src/witness_generator/basic_circuits.rs 0.00% <0.00%> (ø)
core/lib/dal/src/blocks_dal.rs 72.23% <20.00%> (-1.45%) ⬇️
... and 1 more

... and 84 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Deniallugo Deniallugo enabled auto-merge October 20, 2023 17:50
Deniallugo
Deniallugo previously approved these changes Oct 20, 2023
@Deniallugo Deniallugo added this pull request to the merge queue Oct 23, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Oct 23, 2023
@perekopskiy perekopskiy added this pull request to the merge queue Oct 23, 2023
Merged via the queue into main with commit 8928a41 Oct 23, 2023
@perekopskiy perekopskiy deleted the asve-storage-refunds-in-db branch October 23, 2023 13:24
github-merge-queue bot pushed a commit that referenced this pull request Oct 24, 2023
🤖 I have created a release *beep* *boop*
---


##
[16.1.0](core-v16.0.2...core-v16.1.0)
(2023-10-24)


### Features

* Add new commitments
([#219](#219))
([a19256e](a19256e))
* arm64 zk-environment rust Docker images and other
([#296](#296))
([33174aa](33174aa))
* **config:** Extract everything not related to the env config from
zksync_config crate
([#245](#245))
([42c64e9](42c64e9))
* **eth-watch:** process governor upgrades
([#247](#247))
([d250294](d250294))
* **merkle tree:** Expose Merkle tree API
([#209](#209))
([4010c7e](4010c7e))
* **merkle tree:** Snapshot recovery for Merkle tree
([#163](#163))
([9e20703](9e20703))
* **multivm:** Remove lifetime from multivm
([#218](#218))
([7eda27c](7eda27c))
* Remove fee_ticker and token_trading_volume fetcher modules
([#262](#262))
([44f7179](44f7179))
* **reorg_detector:** compare miniblock hashes for reorg detection
([#236](#236))
([2c930b2](2c930b2))
* Rewrite server binary to use `vise` metrics
([#120](#120))
([26ee1fb](26ee1fb))
* **types:** introduce state diff record type and compression
([#194](#194))
([ccf753c](ccf753c))
* **vm:** Improve tracer trait
([#121](#121))
([ff60138](ff60138))
* **vm:** Move all vm versions to the one crate
([#249](#249))
([e3fb489](e3fb489))


### Bug Fixes

* **crypto:** update snark-vk to be used in server and update args for
proof wrapping
([#240](#240))
([4a5c54c](4a5c54c))
* **db:** Fix write stalls in RocksDB
([#250](#250))
([650124c](650124c))
* **db:** Fix write stalls in RocksDB (again)
([#265](#265))
([7b23ab0](7b23ab0))
* **db:** Fix write stalls in RocksDB (for real this time)
([#292](#292))
([0f15919](0f15919))
* Fix `TxStage` string representation
([#255](#255))
([246b5a0](246b5a0))
* fix typos
([#226](#226))
([feb8a6c](feb8a6c))
* **witness-generator:** Witness generator oracle with cached storage
refunds ([#274](#274))
([8928a41](8928a41))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
toni-calvin referenced this pull request in lambdaclass/zksync-era Aug 8, 2024
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.

3 participants