Merge pull request #2755 from input-output-hk/release-with-master

Merge release/4.5.0 and release/4.5.1 into master

Author: nikolaglumac

.nonsense

@@ -1,5 +1,37 @@
 # Changelog
 
+## 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 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))
+
+### 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), [PR 2744](https://github.com/input-output-hk/daedalus/pull/2744))
+
+### Chores
+
+- 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))
+
 ## 4.4.1
 
 ### Fixes

CHANGELOG.md

@@ -35,6 +35,16 @@ Daedalus - Cryptocurrency Wallet
    ```
 3. Run `nix-shell` with correct list of arguments or by using existing `package.json` scripts to load a shell with all the correct versions of all the required dependencies for development.
 
+**Notes:**
+
+If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remote key was not OK) try the next steps:
+1. Reinstall nix
+   ```bash
+   $ nix-env -e *
+   $ curl -L https://nixos.org/nix/install | sh
+   ```
+2. Download certificate from https://docs.certifytheweb.com/docs/kb/kb-202109-letsencrypt/ and import to your keychain.
+
 ## Development
 
 ### Running Daedalus with Cardano Node

README.md

@@ -134,5 +134,6 @@ let
       # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
       inherit pkgs;
     };
+
 in
 mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

nix/sources.nix

@@ -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": {
@@ -167,7 +167,7 @@
     "yarn-lockfile": "1.1.1"
   },
   "dependencies": {
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "3.1.0",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "4.0.0",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
     "@ledgerhq/hw-transport-node-hid": "5.51.1",
     "aes-js": "3.1.2",
@@ -228,7 +228,7 @@
     "react-intl": "2.7.2",
     "react-lottie": "1.2.3",
     "react-markdown": "4.3.1",
-    "react-polymorph": "1.0.0-next.1",
+    "react-polymorph": "1.0.1",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
     "react-svg-inline": "2.1.1",

package.json

@@ -1,4 +1,13 @@
 // @flow
+import {
+  MAINNET,
+  TESTNET,
+  STAGING,
+  SHELLEY_QA,
+  ALONZO_PURPLE,
+  SELFNODE,
+} from './environment.types';
+
 export type TlsConfig = {
   hostname: string,
   port: number,
@@ -142,17 +151,26 @@ export type CardanoStatus = {
   cardanoWalletPID: number,
 };
 
-// Cardano Mainet network magic
-export const MAINNET_MAGIC = [1, null];
-
-// Cardano Byron Testnet network magic
-export const TESTNET_MAGIC = [1097911063, 0];
-
-// Cardano Staging network magic
-export const STAGING_MAGIC = [633343913, 1];
+export type NetworkMagicType = Array<?number>;
 
-// Cardano Alonzo Purple network magic
-export const ALONZO_PURPLE_MAGIC = [8, 0];
-
-// Cardano Selfnode network magic
-export const SELFNODE_MAGIC = MAINNET_MAGIC;
+export const NetworkMagics: {
+  mainnet: NetworkMagicType,
+  testnet: NetworkMagicType,
+  staging: NetworkMagicType,
+  alonzo_purple: NetworkMagicType,
+  shelley_qa: NetworkMagicType,
+  selfnode: NetworkMagicType,
+} = {
+  // Cardano Mainet network magic
+  [MAINNET]: [1, null],
+  // Cardano Staging network magic
+  [STAGING]: [633343913, 1],
+  // Cardano Byron Testnet network magic
+  [TESTNET]: [1097911063, 0],
+  // Cardano Alonzo Purple network magic
+  [ALONZO_PURPLE]: [8, 0],
+  // Cardano Shelley QA network magic
+  [SHELLEY_QA]: [3, 0],
+  // Cardano Selfnode network magic
+  [SELFNODE]: [1, null],
+};

source/common/types/cardano-node.types.js

@@ -12,6 +12,7 @@ export type Environment = {
   isStaging: boolean,
   isTestnet: boolean,
   isAlonzoPurple: boolean,
+  isShelleyQA: boolean,
   isSelfnode: boolean,
   isDevelopment: boolean,
   isWatchMode: boolean,

source/common/types/environment.types.js

@@ -262,6 +262,7 @@ export type LedgerSignTransactionRequest = {
   validityIntervalStartStr?: ?string, // It is disabled for now
   signingMode: string,
   auxiliaryData: ?LedgerAuxiliaryDataType,
+  additionalWitnessPaths: Array<?BIP32Path>,
 };
 
 export type TrezorSignTransactionRequest = {

source/common/types/hardware-wallets.types.js

@@ -5,4 +5,5 @@ export type CheckDiskSpaceResponse = {
   diskSpaceMissing: string,
   diskSpaceRecommended: string,
   diskSpaceAvailable: string,
+  hadNotEnoughSpaceLeft: boolean,
 };

source/common/types/no-disk-space.types.js

@@ -2,6 +2,7 @@
 import { upperFirst } from 'lodash';
 import {
   ALONZO_PURPLE,
+  SHELLEY_QA,
   DEVELOPMENT,
   LINUX,
   MAC_OS,
@@ -54,6 +55,7 @@ export const checkIsMainnet = (network: string) => network === MAINNET;
 export const checkIsTestnet = (network: string) => network === TESTNET;
 export const checkIsAlonzoPurple = (network: string) =>
   network === ALONZO_PURPLE;
+export const checkIsShelleyQA = (network: string) => network === SHELLEY_QA;
 export const checkIsStaging = (network: string) => network === STAGING;
 export const checkIsSelfnode = (network: string) => network === SELFNODE;
 export const checkIsDevelopment = (network: string) => network === DEVELOPMENT;