Merge pull request #2999 from input-output-hk/merge-4.11.0-into-main

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

@@ -113,7 +113,7 @@
      {
       "files": "hardware-wallet-tests/**/*.ts",
       "rules": {
-          "jest/no-standalone-expect": "off",
+          "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

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 4.11.0
+
+### Fixes
+
+- 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))
+- Improved error handling for incorrect passphrase and incorrect hardware wallet error ([PR 2860](https://github.com/input-output-hk/daedalus/pull/2860))
+
+### 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 support for Trezor firmware 2.5.1 ([PR 2991](https://github.com/input-output-hk/daedalus/pull/2991))
+- 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
@@ -89,7 +108,7 @@
 - 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

default.nix

@@ -32,6 +32,8 @@ let
   };
   pkgs = import sources.nixpkgs { inherit system config; };
   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; {
@@ -56,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";
@@ -86,7 +89,7 @@ let
     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");
@@ -266,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
@@ -316,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 {};
 

gulpfile.js

@@ -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'
   )
 );

hardware-wallet-tests/connect-multiple-hardware-wallets.ts

@@ -19,6 +19,7 @@ export const run = () => {
   createTestInstructions([
     'Start test runner',
     'Plug Ledger Nano S to your computer',
+    'Plug Ledger Nano S Plus to your computer',
     'Plug Ledger Nano X to your computer',
   ]);
 
@@ -27,6 +28,10 @@ export const run = () => {
       disconnected: false,
       deviceModel: 'nanoS',
     },
+    {
+      disconnected: false,
+      deviceModel: 'nanoSP',
+    },
     {
       disconnected: false,
       deviceModel: 'nanoX',

hardware-wallet-tests/disconnect-multiple-hardware-wallets.ts

@@ -14,6 +14,10 @@ const getNextExpectedSequence = createSequentialResult([
     disconnected: false,
     deviceModel: 'nanoS',
   },
+  {
+    disconnected: false,
+    deviceModel: 'nanoSP',
+  },
   {
     disconnected: false,
     deviceModel: 'nanoX',
@@ -22,6 +26,10 @@ const getNextExpectedSequence = createSequentialResult([
     disconnected: true,
     deviceModel: 'nanoS',
   },
+  {
+    disconnected: true,
+    deviceModel: 'nanoSP',
+  },
   {
     disconnected: true,
     deviceModel: 'nanoX',
@@ -37,8 +45,10 @@ export const run = () => {
 
   createTestInstructions([
     'Connect Nano S',
+    'Connect Nano S Plus',
     'Connect Nano X',
     'Disconnect Nano S',
+    'Disconnect Nano S Plus',
     'Disconnect Nano X',
   ]);
 

installer-clusters.cfg

@@ -1 +1 @@
-mainnet mainnet_flight testnet shelley_qa staging alonzo_purple
+mainnet selfnode mainnet_flight testnet