Merge branch 'develop' into fix/ddw-1061-download-file-remains-after-update

# Conflicts:
#	CHANGELOG.md

Author: danielmain

.buildkite/pipeline.yml

@@ -2,12 +2,20 @@ env:
   ARTIFACT_BUCKET: s3://ci-output-sink
 steps:
   - label: 'daedalus-x86_64-darwin'
-    command: 'scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/build-installer-unix.sh--nix-2.5 --build-id $BUILDKITE_BUILD_NUMBER'
     env:
       NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
     agents:
       queue: daedalus
       system: x86_64-darwin
+  - label: 'daedalus-aarch64-darwin'
+    command: 'scripts/build-installer-unix.sh--nix-2.5 --build-id $BUILDKITE_BUILD_NUMBER'
+    env:
+      NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
+      UPLOAD_DIR_OVERRIDE: UNSAFE-internal-build
+    agents:
+      queue: daedalus
+      system: aarch64-darwin
   - label: 'daedalus-x86_64-linux-nix'
     command: 'scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
     agents:

.eslintrc

@@ -109,6 +109,12 @@
           "no-useless-constructor": "off",
           "@typescript-eslint/no-useless-constructor": "error"
       }
+    },
+     {
+      "files": "hardware-wallet-tests/**/*.ts",
+      "rules": {
+          "jest/no-standalone-expect": "off"
+      }
     }
   ]
 }

.gitignore

@@ -41,6 +41,11 @@ installers/tls/client
 installers/tls/server
 installers/DLLs
 installers/libressl
+installers/cfg-files
+installers/config.yaml
+installers/icons/electron.icns
+installers/installer-config.json
+installers/topology.yaml
 
 # temporary certs for daedalus dev
 tls/client
@@ -119,6 +124,8 @@ Debug
 /cardano-cli
 /cardano-wallet
 .vscode
+.yalc
+yalc.lock
 
 # Typescript
 *.scss.d.ts

.prettierignore

@@ -5,6 +5,7 @@
 !source/
 !features/
 !storybook/
+!hardware-wallet-tests/
 
 # Now we ignore all files
 *.*

CHANGELOG.md

@@ -2,8 +2,27 @@
 
 ## vNext
 
