[DDW-1179] Merges-in latest develop branch and fix conflicts

Author: tomislavhoracek

.buildkite/pipeline.yml

@@ -1,25 +1,37 @@
 env:
   ARTIFACT_BUCKET: s3://ci-output-sink
 steps:
+
+  - input: ':recycle: Trigger ‘x86_64-darwin’'
+    key: 'trigger-x86_64-darwin'
+
+  - input: ':recycle: Trigger ‘aarch64-darwin’'
+    key: 'trigger-aarch64-darwin'
+
   - label: 'daedalus-x86_64-darwin'
     command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
+    depends_on: 'trigger-x86_64-darwin'
     env:
       NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
     agents:
       queue: daedalus
       system: x86_64-darwin
+
   - label: 'daedalus-aarch64-darwin'
     command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
+    depends_on: 'trigger-aarch64-darwin'
     env:
       NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
       UPLOAD_DIR_OVERRIDE: UNSAFE-internal-build
     agents:
       queue: daedalus
       system: aarch64-darwin
+
   - label: 'daedalus-x86_64-linux-nix'
     command: 'scripts/with-nix-2.5.sh scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
     agents:
       system: x86_64-linux
+
   - label: 'daedalus-x86_64-windows-nix'
     command: 'scripts/with-nix-2.5.sh scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
     agents:

CHANGELOG.md

@@ -2,14 +2,21 @@
 
 ## vNext
 
+### Chores
+
+- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `6.0.0` and `@ledgerhq/hw-transport-node-hid` to version `6.27.12` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3093))
+
+## 5.2.0
+
 ### Features
 
