[LW-9860] Fix the installer builds

Author: michalrus

installers/common/MacInstaller.hs

@@ -239,7 +239,6 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "bs58"
       , "bs58check"
       , "buffer"
-      , "bytebuffer"
       , "call-bind"
       , "cashaddrjs"
       , "clone"
@@ -315,12 +314,20 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "util-deprecate"
       , "varuint-bitcoin"
       , "wif"
+      , "whatwg-url"
+      , "tr46"
+      , "usb"
+      , "node-gyp-build"
+      , "@sinclair"
+      , "ts-mixer"
+      , "core-js"
       ]
   mapM_ (\lib -> do
       cptree ("../node_modules" </> lib) ((fromText pathtoapp) </> "Contents/Resources/app/node_modules" </> lib)
     ) externalYarn
   mktree ((fromText pathtoapp) </> "Contents/Resources/app/build")
-  mapM_ (\(srcdir, name) -> cp ("../node_modules" </> srcdir </> name) ((fromText pathtoapp) </> "Contents/Resources/app/build" </> name)) [ ("usb/build/Release","usb_bindings.node"), ("node-hid/build/Release", "HID.node"), ("usb-detection/build/Release", "detection.node") ]
+  mapM_ (\(srcdir, name) -> cp ("../node_modules" </> srcdir </> name) ((fromText pathtoapp) </> "Contents/Resources/app/build" </> name)) [ ("usb/build/Release","usb_bindings.node"), ("node-hid/build/Release", "HID.node"), ("usb-detection/build/Release", "detection.node"), ( "utf-8-validate/build/Release", "validation.node") ]
+
   rewritePackageJson (T.unpack $ pathtoapp <> "/Contents/Resources/app/package.json") (spacedName installerConfig)
   pure $ fromString $ T.unpack $ pathtoapp
 

nix/internal/x86_64-linux.nix

