Merge branch 'main' into fix-ledger-api-doc

Author: Mr-Leshiy

Cargo.lock

@@ -36,40 +36,50 @@
         (std.blockTypes.functions "constants")
         (std.blockTypes.functions "lib")
         (std.blockTypes.functions "toolchains")
+        (std.blockTypes.installables "artifacts")
+        (std.blockTypes.installables "libraries")
         (std.blockTypes.installables "packages")
         (std.blockTypes.nixago "configs")
         (std.blockTypes.runnables "operables")
       ];
     }
     {
       devShells = std.harvest inputs.self ["automation" "devshells"];
+      artifacts = std.harvest inputs.self [
+        ["artifacts" "artifacts"]
+      ];
+      containers = std.harvest inputs.self [
+        ["jormungandr" "containers"]
+        ["vit-servicing-station" "containers"]
+        ["vit-testing" "containers"]
+      ];
+      libraries = std.harvest inputs.self [
+        ["catalyst-toolbox" "libraries"]
+        ["chain-libs" "libraries"]
+        ["chain-wallet-libs" "libraries"]
+        ["jormungandr" "libraries"]
+        ["jortestkit" "libraries"]
+        ["vit-servicing-station" "libraries"]
+        ["vit-testing" "libraries"]
+      ];
       packages = std.harvest inputs.self [
-        ["artifacts" "packages"]
         ["catalyst-toolbox" "packages"]
-        ["chain-libs" "packages"]
-        ["chain-wallet-libs" "packages"]
         ["jormungandr" "packages"]
-        ["jortestkit" "packages"]
         ["vit-servicing-station" "packages"]
         ["vit-testing" "packages"]
         ["voting-tools" "packages"]
         ["voting-tools-rs" "packages"]
       ];
-      containers = std.harvest inputs.self [
-        ["jormungandr" "containers"]
-        ["vit-servicing-station" "containers"]
-        ["vit-testing" "containers"]
-      ];
     };
 
   nixConfig = {
     extra-substituters = [
-      #"https://hydra.iohk.io"
-      "https://iog-gov-nix.s3.eu-central-1.amazonaws.com"
+      "https://cache.iog.io"
+      "https://iog-catalyst-cache.s3.eu-central-1.amazonaws.com"
     ];
     extra-trusted-public-keys = [
       "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
-      "gov:uG8+LG8RqFGScUmOrDkGb4VCbtNhChbnycVnxZxb8AY="
+      "catalyst:kNW0n7ijUJDvu4BrpqC3j54rgoHNccXx7ABuVzuL9WM="
     ];
     allow-import-from-derivation = "true";
   };

flake.nix

