Merge remote-tracking branch 'origin/develop' into chore/ddw-596-webpack-5-upgrade

Author: szymonmaslowski

.eslintrc

@@ -119,7 +119,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,21 @@
 # Changelog
 
+## vNext
+
+### 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))
+
+### Features
+
+- Added support for Ledger Nano S Plus ([PR 2975](https://github.com/input-output-hk/daedalus/pull/2975))
+
+### 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
@@ -86,12 +102,12 @@
 
 ### Fixes
 
-- Improved error handling for incorrect passphrase and incorrect hardware wallet error ([PR 2860](https://github.com/input-output-hk/daedalus/pull/2860)) 
+- 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,6 +42,7 @@ 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
@@ -105,21 +106,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 +208,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

@@ -86,7 +86,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 +266,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

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

installers/common/MacInstaller.hs

@@ -330,12 +330,19 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       -- Executables (from daedalus-bridge)
       forM_ ["cardano-wallet", "cardano-node", "cardano-cli", "cardano-address" ] $ \f ->
         cp (bridge </> "bin" </> f) (dir </> f)
-      forM_ ["config.yaml", "genesis.json", "genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json", "topology.yaml" ] $ \f ->
+      forM_ ["config.yaml", "genesis.json", "topology.yaml" ] $ \f ->
         cp f (dataDir </> f)
+      when (oCluster /= Selfnode) $ do
+        forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json" ] $ \f ->
+          cp f (dataDir </> f)
 
       when (oCluster == Selfnode) $ do
         cp "signing.key" (dataDir </> "signing.key")
         cp "delegation.cert" (dataDir </> "delegation.cert")
+        cp (bridge </> "bin" </> "mock-token-metadata-server") (dir </> "mock-token-metadata-server")
+        cp (bridge </> "bin" </> "token-metadata.json") (dataDir </> "token-metadata.json")
+        cp (bridge </> "bin" </> "local-cluster--unwrapped") (dir </> "local-cluster")
+        cptreeL (bridge </> "bin" </> "test" </> "data") (dataDir </> "data")
 
       procs "chmod" ["-R", "+w", tt dir] empty
 
@@ -362,6 +369,9 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       mapM_ sortaMove [ "HID.node" ]
       void $ chain (encodeString dir) [ tt $ dir </> "HID.node" ]
 
+      when (oCluster == Selfnode) $ do
+        void $ chain (encodeString dir) $ fmap tt [ dir </> "mock-token-metadata-server", dir </> "local-cluster" ]
+
   -- Prepare launcher
   de <- testdir (dir </> "Frontend")
   unless de $ mv (dir </> (fromString $ T.unpack $ dcAppName)) (dir </> "Frontend")

installers/common/WindowsInstaller.hs

@@ -199,13 +199,23 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                     file [] "config.yaml"
                     file [] "topology.yaml"
                     file [] "genesis.json"
-                    file [] "genesis-byron.json"
-                    file [] "genesis-shelley.json"
-                    file [] "genesis-alonzo.json"
+                    when (clusterName /= Selfnode) $ do
+                      file [] "genesis-byron.json"
+                      file [] "genesis-shelley.json"
+                      file [] "genesis-alonzo.json"
                     file [] "libsodium-23.dll"
                     when (clusterName == Selfnode) $ do
                       file [] "signing.key"
                       file [] "delegation.cert"
+                      file [] "local-cluster.exe"
+                      file [] "libgcc_s_seh-1.dll"
+                      file [] "libgmpxx-4.dll"
+                      file [] "libstdc++-6.dll"
+                      file [] "libwinpthread-1.dll"
+                      file [] "mcfgthread-12.dll"
+                      file [] "mock-token-metadata-server.exe"
+                      file [Recursive] "test\\"
+                      file [] "token-metadata.json"
                 file [] "cardano-launcher.exe"
                 file [] "libffi-7.dll"
                 file [] "libffi-8.dll"