Merge release/4.1.0 into master

CHANGELOG.md

@@ -1,6 +1,49 @@
 Changelog
 =========
 
+## 4.1.0
+
+### Features
+
+- Enabled Catalyst voting registration on Mainnet and Flight builds
+
+## 4.1.0-FC1
+
+### Features
+
+- Integrated cardano-wallet Api native tokens decimal places value ([PR 2577](https://github.com/input-output-hk/daedalus/pull/2577))
+- Added address verification for "Trezor" hardware wallet devices ([PR 2558](https://github.com/input-output-hk/daedalus/pull/2558))
+- Added address verification for "Ledger" hardware wallet devices ([PR 2282](https://github.com/input-output-hk/daedalus/pull/2282))
+- Implemented manually configurable decimal places for native tokens ([PR 2533](https://github.com/input-output-hk/daedalus/pull/2533))
+- Added warning message when pasting an address of the same wallet in the send form ([PR 2506](https://github.com/input-output-hk/daedalus/pull/2506))
+- Implemented select search style variables ([PR 2512](https://github.com/input-output-hk/daedalus/pull/2512))
+- Enabled pasting of wallet recovery phrase ([PR 2459](https://github.com/input-output-hk/daedalus/pull/2459))
+
+### Fixes
+
+- Fixed pool description scrolling and styling ([PR 2556](https://github.com/input-output-hk/daedalus/pull/2564), [PR 2568](https://github.com/input-output-hk/daedalus/pull/2568))
+- Fixed external currencies not appearing when not connected ([PR 2556](https://github.com/input-output-hk/daedalus/pull/2556))
+- Fixed hardware wallets transactions issue with native tokens ([PR 2543](https://github.com/input-output-hk/daedalus/pull/2543))
+- Fixed hardware wallets transaction initialization issue on device reconnect ([PR 2541](https://github.com/input-output-hk/daedalus/pull/2541))
+- Fixed blank currency selection after updating to 4.0.5 ([PR 2529](https://github.com/input-output-hk/daedalus/pull/2529))
+- Fixed hardware wallets confirmation crashing issue when device is in "Busy" state ([PR 2522](https://github.com/input-output-hk/daedalus/pull/2522))
+- Fixed hardware wallets spending password issue ([PR 2519](https://github.com/input-output-hk/daedalus/pull/2519))
+
+### Chores
+
+- Updated wallet importer to extract private keys from 'WalletUserSecret' field ([PR 2445](https://github.com/input-output-hk/daedalus/pull/2445))
+- Changed the assets identifiers from fingerprint to policyId+name ([PR 2562](https://github.com/input-output-hk/daedalus/pull/2562))
+- Implemented the Items Dropdown component and simplified the Wallets and Assets Dropdowns ([PR 2540](https://github.com/input-output-hk/daedalus/pull/2540))
+- Included wallet names in dialog windows ([PR 2552](https://github.com/input-output-hk/daedalus/pull/2552))
+- Updated `cardano-cli` version to always match the one from `cardano-wallet` ([PR 2561](https://github.com/input-output-hk/daedalus/pull/2561))
+- Updated `react-polymorph` to version `1.0.0` ([PR 2549](https://github.com/input-output-hk/daedalus/pull/2549))
+- Updated `cardano-wallet` to version `2021-05-26` ([PR 2577](https://github.com/input-output-hk/daedalus/pull/2577), [PR 2580](https://github.com/input-output-hk/daedalus/pull/2580))
+- Updated `cardano-wallet` to version `2021-04-28` and `cardano-node` to version `1.26.2` ([PR 2551](https://github.com/input-output-hk/daedalus/pull/2551))
+- Updated Catalyst voting registration to include rewards address instead of the payment one ([PR 2550](https://github.com/input-output-hk/daedalus/pull/2550))
+- Moved currency related code into a dedicated store ([PR 2546](https://github.com/input-output-hk/daedalus/pull/2546))
+- Updated `trezor-connect` dependency to version `8.1.26` ([PR 2534](https://github.com/input-output-hk/daedalus/pull/2534))
+- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` package to version `3.0.0` ([PR 2530](https://github.com/input-output-hk/daedalus/pull/2530))
+
 ## 4.0.5
 
 ### Features
@@ -89,9 +132,6 @@ Changelog
 ### Features
 
 - Added native token support [PR 2292](https://github.com/input-output-hk/daedalus/pull/2292)
-
-### Features
-
 - Enabled rewards withdrawals on hardware wallets ([PR 2408](https://github.com/input-output-hk/daedalus/pull/2408))
 
 ### Fixes

default.nix

@@ -87,8 +87,7 @@ let
     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;
     cardano-shell = import self.sources.cardano-shell { inherit system; crossSystem = crossSystem shellPkgs.lib; };
-    cardano-cli = (import self.sources.cardano-node { inherit system; crossSystem = crossSystem nodePkgs.lib; }).cardano-cli;
-    local-cluster = if cluster == "selfnode" then (import self.sources.cardano-wallet { inherit system; gitrev = self.sources.cardano-wallet.rev; crossSystem = crossSystem walletPkgs.lib; }).project.hsPkgs.cardano-wallet.components.exes.local-cluster else null;
+    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;
     cardano-node-cluster = let
       # Test wallets with known mnemonics
       walletTestGenesisYaml = (self.sources.cardano-wallet + "/lib/shelley/test/data/cardano-node-shelley/genesis.yaml");
@@ -103,8 +102,11 @@ 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; }).haskellPackages.cardano-node.components.exes.cardano-node
+                   then (import self.sources.cardano-node { inherit system; crossSystem = crossSystem nodePkgs.lib; }).cardano-node
                    else self.cardano-wallet.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;
     darwin-launcher = self.callPackage ./nix/darwin-launcher.nix {};
 
     # a cross-compiled fastlist for the ps-list package

nix/sources.json

@@ -29,10 +29,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "7df30796be8bab3351467ecdee5e803f0969b177",
-        "sha256": "158w18wgxmqh2l224llw9vmyk0677k1ainm2qw3ja6mkdi37xns9",
+        "rev": "7426ccc17ecffcc112abf5e8382bcb89cb24f771",
+        "sha256": "0ladc7bpy6fwvlsp2zjw3h8rm384w3qf93gvb1s6nn2n912sp7ck",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/7df30796be8bab3351467ecdee5e803f0969b177.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/7426ccc17ecffcc112abf5e8382bcb89cb24f771.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "gitignore": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.0.5",
+  "version": "4.1.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
@@ -86,6 +86,7 @@
     "@babel/preset-flow": "7.8.3",
     "@babel/preset-react": "7.0.0",
     "@babel/register": "7.0.0",
+    "@dump247/storybook-state": "1.6.1",
     "@storybook/addon-actions": "5.3.14",
     "@storybook/addon-knobs": "5.3.14",
     "@storybook/addon-links": "5.3.14",
@@ -173,7 +174,7 @@
     "yarn-lockfile": "1.1.1"
   },
   "dependencies": {
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "2.2.0",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "3.0.0",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
     "aes-js": "3.1.2",
     "bech32": "2.0.0",
@@ -233,7 +234,7 @@
     "react-intl": "2.7.2",
     "react-lottie": "1.2.3",
     "react-markdown": "4.3.1",
-    "react-polymorph": "0.9.8-rc.11",
+    "react-polymorph": "1.0.0-next.1",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
     "react-svg-inline": "2.1.1",
@@ -250,7 +251,7 @@
     "source-map-support": "0.5.19",
     "spectron-fake-dialog": "0.0.1",
     "tcp-port-used": "1.0.1",
-    "trezor-connect": "8.1.25-extended",
+    "trezor-connect": "8.1.26-extended",
     "unorm": "1.6.0",
     "validator": "13.1.17"
   },

source/common/config/electron-store.config.js

@@ -13,25 +13,27 @@ export const STORAGE_TYPES: {
 export const STORAGE_KEYS: {
   [key: string]: StorageKey,
 } = {
-  RESET: 'RESET',
-  USER_LOCALE: 'USER-LOCALE',
-  USER_NUMBER_FORMAT: 'USER-NUMBER-FORMAT',
-  USER_DATE_FORMAT_ENGLISH: 'USER-DATE-FORMAT-ENGLISH',
-  USER_DATE_FORMAT_JAPANESE: 'USER-DATE-FORMAT-JAPANESE',
-  USER_TIME_FORMAT: 'USER-TIME-FORMAT',
-  TERMS_OF_USE_ACCEPTANCE: 'TERMS-OF-USE-ACCEPTANCE',
-  THEME: 'THEME',
-  DATA_LAYER_MIGRATION_ACCEPTANCE: 'DATA-LAYER-MIGRATION-ACCEPTANCE',
-  READ_NEWS: 'READ-NEWS',
-  WALLETS: 'WALLETS',
-  HARDWARE_WALLETS: 'HARDWARE-WALLETS',
-  HARDWARE_WALLET_DEVICES: 'HARDWARE-WALLET-DEVICES',
-  WALLET_MIGRATION_STATUS: 'WALLET-MIGRATION-STATUS',
-  DOWNLOAD_MANAGER: 'DOWNLOAD-MANAGER',
   APP_AUTOMATIC_UPDATE_FAILED: 'APP-AUTOMATIC-UPDATE-FAILED',
   APP_UPDATE_COMPLETED: 'APP-UPDATE-COMPLETED',
-  CURRENCY_SELECTED: 'CURRENCY-SELECTED',
+  ASSET_DATA: 'ASSET-DATA',
+  ASSET_SETTINGS_DIALOG_WAS_OPENED: 'ASSET-SETTINGS-DIALOG-WAS-OPENED',
   CURRENCY_ACTIVE: 'CURRENCY-ACTIVE',
+  CURRENCY_SELECTED: 'CURRENCY-SELECTED',
+  DATA_LAYER_MIGRATION_ACCEPTANCE: 'DATA-LAYER-MIGRATION-ACCEPTANCE',
+  DOWNLOAD_MANAGER: 'DOWNLOAD-MANAGER',
+  HARDWARE_WALLET_DEVICES: 'HARDWARE-WALLET-DEVICES',
+  HARDWARE_WALLETS: 'HARDWARE-WALLETS',
+  READ_NEWS: 'READ-NEWS',
+  RESET: 'RESET',
   SMASH_SERVER: 'SMASH-SERVER',
   STAKING_INFO_WAS_OPEN: 'STAKING-INFO-WAS-OPEN',
+  TERMS_OF_USE_ACCEPTANCE: 'TERMS-OF-USE-ACCEPTANCE',
+  THEME: 'THEME',
+  USER_DATE_FORMAT_ENGLISH: 'USER-DATE-FORMAT-ENGLISH',
+  USER_DATE_FORMAT_JAPANESE: 'USER-DATE-FORMAT-JAPANESE',
+  USER_LOCALE: 'USER-LOCALE',
+  USER_NUMBER_FORMAT: 'USER-NUMBER-FORMAT',
+  USER_TIME_FORMAT: 'USER-TIME-FORMAT',
+  WALLET_MIGRATION_STATUS: 'WALLET-MIGRATION-STATUS',
+  WALLETS: 'WALLETS',
 };

source/common/ipc/api.js

@@ -414,6 +414,32 @@ export type DeriveXpubRendererRequestType = {
   derivationScheme: number,
 };
 
+export type StakingBlockchainPointer = {
+  blockIndex: number,
+  txIndex: number,
+  certificateIndex: number,
+};
+
+export type deriveAddressRendererRequestType = {
+  devicePath: ?string,
+  addressType: number,
+  networkId: number,
+  protocolMagic: number,
+  spendingPathStr: string,
+  stakingPathStr: ?string,
+  isTrezor: boolean,
+};
+
+export type showAddressRendererRequestType = {
+  devicePath: ?string,
+  addressType: number,
+  networkId: number,
+  protocolMagic: number,
+  spendingPathStr: string,
+  stakingPathStr: ?string,
+  isTrezor: boolean,
+};
+
 /**
  * Channel for introspecting an address
  */
@@ -477,3 +503,11 @@ export type deriveXpubMainResponse = string;
 export const RESET_ACTION_TREZOR_CHANNEL = 'RESET_ACTION_TREZOR_CHANNEL';
 export type resetTrezorActionRendererRequest = void;
 export type resetTrezorActionMainResponse = void;
+
+export const DERIVE_ADDRESS_CHANNEL = 'DERIVE_ADDRESS_CHANNEL';
+export type deriveAddressRendererRequest = deriveAddressRendererRequestType;
+export type deriveAddressMainResponse = string;
+
+export const SHOW_ADDRESS_CHANNEL = 'SHOW_ADDRESS_CHANNEL';
+export type showAddressRendererRequest = showAddressRendererRequestType;
+export type showAddressMainResponse = void;

source/common/types/electron-store.types.js

@@ -3,27 +3,29 @@
 export type StorageType = 'get' | 'set' | 'delete' | 'reset';
 
 export type StorageKey =
+  | 'APP-AUTOMATIC-UPDATE-FAILED'
+  | 'APP-UPDATE-COMPLETED'
+  | 'ASSET-DATA'
+  | 'ASSET-SETTINGS-DIALOG-WAS-OPENED'
+  | 'CURRENCY-ACTIVE'
+  | 'CURRENCY-SELECTED'
+  | 'DATA-LAYER-MIGRATION-ACCEPTANCE'
+  | 'DOWNLOAD-MANAGER'
+  | 'HARDWARE-WALLET-DEVICES'
+  | 'HARDWARE-WALLETS'
+  | 'READ-NEWS'
   | 'RESET'
-  | 'USER-LOCALE'
-  | 'USER-NUMBER-FORMAT'
+  | 'SMASH-SERVER'
+  | 'STAKING-INFO-WAS-OPEN'
+  | 'TERMS-OF-USE-ACCEPTANCE'
+  | 'THEME'
   | 'USER-DATE-FORMAT-ENGLISH'
   | 'USER-DATE-FORMAT-JAPANESE'
+  | 'USER-LOCALE'
+  | 'USER-NUMBER-FORMAT'
   | 'USER-TIME-FORMAT'
-  | 'TERMS-OF-USE-ACCEPTANCE'
-  | 'THEME'
-  | 'DATA-LAYER-MIGRATION-ACCEPTANCE'
-  | 'READ-NEWS'
-  | 'WALLETS'
-  | 'HARDWARE-WALLETS'
-  | 'HARDWARE-WALLET-DEVICES'
   | 'WALLET-MIGRATION-STATUS'
-  | 'DOWNLOAD-MANAGER'
-  | 'APP-AUTOMATIC-UPDATE-FAILED'
-  | 'APP-UPDATE-COMPLETED'
-  | 'CURRENCY-SELECTED'
-  | 'CURRENCY-ACTIVE'
-  | 'SMASH-SERVER'
-  | 'STAKING-INFO-WAS-OPEN';
+  | 'WALLETS';
 
 export type StoreMessage = {
   type: StorageType,

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

@@ -118,12 +118,6 @@ export type TransportDevice = {
   firmwareVersion: ?string,
 };
 
-/* export type Certificate = {|
-  type: CertificateType,
-  path: BIP32Path,
-  poolKeyHashHex: ?string,
-|}; */
-
 export type Certificate = {
   address: string,
   type: string,
@@ -236,10 +230,11 @@ export type LedgerSignTransactionRequest = {
   protocolMagic: number,
   certificates: Array<?Certificate>,
   withdrawals: Array<?Withdrawal>,
-  metadataHashHex: ?string,
+  auxiliaryData: ?string,
   reset?: boolean,
   devicePath: ?string,
   validityIntervalStartStr?: string,
+  signingMode: string,
 };
 
 export type TrezorSignTransactionRequest = {

source/main/environment.js

@@ -61,7 +61,7 @@ const isDevelopment = checkIsDevelopment(NETWORK);
 const isWatchMode = process.env.IS_WATCH_MODE;
 const keepLocalClusterRunning = process.env.KEEP_LOCAL_CLUSTER_RUNNING;
 const API_VERSION = process.env.API_VERSION || 'dev';
-const NODE_VERSION = '1.25.1'; // TODO: pick up this value from process.env
+const NODE_VERSION = '1.26.2'; // TODO: pick up this value from process.env
 const mainProcessID = get(process, 'ppid', '-');
 const rendererProcessID = process.pid;
 const PLATFORM = os.platform();