[DDW-808] Update cardano-launcher and introduce Cardano Node RTS flags (#2735)

nikolaglumac · Daniel Main · disassembler · web-flow · commit e9623ecc8919 · 2021-11-10T09:16:16.000+01:00
* [DDW-808] Bumps cardano-launcher to the latest version

* [DDW-808] Updated nix channel and nodejs

* use different nixpkgs for nodejs

* use pkgs from iohk-nix for default

* [DDW-808] upgraded cardano-js

* [DDW-808] Upgraded node-sass

* [DDW-808] Added electron-chromedriver to the list of duplicated packages

* [DDW-808] Back to nodejs 14. Upgraded cardano-launcher

* [DDW-808] Using correct node-sass version according to nodejs version

* [DDW-808] Adds RTS flags

* [DDW-808] Updates CHANGELOG

* [DDW-808] Cleanup test switch for RTS flags

Co-authored-by: Daniel Main &lt;daniel.main.cernhoff@icould.com&gt;
Co-authored-by: Samuel Leathers &lt;samuel.leathers@iohk.io&gt;
Co-authored-by: Daniel Main &lt;daniel.main.cernhoff@icloud.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 
 ### Chores
 
+- Updated `cardano-launcher` to version `0.20211105.1` and added Cardano Node RTS flags which improve resource usage ([PR 2734](https://github.com/input-output-hk/daedalus/pull/2734))
 - Updated README with solution steps for the nix SSL issue ([PR 2727](https://github.com/input-output-hk/daedalus/pull/2727))
 - Covered LedgerJS v4.0.0 breaking changes ([PR 2697](https://github.com/input-output-hk/daedalus/pull/2697))
 - Added hardware wallet support for all non-public testnets ([PR 2672](https://github.com/input-output-hk/daedalus/pull/2672))
diff --git a/default.nix b/default.nix
@@ -30,7 +30,8 @@ let
       });
     };
   };
-  pkgs = localLib.iohkNix.getPkgsDefault { inherit system config; };
+  pkgs = localLib.iohkNix.pkgsDefault;
+  pkgsNodeJS = import sources.nixpkgs { inherit system config; };
   pkgsNative = localLib.iohkNix.getPkgsDefault {};
   sources = localLib.sources;
   walletPkgs = import "${sources.cardano-wallet}/nix" {};
@@ -54,8 +55,8 @@ let
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
-    nodejs = pkgs.nodejs-14_x;
-    nodePackages = pkgs.nodePackages.override { nodejs = self.nodejs; };
+    nodejs = pkgsNodeJS.nodejs-14_x;
+    nodePackages = pkgsNodeJS.nodePackages.override { nodejs = self.nodejs; };
     yarnInfo = {
       version = "1.22.4";
       hash = "1l3sv30g61dcn7ls213prcja2y3dqdi5apq9r7yyick295w25npq";
diff --git a/installers/daedalus-installer.nix b/installers/daedalus-installer.nix
@@ -1,7 +1,7 @@
 { mkDerivation, aeson, base, bytestring, containers, directory
 , filepath, foldl, github, Glob, hspec, lens-aeson, managed
 , megaparsec, microlens, network-uri, nsis, optional-args
-, optparse-applicative, optparse-generic, split, stdenv
+, optparse-applicative, optparse-generic, split, lib
 , system-filepath, temporary, text, turtle, universum, raw-strings-qq
 , unordered-containers, wreq, yaml, zip-archive
 }:
@@ -30,5 +30,6 @@ mkDerivation {
     system-filepath temporary text turtle universum yaml
   ];
   description = "Daedalus Installer Builder";
-  license = stdenv.lib.licenses.asl20;
+
+  license = lib.licenses.asl20;
 }
diff --git a/installers/dhall-haskell.nix b/installers/dhall-haskell.nix
@@ -4,7 +4,7 @@
 , fetchgit, filepath, formatting, haskeline, http-client
 , http-client-tls, insert-ordered-containers, lens-family-core
 , memory, mtl, optparse-generic, parsers, prettyprinter
-, prettyprinter-ansi-terminal, repline, scientific, stdenv, tasty
+, prettyprinter-ansi-terminal, repline, scientific, stdenv, tasty, lib
 , tasty-hunit, text, text-format, transformers, trifecta, unordered-containers
 , vector
 }:
@@ -35,5 +35,5 @@ mkDerivation {
     tasty-hunit text vector text-format
   ];
   description = "A configuration language guaranteed to terminate";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/installers/dhall-json.nix b/installers/dhall-json.nix
@@ -1,5 +1,5 @@
 { mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-, fetchgit, optparse-generic, stdenv, text, trifecta
+, fetchgit, optparse-generic, stdenv, text, trifecta, lib
 , unordered-containers, yaml
 }:
 mkDerivation {
@@ -19,5 +19,5 @@ mkDerivation {
     aeson aeson-pretty base bytestring dhall optparse-generic text yaml
   ];
   description = "Compile Dhall to JSON or YAML";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/installers/nix/electron.nix b/installers/nix/electron.nix
@@ -1,4 +1,4 @@
-{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at_spi2_core, libxshmfence,
+{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at_spi2_core, libxshmfence,
   libdrm, libxkbcommon, mesa }:
 
 let
@@ -7,7 +7,7 @@ let
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross platform desktop application shell";
     homepage = https://github.com/electron/electron;
     license = licenses.mit;
@@ -48,15 +48,15 @@ let
 
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at_spi2_core ]}:$out/lib/electron" \
+        --set-rpath "${atomEnv.libPath}:${lib.makeLibraryPath [ libuuid at-spi2-atk at_spi2_core ]}:$out/lib/electron" \
         $out/lib/electron/electron
 
       wrapProgram $out/lib/electron/electron \
-        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
-        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libdrm ]}/libdrm.so.2 \
-        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxkbcommon ]}/libxkbcommon.so.0 \
-        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ mesa ]}/libgbm.so.1 \
-        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxshmfence ]}/libxshmfence.so.1
+        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
+        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdrm ]}/libdrm.so.2 \
+        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libxkbcommon ]}/libxkbcommon.so.0 \
+        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ mesa ]}/libgbm.so.1 \
+        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libxshmfence ]}/libxshmfence.so.1
     '';
   };
 
