[DDW-1213] Upgrade Electron to 24.2, and Node.js to 18.×

Author: michalrus

nix/any-darwin.nix

@@ -77,10 +77,6 @@ in rec {
       find . -type f -name '*.node' -not -path '*/@swc*/*' -exec rm -vf {} ';'
 
       patchShebangs . >/dev/null  # a real lot of paths to patch, no need to litter logs
-      sed -r 's#/bin/sh#sh#' -i node_modules/lzma-native/node_modules/node-gyp-build/bin.js
-
-      # GNU sed is a bit different:
-      sed -r "s#sed -i '''#sed -i#" -i node_modules/lzma-native/liblzma-config.sh
 
       # And now, with correct shebangs, run the install scripts (we have to do that
       # semi-manually, because another `yarn install` will overwrite those shebangs…):

nix/new-common.nix

@@ -30,14 +30,14 @@ rec {
   #     patches = pkgs.lib.optional pkgs.stdenv.isDarwin (njPath + "/bypass-xcodebuild.diff");
   #   };
 
-  nodejs = pkgs.nodejs-14_x.overrideAttrs (drv: {
+  nodejs = pkgs.nodejs-18_x.overrideAttrs (drv: {
     # XXX: we don’t want `bypass-xcodebuild.diff`, rather we supply
     # the pure `xcbuild` – without that, `blake2` doesn’t build,
     # cf. <https://github.com/NixOS/nixpkgs/blob/29ae6a1f3d7a8886b3772df4dc42a13817875c7d/pkgs/development/web/nodejs/bypass-xcodebuild.diff>
     patches = [];
   });
 
-  nodePackages = pkgs.nodePackages.override { nodejs = nodejs; };
+  nodePackages = pkgs.nodePackages.override { inherit nodejs; };
 
   yarn = (pkgs.yarn.override { inherit nodejs; }).overrideAttrs (drv: {
     # XXX: otherwise, unable to run our package.json scripts in Nix sandbox (patchShebangs doesn’t catch this)
@@ -50,8 +50,8 @@ rec {
     # Nixpkgs master @ 2022-07-18
     # Why → newer `yarn2nix` uses `deep-equal` to see if anything changed in the lockfile, we need that.
     source = pkgs.fetchzip {
-      url = "https://github.com/NixOS/nixpkgs/archive/qe4d49de45a3b5dbcb881656b4e3986e666141ea9.tar.gz";
-      sha256 = "0y0c9ybkcfmjgrl93wzzlk7ii95kh2fb4v5ac5w6rmcsq2ff3yaz";
+      url = "https://github.com/NixOS/nixpkgs/archive/e4d49de45a3b5dbcb881656b4e3986e666141ea9.tar.gz";
+      hash = "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=";
     };
     subdir = builtins.path { path = source + "/pkgs/development/tools/yarn2nix-moretea/yarn2nix"; };
     in
@@ -135,7 +135,7 @@ rec {
       # XXX: don’t use fetchzip, we need the raw .tar.gz in `patchElectronRebuild` below
       src = pkgs.fetchurl {
         url = "https://electronjs.org/headers/v${electronVersion}/node-v${electronVersion}-headers.tar.gz";
-        hash = "sha256-+FZ1EYV6tiZZUFulFYtq1pr861EhBaMlHRgP5H9ENmw=";
+        hash = "sha256-er08CKt3fwotSjYxqdzpm8Q0YjvD1PhfNBDZ3Jozsvk=";
       };
     } ''
       tar -xf $src
@@ -144,16 +144,18 @@ rec {
     '';
 
     electronShaSums = pkgs.fetchurl {
+      name = "electronShaSums-${electronVersion}"; # cache invalidation
       url = "https://github.com/electron/electron/releases/download/v${electronVersion}/SHASUMS256.txt";
-      hash = "sha256-NiUplP/dqmynH2ZN97kJVqMkzSLOLi3JR1T/OWHiOiA=";
+      hash = "sha256-75bNqt2c7u/fm0P2Ha6NvkbGThEifIHXl2x5UCdy4fM=";
     };
 
     electronCacheHash = builtins.hashString "sha256"
       "https://github.com/electron/electron/releases/download/v${electronVersion}";
 
     electronChromedriverShaSums = pkgs.fetchurl {
+      name = "electronChromedriverShaSums-${electronChromedriverVersion}"; # cache invalidation
       url = "https://github.com/electron/electron/releases/download/v${electronChromedriverVersion}/SHASUMS256.txt";
-      sha256 = "07xxam8dvn1aixvx39gd5x3yc1bs6i599ywxwi5cbkpf957ilpcx";
+      hash = "sha256-nV0aT0nuzsVK5J37lEo0egXmRy/tpdF3jyrY3VBVvR8=";
     };
 
     electronChromedriverCacheHash = builtins.hashString "sha256"
@@ -176,15 +178,7 @@ rec {
   patchElectronRebuild = pkgs.writeShellScriptBin "patch-electron-rebuild" ''
     echo 'Patching electron-rebuild to force our Node.js headers…'
 
-    nodeGypJs=lib/src/module-type/node-gyp.js
-    if [ ! -e $nodeGypJs ] ; then
-      # makes it work both here, and in shell.nix:
-      nodeGypJs="node_modules/electron-rebuild/$nodeGypJs"
-    fi
-    if [ ! -e $nodeGypJs ] ; then
-      echo >&2 'fatal: shouldn’t happen unless electron-rebuild changes'
-      exit 1
-    fi
+    nodeGypJs="node_modules/@electron/rebuild/lib/module-type/node-gyp/node-gyp.js"
 
     # Patch idempotently (matters in repetitive shell.nix):
     if ! grep -qF ${commonSources.electronHeaders.src} $nodeGypJs ; then

nix/x86_64-linux.nix

@@ -57,7 +57,6 @@ in rec {
       find . -type f -name '*.node' -not -path '*/@swc*/*' -exec rm -vf {} ';'
 
       patchShebangs . >/dev/null  # a real lot of paths to patch, no need to litter logs
-      sed -r 's#/bin/sh#sh#' -i node_modules/lzma-native/node_modules/node-gyp-build/bin.js
 
       # And now, with correct shebangs, run the install scripts (we have to do that
       # semi-manually, because another `yarn install` will overwrite those shebangs…):
@@ -102,7 +101,7 @@ in rec {
     patchedPackageJson = pkgs.writeText "package.json" (builtins.toJSON (
       pkgs.lib.recursiveUpdate originalPackageJson {
         productName = oldCode.launcherConfigs.installerConfig.spacedName;
-        main = "main/index.js";
+        main = "dist/main/index.js";
       }
     ));
     buildPhase = ''
@@ -119,6 +118,9 @@ in rec {
       cp -R dist/. $out/share/daedalus/.
       cp $patchedPackageJson $out/share/daedalus/package.json
 
+      chmod +w $out/share/daedalus/package.json
+      sed -r 's,"dist/main/index.js","main/index.js",g' -i $out/share/daedalus/package.json
+
       # XXX: the webpack utils embed the original source paths into map files, which causes the derivation
       # to depend on the original inputs at the nix layer, and double the size of the linux installs.
       # this will just replace all storepaths with an invalid one:
@@ -309,7 +311,7 @@ in rec {
   linuxSources = {
     electron = pkgs.fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${electronVersion}/electron-v${electronVersion}-linux-x64.zip";
-      hash = "sha256-dgdCKkuoDNpL1/77L74vTguac9uS4egtwBASqFtdDSs=";
+      hash = "sha256-jXeA3Sr8/l6Uos9XT0+hCiosaRIndx/KSQUcUkrGdRM=";
     };
 
     electronChromedriver = pkgs.fetchurl {

package.json

@@ -124,8 +124,8 @@
     "electron-connect": "0.6.3",
     "electron-devtools-installer": "3.2.0",
     "electron-mock-ipc": "0.3.12",
-    "electron-packager": "15.4.0",
-    "electron-rebuild": "3.2.7",
+    "electron-packager": "17.1.1",
+    "@electron/rebuild": "3.2.13",
     "electron-reloader": "1.2.1",
     "eslint": "8.13.0",
     "eslint-config-airbnb": "19.0.4",
@@ -219,7 +219,7 @@
     "classnames": "2.2.6",
     "csv-stringify": "5.5.1",
     "cucumber-html-reporter": "5.2.0",
-    "electron": "13.6.3",
+    "electron": "24.2.0",
     "electron-log-daedalus": "2.2.21",
     "electron-store": "8.0.1",
     "es6-error": "4.1.1",
@@ -311,6 +311,8 @@
     "**/**/usb": "1.7.2",
     "**/**/prismjs": "1.27.0",
     "**/**/prebuild-install": "^6.1.4",
+    "**/**/node-abi": "^3.40.0",
+    "**/**/nan": "^2.17.0",
     "prebuild-install": "^6.1.4",
     "pbkdf2": "3.1.2"
   }

scripts/rebuild-native-modules.sh

@@ -17,6 +17,9 @@ find . -type f -name '*.node' -not -path '*/@swc*/*' -exec rm -vf {} ';'
 # doesn’t work reliably.
 nix run -L .#internal.mainnet.newCommon.patchElectronRebuild
 
+# XXX: Electron 24.2 requires c++17:
+sed -r 's,std=c\+\+14,std=c++17,g' -i node_modules/usb/binding.gyp
+
 # TODO: do we really need to run `electron-rebuild` 3×?
 
 electron-rebuild --force

source/main/cardano/CardanoNode.ts

@@ -738,14 +738,14 @@ export class CardanoNode {
           ca: '' as any,
           key: '' as any,
           cert: '' as any,
-          hostname: 'localhost',
+          hostname: '127.0.0.1', // “localhost” breaks under new electron, which prefers ::1 (IPv6)
           port,
         }
       : {
           ca: _actions.readFileSync(`${tlsPath}/client/ca.crt`),
           key: _actions.readFileSync(`${tlsPath}/client/client.key`),
           cert: _actions.readFileSync(`${tlsPath}/client/client.pem`),
-          hostname: 'localhost',
+          hostname: '127.0.0.1', // “localhost” breaks under new electron, which prefers ::1 (IPv6)
           port,
         };
 

source/main/cardano/CardanoSelfnodeLauncher.ts

@@ -31,7 +31,8 @@ const CARDANO_WALLET_START_TIMEOUT = 60 * 1000; // 60 seconds | unit: millisecon
 const CARDANO_WALLET_START_CHECK_INTERVAL = 500; // 500 ms | unit: milliseconds
 
 const TOKEN_METADATA_SERVER_PORT = 65432;
-const TOKEN_METADATA_SERVER = `http://localhost:${TOKEN_METADATA_SERVER_PORT}/`;
+// “localhost” breaks under new electron, which prefers ::1 (IPv6)
+const TOKEN_METADATA_SERVER = `http://127.0.0.1:${TOKEN_METADATA_SERVER_PORT}/`;
 const TOKEN_METADATA_SERVER_PROCESS_NAME = environment.isWindows
   ? 'mock-token-metadata-server.exe'
   : 'mock-token-metadata-server';

source/main/config.ts

@@ -178,7 +178,8 @@ export const FALLBACK_TOKEN_METADATA_SERVER_URL =
 export const MINIMUM_AMOUNT_OF_RAM_FOR_RTS_FLAGS = 16 * 1024 * 1024 * 1024; // 16gb RAM
 
 // Used by mock-token-metadata-server
-export const MOCK_TOKEN_METADATA_SERVER_URL = 'http://localhost';
+// “localhost” breaks under new electron, which prefers ::1 (IPv6)
+export const MOCK_TOKEN_METADATA_SERVER_URL = 'http://127.0.0.1';
 export const MOCK_TOKEN_METADATA_SERVER_PORT =
   process.env.MOCK_TOKEN_METADATA_SERVER_PORT || 0;
 export const RTS_FLAGS = ['-c'];

source/main/windows/main.ts

@@ -55,6 +55,7 @@ export const createMainWindow = (
       // TODO: change to ipc
       enableRemoteModule: isTest,
       preload: path.join(__dirname, './preload.js'),
+      nodeIntegration: true,
       additionalArguments: isBlankScreenFixActive ? ['--safe-mode'] : [],
     },
   };
@@ -81,7 +82,7 @@ export const createMainWindow = (
     window.close();
   });
   if (isDev) {
-    window.loadURL(`http://localhost:8080`);
+    window.loadURL(`http://127.0.0.1:8080`);
   } else {
     window.loadURL(`file://${__dirname}/../renderer/index.html`);
   }

source/renderer/app/api/index.ts

@@ -9,7 +9,7 @@ export type Api = {
 
 export const setupApi = (isTest: boolean): Api => ({
   ada: new AdaApi(isTest, {
-    hostname: 'localhost',
+    hostname: '127.0.0.1', // “localhost” breaks under new electron, which prefers ::1 (IPv6)
     port: 8090,
     ca: Uint8Array.from([]),
     key: Uint8Array.from([]),