Merge branch 'develop' into chore/LW-10649-no-nix-chroot

michalrus · michalrus · commit 2da96b5edc9a · 2024-08-05T10:17:43.000+02:00
diff --git a/.github/workflows/verify_pr.yml b/.github/workflows/verify_pr.yml
@@ -6,16 +6,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: "14"
+          node-version: 18
       - name: Restore node_modules from cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - name: Install native dependencies
+        run: sudo apt-get install libudev-dev
       - name: Install dependencies
         run: yarn --frozen-lockfile
       - name: Run checks
diff --git a/Brewfile.netlify b/Brewfile.netlify
@@ -0,0 +1,4 @@
+brew "libusb"
+
+# libudev.h
+brew "systemd"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Fixed installation and running on Ubuntu 24.04 LTS with AppArmor enabled by removing the `chroot` ([PR 3207](https://github.com/input-output-hk/daedalus/pull/3207))
 
+### Chores
+
+- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `7.1.3` and `@trezor/connect` to version `9.3.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3215))
+
 ## 5.4.0
 
 ### Fixes
diff --git a/installers/common/MacInstaller.hs b/installers/common/MacInstaller.hs
@@ -219,6 +219,7 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "@noble"
       , "@protobufjs"
       , "@trezor"
+      , "@sinclair"
       , "agent-base"
       , "babel-runtime"
       , "base-x"
@@ -307,13 +308,17 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "socks-proxy-agent"
       , "tiny-inflate"
       , "tiny-secp256k1"
+      , "tr46"
       , "tslib"
+      , "ts-mixer"
       , "typeforce"
       , "unicode-properties"
       , "unicode-trie"
+      , "usb"
       , "usb-detection"
       , "util-deprecate"
       , "varuint-bitcoin"
+      , "whatwg-url"
       , "wif"
       ]
   mapM_ (\lib -> do
diff --git a/netlify.toml b/netlify.toml
@@ -1,3 +1,8 @@
 [build]
-  environment = { YARN_VERSION = "1.22.4", NODE_VERSION = "14.19.1" }
-  command = "yarn && yarn storybook:build"
+command = "yarn && yarn storybook:build"
+
+[build.environment]
+YARN_VERSION = "1.22.19"
+NODE_VERSION = "18.12.1"
+CXXFLAGS = "-I/home/linuxbrew/.linuxbrew/include"
+LDFLAGS = "-L/home/linuxbrew/.linuxbrew/lib"
diff --git a/nix/devshells.nix b/nix/devshells.nix
@@ -47,6 +47,7 @@ let
       darwin.apple_sdk.frameworks.AppKit
       darwin.cctools
       xcbuild
+      perl
     ] else [
       internal.relocatableElectron
       winePackages.minimal
diff --git a/nix/internal/any-darwin.nix b/nix/internal/any-darwin.nix
@@ -62,7 +62,7 @@ in rec {
     name = "daedalus-node_modules";
     src = srcLockfiles;
     nativeBuildInputs = [ yarn nodejs ]
-      ++ (with pkgs; [ python3 pkgconfig jq darwin.cctools xcbuild ]);
+      ++ (with pkgs; [ python3 perl pkgconfig jq darwin.cctools xcbuild ]);
     buildInputs = (with pkgs.darwin; [
       apple_sdk.frameworks.CoreServices
       apple_sdk.frameworks.AppKit
@@ -80,6 +80,8 @@ in rec {
 
       patchShebangs . >/dev/null  # a real lot of paths to patch, no need to litter logs
 
+      ${builtins.path { path = inputs.self + "/scripts/darwin-no-x-compile.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…):
       find node_modules -type f -name 'package.json' | sort | xargs grep -F '"install":' | cut -d: -f1 | while IFS= read -r dependency ; do
@@ -111,7 +113,7 @@ in rec {
     name = pname;
     src = srcWithoutNix;
     nativeBuildInputs = [ yarn nodejs daedalus-installer ]
-      ++ (with pkgs; [ python3 pkgconfig darwin.cctools xcbuild ]);
+      ++ (with pkgs; [ python3 perl pkgconfig darwin.cctools xcbuild ]);
     buildInputs = (with pkgs.darwin; [
       apple_sdk.frameworks.CoreServices
       apple_sdk.frameworks.AppKit
diff --git a/nix/internal/x86_64-linux.nix b/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,\@sinclair,\@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,tr46,ts-mixer,usb,whatwg-url} $out/share/daedalus/node_modules/
 
       chmod -R +w $out
 
diff --git a/nix/internal/x86_64-windows.nix b/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,\@sinclair,\@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,tr46,ts-mixer,usb,whatwg-url} $out/resources/app/node_modules
 
       chmod -R +w $out
 
diff --git a/package.json b/package.json
@@ -184,7 +184,7 @@
     "timemachine": "0.3.2",
     "transform-loader": "0.2.4",
     "typed-scss-modules": "5.0.0",
-    "typescript": "4.6.2",
+    "typescript": "4.9.5",
     "utf-8-validate": "5.0.2",
     "wait-on": "6.0.1",
     "webdriverio": "5.18.7",
@@ -196,10 +196,10 @@
     "yarn-lockfile": "1.1.1"
   },
   "dependencies": {
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "6.0.0",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
     "@ledgerhq/hw-transport-node-hid": "6.27.15",
-    "@trezor/connect": "9.0.8",
+    "@trezor/connect": "9.3.0",
     "@trezor/transport": "1.1.12",
     "aes-js": "3.1.2",
     "bech32": "2.0.0",
diff --git a/scripts/darwin-no-x-compile.sh b/scripts/darwin-no-x-compile.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+
+# x86_64 cross-compilation won’t fly in this pure derivation:
+if [[ $system == *darwin* ]]; then
+  if [[ $system == *aarch64* ]] ; then
+    changeFrom="x86_64"
+    changeTo="arm64"
+  else
+    changeFrom="arm64"
+    changeTo="x86_64"
+  fi
+  find node_modules/ -type f '(' -name '*.gyp' -o -name '*.gypi' ')' \
+    | ( xargs grep -F "$changeFrom" || true ; ) | cut -d: -f1 | sort --unique \
+    | while IFS= read -r file
+  do
+    sed -r "s/$changeFrom/$changeTo/g" -i "$file"
+  done
+fi
diff --git a/scripts/rebuild-native-modules.sh b/scripts/rebuild-native-modules.sh
@@ -3,6 +3,8 @@
 set -o errexit
 set -o pipefail
 
+SCRIPT_DIR="$(cd "$(dirname "$0")"; pwd)"
+
 # XXX: From the very beginning we have problems with `*.node` native
 # extensions being built against Node.js ABI, and not
 # Electron’s. Let’s solve this once and for all.
@@ -20,13 +22,15 @@ nix run -L .#internal."${system:-x86_64-darwin}".common.patchElectronRebuild
 # XXX: Electron 24.2 requires c++17, not 14 (or old 1y):
 sed -r 's,std=c\+\+(14|1y),std=c++17,g' -i node_modules/usb/binding.gyp
 
+"$SCRIPT_DIR"/darwin-no-x-compile.sh
+
 # TODO: do we really need to run `electron-rebuild` 3×?
 
 electron-rebuild --force
 
 electron-rebuild -w usb-detection --force -s # <https://github.com/MadLittleMods/node-usb-detection#install-for-electron>
 
-if [ "$(uname)" == "Linux" ] ; then
+if [[ $system == *linux* ]]; then
   # We ship debug version because the release one has issues with Ledger Nano S
   electron-rebuild -w usb --force -s --debug
 fi
@@ -64,6 +68,6 @@ tryLink   "usb"           "usb_bindings.node"
 tryLink   "usb-detection" "detection.node"
 tryLink   "node-hid"      "HID.node"
 
-if [ "$(uname)" == "Linux" ] ; then
+if [[ $system == *linux* ]]; then
   tryLink "node-hid"      "HID_hidraw.node"
 fi
diff --git a/source/main/trezor/connection.ts b/source/main/trezor/connection.ts
@@ -10,7 +10,6 @@ export const initTrezorConnect = async () => {
       debug: process.env.DEBUG_TREZOR === 'true',
       manifest,
     });
-
     logger.info('[TREZOR-CONNECT] Called TrezorConnect.init()');
   } catch (error) {
     logger.info('[TREZOR-CONNECT] Failed to call TrezorConnect.init()');
diff --git a/source/main/utils/config.ts b/source/main/utils/config.ts
@@ -60,7 +60,7 @@ export const readLauncherConfig = (
   const inputYaml = configPath ? readFileSync(configPath, 'utf8') : '';
   const parsed = yamljs.parse(inputYaml);
   const finalYaml = recurseReplace(parsed);
-
+  // @ts-ignore
   if (finalYaml === null || finalYaml === []) {
     throw new Error('Daedalus requires a valid launcher config file to work');
   }
diff --git a/source/renderer/app/components/loading/syncing-connecting/SyncingConnectingStatus.tsx b/source/renderer/app/components/loading/syncing-connecting/SyncingConnectingStatus.tsx
@@ -223,6 +223,7 @@ export default class SyncingConnectingStatus extends Component<Props> {
         </h1>
         <div className={styles.description}>
           {connectingDescription && (
+            // @ts-ignore
             <FormattedHTMLMessage {...connectingDescription} />
           )}
         </div>
diff --git a/source/renderer/app/components/notifications/LegacyNotification.tsx b/source/renderer/app/components/notifications/LegacyNotification.tsx
@@ -108,6 +108,7 @@ class LegacyNotification extends Component<Props> {
       activeWalletName,
       ..._values,
     };
+    // @ts-ignore
     return <FormattedMessage {...message} values={values} />;
   };
 
diff --git a/source/renderer/app/utils/shelleyLedger.ts b/source/renderer/app/utils/shelleyLedger.ts
@@ -4,7 +4,7 @@ import {
   TxOutputDestinationType,
   AddressType,
   TxAuxiliaryDataType, // CHECK THIS
-  StakeCredentialParamsType,
+  CredentialParamsType,
   CIP36VoteRegistrationFormat,
 } from '@cardano-foundation/ledgerjs-hw-app-cardano';
 import {
@@ -52,7 +52,7 @@ export const toLedgerCertificate = (cert: CoinSelectionCertificate) => {
     type: CERTIFICATE_TYPE[cert.certificateType],
     params: {
       stakeCredential: {
-        type: StakeCredentialParamsType.KEY_PATH,
+        type: CredentialParamsType.KEY_PATH,
         keyPath: derivationPathToLedgerPath(cert.rewardAccountPath),
       },
       poolKeyHashHex: cert.pool
@@ -65,7 +65,7 @@ export const toLedgerCertificate = (cert: CoinSelectionCertificate) => {
 export const toLedgerWithdrawal = (withdrawal: CoinSelectionWithdrawal) => {
   return {
     stakeCredential: {
-      type: StakeCredentialParamsType.KEY_PATH,
+      type: CredentialParamsType.KEY_PATH,
       keyPath: derivationPathToLedgerPath(withdrawal.derivationPath),
     },
     amount: withdrawal.amount.quantity.toString(),
diff --git a/yarn.lock b/yarn.lock
