From d48e90d21ad63faf066dd0b5154eb8ba361fb515 Mon Sep 17 00:00:00 2001 From: Rigidity Date: Wed, 30 Oct 2024 11:54:04 -0400 Subject: [PATCH 1/4] unrelated chnage --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 96354f0f6..8c7767051 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Chia Proof of Space + ![Build](https://github.com/Chia-Network/chiapos/actions/workflows/build-test-cplusplus.yml/badge.svg) ![Wheels](https://github.com/Chia-Network/chiapos/actions/workflows/build-wheels.yml/badge.svg) ![PyPI](https://img.shields.io/pypi/v/chiapos?logo=pypi) @@ -24,7 +25,9 @@ cmake --build . -- -j 6 ``` ## Static Compilation With glibc + ### Statically compile ProofOfSpace + ```bash mkdir -p build && cd build cmake -DBUILD_PROOF_OF_SPACE_STATICALLY=ON ../ @@ -53,13 +56,11 @@ cmake --build . -- -j 6 time ./ProofOfSpace -k 25 create ``` - ### Hellman Attacks usage There is an experimental implementation which implements some of the Hellman Attacks that can provide significant space savings for the final file. - ```bash ./HellmanAttacks -k 18 -f "plot.dat" -m "0x1234" create ./HellmanAttacks -f "plot.dat" check @@ -90,6 +91,7 @@ py.test ./tests -s -v Finally, Rust bindings are provided, but only validation of proofs of space is supported, and it cannot be used to make plots or create proofs for plots. ## ci Building + The primary build process for this repository is to use GitHub Actions to build binary wheels for MacOS, Linux (x64 and aarch64), and Windows and publish them with a source wheel on PyPi. See `.github/workflows/build.yml`. CMake uses @@ -99,6 +101,7 @@ managed by [cibuildwheel](https://github.com/joerick/cibuildwheel). Further installation is then available via `pip install chiapos` e.g. ## Contributing and workflow + Contributions are welcome and more details are available in chia-blockchain's [CONTRIBUTING.md](https://github.com/Chia-Network/chia-blockchain/blob/main/CONTRIBUTING.md). From 24aca9e784450c3effeb0057e8aa003e05b84e6a Mon Sep 17 00:00:00 2001 From: Rigidity Date: Wed, 30 Oct 2024 11:59:41 -0400 Subject: [PATCH 2/4] Don't link blake3 in build.rs --- rust-bindings/build.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/rust-bindings/build.rs b/rust-bindings/build.rs index 0bddc1ead..60e7c067d 100644 --- a/rust-bindings/build.rs +++ b/rust-bindings/build.rs @@ -29,16 +29,7 @@ fn main() { "cargo:rustc-link-search=native={}", dst.join("build").to_str().unwrap() ); - println!( - "cargo:rustc-link-search=native={}", - dst.join("build") - .join("_deps") - .join("blake3-build") - .to_str() - .unwrap() - ); - println!("cargo:rustc-link-lib=static=blake3"); println!("cargo:rustc-link-lib=static=chiapos_static"); let bindings = bindgen::Builder::default() From 683187140fca8b3e64d434335d1b7fe864f0db1a Mon Sep 17 00:00:00 2001 From: Rigidity Date: Wed, 30 Oct 2024 12:14:48 -0400 Subject: [PATCH 3/4] Add back but static search --- rust-bindings/build.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rust-bindings/build.rs b/rust-bindings/build.rs index 60e7c067d..a8d924ea9 100644 --- a/rust-bindings/build.rs +++ b/rust-bindings/build.rs @@ -29,7 +29,16 @@ fn main() { "cargo:rustc-link-search=native={}", dst.join("build").to_str().unwrap() ); + println!( + "cargo:rustc-link-search=static={}", + dst.join("build") + .join("_deps") + .join("blake3-build") + .to_str() + .unwrap() + ); + println!("cargo:rustc-link-lib=static=blake3"); println!("cargo:rustc-link-lib=static=chiapos_static"); let bindings = bindgen::Builder::default() From 9bc1989a5ad13d13a2978fdc41b407d885355a85 Mon Sep 17 00:00:00 2001 From: Rigidity Date: Wed, 30 Oct 2024 12:15:39 -0400 Subject: [PATCH 4/4] all --- rust-bindings/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-bindings/build.rs b/rust-bindings/build.rs index a8d924ea9..caa7b2738 100644 --- a/rust-bindings/build.rs +++ b/rust-bindings/build.rs @@ -30,7 +30,7 @@ fn main() { dst.join("build").to_str().unwrap() ); println!( - "cargo:rustc-link-search=static={}", + "cargo:rustc-link-search=all={}", dst.join("build") .join("_deps") .join("blake3-build")