Merge branch 'develop' into feature/jest-unit-tests

Author: DominikGuzei

CHANGELOG.md

@@ -2,31 +2,39 @@
 
 ## vNext
 
-## Chores
+### Chores
 
 - Added jest library for unit testing ([PR 2633](https://github.com/input-output-hk/daedalus/pull/2633))
+- Updated `cardano-launcher` to version `0.20211105.1` and added Cardano Node RTS flags which improve resource usage ([PR 2735](https://github.com/input-output-hk/daedalus/pull/2735), [PR 2741](https://github.com/input-output-hk/daedalus/pull/2741))
+
+## 4.5.1
+
+### Fixes
+
+- Fixed cardano-node startup race condition
+- Fixed automatic closing of the wallet "Restoration" dialog during restoration of a first wallet in UI
+- Fixed Daedalus 4.5.0 Windows deployment issue
 
 ## 4.5.0
 
 ### Features
 
 - Implemented "Catalyst Fund7" voting registration changes ([PR 2732](https://github.com/input-output-hk/daedalus/pull/2732))
-- Added Over-saturation warning in delegation wizard ([PR 2733](https://github.com/input-output-hk/daedalus/pull/2733))
+- Added "Over-saturation" warning in the delegation wizard ([PR 2733](https://github.com/input-output-hk/daedalus/pull/2733), [PR 2738](https://github.com/input-output-hk/daedalus/pull/2738))
 - Added Catalyst footer links ([PR 2721](https://github.com/input-output-hk/daedalus/pull/2721))
-- Fixed the Delegation popover timeout ([PR 2722](https://github.com/input-output-hk/daedalus/pull/2722))
-- Removed "Alonzo tada" icon and "Alonzo countdown" screen ([PR 2708](https://github.com/input-output-hk/daedalus/pull/2708))
 
 ### Fixes
 
+- Fixed the Delegation popover timeout ([PR 2722](https://github.com/input-output-hk/daedalus/pull/2722))
 - Fixed issues relating to minimum window size in Daedalus ([PR 2719](https://github.com/input-output-hk/daedalus/pull/2719))
 - Updated "Trezor T" image shown on the "Pair a hardware wallet device" dialog ([PR 2712](https://github.com/input-output-hk/daedalus/pull/2712))
 - Fixed transaction timestamps localization ([PR 2702](https://github.com/input-output-hk/daedalus/pull/2702))
-- Small UI/UX Fixes ([PR 2685](https://github.com/input-output-hk/daedalus/pull/2685))
+- Small UI/UX Fixes ([PR 2685](https://github.com/input-output-hk/daedalus/pull/2685), [PR 2745](https://github.com/input-output-hk/daedalus/pull/2745))
 
 ### Chores
 
-- Improves the Daedalus startup by avoiding unnecessary cardano-node restarts ([PR 2716](https://github.com/input-output-hk/daedalus/pull/2716))
-- 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))
+- Removed "Alonzo tada" icon and "Alonzo countdown" screen ([PR 2708](https://github.com/input-output-hk/daedalus/pull/2708))
+- Improved the Daedalus startup by avoiding unnecessary Cardano Node restarts ([PR 2716](https://github.com/input-output-hk/daedalus/pull/2716))
 - 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))

default.nix

@@ -30,8 +30,7 @@ let
       });
     };
   };
-  pkgs = localLib.iohkNix.pkgsDefault;
-  pkgsNodeJS = import sources.nixpkgs { inherit system config; };
+  pkgs = import sources.nixpkgs { inherit system config; };
   pkgsNative = localLib.iohkNix.getPkgsDefault {};
   sources = localLib.sources;
   walletPkgs = import "${sources.cardano-wallet}/nix" {};
@@ -52,11 +51,12 @@ let
   ostable.x86_64-darwin = "macos64";
   packages = self: {
     inherit cluster pkgs version target nodeImplementation;
+    inherit (pkgs) hello cabal2nix;
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
-    nodejs = pkgsNodeJS.nodejs-14_x;
-    nodePackages = pkgsNodeJS.nodePackages.override { nodejs = self.nodejs; };
+    nodejs = pkgs.nodejs-14_x;
+    nodePackages = pkgs.nodePackages.override { nodejs = self.nodejs; };
     yarnInfo = {
       version = "1.22.4";
       hash = "1l3sv30g61dcn7ls213prcja2y3dqdi5apq9r7yyick295w25npq";
@@ -314,7 +314,7 @@ let
     };
     rawapp-win64 = self.rawapp.override { win64 = true; };
     source = builtins.filterSource localLib.cleanSourceFilter ./.;
-    yaml2json = pkgs.haskell.lib.disableCabalFlag pkgs.haskellPackages.yaml "no-exe";
+    yaml2json = pkgs.haskell.lib.addExtraLibrary (pkgs.haskell.lib.disableCabalFlag pkgs.haskellPackages.yaml "no-exe") pkgs.haskellPackages.optparse-applicative;
 
     electron = pkgs.callPackage ./installers/nix/electron.nix {};
 

installers/nix/electron.nix

@@ -1,5 +1,5 @@
-{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at_spi2_core, libxshmfence,
-  libdrm, libxkbcommon, mesa }:
+{ stdenv, lib, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at_spi2_core, libxshmfence,
+  libxkbcommon }:
 
 let
   version = "13.1.1";
@@ -48,15 +48,8 @@ let
 
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${atomEnv.libPath}:${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 libxshmfence libxkbcommon ]}:$out/lib/electron" \
         $out/lib/electron/electron
-
-      wrapProgram $out/lib/electron/electron \
-        --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
     '';
   };
 

installers/overlays/required.nix

@@ -8,5 +8,5 @@ self: super: {
   dhall = dontCheck (doJailbreak (self.callPackage ./dhall.nix {}));
   universum = dontCheck (self.callPackage ./universum.nix {});
   nsis = self.callPackage ./nsis.nix {};
-  github = self.callHackage "github" "0.26" {};
+  github = self.callHackage "github" "0.27" {};
 }

nix/sources.json

@@ -101,10 +101,10 @@
         "homepage": "",
         "owner": "input-output-hk",
         "repo": "nix-bundle",
-        "rev": "acf3b142c1fa332d4f9050e7cdfb3c3f8091e78b",
-        "sha256": "0pcc8bh1x3shr6k2h8zw05n0apm5ppx6nk07xp89ljldah4mmc6c",
+        "rev": "a43e9280628d6e7fcc2f89257106f5262d531bc7",
+        "sha256": "10qgincrs8fjdl16mld6lzd69syhyzwx65lcbz4widnkdvhlwh3i",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/nix-bundle/archive/acf3b142c1fa332d4f9050e7cdfb3c3f8091e78b.tar.gz",
+        "url": "https://github.com/input-output-hk/nix-bundle/archive/a43e9280628d6e7fcc2f89257106f5262d531bc7.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.4.1",
+  "version": "4.5.1",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

shell.nix

@@ -2,7 +2,7 @@
 , config ? {}
 , nodeImplementation ? "cardano"
 , localLib ? import ./lib.nix { inherit nodeImplementation; }
-, pkgs ? localLib.iohkNix.getPkgs { inherit system config; }
+, pkgs ? import (import ./nix/sources.nix).nixpkgs { inherit system config; }
 , cluster ? "selfnode"
 , systemStart ? null
 , autoStartBackend ? systemStart != null

source/main/cardano/CardanoNode.js

@@ -794,7 +794,7 @@ export class CardanoNode {
    * @private
    */
   _canBeStarted = async (): Promise<boolean> => {
-    if (this._isConnected()) {
+    if (this._isConnected() || this.state === CardanoNodeStates.STARTING) {
       return false;
     }
     try {

source/renderer/app/components/staking/delegation-setup-wizard/DelegationSetupWizardDialog.js

@@ -43,6 +43,7 @@ type Props = {
   getStakePoolById: Function,
   hwDeviceStatus: HwDeviceStatus,
   isTrezor: boolean,
+  onThumbPoolSelect: Function,
 };
 
 const getOversaturationPercentage = (
@@ -108,6 +109,7 @@ export default class DelegationSetupWizardDialog extends Component<Props> {
       hwDeviceStatus,
       isTrezor,
       maxDelegationFunds,
+      onThumbPoolSelect,
     } = this.props;
 
     const selectedWalletId = get(selectedWallet, 'id', null);
@@ -156,9 +158,10 @@ export default class DelegationSetupWizardDialog extends Component<Props> {
             selectedPool={selectedPool}
             onClose={onClose}
             onBack={onBack}
-            onSelectPool={onSelectPool}
-            onContinue={onContinue}
+            onSelectPool={onThumbPoolSelect}
+            onContinue={onSelectPool}
             oversaturationPercentage={oversaturationPercentage}
+            onThumbPoolSelect={onThumbPoolSelect}
           />
         );
         break;

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseStakePoolDialog.js

@@ -50,6 +50,7 @@ type Props = {
   intl: intlShape.isRequired,
   onContinue: Function,
   oversaturationPercentage: number,
+  onThumbPoolSelect: Function,
 };
 
 type FooterProps = {
@@ -90,22 +91,25 @@ const DelegationStepsChooseStakePoolDialog = observer((props: Props) => {
     setSearchValue('');
   });
 
-  const handleSelect = useCallback((value: string) => {
-    const _selectedPool = find(
-      stakePoolsList,
-      (stakePool) => stakePool.id === value
-    );
-    setSelectedPool(_selectedPool);
-    props.onSelectPool(_selectedPool.id);
-  });
+  const handleSelect = useCallback(
+    (value: string) => {
+      const _selectedPool = find(
+        stakePoolsList,
+        (stakePool) => stakePool.id === value
+      );
+      setSelectedPool(_selectedPool);
+      props.onThumbPoolSelect(_selectedPool.id);
+    },
+    [props.onThumbPoolSelect, stakePoolsList]
+  );
 
   useEffect(() => {
     if (preselectedPool && preselectedPool.id) handleSelect(preselectedPool.id);
   }, [preselectedPool]);
 
   const onContinue = useCallback(() => {
-    props.onContinue();
-  }, [props.onContinue]);
+    props.onContinue(selectedPool);
+  }, [props.onContinue, selectedPool]);
 
   const {
     name: selectedWalletName,