Merge pull request #3048 from input-output-hk/merge-5.1.0-into-main

Merge 5.1.0 into main

Author: danielmain

CHANGELOG.md

@@ -1,10 +1,21 @@
 # Changelog
 
+## 5.1.0
+
+### Chores
+
+- Updated `cardano-wallet` to v2022-10-06 ([PR 3045](https://github.com/input-output-hk/daedalus/pull/3045))
+- Changed Japanese translations in delegate screen ([PR 3044](https://github.com/input-output-hk/daedalus/pull/3044))
+- Updated trezor-connect to v9 ([PR 3038](https://github.com/input-output-hk/daedalus/pull/3038))
+- Added analytics data collection ([PR 2927](https://github.com/input-output-hk/daedalus/pull/2927), [PR 2989](https://github.com/input-output-hk/daedalus/pull/2989), [PR 3003](https://github.com/input-output-hk/daedalus/pull/3003), [PR 3028](https://github.com/input-output-hk/daedalus/pull/3028))
+- Updated LedgerJS to 5.1.0 ([PR 3036](https://github.com/input-output-hk/daedalus/pull/3036))
+
 ## 5.0.0
 
 ### Features
 
 - Added new Mnemonic input component ([PR 2979](https://github.com/input-output-hk/daedalus/pull/2979))
+- Updated Terms of Service ([PR 3009](https://github.com/input-output-hk/daedalus/pull/3009))
 
 ### Fixes
 
@@ -19,10 +30,6 @@
 - Fix `darwin-launcher.go` to replace its process image with `cardano-launcher` (binary), and not swallow `stdout` ([PR 3023](https://github.com/input-output-hk/daedalus/pull/3023))
 - 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

default.nix

@@ -32,12 +32,15 @@ let
   };
   pkgs = import sources.nixpkgs { inherit system config; };
   sources = localLib.sources // {
-    cardano-wallet = pkgs.runCommand "cardano-wallet" {} ''
-      cp -r ${localLib.sources.cardano-wallet} $out
-      chmod -R +w $out
-      cd $out
-      patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
-    '';
+    cardano-wallet =
+      if target != "aarch64-darwin"
+      then localLib.sources.cardano-wallet
+      else pkgs.runCommand "cardano-wallet" {} ''
+        cp -r ${localLib.sources.cardano-wallet} $out
+        chmod -R +w $out
+        cd $out
+        patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
+      '';
   };
   haskellNix = import sources."haskell.nix" {};
   inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix;

installers/common/MacInstaller.hs

@@ -253,7 +253,6 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "bytebuffer"
       , "call-bind"
       , "cashaddrjs"
-      , "cbor-web"
       , "clone"
       , "create-hash"
       , "create-hmac"
@@ -313,15 +312,14 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "ripple-keypairs"
       , "ripple-lib"
       , "ripple-lib-transactionparser"
-      , "runtypes"
       , "safe-buffer"
       , "semver-compare"
       , "smart-buffer"
       , "socks"
       , "socks-proxy-agent"
       , "tiny-inflate"
       , "tiny-secp256k1"
-      , "trezor-connect"
+      , "tslib"
       , "typeforce"
       , "unicode-properties"
       , "unicode-trie"

matomo.docker-compose.yml

@@ -0,0 +1,32 @@
+version: "3"
+services:
+  mariadb:
+    image: docker.io/bitnami/mariadb:10.6
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+      - MARIADB_USER=bn_matomo
+      - MARIADB_DATABASE=bitnami_matomo
+      - MARIADB_EXTRA_FLAGS=--max_allowed_packet=64MB
+    volumes:
+      - "matomo_db_data:/bitnami/mariadb"
+  matomo:
+    image: docker.io/bitnami/matomo:4
+    ports:
+      - "8080:8080"
+    environment:
+      - MATOMO_DATABASE_HOST=mariadb
+      - MATOMO_DATABASE_PORT_NUMBER=3306
+      - MATOMO_DATABASE_USER=bn_matomo
+      - MATOMO_DATABASE_NAME=bitnami_matomo
+      - MATOMO_USERNAME=user
+      - MATOMO_PASSWORD=password
+      - ALLOW_EMPTY_PASSWORD=yes
+    volumes:
+      - "matomo_data:/bitnami/matomo"
+    depends_on:
+      - mariadb
+volumes:
+  matomo_db_data:
+    driver: local
+  matomo_data:
+    driver: local

nix/sources.json

@@ -24,15 +24,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-wallet": {
-        "branch": "v2022-08-16",
+        "branch": "v2022-10-06",
         "description": "Official Wallet Backend & API for Cardano decentralized",
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "afe575663a866c612b4a4dc3a90a8a700e387a86",
-        "sha256": "03shbj5kxvcb22k1bvfcv9q529lg47g9y9pvvwkyb2jy285rwyhv",
+        "rev": "2130fe0acf19fa218cef8de4ef325ae9078e356e",
+        "sha256": "0d0wk6n7vij4qkp2qml5qdghk41dvm1078ps48673waf4cxjxaz0",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/afe575663a866c612b4a4dc3a90a8a700e387a86.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/2130fe0acf19fa218cef8de4ef325ae9078e356e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-world": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
@@ -103,9 +103,11 @@
     "@types/node": "14.18.1",
     "@types/qrcode.react": "1.0.2",
     "@types/react": "16.9.56",
+    "@types/react-router": "5.1.18",
+    "@types/react-router-dom": "5.3.3",
     "@types/react-svg-inline": "2.1.3",
     "@types/react-table": "^7.7.9",
-    "@types/trezor-connect": "8.1.18",
+    "@types/uuid": "8.3.4",
     "@typescript-eslint/eslint-plugin": "5.20.0",
     "@typescript-eslint/parser": "5.20.0",
     "@xarc/run": "1.1.1",
@@ -199,9 +201,10 @@
     "yarn-lockfile": "1.1.1"
   },
   "dependencies": {
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "5.0.0",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "5.1.0",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
     "@ledgerhq/hw-transport-node-hid": "6.27.1",
+    "@trezor/connect": "9.0.2",
     "aes-js": "3.1.2",
     "bech32": "2.0.0",
     "bignumber.js": "9.0.1",
@@ -215,7 +218,6 @@
     "cardano-js": "0.4.8",
     "cardano-launcher": "0.20220119.0",
     "cbor": "5.0.2",
-    "cbor-web": "7.0.6",
     "check-disk-space": "3.2.0",
     "chroma-js": "2.1.0",
     "classnames": "2.2.6",
@@ -239,7 +241,8 @@
     "inquirer": "7.3.3",
     "json-bigint": "1.0.0",
     "lodash": "4.17.21",
-    "lodash-es": "4.17.21",
+    "lodash-es": "4.17.15",
+    "matomo-tracker": "2.2.4",
     "mime-types": "2.1.27",
     "mkdirp": "1.0.4",
     "mobx": "5.15.7",
@@ -286,11 +289,11 @@
     "spectron-fake-dialog": "0.0.1",
     "tail": "2.2.4",
     "tcp-port-used": "1.0.1",
-    "trezor-connect": "8.2.8-extended",
     "unorm": "1.6.0",
     "url": "0.11.0",
     "usb-detection": "4.13.0",
     "util": "0.12.4",
+    "uuid": "8.3.2",
     "validator": "13.7.0"
   },
   "devEngines": {

source/common/config/electron-store.config.ts

@@ -23,6 +23,8 @@ export const STORAGE_KEYS: Record<string, StorageKey> = {
   STAKE_POOLS_LIST_VIEW_TOOLTIP: 'STAKE-POOLS-LIST-VIEW-TOOLTIP',
   STAKING_INFO_WAS_OPEN: 'ALONZO-INFO-WAS-OPEN',
   TERMS_OF_USE_ACCEPTANCE: 'TERMS-OF-USE-ACCEPTANCE',
+  ANALYTICS_ACCEPTANCE: 'ANALYTICS-ACCEPTANCE',
+  USER_ID: 'USER-ID',
   THEME: 'THEME',
   TOKEN_FAVORITES: 'TOKEN-FAVORITES',
   USER_DATE_FORMAT_ENGLISH: 'USER-DATE-FORMAT-ENGLISH',

source/common/ipc/api.ts

@@ -4,7 +4,7 @@ import {
   CommonParams,
   Success,
   Unsuccessful,
-} from 'trezor-connect';
+} from '@trezor/connect';
 import type {
   BugReportRequestHttpOptions,
   BugReportRequestPayload,

source/common/ipc/constants.ts

@@ -1,4 +1,6 @@
-export const DIALOGS = {
+import { ApplicationDialog } from '../../renderer/app/types/applicationDialogTypes';
+
+export const DIALOGS: Record<string, ApplicationDialog> = {
   ABOUT: 'ABOUT_DIALOG',
   DAEDALUS_DIAGNOSTICS: 'DAEDALUS_DIAGNOSTICS_DIALOG',
   ITN_REWARDS_REDEMPTION: 'ITN_REWARDS_REDEMPTION_DIALOG',

source/common/ipc/lib/IpcConversation.ts

@@ -1,5 +1,5 @@
 import { isString } from 'lodash';
-import uuid from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 
 export type IpcSender = {
   send: (channel: string, conversationId: string, ...args: Array<any>) => void;
@@ -68,7 +68,7 @@ export class IpcConversation<Incoming, Outgoing> {
     receiver: IpcReceiver
   ): Promise<Incoming> {
     return new Promise((resolve, reject) => {
-      const conversationId = uuid();
+      const conversationId = uuidv4();
 
       const handler = (
         event,