Merge pull request #2753 from input-output-hk/release-with-develop

nikolaglumac · web-flow · commit 66427855ff4e · 2021-11-22T12:13:34.000+01:00
Merge release/4.5.0 and release/4.5.1 into develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,25 +2,38 @@
 
 ## vNext
 
+### Chores
+
+- 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))
diff --git a/default.nix b/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 {};
 
diff --git a/installers/nix/electron.nix b/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
     '';
   };
 
diff --git a/installers/overlays/required.nix b/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" {};
 }
diff --git a/nix/sources.json b/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": {
diff --git a/package.json b/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": {
diff --git a/shell.nix b/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
diff --git a/source/main/cardano/CardanoNode.js b/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 {
diff --git a/source/renderer/app/components/staking/delegation-setup-wizard/DelegationSetupWizardDialog.js b/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;
diff --git a/source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseStakePoolDialog.js b/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,
diff --git a/source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js b/source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js
@@ -12,6 +12,7 @@ import {
 } from '../../../config/stakingConfig';
 import type { DelegationCalculateFeeResponse } from '../../../api/staking/types';
 import type { InjectedDialogContainerProps } from '../../../types/injectedPropsType';
+import StakePool from '../../../domains/StakePool';
 
 const messages = defineMessages({
   learnMoreLinkUrl: {
@@ -155,11 +156,15 @@ export default class DelegationSetupWizardDialogContainer extends Component<
     this.handleContinue();
   };
 
-  handleSelectPool = (poolId: string) => {
-    this._handleCalculateTransactionFee(poolId);
+  handleChoosePool = (poolId: string) => {
     this.setState({ selectedPoolId: poolId });
   };
 
+  handleSelectPool = (pool: StakePool) => {
+    this._handleCalculateTransactionFee(pool.id);
+    this.handleContinue();
+  };
+
   render() {
     const {
       activeStep,
@@ -230,6 +235,7 @@ export default class DelegationSetupWizardDialogContainer extends Component<
         onContinue={this.handleContinue}
         onSelectWallet={this.handleSelectWallet}
         onSelectPool={this.handleSelectPool}
+        onThumbPoolSelect={this.handleChoosePool}
         onBack={this.onBack}
         onLearnMoreClick={this.handleLearnMoreClick}
         onConfirm={this.handleConfirm}
diff --git a/source/renderer/app/containers/wallet/dialogs/wallet-restore/StepConfigurationContainer.js b/source/renderer/app/containers/wallet/dialogs/wallet-restore/StepConfigurationContainer.js
@@ -15,7 +15,6 @@ export default class ConfigurationDialogContainer extends Component<Props> {
 
   handleContinue = () => {
     this.props.actions.wallets.restoreWallet.trigger();
-    this.props.actions.wallets.restoreWalletEnd.trigger();
   };
 
   handleChange = (param: string, field: Object) =>
@@ -28,14 +27,19 @@ export default class ConfigurationDialogContainer extends Component<Props> {
     const { onClose, onBack, stores } = this.props;
     const { wallets, profile } = stores;
     const { currentLocale } = profile;
-    const { error, isExecuting } = wallets.restoreRequest;
-    const { walletName, spendingPassword, repeatPassword } = wallets;
+    const { error } = wallets.restoreRequest;
+    const {
+      walletName,
+      spendingPassword,
+      repeatPassword,
+      isRestoring,
+    } = wallets;
     const {
       error: certificateError,
     } = stores.wallets.getWalletRecoveryPhraseFromCertificateRequest;
     return (
       <ConfigurationDialog
-        isSubmitting={isExecuting}
+        isSubmitting={isRestoring}
         onClose={onClose}
         onContinue={this.handleContinue}
         onChange={this.handleChange}
diff --git a/source/renderer/app/containers/wallet/dialogs/wallet-restore/StepSuccessContainer.js b/source/renderer/app/containers/wallet/dialogs/wallet-restore/StepSuccessContainer.js
@@ -16,10 +16,10 @@ export default class SuccessDialogContainer extends Component<Props> {
   render() {
     const { stores, actions } = this.props;
     const { walletKindDaedalus, walletKindYoroi } = stores.wallets;
-    const { restoreWalletClose } = actions.wallets;
+    const { restoreWalletEnd } = actions.wallets;
     return (
       <SuccessDialog
-        onClose={() => restoreWalletClose.trigger()}
+        onClose={() => restoreWalletEnd.trigger()}
         walletKindDaedalus={walletKindDaedalus}
         walletKindYoroi={walletKindYoroi}
       />
diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json
@@ -17105,55 +17105,55 @@
         "description": "\"Learn more\" link URL on the delegation setup \"intro\" dialog.",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js",
         "id": "staking.delegationSetup.intro.step.dialog.learnMore.url",
         "start": {
           "column": 20,
-          "line": 17
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Wallet",
         "description": "Step 1 label text on delegation steps dialog.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 28
         },
         "file": "source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js",
         "id": "staking.delegationSetup.steps.step.1.label",
         "start": {
           "column": 29,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Stake pool",
         "description": "Step 2 label text on delegation steps dialog.",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 33
         },
         "file": "source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js",
         "id": "staking.delegationSetup.steps.step.2.label",
         "start": {
           "column": 29,
-          "line": 28
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Confirmation",
         "description": "Step 3 label text on delegation steps dialog.",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 38
         },
         "file": "source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js",
         "id": "staking.delegationSetup.steps.step.3.label",
         "start": {
           "column": 29,
-          "line": 33
+          "line": 34
         }
       }
     ],
diff --git a/source/renderer/app/stores/NetworkStatusStore.js b/source/renderer/app/stores/NetworkStatusStore.js
@@ -172,7 +172,6 @@ export default class NetworkStatusStore extends Store {
 
     // Setup disk space checks
     getDiskSpaceStatusChannel.onReceive(this._onCheckDiskSpace);
-    this._checkDiskSpace();
 
     this._getStateDirectoryPath();
 
diff --git a/source/renderer/app/stores/StakingStore.js b/source/renderer/app/stores/StakingStore.js
@@ -291,6 +291,7 @@ export default class StakingStore extends Store {
       if (isHardwareWallet) {
         joinTransaction = await this.stores.hardwareWallets._sendMoney({
           isDelegationTransaction: true,
+          selectedWalletId: walletId,
         });
       } else {
         joinTransaction = await this.joinStakePoolRequest.execute({
@@ -327,6 +328,7 @@ export default class StakingStore extends Store {
       if (isHardwareWallet) {
         quitTransaction = await this.stores.hardwareWallets._sendMoney({
           isDelegationTransaction: true,
+          selectedWalletId: walletId,
         });
       } else {
         quitTransaction = await this.quitStakePoolRequest.execute({
diff --git a/source/renderer/app/stores/WalletsStore.js b/source/renderer/app/stores/WalletsStore.js

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ self: super: {`
`8`	`8`	`dhall = dontCheck (doJailbreak (self.callPackage ./dhall.nix {}));`
`9`	`9`	`universum = dontCheck (self.callPackage ./universum.nix {});`
`10`	`10`	`nsis = self.callPackage ./nsis.nix {};`
`11`		`- github = self.callHackage "github" "0.26" {};`
	`11`	`+ github = self.callHackage "github" "0.27" {};`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "daedalus",`
`3`	`3`	`"productName": "Daedalus",`
`4`		`- "version": "4.4.1",`
	`4`	`+ "version": "4.5.1",`
`5`	`5`	`"description": "Cryptocurrency Wallet",`
`6`	`6`	`"main": "./dist/main/index.js",`
`7`	`7`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -794,7 +794,7 @@ export class CardanoNode {`
`794`	`794`	`* @private`
`795`	`795`	`*/`
`796`	`796`	`_canBeStarted = async (): Promise<boolean> => {`
`797`		`- if (this._isConnected()) {`
	`797`	`+ if (this._isConnected() \|\| this.state === CardanoNodeStates.STARTING) {`
`798`	`798`	`return false;`
`799`	`799`	`}`
`800`	`800`	`try {`