[DDW-779] Merges-in latest develop branch and fix conflicts

Author: tomislavhoracek

.babelrc

@@ -7,6 +7,7 @@
   "plugins": [
     ["@babel/plugin-proposal-decorators", { "legacy": true }],
     ["@babel/plugin-proposal-class-properties", { "loose": true }],
+    ["@babel/plugin-proposal-private-property-in-object", { "loose": true }],
     [
       "@babel/plugin-proposal-private-methods",
       {

.eslintrc

@@ -1,5 +1,5 @@
 {
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "parserOptions": {
     "ecmaFeatures": {
       "legacyDecorators": true

CHANGELOG.md

@@ -2,9 +2,14 @@
 
 ## vNext
 
+### Fixes
+
+- Fixed receiver address validation by disallowing rewards addresses ([PR 2781](https://github.com/input-output-hk/daedalus/pull/2781))
+
 ### Chores
 
 - Updated `trezor-connect` dependency to version `8.2.4` ([PR 2726](https://github.com/input-output-hk/daedalus/pull/2726))
+- Updated vulnerable dependencies ([PR 2769](https://github.com/input-output-hk/daedalus/pull/2769))
 
 ## 4.6.0
 

README.md

@@ -26,13 +26,25 @@ Daedalus - Cryptocurrency Wallet
    ```
    and then add the following lines:
    ```
+   build-users-group = nixbld
+
+   max-jobs = auto
+   cores = 0
+   sandbox = false
+
+   require-sigs = true
+   trusted-users = root
+   allowed-users = *
+
    substituters = https://hydra.iohk.io https://cache.nixos.org/
    trusted-substituters =
    trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-   max-jobs = 2  # run at most two builds at once
-   cores = 0     # the builder will use all available CPU cores
-   extra-sandbox-paths = /System/Library/Frameworks
+   extra-sandbox-paths = /System/Library/Frameworks /System/Library/PrivateFrameworks /usr/lib
+
+   # If you are running on a Mac with M1 chip please uncomment 'system' setting to enforce running on Rosetta2
+   # system = x86_64-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.
 
 **Notes:**

installers/nix/electron.nix

@@ -2,7 +2,7 @@
   libxkbcommon }:
 
 let
-  version = "13.1.1";
+  version = "13.6.3";
   name = "electron-${version}";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
@@ -21,19 +21,19 @@ let
     src = {
       i686-linux = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
-        sha256 = "fed00edaaba0c4a615fe835baf7d0d0ff893dff902800006bf63cc994c24d3dd";
+        sha256 = "db9261c05ed57af2fcd4a84b89d299c76948b9d57ce0dba38e3240eb43935257";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-        sha256 = "eb6ae81d71a4d390ec5140d907b191a84c37621176eec9369bb6fc3bf8570e3b";
+        sha256 = "7607422a4ba80cda4bd7fefb2fbe2f4e0b9a73db92e1e82dc01012a85b5d0d2b";
       };
       armv7l-linux = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
-        sha256 = "7e745a38c6761fa9826b3b9b8d0bd060126a3949da6f3f09f11b842e5e22cee4";
+        sha256 = "a293a9684e16a427a9f68d101814575a4b1dd232dc3fca47552f906019a6cadc";
       };
       aarch64-linux = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
-        sha256 = "445c88e9c9b33abbdb263103736fb5203938b0643bc5377fbdf12b444d26f211";
+        sha256 = "1599d259832c806b98751a68fb93112711963d259024f0e36f12f064995b3251";
       };
     }.${stdenv.hostPlatform.system} or throwSystem;
 
@@ -59,11 +59,11 @@ let
     src = {
       x86_64-darwin = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
-        sha256 = "1594ba9aa2e2aa059a03e6b70e16b8116de1998b38f8360801e113fa8d72938c";
+        sha256 = "6bf09794d6f020bbaaf806a7758da125137b3c96646f4503eb81b9541e50e02f";
       };
       aarch64-darwin = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-arm64.zip";
-        sha256 = "7045538917c36214127b7f11a3223396c7199ac19e989e5648a0963773962e6c";
+        sha256 = "374ddf0581794b31eee900828172f9218193c032c0e46bffcfac6aec95c22f1a";
       };
     }.${stdenv.hostPlatform.system} or throwSystem;
 

nix/sources.json

@@ -29,10 +29,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "dac16ba7e3bf64bf5474497656932fd342c3b720",
-        "sha256": "012lnp5rah4qyl8r0v04d0rz28b1rdaz6flhjrahf45b9gx7mny1",
+        "rev": "760140e238a5fbca61d1b286d7a80ece058dc729",
+        "sha256": "014njpddrlqm9bbab636h2gf58zkm0bx04i1jsn07vh5j3k0gri6",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/dac16ba7e3bf64bf5474497656932fd342c3b720.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/760140e238a5fbca61d1b286d7a80ece058dc729.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "gitignore": {

package.json

@@ -68,16 +68,17 @@
     "electron": "./node_modules/.bin/electron"
   },
   "devDependencies": {
-    "@babel/cli": "7.2.0",
-    "@babel/core": "7.4.5",
-    "@babel/helper-create-regexp-features-plugin": "7.7.0",
+    "@babel/cli": "7.16.0",
+    "@babel/core": "7.16.0",
+    "@babel/eslint-parser": "7.16.3",
+    "@babel/helper-create-regexp-features-plugin": "7.16.0",
     "@babel/plugin-proposal-class-properties": "7.2.1",
-    "@babel/plugin-proposal-decorators": "7.2.0",
+    "@babel/plugin-proposal-decorators": "7.16.4",
     "@babel/plugin-proposal-object-rest-spread": "7.2.0",
     "@babel/plugin-transform-runtime": "7.2.0",
     "@babel/polyfill": "7.0.0",
-    "@babel/preset-env": "7.2.0",
-    "@babel/preset-flow": "7.8.3",
+    "@babel/preset-env": "7.16.4",
+    "@babel/preset-flow": "7.16.0",
     "@babel/preset-react": "7.0.0",
     "@babel/register": "7.0.0",
     "@dump247/storybook-state": "1.6.1",
@@ -91,25 +92,24 @@
     "@testing-library/react": "12.1.2",
     "asar": "2.1.0",
     "autodll-webpack-plugin": "0.4.2",
-    "axios": "0.21.1",
-    "babel-eslint": "10.1.0",
+    "axios": "0.24.0",
     "babel-loader": "8.0.4",
     "babel-plugin-react-intl": "3.0.1",
     "bufferutil": "4.0.1",
     "cache-loader": "4.1.0",
-    "chai": "4.2.0",
+    "chai": "4.3.4",
     "chalk": "4.1.0",
     "concurrently": "5.3.0",
     "cross-env": "7.0.2",
     "css-loader": "2.0.1",
     "cucumber": "6.0.5",
     "cucumber-pretty": "6.0.0",
     "del": "6.0.0",
-    "electron-chromedriver": "13.0.0",
+    "electron-chromedriver": "16.0.0",
     "electron-connect": "0.6.3",
     "electron-devtools-installer": "3.2.0",
-    "electron-packager": "15.2.0",
-    "electron-rebuild": "1.11.0",
+    "electron-packager": "15.4.0",
+    "electron-rebuild": "2.0.1",
     "eslint": "7.10.0",
     "eslint-config-airbnb": "18.2.0",
     "eslint-config-prettier": "6.12.0",
@@ -134,19 +134,19 @@
     "husky": "4.3.0",
     "identity-obj-proxy": "3.0.0",
     "jest": "26.6.3",
-    "jest-css-modules-transform": "^4.3.0",
+    "jest-css-modules-transform": "4.3.0",
     "jest-environment-jsdom": "26.6.2",
-    "jest-svg-transformer": "^1.0.0",
+    "jest-svg-transformer": "1.0.0",
     "markdown-loader": "5.1.0",
-    "mini-css-extract-plugin": "0.9.0",
+    "mini-css-extract-plugin": "0.12.0",
     "minimist": "1.2.5",
     "mobx-react-devtools": "6.1.1",
     "node-forge": "0.10.0",
     "node-libs-browser": "2.2.1",
     "node-sass": "4.14.1",
     "nodemon": "2.0.4",
     "npmlog": "4.1.2",
-    "postcss": "7.0.27",
+    "postcss": "7.0.39",
     "postcss-modules": "1.5.0",
     "prettier": "2.1.2",
     "pretty-quick": "3.0.2",
@@ -155,7 +155,6 @@
     "react-intl-translations-manager": "5.0.3",
     "react-syntax-highlighter": "13.5.3",
     "regenerator-runtime": "0.13.7",
-    "resolve-url": "0.2.1",
     "sass-loader": "7.1.0",
     "sinon": "9.2.2",
     "spawn-sync": "2.0.0",
@@ -196,11 +195,11 @@
     "classnames": "2.2.6",
     "csv-stringify": "5.5.1",
     "cucumber-html-reporter": "5.2.0",
-    "electron": "13.1.1",
+    "electron": "13.6.3",
     "electron-log-daedalus": "2.2.21",
-    "electron-store": "8.0.0",
+    "electron-store": "8.0.1",
     "es6-error": "4.1.1",
-    "find-process": "1.4.4",
+    "find-process": "1.4.7",
     "fireworks-js": "1.0.4",
     "form-data": "3.0.0",
     "fs-extra": "9.0.1",
@@ -214,7 +213,7 @@
     "lodash": "4.17.21",
     "lodash-es": "4.17.15",
     "mime-types": "2.1.27",
-    "mkdirp": "0.5.1",
+    "mkdirp": "0.5.5",
     "mobx": "5.15.7",
     "mobx-react": "6.3.0",
     "mobx-react-form": "2.0.8",
@@ -256,7 +255,7 @@
     "tcp-port-used": "1.0.1",
     "trezor-connect": "8.2.4-extended",
     "unorm": "1.6.0",
-    "validator": "13.1.17"
+    "validator": "13.7.0"
   },
   "devEngines": {
     "node": ">=14.17.0",

source/common/types/address-introspection.types.js

@@ -4,7 +4,9 @@ export type IntrospectAddressRequest = {
   input: string,
 };
 
-export type AddressStyle = 'Byron' | 'Icarus' | 'Jormungandr' | 'Shelley';
+export type AddressStyle = 'Byron' | 'Icarus' | 'Shelley';
+
+export type AddressType = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 14 | 15;
 
 export type ChainPointer = {
   slot_num: number,
@@ -13,6 +15,7 @@ export type ChainPointer = {
 };
 
 export type AddressBase = {
+  address_type: AddressType,
   address_style: AddressStyle,
   network_tag: number | null,
   stake_reference: 'none' | 'by pointer' | 'by value',
@@ -27,14 +30,6 @@ export type IcarusAddress = AddressBase & {
   address_root: string,
 };
 
-export type JormungandrAddress = AddressBase & {
-  address_type: 'single' | 'group' | 'account' | 'multisig',
-  account_key?: string,
-  merkle_root?: string,
-  spending_key?: string,
-  stake_key?: string,
-};
-
 export type ShelleyAddress = AddressBase & {
   pointer?: ChainPointer,
   script_hash?: string,
@@ -45,10 +40,6 @@ export type ShelleyAddress = AddressBase & {
 
 export type IntrospectAddressResponse =
   | {
-      introspection:
-        | ByronAddress
-        | IcarusAddress
-        | JormungandrAddress
-        | ShelleyAddress,
+      introspection: ByronAddress | IcarusAddress | ShelleyAddress,
     }
   | 'Invalid';

source/renderer/app/stores/WalletsStore.js

@@ -18,7 +18,10 @@ import { logger } from '../utils/logging';
 import { ROUTES } from '../routes-config';
 import { formattedWalletAmount } from '../utils/formatters';
 import { ellipsis } from '../utils/strings';
-import { bech32EncodePublicKey } from '../utils/hardwareWalletUtils';
+import {
+  bech32EncodePublicKey,
+  isReceiverAddressType,
+} from '../utils/hardwareWalletUtils';
 import {
   WalletPaperWalletOpenPdfError,
   WalletRewardsOpenCsvError,
@@ -1039,9 +1042,14 @@ export default class WalletsStore extends Store {
     }
     try {
       const response = await introspectAddressChannel.send({ input: address });
-      if (response === 'Invalid') {
+
+      if (
+        response === 'Invalid' ||
+        !isReceiverAddressType(response.introspection.address_type)
+      ) {
         return false;
       }
+
       runInAction('check if address is from the same wallet', () => {
         const walletAddresses = this.stores.addresses.all
           .slice()

source/renderer/app/utils/hardwareWalletUtils.js

@@ -6,6 +6,7 @@ import { HARDENED } from '../config/hardwareWalletsConfig';
 
 // Types
 import type { CoinSelectionAssetsType } from '../api/transactions/types';
+import type { AddressType } from '../../../common/types/address-introspection.types';
 
 export type PathRoleIdentityType =
   | 'utxo_external'
@@ -38,6 +39,21 @@ export const KEY_PREFIXES = {
 
 // Helpers
 
+const receiverAddressTypes: Set<AddressType> = new Set([
+  0,
+  1,
+  2,
+  3,
+  4,
+  5,
+  6,
+  7,
+  8,
+]);
+
+export const isReceiverAddressType = (addressType: AddressType) =>
+  receiverAddressTypes.has(addressType);
+
 // [1852H, 1815H, 0H] => m/1852'/1815'/0'
 export const derivationPathToString = (derivationPath: Array<string>) => {
   let constructedPath = 'm';