Merge branch 'develop' into merge-4.12.0-into-develop

Author: michalrus

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## vNext
+
+### Fixes
+
+- Ensured non-recommended decimal place setting alert is correctly shown ([PR 3007](https://github.com/input-output-hk/daedalus/pull/3007))
+
+### Chores
+
+- Updated cardano-node to 1.35.1 ([PR 3012](https://github.com/input-output-hk/daedalus/pull/3012))
+
+### Features
+
+- Updated Terms of Service ([PR 3009](https://github.com/input-output-hk/daedalus/pull/3009))
+
 ## 4.12.0
 
 ### Fixes
@@ -9,6 +23,7 @@
 
 ### Chores
 
+- Made Windows installer more resilient w.r.t. auto-updates ([PR 3017](https://github.com/input-output-hk/daedalus/pull/3017))
 - Added OS-architecture tuple to installer file names to help with releases ([PR 3016](https://github.com/input-output-hk/daedalus/pull/3016))
 - Added Vasil-supported cardano-wallet ([PR 3001](https://github.com/input-output-hk/daedalus/pull/3001))
 - Upgraded webpack to version 5 ([PR 2772](https://github.com/input-output-hk/daedalus/pull/2772))

default.nix

@@ -80,7 +80,20 @@ let
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
-    nodejs = pkgs.nodejs-16_x;
+    nodejs = let
+      njPath = pkgs.path + "/pkgs/development/web/nodejs";
+      buildNodeJs = pkgs.callPackage (import (njPath + "/nodejs.nix")) {
+        python = pkgs.python3;
+        icu = pkgs.icu68; # can’t build against ICU 69: <https://chromium-review.googlesource.com/c/v8/v8/+/2477751>
+      };
+    in
+      buildNodeJs {
+        enableNpm = true;
+        version = "14.17.0";
+        sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n";
+        patches = pkgs.lib.optional pkgs.stdenv.isDarwin (njPath + "/bypass-xcodebuild.diff");
+      };
+
     nodePackages = pkgs.nodePackages.override { nodejs = self.nodejs; };
     yarnInfo = {
       version = "1.22.4";

installers/nix/electron.nix

@@ -1,8 +1,8 @@
 { stdenv, lib, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at_spi2_core, libxshmfence,
-  libxkbcommon }:
+  libxkbcommon, runCommand, binutils-unwrapped }:
 
 let
-  version = "13.6.3";
+  version = (builtins.fromJSON (builtins.readFile ../../package.json)).dependencies.electron;
   name = "electron-${version}";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";

nix/yarn-nix-shell.sh

@@ -29,5 +29,9 @@ if [ -z "$command" ] ; then
 fi
 
 export NETWORK
+
+# Prevent segfaults on Darwin in `GC_*` code:
+export GC_DONT_GC=1
+
 # `return` will make the user stay in `nix-shell` after the initial command finishes:
 exec nix-shell --argstr nodeImplementation cardano --argstr cluster "$cluster" --command "$command ; return"

package.json

@@ -13,7 +13,7 @@
     "build:main": "yarn webpack -c source/main/webpack.config.js --progress",
     "build:renderer": "yarn webpack -c source/renderer/webpack.config.js --progress",
     "build:cleanup": "rimraf ./dist",
-    "build:electron": "electron-rebuild -w usb --useCache -s --debug",
+    "build:electron": "electron-rebuild --useCache && electron-rebuild -w usb --useCache -s --debug",
     "check:all": "yarn prettier:check && yarn lint && yarn compile && yarn stylelint && yarn lockfile:check && yarn i18n:manage && yarn storybook:build",
     "start": "yarn electron ./",
     "start:dev": "nodemon --watch 'dist/main' --exec 'NODE_ENV=development yarn start'",

release.nix

@@ -69,8 +69,11 @@ in {
   in {
   daedalus-installer = allArchesNoWindows;
   yaml2json = allArchesNoWindows;
+  nodejs = allArchesNoWindows;
   bridgeTable = {
     cardano = allArches;
   };
   cardano-node = allArches;
-}))
+})) // {
+  recurseForDerivations = {};
+}

scripts/postinstall.sh

@@ -2,4 +2,9 @@
 
 if [[ "$CI" != "true" ]]; then
   yarn lockfile:fix
+
+  # Let’s patch electron-rebuild to force correct Node.js headers to
+  # build native modules against even in `nix-shell`, otherwise, it
+  # doesn’t work reliably.
+  eval "$(nix-build -A rawapp.patchElectronRebuild)"
 fi

shell.nix

@@ -111,16 +111,6 @@ let
       ln -svf $(type -P cardano-node)
       ln -svf $(type -P cardano-wallet)
       ln -svf $(type -P cardano-cli)
-      mkdir -p ${BUILDTYPE}/
-      ${let
-        # (TODO: investigate why – @michalrus)
-        sourceBUILDTYPE = "Release";
-      in ''
-        ln -svf $PWD/node_modules/usb/build/${sourceBUILDTYPE}/usb_bindings.node ${BUILDTYPE}/
-        ln -svf $PWD/node_modules/node-hid/build/${sourceBUILDTYPE}/HID.node ${BUILDTYPE}/
-        ln -svf $PWD/node_modules/node-hid/build/${sourceBUILDTYPE}/HID_hidraw.node ${BUILDTYPE}/
-        ln -svf $PWD/node_modules/usb-detection/build/${sourceBUILDTYPE}/detection.node ${BUILDTYPE}/
-      ''}
 
       ${pkgs.lib.optionalString (nodeImplementation == "cardano") ''
         source <(cardano-node --bash-completion-script `type -p cardano-node`)
@@ -135,14 +125,51 @@ let
         ''
       }
       yarn install --frozen-lockfile
+
+      # Rebuild native modules for <https://www.electronjs.org/docs/latest/tutorial/using-native-node-modules>:
+      find Debug/ Release/ -name '*.node' | xargs rm -v || true
       yarn build:electron
+
+      ${let
+        # Several native modules have to be linked in ${BUILDTYPE}/ in
+        # root directory, for `yarn dev` to work correctly. If a Debug
+        # version of such extension exists, we use it, otherwise, we
+        # use Release:
+        tryLink = dependency: fileName: ''
+          symlinkTarget=$(ls 2>/dev/null -d \
+            "$PWD/node_modules/${dependency}/build/Debug/${fileName}" \
+            "$PWD/node_modules/${dependency}/build/Release/${fileName}" \
+            | head -1
+          )
+
+          if [ -z "$symlinkTarget" ] ; then
+            echo >&2 "error: symlink target not found: ‘${fileName}’ in ‘${dependency}’"
+            # ~exit 1~ — do not exit, let the person fix from inside `nix-shell`
+          fi
+
+          ${localLib.optionalString pkgs.stdenv.isLinux ''
+            ${pkgs.patchelf}/bin/patchelf --set-rpath ${pkgs.lib.makeLibraryPath [
+              pkgs.stdenv.cc.cc pkgs.udev
+            ]} "$symlinkTarget"
+          ''}
+
+          mkdir -p ${BUILDTYPE}/
+          ln -svf "$symlinkTarget" ${BUILDTYPE}/
+          unset symlinkTarget
+        '';
+      in ''
+        ${tryLink "usb"           "usb_bindings.node"}
+        ${tryLink "usb-detection" "detection.node"}
+        ${tryLink "node-hid"      "HID.node"}
+        ${localLib.optionalString pkgs.stdenv.isLinux ''
+          ${tryLink "node-hid"      "HID_hidraw.node"}
+        ''}
+      ''}
+
       ${localLib.optionalString pkgs.stdenv.isLinux ''
-        ${pkgs.patchelf}/bin/patchelf --set-rpath ${pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc pkgs.udev ]} ${BUILDTYPE}/usb_bindings.node
-        ${pkgs.patchelf}/bin/patchelf --set-rpath ${pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc pkgs.udev ]} ${BUILDTYPE}/HID.node
-        # TODO: is this needed for `detection.node`?
-        ${pkgs.patchelf}/bin/patchelf --set-rpath ${pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc pkgs.udev ]} ${BUILDTYPE}/detection.node
         ln -svf ${daedalusPkgs.electron}/bin/electron ./node_modules/electron/dist/electron
       ''}
+
       echo 'jq < $LAUNCHER_CONFIG'
       echo debug the node by running debug-node
     '';

source/common/types/logging.types.ts

@@ -14,8 +14,8 @@ import type {
 } from '../../renderer/app/api/wallets/types';
 import type { Address } from '../../renderer/app/api/addresses/types';
 import type { GetTransactionsRequest } from '../../renderer/app/api/transactions/types';
-import type { HardwareWalletLocalData } from '../../renderer/app/api/utils/localStorage';
 import type { AdaApiStakePool } from '../../renderer/app/api/staking/types';
+import { HardwareWalletLocalData } from '../../renderer/app/types/localDataTypes';
 
 export type LoggingLevel = 'debug' | 'info' | 'error' | 'warn';
 export type Logger = {

source/renderer/app/api/api.ts

@@ -223,11 +223,11 @@ import type {
   ApiAsset,
   StoredAssetMetadata,
 } from './assets/types';
-import type { AssetLocalData } from './utils/localStorage';
 import Asset from '../domains/Asset';
 import { getAssets } from './assets/requests/getAssets';
 import { getAccountPublicKey } from './wallets/requests/getAccountPublicKey';
 import { doesWalletRequireAdaToRemainToSupportTokens } from './utils/apiHelpers';
+import { AssetLocalData } from '../types/localDataTypes';
 
 export default class AdaApi {
   config: RequestConfig;
@@ -663,14 +663,14 @@ export default class AdaApi {
       logger.debug('AdaApi::getAssets success', {
         assets: response,
       });
-      const assetsLocaldata = await global.daedalus.api.localStorage.getAssetsLocalData();
+      const assetsLocalData = await global.daedalus.api.localStorage.getAssetsLocalData();
       logger.debug('AdaApi::getAssetsLocalData success', {
-        assetsLocaldata,
+        assetsLocalData,
       });
       const assets = response.map((asset) =>
         _createAssetFromServerData(
           asset,
-          assetsLocaldata[asset.policy_id + asset.asset_name] || {},
+          assetsLocalData[asset.policy_id + asset.asset_name] || {},
           this.storedAssetMetadata
         )
       );