Merge remote-tracking branch 'origin/main' into ethereum

cspr-rad · May 26, 2024 · 5b838b7 · 5b838b7
2 parents a1adaa6 + 0187469
commit 5b838b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/src/prover.rs b/client/src/prover.rs
@@ -21,7 +21,7 @@ pub fn prove(
         .to_encoded_point(true)
         .to_bytes()
         .to_vec();
-    let unique_session_signature: Signature = user_secret_key.sign(&choice.as_bytes().to_vec());
+    let unique_session_signature: Signature = user_secret_key.sign(choice.as_bytes());
     let circuit_inputs: CircuitInputs = CircuitInputs {
         choice: choice.to_string(),
         user_public_key: user_public_key_serialized,

diff --git a/flake.nix b/flake.nix
@@ -72,7 +72,8 @@
             ];
 
             cargoExtraArgs = lib.optionalString (!pkgs.stdenv.isDarwin) "--features groth16";
-            cargoTestExtraArgs = lib.optionalString (!pkgs.stdenv.isDarwin) "--features groth16";
+            # We can't run groth16 related tests in a nix build because it requires docker
+            #cargoTestExtraArgs = lib.optionalString (!pkgs.stdenv.isDarwin) "--features groth16";
 
             buildInputs = with pkgs; [
               openssl.dev
@@ -99,6 +100,7 @@
                 # looking for .cargo
                 mkdir .cargo
                 mv .cargo-home/config.toml .cargo/config.toml
+                export LD_LIBRARY_PATH=${lib.makeLibraryPath [ pkgs.openssl pkgs.stdenv.cc.cc.lib ]}
                 export RISC0_RUST_SRC=${rustToolchain}/lib/rustlib/src/rust
                 export RECURSION_SRC_PATH=${recursionZkr}
               '';