diff --git a/installers/overlays/dhall-json.nix b/installers/overlays/dhall-json.nix
@@ -1,7 +1,7 @@
 { mkDerivation, aeson, aeson-pretty, ansi-terminal, base
 , bytestring, containers, dhall, exceptions, filepath, libyaml
 , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-, scientific, stdenv, tasty, tasty-hunit, text
+, scientific, stdenv, tasty, tasty-hunit, text, lib
 , unordered-containers, vector, yaml
 }:
 mkDerivation {
@@ -25,5 +25,5 @@ mkDerivation {
     aeson base bytestring dhall tasty tasty-hunit text
   ];
   description = "Convert between Dhall and JSON or YAML";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/installers/overlays/dhall.nix b/installers/overlays/dhall.nix
@@ -5,7 +5,7 @@
 , generic-random, haskeline, http-client, http-client-tls
 , http-types, lens-family-core, megaparsec, memory, mockery, mtl
 , network-uri, optparse-applicative, parsers, prettyprinter
-, prettyprinter-ansi-terminal, profunctors, QuickCheck
+, prettyprinter-ansi-terminal, profunctors, QuickCheck, lib
 , quickcheck-instances, repline, scientific, semigroups, serialise
 , spoon, stdenv, tasty, tasty-expected-failure, tasty-hunit
 , tasty-quickcheck, template-haskell, text, th-lift-instances
@@ -40,5 +40,5 @@ mkDerivation {
     base bytestring containers directory gauge serialise text
   ];
   description = "A configuration language guaranteed to terminate";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/installers/overlays/nsis.nix b/installers/overlays/nsis.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, directory, fetchFromGitHub, process, stdenv
+{ mkDerivation, base, directory, fetchFromGitHub, process, stdenv, lib
 , transformers, uniplate
 }:
 mkDerivation {
@@ -16,5 +16,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/ndmitchell/nsis#readme";
   description = "DSL for producing Windows Installer using NSIS";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/installers/overlays/universum.nix b/installers/overlays/universum.nix
@@ -1,6 +1,6 @@
 { mkDerivation, base, bytestring, containers, deepseq, doctest
 , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
-, microlens-mtl, mtl, safe-exceptions, stdenv, stm, tasty
+, microlens-mtl, mtl, safe-exceptions, stdenv, lib, stm, tasty
 , tasty-hedgehog, text, transformers, unordered-containers
 , utf8-string, vector
 }:
@@ -22,5 +22,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/serokell/universum";
   description = "Custom prelude used in Serokell";
-  license = stdenv.lib.licenses.mit;
+  license = lib.licenses.mit;
 }
diff --git a/nix/darwin-launcher.nix b/nix/darwin-launcher.nix
@@ -12,6 +12,7 @@ let
     passthru = { inherit test; };
   } ''
     export HOME=$NIX_BUILD_TOP
