From 329d2de3a1348ff85e0bad271b83b939d01bd1e6 Mon Sep 17 00:00:00 2001
From: ChiaAutomation <85647627+ChiaAutomation@users.noreply.github.com>
Date: Wed, 30 Oct 2024 13:25:42 -0500
Subject: [PATCH 1/3] Update Managed Files (#452)

---
 .github/workflows/dependency-review.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 53a3bbdd8..53b8c1209 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.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

From 62236c6bcfbbd9255e076a7b58969826dc624edd Mon Sep 17 00:00:00 2001
From: Earle Lowe <e.lowe@chia.net>
Date: Wed, 30 Oct 2024 14:04:43 -0700
Subject: [PATCH 2/3] Cleanup some stuff

---
 c-bindings/wrapper.h | 1 -
 src/cli.cpp          | 1 -
 src/verifier.hpp     | 1 +
 tests/test.cpp       | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/c-bindings/wrapper.h b/c-bindings/wrapper.h
index 84d7b0423..7d33dd875 100644
--- a/c-bindings/wrapper.h
+++ b/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);
diff --git a/src/cli.cpp b/src/cli.cpp
index 3044c9785..9cf1494fb 100644
--- a/src/cli.cpp
+++ b/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"
diff --git a/src/verifier.hpp b/src/verifier.hpp
index 493bed1b1..2cbe6ac8b 100644
--- a/src/verifier.hpp
+++ b/src/verifier.hpp
@@ -19,6 +19,7 @@
 #include <vector>
 
 #include "calculate_bucket.hpp"
+#include "../lib/include/picosha2.hpp"
 
 class Verifier {
 public:
diff --git a/tests/test.cpp b/tests/test.cpp
index 395eb009e..44c35284d 100644
--- a/tests/test.cpp
+++ b/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"

From 468979a8a5cf11ac04034454bb501bc4bebf86b3 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 31 Oct 2024 12:00:24 +0100
Subject: [PATCH 3/3] Experiment with manually setting archive output directory
 for blake3 and chiapos_static.

---
 CMakeLists.txt         |  2 ++
 rust-bindings/build.rs | 10 +---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9ae4c210..d83916c62 100644
--- a/CMakeLists.txt
+++ b/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 PUBLIC 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(
diff --git a/rust-bindings/build.rs b/rust-bindings/build.rs
index 2f746ffb7..2e0e664ef 100644
--- a/rust-bindings/build.rs
+++ b/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");