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(prover_cli): Fix the issues with home path #2104

Merged
merged 20 commits into from
Jun 7, 2024
Merged

Conversation

ColoCarletti
Copy link
Contributor

@ColoCarletti ColoCarletti commented May 30, 2024

In this PR: Pull Request #2022, the logic was changed to stop using the $ZKSYNC_HOME environment variable to construct paths relative to the root of zksync-era.
But the prover is a separate workspace, so it fails to create the path to the contract with the functions in the main workspace..

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.

@ColoCarletti ColoCarletti marked this pull request as ready for review May 31, 2024 13:35
@ColoCarletti ColoCarletti requested a review from Oppen May 31, 2024 15:44
@ilitteri ilitteri requested review from EmilLuta and removed request for Oppen June 4, 2024 11:13
@ColoCarletti ColoCarletti changed the title fix(prover_cli): Fix the issues with the fix(prover_cli): Fix the issues with 'home' path Jun 4, 2024
@ColoCarletti ColoCarletti changed the title fix(prover_cli): Fix the issues with 'home' path fix(prover_cli): Fix the issues with home path Jun 4, 2024
Copy link
Contributor

@ilitteri ilitteri left a comment

Choose a reason for hiding this comment

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

Everything looks good, left some questions

etc/pliconfig Outdated Show resolved Hide resolved
prover/prover_cli/src/main.rs Outdated Show resolved Hide resolved
prover/prover_cli/src/main.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@ilitteri ilitteri 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 added this pull request to the merge queue Jun 7, 2024
Merged via the queue into main with commit 1e18af2 Jun 7, 2024
51 checks passed
@EmilLuta EmilLuta deleted the prover_cli_zksync_home branch June 7, 2024 13:48
itsacoyote pushed a commit that referenced this pull request Jun 10, 2024
In this PR: [Pull Request
#2022](https://github.com/matter-labs/zksync-era/pull/2022/files), the
logic was changed to stop using the $ZKSYNC_HOME environment variable to
construct paths relative to the root of zksync-era.
But the prover is a separate workspace, so it fails to create the path
to the contract with the functions in the main workspace..

## Checklist

- [x] 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.
- [x] Code has been formatted via `zk fmt` and `zk lint`.
- [x] Spellcheck has been run via `zk spellcheck`.
github-merge-queue bot pushed a commit that referenced this pull request Jun 14, 2024
🤖 I have created a release *beep* *boop*
---


##
[15.0.0](prover-v14.5.0...prover-v15.0.0)
(2024-06-14)


### ⚠ BREAKING CHANGES

* updated boojum and nightly rust compiler
([#2126](#2126))

### Features

* added debug_proof to prover_cli
([#2052](#2052))
([b1ad01b](b1ad01b))
* faster & cleaner VK generation
([#2084](#2084))
([89c8cac](89c8cac))
* **node:** Move some stuff around
([#2151](#2151))
([bad5a6c](bad5a6c))
* **object-store:** Allow caching object store objects locally
([#2153](#2153))
([6c6e65c](6c6e65c))
* **proof_data_handler:** add new endpoints to the TEE prover interface
API ([#1993](#1993))
([eca98cc](eca98cc))
* **prover:** Add file based config for fri prover gateway
([#2150](#2150))
([81ffc6a](81ffc6a))
* **prover:** file based configs for witness generator
([#2161](#2161))
([24b8f93](24b8f93))
* support debugging of recursive circuits in prover_cli
([#2217](#2217))
([7d2e12d](7d2e12d))
* updated boojum and nightly rust compiler
([#2126](#2126))
([9e39f13](9e39f13))
* verification of L1Batch witness (BFT-471) - attempt 2
([#2232](#2232))
([dbcf3c6](dbcf3c6))
* verification of L1Batch witness (BFT-471)
([#2019](#2019))
([6cc5455](6cc5455))


### Bug Fixes

* **config:** Split object stores
([#2187](#2187))
([9bcdabc](9bcdabc))
* **prover_cli:** Fix delete command
([#2119](#2119))
([214f981](214f981))
* **prover_cli:** Fix the issues with `home` path
([#2104](#2104))
([1e18af2](1e18af2))
* **prover:** config
([#2165](#2165))
([e5daf8e](e5daf8e))
* **prover:** Disallow state changes from successful
([#2233](#2233))
([2488a76](2488a76))
* Treat 502s and 503s as transient for GCS OS
([#2202](#2202))
([0a12c52](0a12c52))


### Reverts

* verification of L1Batch witness (BFT-471)
([#2230](#2230))
([227e101](227e101))

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

4 participants