+    go env -w GO111MODULE=off
     mkdir -p $out/bin
     cp ${./darwin-launcher.go} darwin-launcher.go
     CGO_ENABLED=0 go build -a -o $out/bin/darwin-launcher
diff --git a/nix/nsis-inner.nix b/nix/nsis-inner.nix
@@ -42,7 +42,7 @@ in stdenv.mkDerivation {
     scons install "${sconsArgs}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     descripition = "System to create Windows installers";
     homepage = "https://nsis.sourceforge.io/";
   };
diff --git a/nix/sources.json b/nix/sources.json
@@ -107,6 +107,18 @@
         "url": "https://github.com/input-output-hk/nix-bundle/archive/acf3b142c1fa332d4f9050e7cdfb3c3f8091e78b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "nixpkgs": {
+        "branch": "nixos-unstable",
+        "description": "Nix Packages collection",
+        "homepage": "",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b67e752c29f18a0ca5534a07661366d6a2c2e649",
+        "sha256": "1n47f7r8cm9pcsz7vl4nxjfvs0fgzvcmjda5h0inz3yx9vghp5xm",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/b67e752c29f18a0ca5534a07661366d6a2c2e649.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "nixpkgs-nsis": {
         "branch": "nsis",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
diff --git a/nix/sources.nix b/nix/sources.nix
@@ -6,25 +6,33 @@ let
   # The fetchers. fetch_<type> fetches specs of type <type>.
   #
 
-  fetch_file = pkgs: spec:
-    if spec.builtin or true then
-      builtins_fetchurl { inherit (spec) url sha256; }
-    else
-      pkgs.fetchurl { inherit (spec) url sha256; };
+  fetch_file = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+      if spec.builtin or true then
+        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+      else
+        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
 
   fetch_tarball = pkgs: name: spec:
     let
-      ok = str: ! builtins.isNull (builtins.match "[a-zA-Z0-9+-._?=]" str);
-      # sanitize the name, though nix will still fail if name starts with period
-      name' = stringAsChars (x: if ! ok x then "-" else x) "${name}-src";
+      name' = sanitizeName name + "-src";
     in
       if spec.builtin or true then
         builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
       else
         pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
 
-  fetch_git = spec:
-    builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
+  fetch_git = name: spec:
+    let
+      ref =
+        if spec ? ref then spec.ref else
+          if spec ? branch then "refs/heads/${spec.branch}" else
+            if spec ? tag then "refs/tags/${spec.tag}" else
+              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+    in
+      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
 
   fetch_local = spec: spec.path;
 
@@ -40,11 +48,21 @@ let
   # Various helpers
   #
 
+  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
+  sanitizeName = name:
+    (
+      concatMapStrings (s: if builtins.isList s then "-" else s)
+        (
+          builtins.split "[^[:alnum:]+._?=-]+"
+            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
+        )
+    );
+
   # The set of packages used when specs are fetched using non-builtins.
-  mkPkgs = sources:
+  mkPkgs = sources: system:
     let
       sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
       hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
       hasThisAsNixpkgsPath = <nixpkgs> == ./.;
     in
@@ -64,15 +82,27 @@ let
 
     if ! builtins.hasAttr "type" spec then
       abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs spec
+    else if spec.type == "file" then fetch_file pkgs name spec
     else if spec.type == "tarball" then fetch_tarball pkgs name spec
-    else if spec.type == "git" then fetch_git spec
+    else if spec.type == "git" then fetch_git name spec
     else if spec.type == "local" then fetch_local spec
     else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
     else if spec.type == "builtin-url" then fetch_builtin-url name
     else
       abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
 
+  # If the environment variable NIV_OVERRIDE_${name} is set, then use
+  # the path directly as opposed to the fetched source.
+  replace = name: drv:
+    let
+      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
+      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
+    in
+      if ersatz == "" then drv else
+        # this turns the string into an actual Nix path (for both absolute and
+        # relative paths)
+        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
+
   # Ports of functions for older nix versions
 
   # a Nix version of mapAttrs if the built-in doesn't exist
@@ -89,25 +119,29 @@ let
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
   stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
+  concatMapStrings = f: list: concatStrings (map f list);
   concatStrings = builtins.concatStringsSep "";
 
+  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
+  optionalAttrs = cond: as: if cond then as else {};
+
   # fetchTarball version that is compatible between all the versions of Nix
-  builtins_fetchTarball = { url, name, sha256 }@attrs:
+  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
     let
       inherit (builtins) lessThan nixVersion fetchTarball;
     in
       if lessThan nixVersion "1.12" then
-        fetchTarball { inherit name url; }
+        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
       else
         fetchTarball attrs;
 
   # fetchurl version that is compatible between all the versions of Nix
-  builtins_fetchurl = { url, sha256 }@attrs:
+  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
     let
       inherit (builtins) lessThan nixVersion fetchurl;
     in
       if lessThan nixVersion "1.12" then
-        fetchurl { inherit url; }
+        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
       else
         fetchurl attrs;
 
@@ -119,20 +153,22 @@ let
         then abort
           "The values in sources.json should not have an 'outPath' attribute"
         else
-          spec // { outPath = fetch config.pkgs name spec; }
+          spec // { outPath = replace name (fetch config.pkgs name spec); }
     ) config.sources;
 
   # The "config" used by the fetchers
   mkConfig =
