Merge tag '6.0.2'

Daedalus 6.0.2 release

; -----BEGIN PGP SIGNATURE-----
;
; iQJHBAABCgAxFiEE+cmdT4vmbTqno6wTuh9KoKGM3FoFAmb/49ITHG1pY2hhbC5y
; dXNAaW9oay5pbwAKCRC6H0qgoYzcWjBlD/4tJr1s2gYbUBT+jAU6G+kn+l5p3/b+
; 4PtXcIaHlbLDLOaF0/WfYDvifhqMDStC62qLch0rAkMlx0KEeVZglfKRPBlRjqMK
; FUINtP25g/GierH3cu0Dw2YLvUVLNNd/VVxf1j9asLa8iyHVxG0lK/jCn0wwFIot
; aKD7zHzN3kT9vr90GW+U90lbACk34kxtuYjEUtavF/QEJ+ZqkC70yovDGLTWFZRA
; qUZ0XxFjLdAUi2Ncw1pcbyW23v7QN4SErPSp0d5UYeQBOSjvET5fP7KZ2ZCxEXrj
; avlA0UEaSdbhVACTZvz6S8UPnfUGYfrno2FmX9WTCmSfNJMwhdM7wCMwuLXNX/XR
; i5ldLadUeRCgAaKhUmJCOK/AsonRK5V6ku3TgoA/de7M6RxtIM+bgMOUoy18cM+b
; DgBMxTTcTum+Z3H60UtUMcY42y+YbofdXrZ7zmT/zQkOc85hlolsoDAtvxBs6mtI
; UxfhI4qCQ8WcPHOfvFvgAzznNiBP0TzDPbkBD7MxKqmJdJXUsDgqvW/LHKktKDbw
; mLAkfzGsK5+bUpLjR1mfqXupY86+vNNUC0nNKNIVlv7bl3t49MXwXNBuADgCP50V
; kvmFFyjEGETQzkNOP0SKCbZqvsYOR60gXeeN0t9yqyuBK2JwKLHAq1ys59zdEHql
; sopgzwow25OGVg==
; =OvBe
; -----END PGP SIGNATURE-----
; gpg: Signature made Fri 04 Oct 2024 14:47:14 CEST
; gpg:                using RSA key F9C99D4F8BE66D3AA7A3AC13BA1F4AA0A18CDC5A
; gpg:                issuer "[email protected]"
; gpg: Good signature from "Michal Rus <[email protected]>" [ultimate]
; Primary key fingerprint: F9C9 9D4F 8BE6 6D3A A7A3  AC13 BA1F 4AA0 A18C DC5A

Author: michalrus

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 6.0.2
+
+### Fixes
+
+- Fix token metadata server URL on all networks ([PR 3227](https://github.com/input-output-hk/daedalus/pull/3227))
+
+- Un-brick auto-update on devices where it failed in the past ([PR 3223](https://github.com/input-output-hk/daedalus/pull/3223))
+
+### Chores
+
+- Decrease Catalyst voting power threshold from 500 to 25 ADA ([PR 3230](https://github.com/input-output-hk/daedalus/pull/3230))
+
 ## 6.0.1
 
 ### Fixes

nix/internal/launcher-config.nix

@@ -34,6 +34,12 @@ let
     preview = "https://preview-smash.world.dev.cardano.org";
   };
 
+  tokenMetadataServers = {
+    mainnet = "https://tokens.cardano.org";
+    preprod = "https://metadata.world.dev.cardano.org";
+    preview = "https://metadata.world.dev.cardano.org";
+  };
+
   fromCardanoPlayground = envName: let
     originalFiles = builtins.path {
       name = "cardano-playground-config-${envName}";
@@ -57,6 +63,7 @@ let
     cardanoEnv = {
       inherit nodeConfig;
       topologyFile = originalFiles + "/topology.json";
+      metadataUrl = tokenMetadataServers.${envName};
     };
   };
 
@@ -301,13 +308,13 @@ let
           topologyFile = mkConfigPath nodeConfigFiles "topology.yaml";
         };
       };
-    } // (lib.optionalAttrs (network == "selfnode") {
+    } // (lib.optionalAttrs (network != "selfnode") {
+      metadataUrl = envCfg.metadataUrl;
+    }) // (lib.optionalAttrs (network == "selfnode") {
       selfnodeBin = mkBinPath "local-cluster";
       mockTokenMetadataServerBin = mkBinPath "mock-token-metadata-server";
     }) // (lib.optionalAttrs (__hasAttr network smashServers) {
       smashUrl = smashServers.${network};
