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

Update main to dev at d5b9c91ffe333850a8dbcb23a49e3cbc9e940fff #111

Merged
merged 2 commits into from
Jun 6, 2024
Merged

Conversation

nategraf
Copy link
Contributor

@nategraf nategraf commented Jun 5, 2024

Update the main branch to be in sync with dev at commit d5b9c91

capossele and others added 2 commits June 4, 2024 09:55
* update zkvm usage

* update lib

* update risc0-ethereum

* improve local prover instructions

* update deps

* bump risc0-ethereum

* bump risc0-ethereum

* bump risc0-ethereum

* add deployment guide

* bump risc0-ethereum

* use local prover

* fix action

* use main branch

* use sccache

* add permissions

* use ubuntu

* Set submodule commits to match dependencies on risc0-ethereum (#109)

* remove dependency on murky

* update forge std and openzeppelin versions

* point risc0-ethereum submodule to release-1.0 branch

* switch cargo refs to main

* fix up build issues

* update notes in the README about proving with Groth16

* point to the pending release-1.0 branch

* move TxSender directly into publisher

* remove unused submodule

* use cargo-risczero-install action from risc0-ethereum and remove unused deps

* fix use of removed env var

* i see you, whitespace

* use pending version of cargo-risczero-install

* bump CI

* bump

* bump cargo-risczero-install action

* update risc0-ethereum refs to the v1.0.0-rc.6 tag

---------

Co-authored-by: Victor Graf <[email protected]>
* update versions to 1.0 in Cargo.toml

* update commit

* update lock files
@nategraf
Copy link
Contributor Author

nategraf commented Jun 5, 2024

NOTE: This PR should be merged with "rebase and merge" such that commits get applied directly and main has the same commit hash as dev

@nategraf nategraf requested a review from capossele June 5, 2024 22:21
@nategraf nategraf enabled auto-merge (rebase) June 5, 2024 22:57
@nategraf nategraf merged commit 27eba00 into main Jun 6, 2024
3 checks passed
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.

2 participants