-    { sourcesFile ? ./sources.json
-    , sources ? builtins.fromJSON (builtins.readFile sourcesFile)
-    , pkgs ? mkPkgs sources
+    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
+    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
+    , system ? builtins.currentSystem
+    , pkgs ? mkPkgs sources system
     }: rec {
       # The sources, i.e. the attribute set of spec name to spec
       inherit sources;
 
       # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
       inherit pkgs;
     };
+
 in
 mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
diff --git a/package.json b/package.json
@@ -179,8 +179,8 @@
     "borc": "2.1.2",
     "bs58": "4.0.1",
     "cardano-crypto.js": "5.3.6-rc.6",
-    "cardano-js": "0.4.7",
-    "cardano-launcher": "0.20210215.0",
+    "cardano-js": "0.4.8",
+    "cardano-launcher": "0.20211105.1",
     "cbor": "5.0.2",
     "check-disk-space": "2.1.0",
     "chroma-js": "2.1.0",
diff --git a/source/main/cardano/CardanoWalletLauncher.js b/source/main/cardano/CardanoWalletLauncher.js
@@ -138,6 +138,15 @@ export async function CardanoWalletLauncher(
       logger.info('Launching Wallet with --token-metadata-server flag', {
         tokenMetadataServer,
       });
+
+      // RTS flags:
+      // 1) "-H4G -M6553M -c70"  16.0% peak RSS reduction and a sub-percentile CPU regression
+      // 2) "-H4G -M6553M"       18.5% peak RSS reduction and a second-best CPU regression
+      nodeConfig.rtsOpts = ['-H4G', '-M6553M', '-c70'];
+      logger.info('Launching Cardano Node with RTS flags', {
+        rtsFlags: nodeConfig.rtsOpts,
+      });
+
       merge(launcherConfig, {
         nodeConfig,
         tlsConfiguration,
diff --git a/source/main/config.js b/source/main/config.js
diff --git a/yarn.lock b/yarn.lock
diff --git a/yarn2nix.nix b/yarn2nix.nix