-    }) // (lib.optionalAttrs (__hasAttr "metadataUrl" envCfg) {
-      metadataUrl = envCfg.metadataUrl;
     });
 
     installerConfig = {

package.json

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

source/main/config.ts

@@ -174,7 +174,7 @@ export const DISK_SPACE_CHECK_TIMEOUT = 9 * 1000; // Timeout for checking disks
 
 // Used if token metadata server URL is not defined in launcher config
 export const FALLBACK_TOKEN_METADATA_SERVER_URL =
-  'https://metadata.cardano-testnet.iohkdev.io';
+  'https://metadata.world.dev.cardano.org';
 export const MINIMUM_AMOUNT_OF_RAM_FOR_RTS_FLAGS = 16 * 1024 * 1024 * 1024; // 16gb RAM
 
 // Used by mock-token-metadata-server

source/renderer/app/components/voting/voting-info/RegisterToVote.messages.ts

@@ -20,7 +20,7 @@ export const messages = defineMessages({
   step2CheckBoxLabel: {
     id: 'voting.registerToVote.step2CheckBoxLabel',
     defaultMessage:
-      '!!!Ensure that you register and hold the necessary 500 ADA at the time of the snapshot.',
+      '!!!Ensure that you register and hold the necessary {minVotingFunds} ADA at the time of the snapshot.',
     description: 'Second step to follow in order to vote',
   },
   buttonLabel: {

source/renderer/app/components/voting/voting-info/RegisterToVote.tsx

@@ -1,11 +1,13 @@
 import React, { useState } from 'react';
+import BigNumber from 'bignumber.js';
 import { injectIntl } from 'react-intl';
 import { Button } from 'react-polymorph/lib/components/Button';
 import { Checkbox } from 'react-polymorph/lib/components/Checkbox';
 import type { Intl } from '../../../types/i18nTypes';
 import { messages } from './RegisterToVote.messages';
 import { messages as votingMessages } from './VotingInfo.messages';
 import styles from './RegisterToVote.scss';
+import { VOTING_REGISTRATION_MIN_WALLET_FUNDS } from '../../../config/votingConfig';
 
 type Props = {
   intl: Intl;
@@ -38,7 +40,11 @@ function RegisterToVote({ intl, onRegisterToVoteClick }: Props) {
       <div className={styles.step}>
         <Checkbox
           checked={step2}
-          label={intl.formatMessage(messages.step2CheckBoxLabel)}
+          label={intl.formatMessage(messages.step2CheckBoxLabel, {
+            minVotingFunds: new BigNumber(
+              VOTING_REGISTRATION_MIN_WALLET_FUNDS
+            ).toFormat(0),
+          })}
           onChange={setStep2}
         />
       </div>

source/renderer/app/config/votingConfig.ts

@@ -1,5 +1,5 @@
 const { isDev } = global.environment;
-export const VOTING_REGISTRATION_MIN_WALLET_FUNDS = 500; // 500 ADA | unit: ADA
+export const VOTING_REGISTRATION_MIN_WALLET_FUNDS = 25; // 25 ADA | unit: ADA
 export const VOTING_REGISTRATION_FEE_CALCULATION_AMOUNT = 1; // 1 ADA | unit: ADA
 export const VOTING_REGISTRATION_PIN_CODE_LENGTH = 4;
 export const VOTING_REGISTRATION_MIN_TRANSACTION_CONFIRMATIONS = isDev ? 2 : 10;

source/renderer/app/i18n/locales/defaultMessages.json

@@ -4467,7 +4467,7 @@
         "id": "voting.registerToVote.step1CheckBoxLabel"
       },
       {
-        "defaultMessage": "!!!Ensure that you register and hold the necessary 500 ADA at the time of the snapshot.",
+        "defaultMessage": "!!!Ensure that you register and hold the necessary {minVotingFunds} ADA at the time of the snapshot.",
         "description": "Second step to follow in order to vote",
         "id": "voting.registerToVote.step2CheckBoxLabel"
       },

source/renderer/app/i18n/locales/en-US.json

@@ -728,7 +728,7 @@
   "voting.registerToVote.header": "Register to vote",
   "voting.registerToVote.registerToVoteButtonLabel": "Register to vote",
   "voting.registerToVote.step1CheckBoxLabel": "Download the Catalyst Voting app on your smartphone",
-  "voting.registerToVote.step2CheckBoxLabel": "Ensure that you register and hold the necessary 500 ADA at the time of the snapshot.",
+  "voting.registerToVote.step2CheckBoxLabel": "Ensure that you register and hold the necessary {minVotingFunds} ADA at the time of the snapshot.",
   "voting.registerToVote.stepsTitle": "Follow these steps to vote:",
   "voting.registerToVote.votingInstructions": "If you are not registered yet, make sure to register to vote in the current fund before the snapshot date.",
   "voting.resultsPhase.endDateLabel": "End of voting:",

source/renderer/app/i18n/locales/ja-JP.json

@@ -728,7 +728,7 @@
   "voting.registerToVote.header": "有権者登録をする",
   "voting.registerToVote.registerToVoteButtonLabel": "有権者登録をする",
   "voting.registerToVote.step1CheckBoxLabel": "スマートフォンにCatalyst Votingアプリをダウンロードします",
-  "voting.registerToVote.step2CheckBoxLabel": "スナップショット実施の時点で、登録を済ませ、500ADAを保有していてください",
+  "voting.registerToVote.step2CheckBoxLabel": "スナップショット実施の時点で、登録を済ませ、{minVotingFunds}ADAを保有していてください",
   "voting.registerToVote.stepsTitle": "投票方法:",
   "voting.registerToVote.votingInstructions": "登録を済ませていない場合は、スナップショットの実施日前に現行のファンドの有権者登録を行ってください。",
   "voting.resultsPhase.endDateLabel": "投票締め切り:",