+- Added custom dimension to track legacy and hardware wallets ([PR 3091](https://github.com/input-output-hk/daedalus/pull/3091))
 - Implemented CPU name grouping mechanism for analytics ([PR 3089](https://github.com/input-output-hk/daedalus/pull/3089))
 - Implemented rounding RAM size in analytics ([PR 3088](https://github.com/input-output-hk/daedalus/pull/3088))
 
 ### Chores
 
-- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` package to version `6.0.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3093))
+- Update `cardano-node` to 1.35.4 for the Preview network respin ([PR 3082](https://github.com/input-output-hk/daedalus/pull/3082))
 - Updated new Catalyst API URL ([PR 3087](https://github.com/input-output-hk/daedalus/pull/3087))
 - Fixed Storybook state for General stories ([PR 3064](https://github.com/input-output-hk/daedalus/pull/3064))
 

CODE-OF-CONDUCT.md

@@ -0,0 +1 @@
+See [Code of Conduct](https://github.com/input-output-hk/cardano-engineering-handbook/blob/main/CODE-OF-CONDUCT.md)

README.md

@@ -1,5 +1,5 @@
 <blockquote>
-<sub>Document maintainer: Nikola Glumac<br/>Document status: Active</sub>
+<sub>Document maintainer: Daniel Main<br/>Document status: Active</sub>
 </blockquote>
 
 # Daedalus
@@ -20,7 +20,7 @@ Daedalus - Cryptocurrency Wallet
 
 [Nix](https://nixos.org/nix/) is needed to run Daedalus in `nix-shell`.
 
-1. Install nix: `curl -L https://nixos.org/nix/install | sh` (use `sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume` on macOS Catalina)
+1. Install nix: `curl -L https://nixos.org/nix/install | sh` (use `sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume` on macOS 10.15 and higher)
 2. Employ the signed IOHK binary cache:
    ```bash
    $ sudo mkdir -p /etc/nix
@@ -41,9 +41,15 @@ Daedalus - Cryptocurrency Wallet
    substituters = https://cache.iog.io https://cache.nixos.org/
    trusted-substituters =
    trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+   
+   # Only if using mac 
    extra-sandbox-paths = /System/Library/Frameworks /System/Library/PrivateFrameworks /usr/lib
+
    experimental-features = nix-command flakes
 
+   # If you are running on Linux x86/64
+   system = x86_64-linux
+   
    # If you are running on a Mac with Intel chip 
    system = x86_64-darwin
    
@@ -70,16 +76,16 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
 1. Run `yarn nix:selfnode` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell` (use `KEEP_LOCAL_CLUSTER_RUNNING` environment variable to keep the local cluster running after Daedalus exits: `KEEP_LOCAL_CLUSTER_RUNNING=true yarn dev`)
 3. Once Daedalus has started and has gotten past the loading screen run the following commands from a new terminal window if you wish to import funded wallets:
-  - Byron wallets: `yarn byron:wallet:importer`
-  - Shelley wallets: `yarn shelley:wallet:importer`
-  - Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
-  - Yoroi Byron wallets: `yarn yoroi:wallet:importer`
-  - _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
-  - _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
+- Byron wallets: `yarn byron:wallet:importer`
+- Shelley wallets: `yarn shelley:wallet:importer`
+- Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
+- Yoroi Byron wallets: `yarn yoroi:wallet:importer`
+- _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
+- _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
 
-   These scripts import 3 wallets by default. You can import up to 10 wallets by supplying `WALLET_COUNT` environment variable (e.g. `WALLET_COUNT=10 yarn mary:wallet:importer`).
+These scripts import 3 wallets by default. You can import up to 10 wallets by supplying `WALLET_COUNT` environment variable (e.g. `WALLET_COUNT=10 yarn mary:wallet:importer`).
 
-   List of all funded wallet recovery phrases can be found here: https://github.com/input-output-hk/daedalus/blob/develop/utils/api-importer/mnemonics.js
+List of all funded wallet recovery phrases can be found here: https://github.com/input-output-hk/daedalus/blob/develop/utils/api-importer/mnemonics.js
 
 **Notes:**
 - Cardano wallet process ID shown on the "Diagnostics" screen is faked and expected to match the Cardano node process ID.

nix/sources.json

@@ -1,14 +1,14 @@
 {
     "cardano-node": {
-        "branch": "tags/1.35.3",
+        "branch": "tags/1.35.4",
         "description": null,
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-node",
-        "rev": "950c4e222086fed5ca53564e642434ce9307b0b9",
-        "sha256": "020fwimsm24yblr1fmnwx240wj8r3x715p89cpjgnnd8axwf32p0",
+        "rev": "ebc7be471b30e5931b35f9bbc236d21c375b91bb",
+        "sha256": "1j01m2cp2vdcl26zx9xmipr551v3b2rz9kfn9ik8byfwj1z7652r",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-node/archive/950c4e222086fed5ca53564e642434ce9307b0b9.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-node/archive/ebc7be471b30e5931b35f9bbc236d21c375b91bb.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-shell": {
@@ -24,15 +24,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-wallet": {
-        "branch": "v2022-10-06",
+        "branch": "v2022-12-14",
         "description": "Official Wallet Backend & API for Cardano decentralized",
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "2130fe0acf19fa218cef8de4ef325ae9078e356e",
-        "sha256": "0d0wk6n7vij4qkp2qml5qdghk41dvm1078ps48673waf4cxjxaz0",
+        "rev": "bbf11d4feefd5b770fb36717ec5c4c5c112aca87",
+        "sha256": "1gvxmyclarklajifbyi2l8zwc1gqhbdps73rl9if9a3mpn5xngcp",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/2130fe0acf19fa218cef8de4ef325ae9078e356e.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/bbf11d4feefd5b770fb36717ec5c4c5c112aca87.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-world": {
@@ -41,10 +41,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-world",
-        "rev": "7561fe35ee8c532f2666f0627d49ea6e107e0e3f",
-        "sha256": "1sxf611cnqlwc3sz10nnxjip2w9j7ii9n42zby90j409sx40mg7g",
+        "rev": "a0a315100ee320395be97fcc83f46678d5a7fb6e",
+        "sha256": "08scj58jixs15sjidhjfw93y3vyqp3vmbjmlrc4hpp5q5xwri3k6",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-world/archive/7561fe35ee8c532f2666f0627d49ea6e107e0e3f.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-world/archive/a0a315100ee320395be97fcc83f46678d5a7fb6e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "flake-compat": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "5.1.1",
+  "version": "5.2.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

source/main/environment.ts

@@ -53,7 +53,7 @@ const isDevelopment = checkIsDevelopment(NETWORK);
 const analyticsFeatureEnabled = true;
 const keepLocalClusterRunning = process.env.KEEP_LOCAL_CLUSTER_RUNNING;
 const API_VERSION = process.env.API_VERSION || 'dev';
-const NODE_VERSION = '1.35.3'; // TODO: pick up this value from process.env
+const NODE_VERSION = '1.35.4'; // TODO: pick up this value from process.env
 
 const mainProcessID = get(process, 'ppid', '-');
 const rendererProcessID = process.pid;

source/renderer/app/analytics/MatomoAnalyticsTracker.ts

@@ -4,13 +4,15 @@ import { Environment } from '../../../common/types/environment.types';
 import LocalStorageApi from '../api/utils/localStorage';
 import { MatomoClient } from './MatomoClient';
 import { NoopAnalyticsClient } from './noopAnalyticsClient';
+import AdaApi from '../api/api';
 
 export class MatomoAnalyticsTracker implements AnalyticsTracker {
   #analyticsClient: AnalyticsClient;
 
   constructor(
     private environment: Environment,
-    private localStorageApi: LocalStorageApi
+    private localStorageApi: LocalStorageApi,
+    private adaApi: AdaApi
   ) {
     this.#analyticsClient = NoopAnalyticsClient;
     this.#enableTrackingIfAccepted();
@@ -19,6 +21,7 @@ export class MatomoAnalyticsTracker implements AnalyticsTracker {
   async enableTracking() {
     this.#analyticsClient = new MatomoClient(
       this.environment,
+      this.adaApi,
       await this.localStorageApi.getUserID()
     );
   }

source/renderer/app/analytics/MatomoClient.ts

@@ -3,15 +3,11 @@ import { AnalyticsClient } from './types';
 import { Environment } from '../../../common/types/environment.types';
 import {
   ANALYTICS_API_ENDPOINT,
-  CPU_DIMENSION_KEY,
   DEV_MODE_SITE_MAP_ID,
   NETWORK_TO_ANALYTICS_SITE_ID_MAP,
-  OS_DIMENSION_KEY,
-  RAM_DIMENSION_KEY,
-  VERSION_DIMENSION_KEY,
 } from '../config/analyticsConfig';
-import { formattedBytesToSize } from '../utils/formatters';
-import { getShortCpuDescription } from '../utils/getShortCpuDescription';
+import { getCustomDimensions } from './getCustomDimensions';
+import AdaApi from '../api/api';
 
 /**
  * Matomo API reference:
@@ -20,24 +16,28 @@ import { getShortCpuDescription } from '../utils/getShortCpuDescription';
 export class MatomoClient implements AnalyticsClient {
   private matomoTracker: MatomoTracker;
 
-  constructor(private environment: Environment, private userId: string) {
+  constructor(
+    private environment: Environment,
+    private adaApi: AdaApi,
+    private userId: string
+  ) {
     this.matomoTracker = new MatomoTracker(
       this.getMatomoSiteId(environment),
       ANALYTICS_API_ENDPOINT
     );
   }
 
   sendPageNavigationEvent = async (pageTitle: string) => {
+    const customDimensions = await getCustomDimensions(
+      this.environment,
+      this.adaApi
+    );
+
     this.matomoTracker.track({
       _id: this.userId,
       action_name: pageTitle,
       url: this.getAnalyticsURL(),
-      [CPU_DIMENSION_KEY]: getShortCpuDescription(
-        this.environment.cpu[0]?.model
-      ),
-      [RAM_DIMENSION_KEY]: formattedBytesToSize(this.environment.ram, 0),
-      [OS_DIMENSION_KEY]: this.environment.os,
-      [VERSION_DIMENSION_KEY]: this.environment.version,
+      ...customDimensions,
     });
   };
 

source/renderer/app/analytics/getCustomDimensions.ts

@@ -0,0 +1,34 @@
+import { Environment } from '../../../common/types/environment.types';
+import {
+  CPU_DIMENSION_KEY,
+  OS_DIMENSION_KEY,
+  RAM_DIMENSION_KEY,
+  USES_HARDWARE_WALLET_DIMENSION_KEY,
+  USES_LEGACY_WALLET_DIMENSION_KEY,
+  VERSION_DIMENSION_KEY,
+} from '../config/analyticsConfig';
+import { getShortCpuDescription } from '../utils/getShortCpuDescription';
+import { formattedBytesToSize } from '../utils/formatters';
+import AdaApi from '../api/api';
+
+const booleanToText = (flag: boolean) => (flag ? 'yes' : 'no');
+
+export const getCustomDimensions = async (
+  environment: Environment,
+  adaApi: AdaApi
+) => {
+  const userWallets = await adaApi.getWallets();
+  const usesByronWallets = userWallets.some((wallet) => wallet.isLegacy);
+  const usesHardwareWallets = userWallets.some(
+    (wallet) => wallet.isHardwareWallet
+  );
+
+  return {
+    [CPU_DIMENSION_KEY]: getShortCpuDescription(environment.cpu[0]?.model),
+    [RAM_DIMENSION_KEY]: formattedBytesToSize(environment.ram, 0),
+    [OS_DIMENSION_KEY]: environment.os,
+    [VERSION_DIMENSION_KEY]: environment.version,
+    [USES_LEGACY_WALLET_DIMENSION_KEY]: booleanToText(usesByronWallets),
+    [USES_HARDWARE_WALLET_DIMENSION_KEY]: booleanToText(usesHardwareWallets),
+  };
+};