@@ -143,7 +143,7 @@ in rec {
       ln -sv $out/share/daedalus/renderer/assets $out/share/fonts/daedalus
 
       mkdir -pv $out/share/daedalus/node_modules
-      cp -r node_modules/{\@babel,\@noble,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib} $out/share/daedalus/node_modules/
+      cp -r node_modules/{\@babel,\@noble,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib,whatwg-url,tr46,usb,node-gyp-build,\@sinclair,ts-mixer,core-js} $out/share/daedalus/node_modules/
 
       chmod -R +w $out
 
@@ -170,7 +170,15 @@ in rec {
       # TODO: we took Release/detection.node before `rebuild-native-modules.sh` ever existed – is this still fine?
       cp node_modules/usb-detection/build/Debug/detection.node $out/share/daedalus/node_modules/usb-detection/build
 
-      for file in $out/share/daedalus/node_modules/usb/build/usb_bindings.node $out/share/daedalus/node_modules/node-hid/build/HID_hidraw.node $out/share/daedalus/node_modules/usb-detection/build/detection.node; do
+      mkdir -p $out/share/daedalus/node_modules/utf-8-validate/build
+      cp node_modules/utf-8-validate/build/Debug/validation.node $out/share/daedalus/node_modules/utf-8-validate/build
+
+      for file in \
+        $out/share/daedalus/node_modules/usb/build/usb_bindings.node \
+        $out/share/daedalus/node_modules/node-hid/build/HID_hidraw.node \
+        $out/share/daedalus/node_modules/usb-detection/build/detection.node \
+        $out/share/daedalus/node_modules/utf-8-validate/build/validation.node \
+      ; do
         $STRIP $file
         patchelf --shrink-rpath $file
       done

nix/internal/x86_64-windows.nix

@@ -110,7 +110,7 @@ in rec {
       rm -rf $out/resources/app/{installers,launcher-config.yaml,gulpfile.js,home}
 
       mkdir -pv $out/resources/app/node_modules
-      cp -r node_modules/{\@babel,\@noble,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib} $out/resources/app/node_modules
+      cp -r node_modules/{\@babel,\@noble,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib,whatwg-url,tr46,usb,node-gyp-build,\@sinclair,ts-mixer,core-js} $out/resources/app/node_modules
 
       chmod -R +w $out
 
@@ -389,6 +389,7 @@ in rec {
       cp node_modules/usb-detection/build/Release/detection.node $out/build/Release/
       cp node_modules/usb/build/Release/usb_bindings.node        $out/build/Release/
       cp node_modules/node-hid/build/Release/HID.node            $out/build/Release/
+      cp node_modules/utf-8-validate/build/Release/validation.node $out/build/Release/
 
       # make sure they’re for Windows
       find $out -iname '*.node' | while IFS= read -r ext ; do

package.json

@@ -80,7 +80,6 @@
     "asar": "2.1.0",
     "autodll-webpack-plugin": "0.4.2",
     "axios": "0.24.0",
-    "bufferutil": "4.0.1",
     "cache-loader": "4.1.0",
     "chai": "4.3.4",
     "chalk": "4.1.0",
@@ -92,8 +91,8 @@
     "electron-connect": "0.6.3",
     "electron-devtools-installer": "3.2.0",
     "electron-mock-ipc": "0.3.12",
-    "electron-packager": "17.1.1",
-    "electron-reloader": "1.2.1",
+    "electron-packager": "17.1.2",
+    "electron-reloader": "1.2.3",
     "eslint": "8.13.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-prettier": "8.5.0",
@@ -152,7 +151,6 @@
     "transform-loader": "0.2.4",
     "typed-scss-modules": "5.0.0",
     "typescript": "4.6.2",
-    "utf-8-validate": "5.0.2",
     "wait-on": "6.0.1",
     "webdriverio": "5.18.7",
     "webpack": "5.72.0",
@@ -164,16 +162,16 @@
     "yarn-audit-html": "^7.3.2"
   },
   "dependencies": {
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "6.0.0",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "6.0.1",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
-    "@ledgerhq/hw-transport-node-hid": "6.27.15",
-    "@trezor/connect": "9.1.11",
-    "@trezor/transport": "1.1.22",
+    "@ledgerhq/hw-transport-node-hid": "6.28.4",
+    "@trezor/connect": "9.1.12",
+    "@trezor/transport": "1.1.24",
     "aes-js": "3.1.2",
     "bech32": "2.0.0",
     "bignumber.js": "9.0.1",
     "bip39": "3.0.4",
-    "blake2b": "2.1.3",
+    "blake2b": "2.1.4",
     "blakejs": "1.1.0",
     "borc": "2.1.2",
     "bs58": "4.0.1",
@@ -188,7 +186,7 @@
     "csv-stringify": "5.5.1",
     "electron": "24.2.0",
     "electron-log-daedalus": "2.2.21",
-    "electron-store": "8.0.1",
+    "electron-store": "8.1.0",
     "es6-error": "4.1.1",
     "find-process": "1.4.7",
     "fireworks-js": "1.0.4",
@@ -204,7 +202,7 @@
     "inquirer": "7.3.3",
     "json-bigint": "1.0.0",
     "lodash": "4.17.21",
-    "lodash-es": "4.17.15",
+    "lodash-es": "4.17.21",
     "matomo-tracker": "2.2.4",
     "mime-types": "2.1.27",
     "mkdirp": "1.0.4",
@@ -215,7 +213,6 @@
     "moment": "2.29.0",
     "nanoid": "3.2.0",
     "node-downloader-helper": "1.0.18",
-    "node-hid": "2.1.2",
     "omit-deep-lodash": "1.1.5",
     "pbkdf2": "3.1.2",
     "pdfkit": "0.8.3",
@@ -279,6 +276,9 @@
     "**/**/prebuild-install": "^6.1.4",
     "**/**/node-abi": "^3.40.0",
     "**/**/nan": "^2.17.0",
+    "**/**/usb": "^2.11.0",
+    "**/**/bufferutil": "^4.0.1",
+    "**/**/utf-8-validate": "^5.0.2",
     "prebuild-install": "^6.1.4",
     "pbkdf2": "3.1.2"
   }

scripts/rebuild-native-modules.sh

@@ -23,9 +23,9 @@ sed -r 's,std=c\+\+(14|1y),std=c++17,g' -i node_modules/usb/binding.gyp
 if [ "$(uname)" == "Darwin" ] ; then
   ourArch="$(uname -m)"
   for f in \
-    node_modules/@trezor/transport/node_modules/usb/binding.gyp \
-    node_modules/@trezor/transport/node_modules/usb/libusb.gypi \
-    node_modules/rpc-websockets/node_modules/utf-8-validate/binding.gyp \
+    node_modules/usb/binding.gyp \
+    node_modules/usb/libusb.gypi \
+    node_modules/utf-8-validate/binding.gyp \
   ; do
     sed -r 's,-arch (x86_64|arm64),-arch '"$ourArch"',g' -i "$f"
   done
@@ -73,6 +73,7 @@ tryLink() {
 
 tryLink   "usb"           "usb_bindings.node"
 tryLink   "usb-detection" "detection.node"
+tryLink   "utf-8-validate" "validation.node"
 tryLink   "node-hid"      "HID.node"
 
 if [ "$(uname)" == "Linux" ] ; then