+### Fixes
+
+- Fixed downloaded installer being left in Downloads after latest update installs ([PR 2941](https://github.com/input-output-hk/daedalus/pull/2941))
+- Fixed incorrect behaviour of creating new wallet when paired incorrect hardware wallet during address verification ([PR 2906](https://github.com/input-output-hk/daedalus/pull/2906))
+- Fixed phrasing of insufficient funds for tokens message ([PR 2966](https://github.com/input-output-hk/daedalus/pull/2966))
+
 ### Features
 
+- Added support for Ledger Nano S Plus ([PR 2975](https://github.com/input-output-hk/daedalus/pull/2975))
+- Support of Apple AArch64 chip ([PR 2684](https://github.com/input-output-hk/daedalus/pull/2684))
+
+### Chores
+
+- Added steps on how to link with `react-polymorph` and other external UI libraries ([PR 2948](https://github.com/input-output-hk/daedalus/pull/2948))
+- Published selfnode installers for all 3 platforms ([PR 2971](https://github.com/input-output-hk/daedalus/pull/2971))
+
+## 4.10.0
+
+### Features
+
+- Implemented hover tooltips for menu ([PR 2938](https://github.com/input-output-hk/daedalus/pull/2938))
 - Improved UI regarding the Hardware Wallet public key export error ([PR 2922](https://github.com/input-output-hk/daedalus/pull/2922))
 - Added ASCII name to token header when metadata name is missing ([PR 2904](https://github.com/input-output-hk/daedalus/pull/2904))
 - Improved IPC by reducing the amount of messages from periodic events ([PR 2892](https://github.com/input-output-hk/daedalus/pull/2892))
@@ -12,7 +31,10 @@
 
 ### Fixes
 
-- Fixed downloaded installer being left in Downloads after latest update installs ([PR 2941](https://github.com/input-output-hk/daedalus/pull/2941))
+- Fixed dialogs being closed after receiving address shared ([PR 2965](https://github.com/input-output-hk/daedalus/pull/2965))
+- Fixed no progress shown on loading screen on Windows ([PR 2967](https://github.com/input-output-hk/daedalus/pull/2967))
+- Fixes hardware wallet issues on Windows ([PR 2900](https://github.com/input-output-hk/daedalus/pull/2900))
+- Fixed stake pool list styling ([PR 2920](https://github.com/input-output-hk/daedalus/pull/2920))
 - Fixed PopOver overlap ([PR 2954](https://github.com/input-output-hk/daedalus/pull/2954))
 - Fixed tooltip being hidden in several places ([PR-2934](https://github.com/input-output-hk/daedalus/pull/2934))
 - Adjusted padding for search field in stake pools ([PR 2945](https://github.com/input-output-hk/daedalus/pull/2945))
@@ -29,6 +51,9 @@
 
 ### Chores
 
+- Updated cardano-wallet to v2022-04-27 and cardano-node to 1.34.1 ([PR 2951](https://github.com/input-output-hk/daedalus/pull/2951))
+- Refactor to remove duplicated code ([PR 2956](https://github.com/input-output-hk/daedalus/pull/2956))
+- Updated cardano-launcher to 0.20220119.0 ([PR 2839](https://github.com/input-output-hk/daedalus/pull/2839))
 - Added `storybook:build` check to pre-push hook ([PR 2955](https://github.com/input-output-hk/daedalus/pull/2955))
 - Using new faker.js ([PR 2855](https://github.com/input-output-hk/daedalus/pull/2855))
 - Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
@@ -78,11 +103,12 @@
 
 ### Fixes
 
+- Improved error handling for incorrect passphrase and incorrect hardware wallet error ([PR 2860](https://github.com/input-output-hk/daedalus/pull/2860))
 - Fixed rewards CSV export issues ([PR 2885](https://github.com/input-output-hk/daedalus/pull/2885))
 - Fixed behaviour of wallet settings option of the app menu ([PR 2838](https://github.com/input-output-hk/daedalus/pull/2838))
 - Fixed styling of ITN rewards feature ([PR 2861](https://github.com/input-output-hk/daedalus/pull/2861))
 - Fixed available disk space takes a long time to show ([PR 2849](https://github.com/input-output-hk/daedalus/pull/2849))
-  
+
 ### Chores
 
 - Migrated codebase from javascript to typescript ([PR 2843](https://github.com/input-output-hk/daedalus/pull/2843))

README.md

@@ -42,9 +42,13 @@ Daedalus - Cryptocurrency Wallet
    trusted-substituters =
    trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
    extra-sandbox-paths = /System/Library/Frameworks /System/Library/PrivateFrameworks /usr/lib
+   experimental-features = nix-command flakes
 
-   # If you are running on a Mac with M1 chip please uncomment 'system' setting to enforce running on Rosetta2
-   # system = x86_64-darwin
+   # If you are running on a Mac with Intel chip 
+   system = x86_64-darwin
+   
+   # If you are running on a Mac with M1 chip
+   system = aarch64-darwin
    ```
 
 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.
@@ -105,21 +109,6 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
 1. Run `yarn nix:testnet` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
 
-##### Staging
-
-1. Run `yarn nix:staging` from `daedalus`.
-2. Run `yarn dev` from the subsequent `nix-shell`
-
-##### Shelley QA
-
-1. Run `yarn nix:shelley_qa` from `daedalus`.
-2. Run `yarn dev` from the subsequent `nix-shell`
-
-##### Alonzo Purple
-
-1. Run `yarn nix:alonzo_purple` from `daedalus`.
-2. Run `yarn dev` from the subsequent `nix-shell`
-
 ##### Native token metadata server
 
 Daedalus, by default, uses the following metadata server for all networks except for the mainnet: `https://metadata.cardano-testnet.iohkdev.io/`.
@@ -222,6 +211,26 @@ You can debug the main process by following one of these approaches:
 
 The inspector runs on port 9229
 
+### Linking with UI Libraries (e.g. React Polymorph)
+
+You can link libraries with Daedalus using one of the following steps:
+
+#### 1) Using `yalc`
+
+1) Install `yalc` globally using `yarn global add yalc`.
+2) Run `yalc publish` from the library's root directory that you want to link with Daedalus.
+3) Switch to Daedalus and run `yalc add <package-name>` or preferably `yalc link <package-name>`.
+4) You should be able to start Daedalus and see the changes you are making locally in the library.
+5) To make sure your changes are reflected as you update code in the library, use `yalc push`.
+
+#### 2) Using `yarn link`
+
+1) From the Daedalus root directory, go to `node_modules/react` and `yarn link`.
+2) Navigate to the `react-dom` package in the same directory and run `yarn link` again.
+3) Go to the library's root directory and run `yarn link`, `yarn link react` and `yarn link react-dom`.
+4) Go back to the Daedalus root directory and run `yarn link <package-name>`.
+5) Finally, run `yarn build:watch` from the library's root directory.
+
 ## Testing
 
 You can find more details regarding tests setup within

cardano-foundation-ledgerjs-hw-app-cardano-v5.0.0-rc4.tgz

@@ -31,8 +31,17 @@ let
     };
   };
   pkgs = import sources.nixpkgs { inherit system config; };
-  pkgsNative = localLib.iohkNix.getPkgsDefault {};
   sources = localLib.sources;
+  haskellNix = import sources."haskell.nix" {};
+  inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix;
+  flake-compat = import sources.flake-compat;
+  walletFlake = flake-compat  { src = sources.cardano-wallet; };
+  walletPackages = with walletFlake.defaultNix.hydraJobs; {
+    x86_64-windows = linux.windows;
+    x86_64-linux = linux.native;
+    x86_64-darwin = macos.intel;
+    aarch64-darwin = macos.silicon;
+  }.${target};
   walletPkgs = import "${sources.cardano-wallet}/nix" {};
   # only used for CLI, to be removed when upgraded to next node version
   nodePkgs = import "${sources.cardano-node}/nix" {};
@@ -49,13 +58,14 @@ let
   ostable.x86_64-windows = "windows";
   ostable.x86_64-linux = "linux";
   ostable.x86_64-darwin = "macos64";
+  ostable.aarch64-darwin = "macos64-arm";
+
   packages = self: {
     inherit cluster pkgs version target nodeImplementation;
-    inherit (pkgs) hello cabal2nix;
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
-    nodejs = pkgs.nodejs-14_x;
+    nodejs = pkgs.nodejs-16_x;
     nodePackages = pkgs.nodePackages.override { nodejs = self.nodejs; };
     yarnInfo = {
       version = "1.22.4";
@@ -73,17 +83,13 @@ let
 
     sources = localLib.sources;
     bridgeTable = {
-      cardano = self.callPackage ./nix/cardano-bridge.nix {
-        cardano-wallet = self.cardano-wallet.cardano-wallet;
-        cardanoWalletPkgs = self.cardano-wallet.pkgs;
-      };
+      cardano = self.callPackage ./nix/cardano-bridge.nix {};
     };
-    cardano-wallet = import self.sources.cardano-wallet { inherit system; gitrev = self.sources.cardano-wallet.rev; crossSystem = crossSystem walletPkgs.lib; };
-    cardano-wallet-native = import self.sources.cardano-wallet { inherit system; gitrev = self.sources.cardano-wallet.rev; };
-    cardano-address = (import self.sources.cardano-wallet { inherit system; gitrev = self.sources.cardano-wallet.rev; crossSystem = crossSystem walletPkgs.lib; }).cardano-address;
-    mock-token-metadata-server = (import self.sources.cardano-wallet { inherit system; gitrev = self.sources.cardano-wallet.rev; crossSystem = crossSystem walletPkgs.lib; }).mock-token-metadata-server;
+    inherit (walletPackages) cardano-wallet;
+    inherit (walletPackages) cardano-address;
+    inherit (walletPackages) mock-token-metadata-server;
     cardano-shell = import self.sources.cardano-shell { inherit system; crossSystem = crossSystem shellPkgs.lib; };
-    local-cluster = if cluster == "selfnode" then (import self.sources.cardano-wallet { inherit system; gitrev = self.sources.cardano-wallet.rev; crossSystem = crossSystem walletPkgs.lib; }).local-cluster else null;
+    local-cluster = if cluster == "selfnode" then walletPackages.local-cluster else null;
     cardano-node-cluster = let
       # Test wallets with known mnemonics
       walletTestGenesisYaml = (self.sources.cardano-wallet + "/lib/shelley/test/data/cardano-node-shelley/genesis.yaml");
@@ -99,10 +105,10 @@ let
     in (import self.sources.cardano-node { inherit system customConfig; crossSystem = crossSystem nodePkgs.lib; }).cluster;
     cardano-node = if useLocalNode
                    then (import self.sources.cardano-node { inherit system; crossSystem = crossSystem nodePkgs.lib; }).cardano-node
-                   else self.cardano-wallet.cardano-node;
+                   else walletPackages.cardano-node;
     cardano-cli = if useLocalNode
                    then (import self.sources.cardano-node { inherit system; crossSystem = crossSystem nodePkgs.lib; }).haskellPackages.cardano-cli
-                   else self.cardano-wallet.cardano-cli;
+                   else walletPackages.cardano-cli;
     darwin-launcher = self.callPackage ./nix/darwin-launcher.nix {};
 
     # a cross-compiled fastlist for the ps-list package
@@ -123,7 +129,6 @@ let
       network = cluster;
       os = ostable.${target};
       backend = nodeImplementation;
-      runCommandNative = pkgsNative.runCommand;
     };
 
     unsignedUnpackedCardano = self.daedalus-bridge; # TODO
@@ -264,7 +269,7 @@ let
       pushd dlls
       ${if dummyInstaller then "touch foo" else "unzip ${self.dlls}"}
       popd
-      cp -v ${self.unpackedCardano}/bin/* .
+      cp -vr ${self.unpackedCardano}/bin/* .
       cp -v ${self.nsisFiles}/{*.yaml,*.json,daedalus.nsi,*.key,*.cert} .
       cp ${self.uninstaller}/uninstall.exe ../uninstall.exe
       if [ -f ${self.nsisFiles}/block-0.bin ]; then
@@ -314,7 +319,11 @@ let
     };
     rawapp-win64 = self.rawapp.override { win64 = true; };
     source = builtins.filterSource localLib.cleanSourceFilter ./.;
-    yaml2json = pkgs.haskell.lib.addExtraLibrary (pkgs.haskell.lib.disableCabalFlag pkgs.haskellPackages.yaml "no-exe") pkgs.haskellPackages.optparse-applicative;
+    inherit ((haskell-nix.hackage-package { name = "yaml"; compiler-nix-name = "ghc8107"; cabalProject = ''
+      packages: .
+      package yaml
+        flags: -no-exe
+    ''; }).components.exes) yaml2json;
 
     electron = pkgs.callPackage ./installers/nix/electron.nix {};
 

default.nix

@@ -177,7 +177,9 @@ gulp.task(
     'clean:dist',
     'server:create:dev',
     'build:renderer:html',
-    'build:main:watch',
+    process.argv.includes('--disable-electron-reload')
+      ? 'build:main'
+      : 'build:main:watch',
     'build:renderer:watch'
   )
 );

gulpfile.js

@@ -0,0 +1,78 @@
+import expect from 'expect';
+
+import {
+  createAndRegisterHardwareWalletChannels,
+  createHardwareWalletConnectionChannel,
+  initLedgerChannel,
+  createTestInstructions,
+  createCardanoAppChannel,
+  createGetPublicKeyChannel,
+  ipcRenderer,
+} from './utils';
+
+export const run = () => {
+  expect.assertions(3);
+
+  createTestInstructions([
+    'Plug Ledger Nano S to your computer',
+    'Launch Cardano APP on Nano S/Nano X',
+    'Run the test again with Cardano App opened',
+    'Export the public key',
+  ]);
+
+  createAndRegisterHardwareWalletChannels();
+
+  const cardanoAppChannel = createCardanoAppChannel();
+  const publicKeyChannel = createGetPublicKeyChannel();
+  const hardwareWalletConnectionChannel = createHardwareWalletConnectionChannel();
+
+  return new Promise<void>((resolve) => {
+    hardwareWalletConnectionChannel.onReceive(
+      async (params: { path: string }) => {
+        expect(params).toEqual({
+          disconnected: expect.any(Boolean),
+          deviceType: expect.any(String),
+          deviceId: null,
+          deviceModel: expect.any(String),
+          deviceName: expect.any(String),
+          path: expect.any(String),
+          product: expect.any(String),
+        });
+
+        const cardanoAppChannelReply = await cardanoAppChannel.request(
+          { path: params.path },
+          ipcRenderer,
+          ipcRenderer
+        );
+
+        expect(cardanoAppChannelReply).toEqual({
+          minor: expect.any(Number),
+          major: expect.any(Number),
+          patch: expect.any(Number),
+          deviceId: expect.any(String),
+        });
+
+        const extendedPublicKey = await publicKeyChannel.request(
+          {
+            path: "1852'/1815'/0'",
+            // Shelley 1852 ADA 1815 indicator for account '0'
+            isTrezor: false,
+            devicePath: params.path,
+          },
+          ipcRenderer,
+          ipcRenderer
+        );
+
+        expect(extendedPublicKey).toEqual({
+          chainCodeHex: expect.any(String),
+          publicKeyHex: expect.any(String),
+          deviceId: expect.any(String),
+        });
+
+        resolve();
+      }
+    );
+
+    initLedgerChannel();
+  });
+};