Merge branch 'develop' into chore/ddw-1169-preview-respin-node-1.35.4

Author: michalrus

CHANGELOG.md

@@ -2,9 +2,15 @@
 
 ## vNext
 
+### Features
+
+- 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
 
 - 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))
 
 ## 5.1.1

flake.lock

@@ -1,10 +1,11 @@
 {
   description = "Cicero jobs populating https://cache.iog.io – this cannot yet build Daedalus";
   inputs = {
+    nixpkgs.follows = "tullia/nixpkgs";
     tullia.url = "github:input-output-hk/tullia";
   };
   outputs = inputs: {
-    hydraJobs = {
+    hydraJobs = rec {
 
       # --- Linux ----------------------------------------------------
       x86_64-linux.x86_64-linux = let
@@ -46,12 +47,23 @@
       };
       # --------------------------------------------------------------
 
+      # --- What CI should build -------------------------------------
+      x86_64-linux.required = inputs.nixpkgs.legacyPackages.x86_64-linux.releaseTools.aggregate {
+        name = "required for CI";
+        constituents = __attrValues x86_64-linux.x86_64-linux ++ __attrValues x86_64-linux.x86_64-windows;
+      };
+      x86_64-darwin.required = inputs.nixpkgs.legacyPackages.x86_64-darwin.releaseTools.aggregate {
+        name = "required for CI";
+        constituents = __attrValues x86_64-darwin.x86_64-darwin;
+      };
+      # --------------------------------------------------------------
+
     };
   }
   // (let
-    x86_64-linux  = inputs.tullia.fromSimple "x86_64-linux"  (import ./nix/tullia.nix inputs.self "x86_64-linux");
-    x86_64-darwin = inputs.tullia.fromSimple "x86_64-darwin" (import ./nix/tullia.nix inputs.self "x86_64-darwin");
-    fakeEvent = { inputs={"GitHub event".value = {github_body.head_commit.id="0000000";};}; id=""; ociRegistry=""; };
+    x86_64-linux  = inputs.tullia.fromSimple "x86_64-linux"  (import ./nix/tullia.nix);
+    x86_64-darwin = inputs.tullia.fromSimple "x86_64-darwin" (import ./nix/tullia.nix);
+    fakeEvent = { inputs."GitHub event" = {id = ""; created_at = ""; value = {github_body.head_commit.id="0000000";};}; id=""; ociRegistry=""; };
   in {
     tullia.x86_64-linux = x86_64-linux.tullia;
     cicero.x86_64-linux = x86_64-linux.cicero;

flake.nix

@@ -1,72 +1,48 @@
-self: system:
-
 let
-  inherit (self.inputs.tullia.inputs.nixpkgs) lib;
-
   ciInputName = "GitHub event";
+  repository = "input-output-hk/daedalus";
 in
 rec {
-  tasks =
-    let
-      inherit (self.inputs.tullia) flakeOutputTasks taskSequence;
-
-      common =
-        { config
-        , ...
-        }: {
-          preset = {
-            # needed on top-level task to set runtime options
-            nix.enable = true;
-
-            github-ci = {
-              # Tullia tasks can run locally or on Cicero.
-              # When no facts are present we know that we are running locally and vice versa.
-              # When running locally, the current directory is already bind-mounted
-              # into the container, so we don't need to fetch the source from GitHub
-              # and we don't want to report a GitHub status.
-              enable = config.actionRun.facts != { };
-              repo = "input-output-hk/daedalus";
-              sha = config.preset.github-ci.lib.getRevision ciInputName null;
-            };
-          };
-        };
-
-      ciTasks = __mapAttrs
-        (_: flakeOutputTask: { ... }: {
-          imports = [ common flakeOutputTask ];
-
-          memory = 1024 * 8;
-          nomad.resources.cpu = 10000;
-        })
-        (flakeOutputTasks [ "hydraJobs" system ] self);
-
-      ciTasksSeq = taskSequence "ci/" ciTasks (__attrNames ciTasks);
-    in
-    ciTasks // # for running tasks separately
-    ciTasksSeq // # for running in an arbitrary sequence
-    {
-      "ci" = { lib, ... }: {
-        imports = [ common ];
-        after = __attrNames ciTasksSeq;
+  tasks.ci = { config, lib, ... }: {
+    preset = {
+      nix.enable = true;
+
+      github.ci = {
+        # Tullia tasks can run locally or on Cicero.
+        # When no facts are present we know that we are running locally and vice versa.
+        # When running locally, the current directory is already bind-mounted
+        # into the container, so we don't need to fetch the source from GitHub
+        # and we don't want to report a GitHub status.
+        enable = config.actionRun.facts != { };
+        inherit repository;
+        revision = config.preset.github.lib.readRevision ciInputName null;
       };
     };
 
-  actions = {
-    "daedalus/ci" = {
-      task = "ci";
-      io = ''
-        // This is a CUE expression that defines what events trigger a new run of this action.
-        // There is no documentation for this yet. Ask SRE if you have trouble changing this.
-        let github = {
-          #input: "${ciInputName}"
-          #repo: "input-output-hk/daedalus"
-        }
-        #lib.merge
-        #ios: [
-          #lib.io.github_push & github,
-          { #lib.io.github_pr, github, #target_default: false },
-        ]
-      '';
+    command.text = config.preset.github.status.lib.reportBulk {
+      bulk.text = "nix eval .#hydraJobs --apply __attrNames --json | nix-systems -i";
+      each.text = ''nix build -L .#hydraJobs."$1".required'';
+      skippedDescription = lib.escapeShellArg "No nix builder available for this system";
     };
+
+    memory = 1024 * 8;
+    nomad.resources.cpu = 10000;
+  };
+
+  actions."daedalus/ci" = {
+    task = "ci";
+    io = ''
+      // This is a CUE expression that defines what events trigger a new run of this action.
+      // There is no documentation for this yet. Ask SRE if you have trouble changing this.
+      let github = {
+        #input: "${ciInputName}"
+        #repo: "${repository}"
+      }
+      #lib.merge
+      #ios: [
+        #lib.io.github_push & github,
+        { #lib.io.github_pr, github, #target_default: false },
+      ]
+    '';
   };
 }

nix/tullia.nix

@@ -1,7 +1,6 @@
 import MatomoTracker from 'matomo-tracker';
 import { AnalyticsClient } from './types';
 import { Environment } from '../../../common/types/environment.types';
-import formatCpuInfo from '../utils/formatCpuInfo';
 import {
   ANALYTICS_API_ENDPOINT,
   CPU_DIMENSION_KEY,
@@ -12,6 +11,7 @@ import {
   VERSION_DIMENSION_KEY,
 } from '../config/analyticsConfig';
 import { formattedBytesToSize } from '../utils/formatters';
+import { getShortCpuDescription } from '../utils/getShortCpuDescription';
 
 /**
  * Matomo API reference:
@@ -32,8 +32,10 @@ export class MatomoClient implements AnalyticsClient {
       _id: this.userId,
       action_name: pageTitle,
       url: this.getAnalyticsURL(),
-      [CPU_DIMENSION_KEY]: formatCpuInfo(this.environment.cpu),
-      [RAM_DIMENSION_KEY]: formattedBytesToSize(this.environment.ram),
+      [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,
     });

source/renderer/app/analytics/MatomoClient.ts

@@ -11,7 +11,7 @@ export const DEVELOPMENT_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
 export const MAINNET_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
 export const TESTNET_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
 export const STAGING_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
-export const MAINNET_SERVICING_STATION_URL = 'servicing-station.vit.iohk.io';
+export const MAINNET_SERVICING_STATION_URL = 'servicing-station.gov.iog.io';
 export const ALLOWED_EXTERNAL_HOSTNAMES = [
   MAINNET_EXPLORER_URL,
   STAGING_EXPLORER_URL,

source/renderer/app/config/urlsConfig.ts

@@ -185,7 +185,10 @@ export const formattedLovelaceToAmount = (lovelace: number): number =>
   formattedAmountToBigNumber(String(lovelace))
     .dividedBy(LOVELACES_PER_ADA)
     .toNumber();
-export const formattedBytesToSize = (bytes: number): string => {
+export const formattedBytesToSize = (
+  bytes: number,
+  decimalPlaces = 1
+): string => {
   const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
   if (bytes === 0) return 'n/a';
   const i = parseInt(
@@ -194,7 +197,7 @@ export const formattedBytesToSize = (bytes: number): string => {
     10
   );
   if (i === 0) return `${bytes} ${sizes[i]})`;
-  return `${formattedNumber(bytes / 1024 ** i, 1)} ${sizes[i]}`;
+  return `${formattedNumber(bytes / 1024 ** i, decimalPlaces)} ${sizes[i]}`;
 };
 export type FormattedDownloadData = {
   timeLeft: string;