Merge branch 'develop' into feature/ddw-745-arm-support

# Conflicts:
#	installers/common/MacInstaller.hs

Author: danielmain

.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

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## vNext
 
+### Fixes
+
+- Fixed phrasing of insufficient funds for tokens message ([PR 2966](https://github.com/input-output-hk/daedalus/pull/2966))
+
+## 4.10.0
+
+### Features
+
+- Added support for Ledger Nano S Plus ([PR 2975](https://github.com/input-output-hk/daedalus/pull/2975))
+
+## 4.10.0
+
 ### Features
 
 - Implemented hover tooltips for menu ([PR 2938](https://github.com/input-output-hk/daedalus/pull/2938))
@@ -85,6 +97,7 @@
 
 ### 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))

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

@@ -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

@@ -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/connect-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',
   ]);
 

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

@@ -152,14 +152,16 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/build/usb_bindings.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/build/HID.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/build/detection.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/bin/darwin-x64-"*"/keccak.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/bin/darwin-arm64-"*"/keccak.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/build/Release/addon.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/prebuilds/darwin-x64/node.napi.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/prebuilds/darwin-arm64/node.napi.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-arm64/node.napi.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-x64-"*"/blake-hash.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/build/Release/addon.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/build/Release/binding.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/bin/darwin-x64-"*"/blake2.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-x64-"*"/tiny-secp256k1.node"
 
 # Sign the whole component deeply
 sign_cmd "$ABS_PATH"

installers/common/MacInstaller.hs

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.9.1",
+  "version": "4.10.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
@@ -198,7 +198,7 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "5.0.0",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
-    "@ledgerhq/hw-transport-node-hid": "5.51.1",
+    "@ledgerhq/hw-transport-node-hid": "6.27.1",
     "aes-js": "3.1.2",
     "bech32": "2.0.0",
     "bignumber.js": "9.0.1",

package.json

@@ -1,7 +1,7 @@
 import { BridgeInfo, Device as TrezorDevice, UdevInfo } from 'trezor-connect';
 
 export type BIP32Path = Array<number>;
-export type LedgerModel = 'nanoS' | 'nanoX';
+export type LedgerModel = 'nanoS' | 'nanoSP' | 'nanoX';
 export type TrezorModel = '1' | 'T';
 export type DeviceType = 'ledger' | 'trezor';
 export type DeviceEvent =
@@ -24,11 +24,13 @@ export type DeviceEvent =
   | 'unreadable-device';
 export const DeviceModels: {
   LEDGER_NANO_S: LedgerModel;
+  LEDGER_NANO_S_PLUS: LedgerModel;
   LEDGER_NANO_X: LedgerModel;
   TREZOR_ONE: TrezorModel;
   TREZOR_T: TrezorModel;
 } = {
   LEDGER_NANO_S: 'nanoS',
+  LEDGER_NANO_S_PLUS: 'nanoSP',
   LEDGER_NANO_X: 'nanoX',
   TREZOR_ONE: '1',
   TREZOR_T: 'T',