release/4.7.0 into master (#2820)

Co-authored-by: Nikola Glumac <[email protected]>
Co-authored-by: Lucas <[email protected]>
Co-authored-by: Dominik Guzei <[email protected]>
Co-authored-by: Renan Ferreira <[email protected]>
Co-authored-by: Michael Chappell <[email protected]>
Co-authored-by: Tomislav Horaček <[email protected]>
Co-authored-by: Daniel Main <[email protected]>
Co-authored-by: Michael Bishop <[email protected]>
Co-authored-by: Daniel Main <[email protected]>
Co-authored-by: Lucas Araujo <[email protected]>
Co-authored-by: Danilo Prates <[email protected]>
Co-authored-by: Przemysław Włodek <[email protected]>
Co-authored-by: Jean-Baptiste Giraudeau <[email protected]>

Author: 13 people

.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

@@ -1,5 +1,21 @@
 # Changelog
 
+## 4.7.0
+
+### Features
+
+- Updated Catalyst dates ([PR 2812](https://github.com/input-output-hk/daedalus/pull/2812))
+
+### 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))
+- Updated CWB and Cardano Node ([PR 2799](https://github.com/input-output-hk/daedalus/pull/2799))
+
 ## 4.6.0
 
 ### Features

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/common/MacInstaller.hs

@@ -152,6 +152,8 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/build/HID.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/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/blake-hash/prebuilds/darwin-x64/node.napi.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
 
 # Sign the whole component deeply
 sign_cmd "$ABS_PATH"
@@ -232,60 +234,66 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
     externalYarn :: [FilePath]
     externalYarn =
       [ "@babel"
+      , "@protobufjs"
       , "@trezor"
       , "base-x"
       , "base64-js"
       , "bchaddrjs"
+      , "bech32"
       , "big-integer"
-      , "bigi"
       , "bignumber.js"
       , "bip66"
       , "bitcoin-ops"
       , "blake2b"
+      , "blake-hash"
       , "blake2b-wasm"
+      , "bn.js"
+      , "brorand"
       , "bs58"
       , "bs58check"
-      , "bytebuffer-old-fixed-webpack"
+      , "bytebuffer"
       , "call-bind"
       , "cashaddrjs"
       , "cbor-web"
       , "create-hash"
       , "create-hmac"
       , "cross-fetch"
       , "define-properties"
-      , "ecurve"
+      , "elliptic"
       , "es-abstract"
       , "function-bind"
       , "get-intrinsic"
       , "has"
       , "has-symbols"
-      , "hd-wallet"
+      , "hash.js"
+      , "hmac-drbg"
       , "ieee754"
       , "inherits"
       , "int64-buffer"
       , "js-chain-libs-node"
       , "json-stable-stringify"
       , "keccak"
       , "long"
-      , "merkle-lib"
       , "ms"
+      , "minimalistic-assert"
+      , "minimalistic-crypto-utils"
       , "nanoassert"
       , "node-fetch"
       , "object-keys"
       , "object.values"
       , "parse-uri"
-      , "protobufjs-old-fixed-webpack"
+      , "protobufjs"
       , "pushdata-bitcoin"
-      , "queue"
       , "randombytes"
       , "regenerator-runtime"
       , "runtypes"
       , "safe-buffer"
       , "semver-compare"
       , "tiny-worker"
       , "trezor-connect"
-      , "trezor-link"
+      , "tiny-secp256k1"
       , "typeforce"
+      , "util-deprecate"
       , "varuint-bitcoin"
       , "wif"
       ]

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;