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

feat: Make house keeper emit correct protocol version #2062

Merged
merged 16 commits into from
May 30, 2024
Merged

feat: Make house keeper emit correct protocol version #2062

merged 16 commits into from
May 30, 2024

Conversation

Artemka374
Copy link
Contributor

@Artemka374 Artemka374 commented May 27, 2024 •
edited
Loading

What ❔

Emit protocol version from database in metrics.

Why ❔

Before we were emitting hardcoded protocol version, which is not accurate

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.

@Artemka374 Artemka374 requested review from yorik, slowli and popzxc May 27, 2024 16:15
Artemka374 added 2 commits May 28, 2024 16:36
@Artemka374
Merge branch 'refs/heads/main' into afo/fix-protocol-version-metrics
fa9de1f 
# Conflicts:
#	core/node/house_keeper/src/prover/queue_reporter/fri_witness_generator_queue_reporter.rs
@Artemka374
fix query
74bb721
slowli
slowli reviewed May 28, 2024
View reviewed changes
core/node/house_keeper/src/prover/queue_reporter/fri_witness_generator_queue_reporter.rs Outdated Show resolved Hide resolved
core/node/house_keeper/src/prover/queue_reporter/fri_witness_generator_queue_reporter.rs Outdated Show resolved Hide resolved
core/node/house_keeper/src/prover/queue_reporter/fri_witness_generator_queue_reporter.rs Outdated Show resolved Hide resolved
core/node/house_keeper/src/prover/queue_reporter/fri_witness_generator_queue_reporter.rs Outdated Show resolved Hide resolved
core/node/house_keeper/src/prover/queue_reporter/fri_witness_generator_queue_reporter.rs Outdated Show resolved Hide resolved
prover/prover_dal/src/fri_witness_generator_dal.rs Show resolved Hide resolved
prover/prover_dal/src/fri_witness_generator_dal.rs Outdated Show resolved Hide resolved
prover/prover_dal/src/fri_proof_compressor_dal.rs Outdated Show resolved Hide resolved
prover/prover_dal/src/fri_prover_dal.rs Outdated Show resolved Hide resolved
prover/prover_dal/src/fri_witness_generator_dal.rs Outdated Show resolved Hide resolved
@Artemka374 Artemka374 mentioned this pull request May 29, 2024
Merged
5 tasks
@Artemka374 Artemka374 requested a review from slowli May 29, 2024 10:44
@Artemka374 Artemka374 requested a review from slowli May 29, 2024 16:49
slowli
slowli approved these changes May 30, 2024
View reviewed changes
Copy link
Contributor

@slowli slowli left a comment

Choose a reason for hiding this comment

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

Nice 👍

@Artemka374 Artemka374 added this pull request to the merge queue May 30, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 30, 2024
@Artemka374 Artemka374 added this pull request to the merge queue May 30, 2024
Merged via the queue into main with commit a58a7e8 May 30, 2024
52 checks passed
@Artemka374 Artemka374 deleted the afo/fix-protocol-version-metrics branch May 30, 2024 08:16
This was referenced May 30, 2024
Merged
Merged
github-merge-queue bot pushed a commit that referenced this pull request May 30, 2024
@zksync-era-bot
chore(main): release core 24.5.0 (#2004)
e0923ff 
🤖 I have created a release *beep* *boop*
---


##
[24.5.0](core-v24.4.0...core-v24.5.0)
(2024-05-30)


### Features

* Add protocol_version label to WG jobs metric
([#2009](#2009))
([e0a3393](e0a3393))
* **config:** remove zksync home
([#2022](#2022))
([d08fe81](d08fe81))
* **en:** Improve tree snapshot recovery
([#1938](#1938))
([5bc8234](5bc8234))
* Make house keeper emit correct protocol version
([#2062](#2062))
([a58a7e8](a58a7e8))
* **node_framework:** Migrate main node to the framework
([#1997](#1997))
([27a26cb](27a26cb))
* **node_framework:** Synchronize pools layer with logic in
initialize_components
([#2079](#2079))
([3202461](3202461))
* Protocol semantic version
([#2059](#2059))
([3984dcf](3984dcf))
* **prover:** Adnotate prover queue metrics with protocol version
([#1893](#1893))
([d1e1004](d1e1004))
* save writes needed for tree in state keeper
([#1965](#1965))
([471af53](471af53))
* **test:** Add filebased config support for integration tests
([#2043](#2043))
([be3ded9](be3ded9))
* **vm-runner:** implement VM runner main body
([#1955](#1955))
([bf5b6c2](bf5b6c2))


### Bug Fixes

* **API:** polish web3 api block-related types
([#1994](#1994))
([6cd3c53](6cd3c53))
* **en:** chunk factory deps
([#2077](#2077))
([4b9e6fa](4b9e6fa))
* **en:** Fix recovery-related metrics
([#2014](#2014))
([86355d6](86355d6))
* **eth-watch:** Do not track for stm, only for diamond proxy
([#2080](#2080))
([87adac9](87adac9))
* fix metrics reporting wrong values
([#2065](#2065))
([2ec010a](2ec010a))
* **loadtest:** resolve unit conversion error in loadtest metrics
([#1987](#1987))
([b5870a0](b5870a0))
* **merkle-tree:** Fix incoherent Merkle tree view
([#2071](#2071))
([2fc9a6c](2fc9a6c))
* **metadata-calculator:** protective reads sort
([#2087](#2087))
([160c13c](160c13c))
* **node_framework:** Fix the connection pool size for the catchup task
([#2046](#2046))
([c00a2eb](c00a2eb))
* **node_framework:** Use custom pool for commitiment generator
([#2076](#2076))
([994df8f](994df8f))
* **protocol_version:** Add backward compatibility
([#2097](#2097))
([391624b](391624b))
* **pruning:** Fix DB pruner responsiveness during shutdown
([#2058](#2058))
([0a07312](0a07312))
* **zk_toolbox:** Use both folders for loading contracts
([#2030](#2030))
([97c6d5c](97c6d5c))


### Performance Improvements

* **commitment-generator:** Run commitment generation for multiple
batches in parallel
([#1984](#1984))
([602bf67](602bf67))

---
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 <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request May 30, 2024
@zksync-era-bot @perekopskiy
chore(main): release prover 14.4.0 (#2078)
ac37964 
🤖 I have created a release *beep* *boop*
---


##
[14.4.0](prover-v14.3.0...prover-v14.4.0)
(2024-05-30)


### Features

* Make house keeper emit correct protocol version
([#2062](#2062))
([a58a7e8](a58a7e8))
* **pli:** add support for persistent config
([#1907](#1907))
([9d5631c](9d5631c))
* Protocol semantic version
([#2059](#2059))
([3984dcf](3984dcf))
* **prover:** Add `prover_version` binary.
([#2089](#2089))
([e1822f6](e1822f6))


### Bug Fixes

* fix null protocol version error
([#2094](#2094))
([aab3a7f](aab3a7f))
* fix query for proof compressor metrics
([#2103](#2103))
([d23d24e](d23d24e))
* **prover_dal:** fix `save_prover_protocol_version` query
([#2096](#2096))
([d8dd1ae](d8dd1ae))

---
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: perekopskiy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slowli slowli slowli approved these changes

@yorik yorik Awaiting requested review from yorik

@popzxc popzxc Awaiting requested review from popzxc

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

Successfully merging this pull request may close these issues.
2 participants
@Artemka374 @slowli