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

Use latest proof-systems/master in Mina #16464

Open
wants to merge 66 commits into
base: compatible
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
9ac5e53
Submodules/kimchi-vendors: remove temporarily
dannywillems Dec 9, 2024
67b66ad
lib/crypto: run dune fmt --auto-promote
dannywillems Jan 22, 2025
61185cf
kimchi-bindings/wasm: simply reordering deps
dannywillems Dec 9, 2024
b262961
Kimchi-bindings/stubs: reorganize deps in Cargo.toml
dannywillems Dec 9, 2024
9e1e5a4
Kimchi-bindings/stubs: enforce 80 characters per line
dannywillems Dec 9, 2024
381dadc
Kimchi-bindings/wasm: make clippy a bit happier
dannywillems Dec 9, 2024
599be8b
kimchi-bindings/stubs: make clippy happier
dannywillems Dec 9, 2024
1dacf86
kimchi-bindings/stubs: enforce 80 characters limit
dannywillems Dec 9, 2024
10eec36
Bump up proof-systems
dannywillems Jan 13, 2025
cedf508
Kimchi-bindings/stubs: stop ordering to cargo to use vendored srcs
dannywillems Dec 9, 2024
478cade
Kimchi-bindings/stubs: remove --offline parameters to build Rust
dannywillems Dec 9, 2024
989bb09
Kimchi_bindings/stubs: make it compilable with latest proof-systems
dannywillems Dec 9, 2024
8499f24
Kimchi-bindings/stubs: bring back ocaml_str with inherent cache
dannywillems Dec 9, 2024
c622c21
Pickles: update scalars.ml, result of `dune build src/lib/pickles`
dannywillems Dec 9, 2024
90dece9
Rust/Cargo: define workspace + common dependencies
dannywillems Dec 9, 2024
f975d66
Kimchi-bindings/wasm: use workspace deps definition
dannywillems Jan 23, 2025
87772ab
Kimchi-bindings/stubs: use workspace for deps
dannywillems Jan 23, 2025
98dba67
Git submodules: remove proof-systems as submodules
dannywillems Jan 22, 2025
f9e77a9
kimchi-bindings/wasm: clean top-level dune
dannywillems Jan 22, 2025
52b2e60
Kimchi-bindings/stubs: introduce the crate type to build
dannywillems Jan 22, 2025
0fe9c34
Kimchi-bindings/js: remove proof-systems and Cargo.lock
dannywillems Jan 22, 2025
734f4a7
kimchi-bindings/stubs: kimchi-stubs-vendors does not exist anymore
dannywillems Jan 22, 2025
36c2234
kimchi-bindings/stubs: stop removing target and cargo.lock
dannywillems Jan 22, 2025
cef7243
Kimchi-bindings/stubs: add file deps because of cargo workspace
dannywillems Jan 22, 2025
3a6d00a
Rust: bump up deps + reintroduce vendored libs as submodules
dannywillems Jan 22, 2025
0c97cad
Cargo.lock: update lockfile
dannywillems Jan 22, 2025
14e26c8
Makefile: create a target to update Rust dependencies
dannywillems Jan 22, 2025
8222a45
Kimchi/bindings: reintroduce vendored sources for wasm/stubs
dannywillems Jan 22, 2025
904b145
kimchi-bindings/wasm: enforce using vendored libraries
dannywillems Jan 22, 2025
5903af1
kimchi-bindings/stubs: use --offline to build Rust code
dannywillems Jan 23, 2025
d8f1e2c
src/lib/crypto: update README
dannywillems Jan 22, 2025
8348139
kimchi-bindings/stubs: use top-level rust-toolchain.toml
dannywillems Jan 23, 2025
7f78a7f
kimchi-bindings/stubs: use --target-dir instead of env var
dannywillems Jan 23, 2025
49a3234
Kimchi-bindings/stubs: target is now at the root of the project
dannywillems Jan 23, 2025
4d09d18
kimchi-bindings/stubs: add comment reg. absent --release flag
dannywillems Jan 23, 2025
a9e91e7
Cargo: add global config reg. vendored sources
dannywillems Jan 23, 2025
fdfaa28
Kimchi-stubs/dune: options come before args
dannywillems Jan 23, 2025
9735a7d
Move cargo config into top-level
dannywillems Jan 23, 2025
69d0f71
README: enforce 80 characters limit
dannywillems Jan 24, 2025
3ac94b5
kimchi-bindings/wasm: get rid of nightly requirement
dannywillems Jan 24, 2025
357c215
kimchi-bindings/js: add requirements on Cargo top level files
dannywillems Jan 24, 2025
c6e611c
Git: now useless gitignore
dannywillems Jan 24, 2025
ae735fe
Cargo.toml: enforce cc to 1.0.79
dannywillems Jan 24, 2025
2ebba30
Move 'Prepare Monorepo Triage' to generic-multi buildkite agents
mrmr1993 Jan 23, 2025
aa565a4
Move Monorepo triage to `generic-multi` agents too
mrmr1993 Jan 23, 2025
8f861f4
Kimchi-bindings/dune: stop using workspace_root var
dannywillems Jan 24, 2025
d8c8d86
kimchi-bindings/js: add missing mina-rust-deps
dannywillems Jan 24, 2025
1bf66a2
Bump up rust deps
dannywillems Jan 24, 2025
0444421
Bump up Cargo lockfile
dannywillems Jan 24, 2025
de71aa2
Submodule: reintroduce proof-systems as a submodule
dannywillems Jan 24, 2025
79179ea
Cargo: copy proof-systems crate in top-level Cargo workspace
dannywillems Jan 24, 2025
11a9b11
mina-rust-dependencies: bump up
dannywillems Jan 24, 2025
fa6f100
kimchi-bindings: adding proof-systems as source deps
dannywillems Jan 24, 2025
cb8f9a9
kimchi-bindings/stubs: use workspace version
dannywillems Jan 24, 2025
a7d8cac
Nix: remove nightly in toolchain hashes as not used anymore
dannywillems Jan 27, 2025
999a031
Nix: remove nightly related condition
dannywillems Jan 27, 2025
6e2aa15
Nix: Cargo.toml and rust-toolchain.toml is at the top-level now
dannywillems Jan 27, 2025
ddc68ed
Nix: remove code related to std issue when vendoring
dannywillems Jan 27, 2025
fab4c00
Nix: build-std is not used anymore
dannywillems Jan 27, 2025
c7b4e5e
Nix: attempt to add mina-rust-dependencies submodule
dannywillems Jan 27, 2025
fe04b59
kimchi-bindings/js: dependencies on stubs
dannywillems Jan 27, 2025
6b6d8b9
kimchi-bindings/js/dune: add some comments
dannywillems Jan 27, 2025
397c9aa
Fix nix for kimchi_bindings_stubs
georgeee Jan 27, 2025
d71b6c8
Reformat nix
georgeee Jan 27, 2025
e5f9b82
Build plonk_wasm in nix
georgeee Jan 27, 2025
f2c4046
Merge branch 'fix/compatibility' into dw/revamp-use-latest-master-pro…
dannywillems Jan 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# General rustflags for all non-wasm32 targets
[target.'cfg(not(target_arch = "wasm32"))']
rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]

