-
Notifications
You must be signed in to change notification settings - Fork 548
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
Use latest proof-systems/master in Mina #16464
Open
dannywillems
wants to merge
66
commits into
compatible
Choose a base branch
from
dw/revamp-use-latest-master-proof-systems
base: compatible
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Use latest proof-systems/master in Mina #16464
dannywillems
wants to merge
66
commits into
compatible
from
dw/revamp-use-latest-master-proof-systems
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dannywillems
changed the title
Dw/revamp use latest master proof systems
Use latest proof-systems/master in Mina
Jan 13, 2025
!ci-build-me |
1 similar comment
!ci-build-me |
Converting to draft while fixing nix. |
dannywillems
force-pushed
the
dw/revamp-use-latest-master-proof-systems
branch
4 times, most recently
from
January 22, 2025 18:57
73c59ea
to
adb8fbc
Compare
This was referenced Jan 22, 2025
dannywillems
force-pushed
the
dw/revamp-use-latest-master-proof-systems
branch
from
January 22, 2025 19:23
adb8fbc
to
57a8bc4
Compare
!ci-build-me |
dannywillems
force-pushed
the
dw/revamp-use-latest-master-proof-systems
branch
from
January 23, 2025 13:00
57a8bc4
to
109ec75
Compare
dannywillems
force-pushed
the
dw/revamp-use-latest-master-proof-systems
branch
from
January 23, 2025 13:08
109ec75
to
554c22e
Compare
dannywillems
force-pushed
the
dw/revamp-use-latest-master-proof-systems
branch
from
January 23, 2025 13:10
554c22e
to
5272287
Compare
It seems that clippy is not run in this crate. We should activate it later.
dannywillems
force-pushed
the
dw/revamp-use-latest-master-proof-systems
branch
from
January 24, 2025 19:22
e70f245
to
fa6f100
Compare
!ci-build-me |
dannywillems
force-pushed
the
dw/revamp-use-latest-master-proof-systems
branch
from
January 27, 2025 08:01
b7562b2
to
cb8f9a9
Compare
!ci-build-me |
!ci-build-me |
SanabriaRusso
approved these changes
Jan 27, 2025
This was referenced Jan 27, 2025
volhovm
approved these changes
Jan 27, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not merge, please. Fixing o1js/o1js-bindings first. |
I updated the o1js/bindings PR dep:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TODO:
remove 2ebba30remove aa565a4Revamping #16405. Note that this PR targets fix/compatibility, waiting for a fix in o1js.
This pull request has as a first goal to update Mina to use the master branch of proof-systems, instead of develop (which is going to be deleted when the related o1-labs/proof-systems#2868 is merged).
Reviewers can follow commits by commits. The commits are ordered in a way to understand the thought process.
Run these commands to check the build works locally:
In addition to making the code in
kimchi-bindings/stubs
andkimchi-bindings/wasm
compatible with the latest version of proof-systems, this work re-organizes the management of the Rust dependencies between the different Rust crates. Subsequent works will move all the Rust code into proof-systems (see the WIP o1-labs/proof-systems#2875 and o1-labs/proof-systems#2876).Currently, the Rust dependencies of proof-systems/develop and the Rust dependencies involved in the crates kimchi-bindings/stubs and kimchi-bindings/wasm are separated. When doing this work, I encountered multiple conflicting version dependencies, which made the work more complicated to deliver. Therefore, I decided:
to keep proof-systems as a submodule (even though in the history there is an attempt to use it as a direct dependency).
to use Cargo workspaces to manage the dependencies of kimchi-bindings/stubs and kimchi-bindings/wasm together, in addition to proof-systems. It is done by defining once and for all the versions of the dependencies in a top-level Cargo.toml. The Cargo.toml in kimchi-bindings/stubs and kimchi-bindings/wasm. As proof-systems is a submodule, and defines also a workspace, we have to ignore it in the top-level Cargo.toml, and copying the dependencies required by proof-systems at the top-level Cargo.toml is required. A script checking that the versions are the same is in progress here.
to get rid of nightly for wasm. When trying to vendor the dependencies, I realized that it wasn't possible to vendor the std (required as we do
build-std=panic_abort,std
). I end up realizing that using nightly wasn't required, as already noticed in Rust 1.74 o1-labs/proof-systems#2875, and we could simply use the same Rust version).to vendor all dependencies to keep a consistent Rust environment, coined "mina-rust-dependencies", managed as a submodule this time. It is mostly proof-systems-vendor renamed, and updated. A related PR exists here for compatible. We might need to create multiple branch later.
to add a Makefile target to (re-)vendor the Rust dependencies,
update-rust-dependencies
.The cargo workspace will probably disappear soon as we're moving the Rust code in proof-systems.