Merge remote-tracking branch 'origin/main' into implement-deposit-cli-4

cspr-rad · Jun 5, 2024 · fdaea36 · fdaea36
2 parents 12a2d10 + 66a3537
commit fdaea36
Show file tree

Hide file tree

Showing 36 changed files with 3,646 additions and 658 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,2 @@
+KAIROS_SERVER_SOCKET_ADDR="127.0.0.1:7893"
+KAIROS_PROVER_SERVER_SOCKET_ADDR="127.0.0.1:7894"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,8 +6,9 @@ members = [
   "kairos-cli",
   "kairos-crypto",
   "kairos-server",
-  "kairos-tx",
   "kairos-test-utils",
+  "kairos-tx",
+  "kairos-prover/kairos-circuit-logic",
   "demo-contract-tests",
 ]
 

diff --git a/cargo-update-workspaces.sh b/cargo-update-workspaces.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# Set the path to the first argument, defaulting to the current directory if no argument is provided
+path="${1:-.}"
+
+# Find and update Cargo.lock files starting from the specified path or the default path
+find "$path" -name Cargo.lock -execdir cargo update --verbose \;
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -87,11 +87,11 @@
                 ./kairos-server
                 ./kairos-test-utils
                 ./kairos-tx
+                ./kairos-prover/kairos-circuit-logic
               ];
             };
 
             nativeBuildInputs = with pkgs; [ pkg-config ];
-
             buildInputs = with pkgs; [
               openssl.dev
             ] ++ lib.optionals stdenv.isDarwin [
@@ -116,6 +116,7 @@
             CASPER_CHAIN_NAME = "cspr-dev-cctl";
             PATH_TO_WASM_BINARIES = "${self'.packages.kairos-contracts}/bin";
             inputsFrom = [ self'.packages.kairos ];
+            packages = [ inputs'.csprpkgs.packages.cctl ];
           };
 
           packages = {
@@ -167,7 +168,8 @@
 
             coverage-report = craneLib.cargoTarpaulin (kairosNodeAttrs // {
               cargoArtifacts = self'.packages.kairos-deps;
-
+              # FIXME fix weird issue with rust-nightly and tarpaulin https://github.com/xd009642/tarpaulin/issues/1499
+              RUSTFLAGS = "-Cstrip=none";
               # Default values from https://crane.dev/API.html?highlight=tarpau#cranelibcargotarpaulin
               # --avoid-cfg-tarpaulin fixes nom/bitvec issue https://github.com/xd009642/tarpaulin/issues/756#issuecomment-838769320
               cargoTarpaulinExtraArgs = "--features=all-tests --skip-clean --out xml --output-dir $out --avoid-cfg-tarpaulin";