@@ -10,19 +10,23 @@
 
   catalystCore = {...}: {
     name = nixpkgs.lib.mkForce "Catalyst Core";
-    env = mkEnv {
-      PROTOC = "${nixpkgs.protobuf}/bin/protoc";
-      PROTOC_INCLUDE = "${nixpkgs.protobuf}/include";
-    };
+    env = with nixpkgs;
+      mkEnv {
+        OPENSSL_NO_VENDOR = 1;
+        OPENSSL_DIR = "${l.getDev openssl}";
+        OPENSSL_LIB_DIR = "${l.getLib openssl}/lib";
+        PROTOC = "${protobuf}/bin/protoc";
+        PROTOC_INCLUDE = "${protobuf}/include";
+      };
     nixago = [
       cell.configs.lefthook
       cell.configs.prettier
       cell.configs.treefmt
     ];
     packages = with nixpkgs; [
+      gcc
       rustToolchain
       pkg-config
-      openssl
       protobuf
       uniffi-bindgen
       postgresql

nix/artifacts/packages.nix nix/artifacts/artifacts.nixnix/artifacts/packages.nix renamed to nix/artifacts/artifacts.nix

@@ -0,0 +1,13 @@
+{
+  inputs,
+  cell,
+}: let
+  inherit (inputs) nixpkgs std;
+  inherit (inputs.cells.lib) lib;
+  l = nixpkgs.lib // builtins;
+
+  name = "catalyst-toolbox";
+  mkSimplePkg = subPkg: lib.mkPackage {pkgPath = "${name}/${subPkg}";};
+in {
+  snapshot-lib = mkSimplePkg "snapshot-lib";
+}

nix/automation/devshells.nix

@@ -7,15 +7,12 @@
   l = nixpkgs.lib // builtins;
 
   name = "catalyst-toolbox";
-  root = inputs.self + "/src/${name}";
-
-  mkSimplePkg = subPkg: lib.mkPackage {pkgPath = root + "/${subPkg}";};
+  mkSimplePkg = subPkg: lib.mkPackage {pkgPath = "${name}/${subPkg}";};
 in {
   catalyst-toolbox = lib.mkPackage {
-    pkgPath = root + "/catalyst-toolbox";
+    pkgPath = "${name}/catalyst-toolbox";
     nativeBuildInputs = with nixpkgs; [
       postgresql.lib
     ];
   };
-  snapshot-lib = mkSimplePkg "snapshot-lib";
 }

nix/catalyst-toolbox/libraries.nix

@@ -7,9 +7,7 @@
   l = nixpkgs.lib // builtins;
 
   name = "chain-libs";
-  root = inputs.self + "/src/${name}";
-
-  mkSimplePkg = subPkg: lib.mkPackage {pkgPath = root + "/${subPkg}";};
+  mkSimplePkg = subPkg: lib.mkPackage {pkgPath = "${name}/${subPkg}";};
 in {
   chain-addr = mkSimplePkg "chain-addr";
   cardano-legacy-address = mkSimplePkg "cardano-legacy-address";

nix/catalyst-toolbox/packages.nix

@@ -7,16 +7,13 @@
   l = nixpkgs.lib // builtins;
 
   name = "chain-wallet-libs";
-  root = inputs.self + "/src/${name}";
-
-  mkSimplePkg = subPkg: lib.mkPackage {pkgPath = root + "/${subPkg}";};
+  mkSimplePkg = subPkg: lib.mkPackage {pkgPath = "${name}/${subPkg}";};
 in {
-  bip39 = mkSimplePkg "bip39";
   chain-path-derivation = mkSimplePkg "chain-path-derivation";
   hdkeygen = mkSimplePkg "hdkeygen";
   symmetric-cipher = mkSimplePkg "symmetric-cipher";
   wallet = mkSimplePkg "wallet";
   wallet-c = mkSimplePkg "bindings/wallet-c";
   wallet-core = mkSimplePkg "bindings/wallet-core";
-  wallet-js = mkSimplePkg "bindings/wallet-js";
+  wallet-wasm-js = mkSimplePkg "bindings/wallet-wasm-js";
 }

nix/chain-libs/packages.nix nix/chain-libs/libraries.nixnix/chain-libs/packages.nix renamed to nix/chain-libs/libraries.nix

@@ -0,0 +1,20 @@
+{
+  inputs,
+  cell,
+}: let
+  inherit (inputs) nixpkgs std;
+  inherit (inputs.cells.lib) lib;
+  l = nixpkgs.lib // builtins;
+
+  name = "jormungandr";
+  mkSimplePkg = subPkg: lib.mkPackage {pkgPath = "${name}/${subPkg}";};
+in {
+  blockchain = mkSimplePkg "modules/blockchain";
+  explorer = mkSimplePkg "explorer";
+  hersir = mkSimplePkg "testing/hersir";
+  jormungandr-lib = mkSimplePkg "jormungandr-lib";
+  loki = mkSimplePkg "testing/loki";
+  mjolnir = mkSimplePkg "testing/mjolnir";
+  settings = mkSimplePkg "modules/settings";
+  thor = mkSimplePkg "testing/thor";
+}

nix/chain-wallet-libs/packages.nix nix/chain-wallet-libs/libraries.nixnix/chain-wallet-libs/packages.nix renamed to nix/chain-wallet-libs/libraries.nix

@@ -3,12 +3,12 @@
   cell,
 }: let
   inherit (inputs) nixpkgs std;
-  inherit (inputs.cells) artifacts;
+  inherit (inputs.cells.artifacts) artifacts;
   inherit (inputs.cells.lib) constants;
   l = nixpkgs.lib // builtins;
 
   mkOperable = package: namespace: let
-    artifacts' = artifacts.packages."artifacts-${namespace}";
+    artifacts' = artifacts."artifacts-${namespace}";
   in
     std.lib.ops.mkOperable {
       inherit package;