[profile.release.target.wasm32-unknown-unknown]
Copy link
Member

Choose a reason for hiding this comment

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

My local cargo complains that

warning: unused config key `profile.release.target` in `/home/volhovm/code/mina/.cargo/config.toml`

Not sure if it's intended or important though.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I want to fix it too. Leaving it open for now.

debug = true

[source.crates-io]
replace-with = "vendored-sources"

[source.vendored-sources]
directory = "src/lib/crypto/mina-rust-dependencies"

[package.metadata.wasm-pack.profile.release]
wasm-opt = false
#wasm-opt = ["-O4", "--detect-features", "--enable-mutable-globals" ]
#wasm-opt = ["-O4", "--enable-mutable-globals"]
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "src/lib/snarky"]
path = src/lib/snarky
url = https://github.com/o1-labs/snarky
[submodule "src/lib/crypto/mina-rust-dependencies"]
path = src/lib/crypto/mina-rust-dependencies
url = https://github.com/o1-labs/proof-systems-vendors/
[submodule "src/lib/crypto/proof-systems"]
Copy link
Member

Choose a reason for hiding this comment

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

Nice :) personal take but submodule structure is annoying. For (the rare) debugging the two apps together you can always override the dependency to a local copy anyways.

Copy link
Member

Choose a reason for hiding this comment

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

We could also do better versioning for proof-systems... at some point.

Copy link
Member Author

Choose a reason for hiding this comment

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

You're gonna hate, but I had to reintroduce it :(, see here.

path = src/lib/crypto/proof-systems
url = https://github.com/o1-labs/proof-systems.git
[submodule "src/lib/crypto/kimchi_bindings/stubs/kimchi-stubs-vendors"]
path = src/lib/crypto/kimchi_bindings/stubs/kimchi-stubs-vendors
url = https://github.com/MinaProtocol/kimchi-stubs-vendors.git
url = https://github.com/o1-labs/proof-systems
Loading