Merge pull request #2375 from input-output-hk/release-with-master

Merge release/3.3.0 into master

Author: nikolaglumac

CHANGELOG.md

@@ -1,6 +1,57 @@
 Changelog
 =========
 
+## 3.3.0
+
+### Fixes
+
+- Fixed issue with hardware wallet delegation ([PR 2369](https://github.com/input-output-hk/daedalus/pull/2369))
+
+### Chores
+
+- Updated `cardano-launcher` to version `0.20210215.0` ([PR 2363](https://github.com/input-output-hk/daedalus/pull/2363))
+- Updated `cardano-wallet` to version `2021-02-15` ([PR 2363](https://github.com/input-output-hk/daedalus/pull/2363))
+- Updated `cardano-wallet` to version `2021-02-12` ([PR 2358](https://github.com/input-output-hk/daedalus/pull/2358))
+- Improved the error messages for the custom SMASH server url input ([PR 2355](https://github.com/input-output-hk/daedalus/pull/2355))
+
+## 3.3.0-FC1
+
+### Features
+
+- Added display of wallet balance in other currencies ([PR 2290](https://github.com/input-output-hk/daedalus/pull/2290))
+- Implemented alternate Ledger wallet handling ([PR 2342](https://github.com/input-output-hk/daedalus/pull/2342))
+- Re-enabled "Wallet import" feature ([PR 2308](https://github.com/input-output-hk/daedalus/pull/2308))
+- Configured "Staking" sidebar icon to always be shown and added a "Staking Syncing" screen to be shown instead of the "Delegation center" until Daedalus fully syncs ([PR 2315](https://github.com/input-output-hk/daedalus/pull/2315))
+- Implemented "Voting Center" ([PR 2315](https://github.com/input-output-hk/daedalus/pull/2315), [PR 2353](https://github.com/input-output-hk/daedalus/pull/2353), [PR 2354](https://github.com/input-output-hk/daedalus/pull/2354))
+- Implemented transaction metadata display ([PR 2338](https://github.com/input-output-hk/daedalus/pull/2338))
+- Displayed fee and deposit info in transaction details and in the delegation wizard ([PR 2339](https://github.com/input-output-hk/daedalus/pull/2339))
+- Added SMASH server configuration options ([PR 2259](https://github.com/input-output-hk/daedalus/pull/2259))
+
+### Fixes
+
+- Fixed issues with downloading logs and exporting transaction CSV history on Linux platform
+- Fixed an automatic update failure ([PR 2352](https://github.com/input-output-hk/daedalus/pull/2352))
+- Fixed logging issue with too few `cardano-wallet` logs being packed into logs zip archive ([PR 2341](https://github.com/input-output-hk/daedalus/pull/2341))
+- Fixed misalignment of the "i" icon on the "Set password" dialog ([PR 2337](https://github.com/input-output-hk/daedalus/pull/2337))
+- Removed steps counter from the "Success" wallet restoration dialog step ([PR 2335](https://github.com/input-output-hk/daedalus/pull/2335))
+
+### Chores
+
+- Disabled "Voting Center" for Flight builds
+- Updated `cardano-wallet` to revision `1ea5e882` ([PR 2356](https://github.com/input-output-hk/daedalus/pull/2356))
+- Force public key export on every interaction with hardware wallet device ([PR 2342](https://github.com/input-output-hk/daedalus/pull/2342))
+- Updated Hardware Wallets delegation deposit calculation ([PR 2332](https://github.com/input-output-hk/daedalus/pull/2332))
+- Implemented dynamic TTL calculation for hardware wallets transactions ([PR 2331](https://github.com/input-output-hk/daedalus/pull/2331))
+- Added link to connecting issues support article on the hardware wallet "Pairing" dialog ([PR 2336](https://github.com/input-output-hk/daedalus/pull/2336))
+- Updated recovery phrase entry ([PR 2334](https://github.com/input-output-hk/daedalus/pull/2334))
+- Adjusted sorting of table values on the "Rewards" screen ([PR 2333](https://github.com/input-output-hk/daedalus/pull/2333))
+- Fixed error thrown when closing delegation wizard while transaction fees are being calculated ([PR 2330](https://github.com/input-output-hk/daedalus/pull/2330))
+- Fixed number format for syncing percentage and stake pools count ([PR 2313](https://github.com/input-output-hk/daedalus/pull/2313))
+- Updated `cardano-wallet` to version `2021-01-28` and `cardano-node` to version `1.25.1` ([PR 2270](https://github.com/input-output-hk/daedalus/pull/2270))
+- Updated `react-polymorph` package ([PR 2318](https://github.com/input-output-hk/daedalus/pull/2318))
+- Updated `bignumber.js` package ([PR 2305](https://github.com/input-output-hk/daedalus/pull/2305))
+- Disabled application menu navigation before the "Terms of use" have been accepted ([PR 2304](https://github.com/input-output-hk/daedalus/pull/2304))
+
 ## 3.2.0
 
 ### Chores

README.md

@@ -84,6 +84,38 @@ Daedalus - Cryptocurrency Wallet
 1. Run `yarn nix:shelley_qa` 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/`.
+
+It's also possible to use a mock server locally by running the following command in `nix-shell` prior to starting Daedalus:
+
+```
+$ mock-token-metadata-server ./utils/cardano/native-tokens/registry.json
+Mock metadata server running with url http://localhost:65432/
+```
+
+Then proceed to launch Daedalus and make sure to provide the mock token metadata server port:
+
+```
+$ MOCK_TOKEN_METADATA_SERVER_PORT=65432 yarn dev
+```
+
+This enables you to modify the metadata directly by modifying the registry file directly:
+
+```
+$ vi ./utils/cardano/native-tokens/registry.json        # ..or any other editor, if you prefer
+```
+
+Use the following command to check if the mock server is working correctly:
+
+```
+$ curl -i -H "Content-type: application/json" --data '{"subjects":["789ef8ae89617f34c07f7f6a12e4d65146f958c0bc15a97b4ff169f1"],"properties":["name","description","acronym","unit","logo"]}'
+http://localhost:65432/metadata/query
+```
+... and expect a "200 OK" response.
+
+
 ### Running Daedalus with Jormungandr
 
 #### ITN Selfnode

default.nix

@@ -85,6 +85,7 @@ let
     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;
     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;
     cardano-node-cluster = let

installers/common/MacInstaller.hs

@@ -279,6 +279,7 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "cross-fetch"
       , "trezor-connect"
       , "js-chain-libs-node"
+      , "bignumber.js"
       ]
   mapM_ (\lib -> do
       cptree ("../node_modules" </> lib) ((fromText pathtoapp) </> "Contents/Resources/app/node_modules" </> lib)

installers/nix/linux.nix

@@ -6,6 +6,10 @@
 , jormungandrLib
 , launcherConfigs
 , linuxClusterBinName
+, gsettings-desktop-schemas
+, gtk3
+, hicolor-icon-theme
+, xfce
 }:
 
 let
@@ -41,6 +45,7 @@ let
     export           CLUSTER=${cluster'}
     export      DAEDALUS_DIR="''${XDG_DATA_HOME}/Daedalus"
     export   DAEDALUS_CONFIG=${if sandboxed then "/nix/var/nix/profiles/profile-${linuxClusterBinName}/etc" else daedalus-config}
+    export     XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:${hicolor-icon-theme}/share:${xfce.xfce4-icon-theme}/share
 
     mkdir -p "''${DAEDALUS_DIR}/${cluster}/"{Logs/pub,Secrets}
     cd "''${DAEDALUS_DIR}/${cluster}/"

nix/sources.json

@@ -24,17 +24,16 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-wallet": {
-        "branch": "tags/v2020-12-08",
+        "branch": "master",
         "description": "Official Wallet Backend & API for Cardano decentralized",
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "4e49b1f12ae7d653eca149b60d67f2a1a578104a",
-        "sha256": "1ypkyn2s12nxwrk1ims8vrhhyy1xl3v5y35yxrwvqp8y8m2sac2x",
+        "rev": "a37c9856b4d96286e3f01a95026c63b986ebbba0",
+        "sha256": "1mg8n58j2mjqhhzjb4p5yp8z06b9arh40pagi9rddil2f3vxzihm",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/4e49b1f12ae7d653eca149b60d67f2a1a578104a.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
-        "version": "v2021-01-12"
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/a37c9856b4d96286e3f01a95026c63b986ebbba0.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "gitignore": {
         "branch": "master",
@@ -61,15 +60,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "iohk-nix": {
-        "branch": "nixpkgs-bump",
+        "branch": "master",
         "description": "nix scripts shared across projects",
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "iohk-nix",
-        "rev": "940f3b7c16b9e7d4493d400280eedf2c936aa5c0",
-        "sha256": "1m5c8abw3bi5ij99vbcb5bpjywljy72yig5bbm4158r1mck7hljd",
+        "rev": "4efc38924c64c23a582c84950c8c25f72ff049cc",
+        "sha256": "0nhwyrd0xc72yj5q3jqa2wl4khp4g7n72i45cxy2rgn9nrp8wqh0",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/iohk-nix/archive/940f3b7c16b9e7d4493d400280eedf2c936aa5c0.tar.gz",
+        "url": "https://github.com/input-output-hk/iohk-nix/archive/4efc38924c64c23a582c84950c8c25f72ff049cc.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "js-chain-libs": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
@@ -173,16 +173,17 @@
   },
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "2.1.0",
+    "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
     "aes-js": "3.1.2",
-    "bignumber.js": "5.0.0",
+    "bignumber.js": "9.0.1",
     "bip39": "2.3.0",
     "blake2b": "2.1.3",
     "blakejs": "1.1.0",
     "borc": "2.1.2",
     "bs58": "4.0.1",
     "cardano-crypto.js": "5.3.6-rc.6",
     "cardano-js": "0.4.5",
-    "cardano-launcher": "0.20201014.0",
+    "cardano-launcher": "0.20210215.0",
     "cbor": "5.0.2",
     "check-disk-space": "2.1.0",
     "chroma-js": "2.1.0",
@@ -201,6 +202,7 @@
     "history": "4.10.1",
     "humanize-duration": "3.23.1",
     "inquirer": "7.3.3",
+    "json-bigint": "1.0.0",
     "lodash": "4.17.20",
     "lodash-es": "4.17.15",
     "mime-types": "2.1.27",
@@ -228,7 +230,7 @@
     "react-intl": "2.7.2",
     "react-lottie": "1.2.3",
     "react-markdown": "4.3.1",
-    "react-polymorph": "0.9.7-rc.11",
+    "react-polymorph": "0.9.7-rc.17",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
     "react-svg-inline": "2.1.1",

shell.nix

@@ -51,6 +51,7 @@ let
       daedalusPkgs.daedalus-bridge
       daedalusPkgs.daedalus-installer
       daedalusPkgs.darwin-launcher
+      daedalusPkgs.mock-token-metadata-server
     ] ++ (with pkgs; [
       nix bash binutils coreutils curl gnutar
       git python27 curl jq

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

@@ -30,4 +30,7 @@ export const STORAGE_KEYS: {
   DOWNLOAD_MANAGER: 'DOWNLOAD-MANAGER',
   APP_AUTOMATIC_UPDATE_FAILED: 'APP-AUTOMATIC-UPDATE-FAILED',
   APP_UPDATE_COMPLETED: 'APP-UPDATE-COMPLETED',
+  CURRENCY_SELECTED: 'CURRENCY-SELECTED',
+  CURRENCY_ACTIVE: 'CURRENCY-ACTIVE',
+  SMASH_SERVER: 'SMASH-SERVER',
 };

source/common/ipc/api.js

@@ -11,6 +11,7 @@ import type {
   SaveFileDialogResponseParams,
 } from '../types/file-dialog.types';
 import type { GenerateAddressPDFParams } from '../types/address-pdf-request.types';
+import type { GenerateVotingPDFParams } from '../types/voting-pdf-request.types';
 import type { GenerateCsvParams } from '../types/csv-request.types';
 import type { GenerateQRCodeParams } from '../types/save-qrCode.types';
 import type {
@@ -177,7 +178,10 @@ export type SubmitBugReportRequestMainResponse = void;
  * Channel to rebuild the electron application menu after the language setting changes
  */
 export const REBUILD_APP_MENU_CHANNEL = 'REBUILD_APP_MENU_CHANNEL';
-export type RebuildAppMenuRendererRequest = { isUpdateAvailable: boolean };
+export type RebuildAppMenuRendererRequest = {
+  isUpdateAvailable: boolean,
+  isNavigationEnabled: boolean,
+};
 export type RebuildAppMenuMainResponse = void;
 
 /**
@@ -201,6 +205,13 @@ export const GENERATE_ADDRESS_PDF_CHANNEL = 'GENERATE_ADDRESS_PDF_CHANNEL';
 export type GenerateAddressPDFRendererRequest = GenerateAddressPDFParams;
 export type GenerateAddressPDFMainResponse = void;
 
+/**
+ * Channel to generate and save a share voting PDF
+ */
+export const GENERATE_VOTING_PDF_CHANNEL = 'GENERATE_VOTING_PDF_CHANNEL';
+export type GenerateVotingPDFRendererRequest = GenerateVotingPDFParams;
+export type GenerateVotingPDFMainResponse = void;
+
 /**
  * Channel to generate and save a csv file
  */
@@ -295,6 +306,14 @@ export const GENERATE_WALLET_MIGRATION_REPORT_CHANNEL =
 export type GenerateWalletMigrationReportRendererRequest = WalletMigrationReportData;
 export type GenerateWalletMigrationReportMainResponse = void;
 
+/**
+ * Channel for enabling application menu navigation
+ */
+export const ENABLE_APPLICATION_MENU_NAVIGATION_CHANNEL =
+  'ENABLE_APPLICATION_MENU_NAVIGATION_CHANNEL';
+export type EnableApplicationMenuNavigationRendererRequest = void;
+export type EnableApplicationMenuNavigationMainResponse = void;
+
 /**
  * Channel for generating wallet migration report
  */