Merge pull request #3200 from input-output-hk/merge-5-4-0-to-main

Merge release 5.4.0 to main

Author: michalrus

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 5.4.0
+
+### Fixes
+
+- Fixed logs download ([PR 3197](https://github.com/input-output-hk/daedalus/pull/3197))
+- Fixed hardware wallets transaction logic ([PR 3195](https://github.com/input-output-hk/daedalus/pull/3195))
+- Make Windows installer check if previous Daedalus is running ([PR 3141](https://github.com/input-output-hk/daedalus/pull/3141))
+- Fixed out-of-memory errors on https://ci.iog.io ([PR 3145](https://github.com/input-output-hk/daedalus/pull/3145))
+
+### Chores
+
+- Updated cardano-node to 8.9.2 (via cardano-wallet) ([PR 3176](https://github.com/input-output-hk/daedalus/pull/3176))
+- Updated cardano-node to 8.9.1 (via cardano-wallet) ([PR 3152](https://github.com/input-output-hk/daedalus/pull/3152))
+
 ## 5.3.1
 
 ### Fixes

flake.lock

@@ -3,10 +3,10 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
-    cardano-wallet-unpatched.url = "github:input-output-hk/cardano-wallet/v2023-04-14";
+    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-05-05";
     cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
-    cardano-world.url = "github:input-output-hk/cardano-world/a0a315100ee320395be97fcc83f46678d5a7fb6e";
-    cardano-world.flake = false; # otherwise, +19k quadratic dependencies in flake.lock…
+    cardano-playground.url = "github:input-output-hk/cardano-playground";
+    cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
     cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";
     cardano-shell.flake = false;
     tullia.url = "github:input-output-hk/tullia";
@@ -25,12 +25,8 @@
       import ./nix/packages.nix { inherit inputs buildSystem; }
     );
 
-    devShells = lib.genAttrs supportedSystems (
-      system: let
-        all = lib.genAttrs inputs.self.internal.installerClusters (
-          cluster: import ./nix/internal/old-shell.nix { inherit inputs system cluster; }
-        );
-      in all // { default = all.mainnet; }
+    devShells = lib.genAttrs supportedSystems (targetSystem:
+      import ./nix/devshells.nix { inherit inputs targetSystem; }
     );
 
     # Compatibility with older Nix:
@@ -39,11 +35,11 @@
 
     hydraJobs = {
       installer = lib.genAttrs (supportedSystems ++ ["x86_64-windows"]) (
-        targetSystem: lib.genAttrs inputs.self.internal.installerClusters (
-          cluster: inputs.self.internal.${targetSystem}.${cluster}.unsignedInstaller
-        )
+        targetSystem: inputs.self.internal.${targetSystem}.unsignedInstaller
       );
       devshell = lib.genAttrs supportedSystems (system: inputs.self.devShells.${system}.default);
+      # Exposing these DLLs for easier development/debugging on Windows:
+      nativeModules.x86_64-windows = inputs.self.internal.x86_64-windows.nativeModulesZip;
       required = inputs.nixpkgs.legacyPackages.x86_64-linux.releaseTools.aggregate {
         name = "github-required";
         meta.description = "All jobs required to pass CI";

flake.nix

@@ -365,16 +365,15 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       forM_ ["config.yaml", "genesis.json", "topology.yaml" ] $ \f ->
         cp f (dataDir </> f)
       when (oCluster /= Selfnode) $ do
-        forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json" ] $ \f ->
+        forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json", "genesis-conway.json" ] $ \f ->
           cp f (dataDir </> f)
 
       when (oCluster == Selfnode) $ do
         cp "signing.key" (dataDir </> "signing.key")
         cp "delegation.cert" (dataDir </> "delegation.cert")
         cp (bridge </> "bin" </> "mock-token-metadata-server") (dir </> "mock-token-metadata-server")
         cp (bridge </> "bin" </> "token-metadata.json") (dataDir </> "token-metadata.json")
-        cp (bridge </> "bin" </> "local-cluster--unwrapped") (dir </> "local-cluster")
-        cptreeL (bridge </> "bin" </> "test" </> "data") (dataDir </> "data")
+        cp (bridge </> "bin" </> "local-cluster") (dir </> "local-cluster")
 
       procs "chmod" ["-R", "+w", tt dir] empty
 

installers/common/MacInstaller.hs

@@ -201,7 +201,7 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                         Development.NSIS.& ")..."
                         )
                     lockfileDeleted @= true
-                    onError (delete [] (str $ "$APPDATA\\$InstallDir\\" ++ T.unpack uglyName ++ "_lockfile")) $ do
+                    onError (delete [] (fromString $ "$APPDATA\\$InstallDir\\" ++ T.unpack uglyName ++ "_lockfile")) $ do
                         lockfileDeleted @= false
                     iff_ (not_ lockfileDeleted) $ do
                         sleep 1000 -- milliseconds
@@ -225,12 +225,12 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                     file [] "topology.yaml"
                     file [] "genesis.json"
                     when (clusterName /= Selfnode) $ do
+                      file [] "genesis-conway.json"
                       file [] "genesis-byron.json"
                       file [] "genesis-shelley.json"
                       file [] "genesis-alonzo.json"
                     file [] "libsodium-23.dll"
-                    file [] "libsecp256k1-1.dll"
-                    file [] "libsecp256k1-0.dll"
+                    file [] "libsecp256k1-2.dll"
                     file [] "libssl-3-x64.dll"
                     file [] "libcrypto-3-x64.dll"
                     when (clusterName == Selfnode) $ do
@@ -240,14 +240,14 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                       file [] "libgmpxx-4.dll"
                       file [] "libwinpthread-1.dll"
                       file [] "mock-token-metadata-server.exe"
-                      file [Recursive] "test\\"
                       file [] "token-metadata.json"
                 file [] "cardano-launcher.exe"
                 file [] "libffi-8.dll"
                 file [] "libgmp-10.dll"
                 file [] "libstdc++-6.dll"
                 file [] "mcfgthread-12.dll"
                 file [] "libgcc_s_seh-1.dll"
+                file [] "zlib1.dll"
                 --file [] "cardano-x509-certificates.exe"
                 --file [] "log-config-prod.yaml"
                 --file [] "wallet-topology.yaml"

installers/common/WindowsInstaller.hs

@@ -1,49 +1,42 @@
-{ system
-, inputs
-, cluster ? "selfnode"
+{ inputs
+, targetSystem
 }:
 
 let
-  internal = inputs.self.internal.${system}.${cluster};
-  pkgs = internal.newCommon.pkgs;
-
-  daedalusPkgs = import ./old-default.nix {
-    inherit inputs cluster;
-    target = system;
-    devShell = true;
-  };
-
-  regenerateDevCerts = let
-    moddedConfig = pkgs.writeText "launcher-config.yaml" (builtins.toJSON (
-      daedalusPkgs.launcherConfigs.launcherConfig
-      // {
-        daedalusBin = "true";
-      }
-    ));
-  in
-    pkgs.writeShellScriptBin "regenerate-dev-certs" ''
-      ${daedalusPkgs.daedalus-bridge}/bin/cardano-launcher --config ${moddedConfig}
-    '';
-
-  gcRoot = pkgs.runCommandLocal "gc-root" {
-    inherit daedalusShell;
-    cardanoWalletsHaskellNix = daedalusPkgs.walletFlake.outputs.legacyPackages.${system}.roots;
-    daedalusInstallerInputs = with daedalusPkgs.daedalus-installer; buildInputs ++ nativeBuildInputs;
-    # cardano-bridge inputs are GC’d, and rebuilt too often on Apple M1 CI:
-    cardanoBridgeInputs = builtins.map (attr: if daedalusPkgs ? ${attr} && pkgs.lib.isDerivation daedalusPkgs.${attr} then daedalusPkgs.${attr} else null) (builtins.attrNames (builtins.functionArgs (import ./cardano-bridge.nix)));
-  } "export >$out";
-
-  daedalusShell = pkgs.stdenv.mkDerivation (rec {
+  internal = inputs.self.internal.${targetSystem};
+  inherit (internal) common;
+  inherit (common) pkgs;
+
+  devShells = pkgs.lib.genAttrs inputs.self.internal.installerClusters (cluster: let
+
+    launcherConfigs = common.mkLauncherConfigs {
+      inherit cluster;
+      devShell = true;
+    };
+
+    regenerateDevCerts = let
+      moddedConfig = pkgs.writeText "launcher-config.yaml" (builtins.toJSON (
+        launcherConfigs.launcherConfig
+        // {
+          daedalusBin = "true";
+        }
+      ));
+    in
+      pkgs.writeShellScriptBin "regenerate-dev-certs" ''
+        ${common.daedalus-bridge.${cluster}}/bin/cardano-launcher --config ${moddedConfig}
+      '';
+
+  in pkgs.stdenv.mkDerivation (rec {
     buildInputs = [
-      internal.newCommon.nodejs
-      internal.newCommon.yarn
-      daedalusPkgs.daedalus-bridge
-      daedalusPkgs.daedalus-installer
-      daedalusPkgs.mock-token-metadata-server
+      internal.common.nodejs
+      internal.common.yarn
+      common.daedalus-bridge.${cluster}
+      common.daedalus-installer
+      common.mock-token-metadata-server
       regenerateDevCerts
     ] ++ (with pkgs; [
       nix bash binutils coreutils curl gnutar
-      git python27 curl jq
+      git python3 curl jq
       nodePackages.node-gyp nodePackages.node-pre-gyp
       gnumake
       pkgconfig
@@ -59,13 +52,13 @@ let
       winePackages.minimal
     ]));
     name = "daedalus";
-    buildCommand = "touch $out";
+    buildCommand = "export >$out";
     LAUNCHER_CONFIG = DAEDALUS_CONFIG + "/launcher-config.yaml";
-    CARDANO_NODE_VERSION = daedalusPkgs.cardanoNodeVersion;
-    CARDANO_WALLET_VERSION = daedalusPkgs.cardanoWalletVersion;
+    CARDANO_NODE_VERSION = common.cardanoNodeVersion;
+    CARDANO_WALLET_VERSION = common.cardanoWalletVersion;
     DAEDALUS_CONFIG = pkgs.runCommand "daedalus-config" {} ''
       mkdir -pv $out
-      cp ${pkgs.writeText "launcher-config.yaml" (builtins.toJSON daedalusPkgs.launcherConfigs.launcherConfig)} $out/launcher-config.yaml
+      cp ${pkgs.writeText "launcher-config.yaml" (builtins.toJSON launcherConfigs.launcherConfig)} $out/launcher-config.yaml
     '';
     DAEDALUS_INSTALL_DIRECTORY = "./";
     DAEDALUS_DIR = DAEDALUS_INSTALL_DIRECTORY;
@@ -89,7 +82,7 @@ let
       source <(cardano-address --bash-completion-script cardano-address)
       [[ $(type -P cardano-wallet) ]] && source <(cardano-wallet --bash-completion-script cardano-wallet)
 
-      cp -f ${daedalusPkgs.launcherConfigs.installerConfig.iconPath.small} $DAEDALUS_INSTALL_DIRECTORY/icon.png
+      cp -f ${launcherConfigs.installerConfig.iconPath.small} $DAEDALUS_INSTALL_DIRECTORY/icon.png
 
       # These links will only occur to binaries that exist for the
       # specific build config
@@ -99,7 +92,7 @@ let
 
       source <(cardano-node --bash-completion-script `type -p cardano-node`)
 
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${internal.newCommon.nodejs}/include/node -I${toString ../../.}/node_modules/node-addon-api"
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${internal.common.nodejs}/include/node -I${toString ../../.}/node_modules/node-addon-api"
       yarn install
 
       # Rebuild native modules for <https://www.electronjs.org/docs/latest/tutorial/using-native-node-modules>:
@@ -123,14 +116,17 @@ let
 
       echo 'Resolving environment variables to absolute paths…'
       # XXX: they originally contain references to HOME or XDG_DATA_HOME in launcher-config.yaml:
-      export CARDANO_WALLET_TLS_PATH="${daedalusPkgs.launcherConfigs.launcherConfig.tlsPath}"
+      export CARDANO_WALLET_TLS_PATH="${launcherConfigs.launcherConfig.tlsPath}"
 
       echo 'Re-generating dev certificates for ‘cardano-wallet’…'
       mkdir -p "$CARDANO_WALLET_TLS_PATH"
       regenerate-dev-certs >/dev/null
 
+      ${common.temporaryNodeModulesPatches}
+
       echo
       echo 'Now, run ‘yarn dev’.'
     '';
-  });
-in daedalusShell // { inherit gcRoot; }
+  }));
+
+in devShells // { default = devShells.mainnet; }

nix/internal/old-shell.nix renamed to nix/devshells.nix

@@ -5,9 +5,7 @@ let
   inherit (import ./internal/source-lib.nix { inherit inputs; }) installerClusters;
 in
 
-(__mapAttrs (targetSystem: src: lib.genAttrs installerClusters (cluster: import src {
-  inherit inputs targetSystem cluster;
-})) {
+(__mapAttrs (targetSystem: src: import src { inherit inputs targetSystem; }) {
   x86_64-linux = ./internal/x86_64-linux.nix;
   x86_64-windows = ./internal/x86_64-windows.nix;
   x86_64-darwin = ./internal/any-darwin.nix;