Merges release/4.5.1 into release/4.5.0

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## vNext
+
+### 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), [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
@@ -20,7 +34,6 @@
 
 - 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 `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), [PR 2741](https://github.com/input-output-hk/daedalus/pull/2741))
 - 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))

package.json

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

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/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();
 

source/renderer/app/stores/WalletsStore.js

@@ -428,7 +428,8 @@ export default class WalletsStore extends Store {
   };
 
   @action _restoreWalletClose = () => {
-    const { mnemonics, walletName, spendingPassword, restoredWallet } = this;
+    this._resumePolling();
+    const { mnemonics, walletName, spendingPassword } = this;
     const shouldDisplayAbortAlert =
       (mnemonics.length || walletName.length || spendingPassword.length) &&
       this.restoreWalletStep !== null &&
@@ -440,9 +441,6 @@ export default class WalletsStore extends Store {
       this._restoreWalletResetData();
       this.actions.dialogs.closeActiveDialog.trigger();
     }
-    if (restoredWallet) {
-      this.goToWalletRoute(restoredWallet.id);
-    }
   };
 
   @action _restoreWalletCancelClose = () => {
@@ -673,10 +671,10 @@ export default class WalletsStore extends Store {
 
   @action _restore = async () => {
     this.isRestoring = true;
+
     // Pause polling in order to avoid fetching data for wallet we are about to restore
     // so that we remain on the "Add wallet" screen until user closes the TADA screen
     await this._pausePolling();
-
     // Reset restore requests to clear previous errors
     this._restoreWalletResetRequests();
 
@@ -707,7 +705,6 @@ export default class WalletsStore extends Store {
         this.restoreWalletStep = 3;
       });
     } finally {
-      this._resumePolling();
       runInAction('end wallet restore', () => {
         this.isRestoring = false;
       });