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.

Sign up for GitHub

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

Jump to bottom

fix(Prover CLI): status batch bugs #1865

Merged
merged 25 commits into from
May 14, 2024
Merged

fix(Prover CLI): status batch bugs #1865

merged 25 commits into from
May 14, 2024

Conversation

ilitteri
Copy link
Contributor

@ilitteri ilitteri commented May 6, 2024 •
edited
Loading

What ❔

  1. Fix the case where the prover job is in in_gpu_proof status.
  2. Fix BatchData default implementation.
  3. Fix From<Vec<WitnessJobStatus>> and From<Vec<ProverJobFriInfo>>

Why ❔

  1. It panics when you run the status batch command in a GPU prover:
in_gpu_proof
thread 'main' panicked at /home/admin/zksync-era-2/prover/prover_dal/src/fri_prover_dal.rs:679:64:
called `Result::unwrap()` on an `Err` value: VariantNotFound
  1. Recursion tip AggregationRoundInfo in BatchData default implementation was wrong.
  2. InProgress and Successful status were mixed up in From<Vec<WitnessJobStatus>> and From<Vec<ProverJobFriInfo>>

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.
  • Spellcheck has been run via zk spellcheck.
  • Linkcheck has been run via zk linkcheck.

@ilitteri ilitteri changed the title fix(Prover CLI): Handle in_gpu_proof status fix(Prover CLI): status batch bugs May 7, 2024
ColoCarletti
ColoCarletti previously approved these changes May 7, 2024
View reviewed changes
Copy link
Contributor

@ColoCarletti ColoCarletti left a comment

Choose a reason for hiding this comment

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

LGTM

@EmilLuta EmilLuta enabled auto-merge May 8, 2024 13:23
@EmilLuta EmilLuta added this pull request to the merge queue May 8, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 8, 2024
@Artemka374 Artemka374 merged commit 09682f2 into main May 14, 2024
50 checks passed
@Artemka374 Artemka374 deleted the prover_cli_fix_status_batch branch May 14, 2024 11:33
This was referenced May 14, 2024
Merged
Merged
RomanBrodetski pushed a commit that referenced this pull request May 17, 2024
@zksync-era-bot
chore(main): release core 24.3.0 (#1924)
0cbcab3 
🤖 I have created a release *beep* *boop*
---


##
[24.3.0](core-v24.2.0...core-v24.3.0)
(2024-05-16)


### Features

* Added support for making EN a (non-leader) consensus validator
(BFT-426)
([#1905](#1905))
([9973629](9973629))
* **configs:** Extract secrets to an additional config
([#1956](#1956))
([bab4d65](bab4d65))
* **en:** Fetch L1 batch root hashes from main node
([#1923](#1923))
([72a3571](72a3571))
* **eth-client:** Generalize RPC client
([#1898](#1898))
([a4e099f](a4e099f))
* **Prover CLI:** `requeue` cmd
([#1719](#1719))
([f722df7](f722df7))
* **Prover CLI:** `status batch --verbose`
([#1899](#1899))
([cf80184](cf80184))
* **pruning:** Vacuum freeze started daily
([#1929](#1929))
([5c85e9f](5c85e9f))
* Remove metrics crate
([#1902](#1902))
([5f7bda7](5f7bda7))
* **state-keeper:** Parallel l2 block sealing
([#1801](#1801))
([9b06dd8](9b06dd8))
* tee_verifier_input_producer
([#1860](#1860))
([fea7f16](fea7f16))
* **vm-runner:** implement output handler for VM runner
([#1856](#1856))
([1e4aeb5](1e4aeb5))


### Bug Fixes

* **basic_types:** bincode deserialization for `web3::Bytes`
([#1928](#1928))
([406ec8c](406ec8c))
* **config:** Fix data-handler-config
([#1919](#1919))
([b6bb041](b6bb041))
* **en:** Delete old txs by (init_addr, nonce)
([#1942](#1942))
([fa5f4a7](fa5f4a7))
* **en:** Fix reorg detector logic for dealing with last L1 batch
([#1906](#1906))
([3af5f5b](3af5f5b))
* parentHash in websocket blocks subscription is shown as 0x0
([#1946](#1946))
([fc2efad](fc2efad))
* **Prover CLI:** `status batch` bugs
([#1865](#1865))
([09682f2](09682f2))
* **utils:** bincode ser-/deserialization for `BytesToHexSerde`
([#1947](#1947))
([a75b917](a75b917))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: zksync-era-bot <zksync-era-bot@users.noreply.github.com>
RomanBrodetski pushed a commit that referenced this pull request May 17, 2024
@zksync-era-bot
chore(main): release prover 14.2.0 (#1926)
9919153 
🤖 I have created a release *beep* *boop*
---


##
[14.2.0](prover-v14.1.1...prover-v14.2.0)
(2024-05-17)


### Features

* Added support for making EN a (non-leader) consensus validator
(BFT-426)
([#1905](#1905))
([9973629](9973629))
* **configs:** Extract secrets to an additional config
([#1956](#1956))
([bab4d65](bab4d65))
* **eth-client:** Generalize RPC client
([#1898](#1898))
([a4e099f](a4e099f))
* **Prover CLI:** `delete` cmd
([#1802](#1802))
([6e4a92e](6e4a92e))
* **Prover CLI:** `requeue` cmd
([#1719](#1719))
([f722df7](f722df7))
* **Prover CLI:** `status batch --verbose`
([#1899](#1899))
([cf80184](cf80184))
* **state-keeper:** Parallel l2 block sealing
([#1801](#1801))
([9b06dd8](9b06dd8))
* tee_verifier_input_producer
([#1860](#1860))
([fea7f16](fea7f16))


### Bug Fixes

* **Prover CLI:** `status batch` bugs
([#1865](#1865))
([09682f2](09682f2))
* **prover:** Bump Cargo.lock and update VKs
([#1959](#1959))
([367baad](367baad))

---
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
Reviewers

@Artemka374 Artemka374 Artemka374 approved these changes

@EmilLuta EmilLuta EmilLuta approved these changes

@ColoCarletti ColoCarletti ColoCarletti left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ilitteri @EmilLuta @ColoCarletti @Artemka374 @AnastasiiaVashchuk