Merge remote-tracking branch 'origin/main' into test-platforms

.github/workflows/dependency-review.yml

@@ -21,5 +21,5 @@ jobs:
       - name: "Dependency Review"
         uses: actions/dependency-review-action@v4
         with:
-          allow-dependencies-licenses: pkg:pypi/pylint, pkg:pypi/pyinstaller
+          allow-dependencies-licenses: pkg:pypi/pyinstaller
           deny-licenses: AGPL-1.0-only, AGPL-1.0-or-later, AGPL-1.0-or-later, AGPL-3.0-or-later, GPL-1.0-only, GPL-1.0-or-later, GPL-2.0-only, GPL-2.0-or-later, GPL-3.0-only, GPL-3.0-or-later

CMakeLists.txt

@@ -138,6 +138,7 @@ endif()
 
 set(BLAKE3_SRC ${blake3_SOURCE_DIR}/c)
 set(BLAKE3_INCLUDE_DIR ${blake3_SOURCE_DIR}/c)
+set_target_properties(blake3 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib$<0:>")
 target_link_libraries(chiapos PRIVATE blake3)
 target_link_libraries(ProofOfSpace PRIVATE blake3)
 include_directories(
@@ -157,6 +158,7 @@ IF (BUILD_STATIC_CHIAPOS_LIBRARY)
   add_library(chiapos_static STATIC src/chacha8.c c-bindings/wrapper.cpp)
   target_link_libraries(chiapos_static PRIVATE blake3)
   target_include_directories(chiapos_static PUBLIC lib/include)
+  set_target_properties(chiapos_static PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib$<0:>")
 ENDIF()
 
 FetchContent_Declare(

c-bindings/wrapper.h

@@ -1,5 +1,4 @@
 #include <stdint.h>
-#include "picosha2.hpp"
 
 extern "C" {
     bool validate_proof(const uint8_t* plot_id, uint8_t k, const uint8_t* challenge, const uint8_t* proof, uint16_t proof_len, uint8_t* quality_buf);

rust-bindings/build.rs

@@ -27,15 +27,7 @@ fn main() {
 
     println!(
         "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()
+        dst.join("build").join("lib").to_str().unwrap()
     );
 
     println!("cargo:rustc-link-lib=static=chiapos_static");

src/cli.cpp

@@ -16,7 +16,6 @@
 #include <set>
 
 #include "cxxopts.hpp"
-#include "../lib/include/picosha2.hpp"
 #include "plotter_disk.hpp"
 #include "prover_disk.hpp"
 #include "verifier.hpp"

src/verifier.hpp

@@ -19,6 +19,7 @@
 #include <vector>
 
 #include "calculate_bucket.hpp"
+#include "../lib/include/picosha2.hpp"
 
 class Verifier {
 public:

tests/test.cpp

@@ -20,7 +20,6 @@
 #include <catch2/catch_session.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 
-#include "../lib/include/picosha2.hpp"
 #include "calculate_bucket.hpp"
 #include "disk.hpp"
 #include "plotter_disk.hpp"