Merge branch 'develop' into feature/ddw-262-tooltip-promoting-passwor…

…d-managers

CHANGELOG.md

@@ -1,11 +1,102 @@
 Changelog
 =========
 
-## vNext
+## 2.0.1
 
 ### Features
 
+- Disabled creating Byron wallets ([PR 2126](https://github.com/input-output-hk/daedalus/pull/2126))
+
+### Fixes
+
+- Improved wallet delegation error messages ([PR 2111](https://github.com/input-output-hk/daedalus/pull/2111))
+- Fixed Daedalus logo animation on the "Loading" screen ([PR 2124](https://github.com/input-output-hk/daedalus/pull/2124))
+- Fixed text copy on the "Delegation center" screen ([PR 2125](https://github.com/input-output-hk/daedalus/pull/2125))
+
+### Chores
+
+- Updated `cardano-wallet` to revision `03b7568b` ([PR 2119](https://github.com/input-output-hk/daedalus/pull/2119))
+
+## 2.0.0
+
+### Features
+
+- Implemented address validation ([PR 2041](https://github.com/input-output-hk/daedalus/pull/2041))
+- Show block replay progress ([PR 2110](https://github.com/input-output-hk/daedalus/pull/2110))
+
+### Fixes
+
+- Extended the recovery phrase verification to all possible phrase lengths ([PR 2109](https://github.com/input-output-hk/daedalus/pull/2109))
+- Fixed epoch length and slot numbers info ([PR 2108](https://github.com/input-output-hk/daedalus/pull/2108))
+
+## 2.0.0-RC1
+
+### Fixes
+
+- Fixed the epoch duration copy ([PR 2107](https://github.com/input-output-hk/daedalus/pull/2107))
+- Handled errors from a wallet which has ONLY rewards account balance when sending a transaction or delegating ([PR 2100](https://github.com/input-output-hk/daedalus/pull/2100))
+- Fixed `cardano-wallet` info shown on the "About" screen ([PR 2097](https://github.com/input-output-hk/daedalus/pull/2097))
+- Updated stake pool tooltip to display "Produced blocks" instead of "Blocks (current epoch)" ([PR 2096](https://github.com/input-output-hk/daedalus/pull/2096))
+- Fixed wallet recovery phrase length used on "ITN rewards redemption" wizard ([PR 2095](https://github.com/input-output-hk/daedalus/pull/2095))
+
+### Chores
+
+- Updated `cardano-wallet` to revision `ca96c435` ([PR 2105](https://github.com/input-output-hk/daedalus/pull/2105))
+- Extended network-parameters Api endpoint integration with hardfork info ([PR 2105](https://github.com/input-output-hk/daedalus/pull/2105))
+- Configured mainnet instance for Shelley hardfork ([PR 2104](https://github.com/input-output-hk/daedalus/pull/2104))
+- Updated network-info Api endpoint integration ([PR 2101](https://github.com/input-output-hk/daedalus/pull/2101))
+- Extended incident and alert newsfeed type ([PR 2099](https://github.com/input-output-hk/daedalus/pull/2099))
+- Enable Cardano Explorer URLs for STN network ([PR 2098](https://github.com/input-output-hk/daedalus/pull/2098))
+
+## 1.6.0-STN5
+
+### Features
+
+- Added recovery phrase autocomplete on the wallet creation wizard ([PR 2083](https://github.com/input-output-hk/daedalus/pull/2083))
+- Added restoration of 24-word Shelley wallets and 15-word ITN wallets ([PR 2083](https://github.com/input-output-hk/daedalus/pull/2083))
+- Added restoration of legacy Byron hardware wallets ([PR 2082](https://github.com/input-output-hk/daedalus/pull/2082))
+
+### Fixes
+
+- Fixed genesis file
+
+### Chores
+
+- Added handlers for new error messages ([PR 2090](https://github.com/input-output-hk/daedalus/pull/2090))
+- Updated `cardano-wallet` to revision `71c0b8fd` which includes `cardano-node` 1.18.0
+
+## 1.5.0-STN4
+
+### Chores
+
+- Updated `cardano-wallet` to revision `cb6fae7b` which includes `cardano-node` 1.17.0
+
+## 1.4.1-STN3
+
+### Fixes
+
+- Fixed wallet restoration success message text ([PR 2080](https://github.com/input-output-hk/daedalus/pull/2080))
+
+### Chores
+
+- Re-enabled Byron wallet "Transfer funds" wizard ([PR 2080](https://github.com/input-output-hk/daedalus/pull/2080))
+- Updated "Splash" screen text copy ([PR 2080](https://github.com/input-output-hk/daedalus/pull/2080))
+
+## 1.4.0-STN3
+
+### Features
+
+- Added Byron to Shelley transition ([PR 2079](https://github.com/input-output-hk/daedalus/pull/2079))
 - Added UX improvements for the display of stake pool ID ([PR 2074](https://github.com/input-output-hk/daedalus/pull/2074))
+- Updated application name and network identifiers for the Shelley Testnet Mainnet candidate network ([PR 2078](https://github.com/input-output-hk/daedalus/pull/2078))
+
+### Fixes
+
+- Fixed double punctuation on delegation dialog ([PR 2077](https://github.com/input-output-hk/daedalus/pull/2077))
+
+### Chores
+
+- Updated `cardano-wallet` to revision `c01efcfe` ([PR 2078](https://github.com/input-output-hk/daedalus/pull/2078))
 
 ## 1.3.0-STN2
 

README.md

@@ -115,8 +115,8 @@ Daedalus - Cryptocurrency Wallet
 `Niv` is used to manage the version of upstream dependencies. The versions of these dependencies can be seen in `nix/sources.json`.
 
 Dependencies are updated with the follow nix commands:
-- Update to the latest master: `nix-shell -A devops --run "niv update cardano-wallet"`
-- Update to a specific revision: `nix-shell -A devops --run "niv update cardano-wallet -a rev=1988f22895c45e12506ec83da0496ebdcdd17719"`
+- Update to the latest master: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-wallet"`
+- Update to a specific revision: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-wallet -a rev=91db88f9195de49d4fb4299c68fc3f6de09856ab"`
 
 #### Notes
 

installer-clusters.cfg

@@ -1 +1 @@
-shelley_testnet_v3 shelley_qa mainnet_flight selfnode testnet mainnet staging itn_selfnode itn_rewards_v1 qa nightly
+mainnet mainnet_flight testnet shelley_testnet_v6 shelley_qa staging

installers/common/MacInstaller.hs

@@ -268,7 +268,7 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       -- Executables (from daedalus-bridge)
       forM_ [mainBinary kind, "cardano-node", "cardano-cli", "cardano-address" ] $ \f ->
         cp (bridge </> "bin" </> f) (dir </> f)
-      forM_ ["config.yaml", "genesis.json", "topology.yaml" ] $ \f ->
+      forM_ ["config.yaml", "genesis.json", "genesis-byron.json", "genesis-shelley.json", "topology.yaml" ] $ \f ->
         cp f (dataDir </> f)
 
       when (oCluster == Selfnode) $ do

installers/common/Types.hs

@@ -62,7 +62,7 @@ data Cluster
   | Staging
   | Shelley_QA
   | Shelley_Testnet
-  | Shelley_Testnet_v3
+  | Shelley_Testnet_v6
   | Testnet
   deriving (Bounded, Enum, Eq, Read, Show)
 
@@ -121,7 +121,7 @@ clusterNetwork Mainnet_Flight = "mainnet_flight"
 clusterNetwork Staging = "staging"
 clusterNetwork Shelley_QA = "shelley_qa"
 clusterNetwork Shelley_Testnet = "shelley_testnet"
-clusterNetwork Shelley_Testnet_v3 = "shelley_testnet_v3"
+clusterNetwork Shelley_Testnet_v6 = "shelley_testnet_v6"
 clusterNetwork Testnet = "testnet"
 
 packageFileName :: OS -> Cluster -> Version -> Backend -> Text -> Maybe BuildJob -> FilePath

installers/common/WindowsInstaller.hs

@@ -210,6 +210,8 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{hasBlock0,inst
                     file [] "config.yaml"
                     file [] "topology.yaml"
                     file [] "genesis.json"
+                    file [] "genesis-byron.json"
+                    file [] "genesis-shelley.json"
                     file [] "libsodium-23.dll"
                     when (clusterName == Selfnode) $ do
                       file [] "signing.key"

installers/icons/update_icons

@@ -2,7 +2,7 @@
 #
 # this script merges the png files into a single ico for windows
 
-for x in mainnet mainnet_flight staging testnet qa nightly itn_rewards_v1 itn_selfnode selfnode shelley_qa shelley_testnet_v3; do
+for x in mainnet mainnet_flight staging testnet qa nightly itn_rewards_v1 itn_selfnode selfnode shelley_qa shelley_testnet_v6; do
   pushd $x
   convert 16x16.png 24x24.png 32x32.png 48x48.png 64x64.png 128x128.png 256x256.png $x.ico
   popd

nix/jormungandr-bridge.nix

@@ -1,4 +1,4 @@
-{ target, pkgs, cardano-wallet, cardano-shell, sources, jormungandrLib }:
+{ target, pkgs, cardano-wallet, cardano-shell, sources, jormungandrLib, cardano-address }:
 
 let
   commonLib = import ../lib.nix {};
@@ -14,6 +14,7 @@ in pkgs.runCommandCC "daedalus-bridge" {
   cp -f ${cardano-wallet.haskellPackages.cardano-wallet-jormungandr.components.exes.cardano-wallet-jormungandr}/bin/* .
   cp -f ${cardano-shell.haskellPackages.cardano-launcher.components.exes.cardano-launcher}/bin/cardano-launcher* .
   cp -f ${cardano-wallet.jormungandr}/bin/* .
+  cp -f ${cardano-address}/bin/cardano-address* .
 
   echo ${cardano-wallet.version} > $out/version
 

nix/launcher-config.nix

@@ -27,8 +27,8 @@ let
       cluster = "mainnet";
       networkName = "mainnet";
     };
-    shelley_testnet_v3 = {
-      cardanoEnv = cardanoLib.environments.shelley_testnet;
+    shelley_testnet_v6 = {
+      cardanoEnv = cardanoLib.environments.mainnet_candidate_4;
       cluster = "shelley_testnet";
       networkName = "shelley_testnet";
     };
@@ -69,6 +69,7 @@ let
                  else cardanoLib.environments.${network};
     jormungandrEnv = jormungandrLib.environments.${network};
   in if (backend == "cardano") then cardanoEnv else jormungandrEnv;
+  kind = if network == "local" then "shelley" else if (envCfg.nodeConfig.Protocol == "RealPBFT" || envCfg.nodeConfig.Protocol == "Byron") then "byron" else "shelley";
 
   installDirectorySuffix = let
     supportedNetworks = {
@@ -83,7 +84,7 @@ let
       staging = "Staging";
       testnet = "Testnet";
       shelley_testnet = "Shelley Testnet";
-      shelley_testnet_v3 = "Shelley Testnet v3";
+      shelley_testnet_v6 = "Shelley Testnet v6";
       shelley_qa = "Shelley QA";
     };
     unsupported = "Unsupported";
@@ -161,6 +162,7 @@ let
     cluster = if __hasAttr network clusterOverrides then clusterOverrides.${network}.cluster else network;
     networkName = if __hasAttr network clusterOverrides then clusterOverrides.${network}.networkName else network;
     isFlight = network == "mainnet_flight";
+    isStaging = (envCfg.nodeConfig.RequiresNetworkMagic == "RequiresNoMagic");
     nodeImplementation = backend;
   };
 
@@ -174,25 +176,26 @@ let
       cp ${nodeConfigFiles}/* $out/
       cp $launcherConfigPath $out/launcher-config.yaml
       cp $installerConfigPath $out/installer-config.json
+      ${lib.optionalString (envCfg.nodeConfig ? ByronGenesisFile) "cp ${envCfg.nodeConfig.ByronGenesisFile} $out/genesis-byron.json"}
+      ${lib.optionalString (envCfg.nodeConfig ? ShelleyGenesisFile) "cp ${envCfg.nodeConfig.ShelleyGenesisFile} $out/genesis-shelley.json"}
     '';
 
   mkConfigByron = let
     filterMonitoring = config: if devShell then config else builtins.removeAttrs config [ "hasPrometheus" "hasEKG" ];
     cardanoAddressBin = mkBinPath "cardano-address";
-    walletBin = if network == "local" then mkBinPath "cardano-wallet-shelley" else if envCfg.useByronWallet
-                then mkBinPath "cardano-wallet-byron"
-                else mkBinPath "cardano-wallet-shelley";
+    walletBin = mkBinPath "cardano-wallet-${kind}";
     nodeBin = mkBinPath "cardano-node";
     cliBin = mkBinPath "cardano-cli";
     nodeConfig = let
       nodeConfigAttrs = if (configOverride == null) then envCfg.nodeConfig else __fromJSON (__readFile configOverride);
     in builtins.toJSON (filterMonitoring (nodeConfigAttrs // (lib.optionalAttrs (!isDevOrLinux || network == "local") {
-      GenesisFile = "genesis.json";
+      ByronGenesisFile = "genesis-byron.json";
+      ShelleyGenesisFile = "genesis-shelley.json";
     })));
     genesisFile = let
       genesisFile'.selfnode = ../utils/cardano/selfnode/genesis.json;
       genesisFile'.local = (__fromJSON nodeConfig).GenesisFile;
-    in if (genesisOverride != null) then genesisOverride else if (network == "selfnode" || network == "local") then genesisFile'.${network} else envCfg.genesisFile;
+    in if (genesisOverride != null) then genesisOverride else if (network == "selfnode" || network == "local") then genesisFile'.${network} else envCfg.nodeConfig.ByronGenesisFile;
     normalTopologyFile = if network == "selfnode" then envCfg.topology else cardanoLib.mkEdgeTopology {
       inherit (envCfg) edgePort;
       edgeNodes = [ envCfg.relaysNew ];
@@ -241,7 +244,7 @@ let
         legacySecretKey;
       syncTolerance = "300s";
       nodeConfig = {
-        kind = if network == "local" then "shelley" else if envCfg.useByronWallet then "byron" else "shelley";
+        inherit kind;
         configurationDir = "";
         network = {
           configFile = mkConfigPath nodeConfigFiles "config.yaml";
@@ -261,11 +264,13 @@ let
       macPackageName = "Daedalus${network}";
       dataDir = dataDir;
       hasBlock0 = false;
-      installerWinBinaries = let
-        walletExe = if network == "local" then "cardano-wallet-shelley.exe" else if envCfg.useByronWallet
-                    then "cardano-wallet-byron.exe"
-                    else "cardano-wallet-shelley.exe";
-      in [ "cardano-launcher.exe" "cardano-node.exe" walletExe "cardano-cli.exe" "cardano-address.exe" ];
+      installerWinBinaries = [
+        "cardano-launcher.exe"
+        "cardano-node.exe"
+        "cardano-wallet-${kind}.exe"
+        "cardano-cli.exe"
+        "cardano-address.exe"
+      ];
     };
 
   in {

nix/sources.json

@@ -1,14 +1,14 @@
 {
     "cardano-node": {
-        "branch": "master",
+        "branch": "refs/tags/1.18.0",
         "description": null,
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-node",
-        "rev": "712a287602797e8fd889fbf73e56a08c3d8b004a",
-        "sha256": "1lg1g702x5q6m8n61bfyji7pmj2gsw44mm41nxhc5rv2wk4g996c",
+        "rev": "ba0f96b1a9fc9232ed211e57835fd5018093069d",
+        "sha256": "1rj7rpr3qqqwdx00zsfg283jflndnr9q5arxf5fiqrrqms40p7sk",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-node/archive/712a287602797e8fd889fbf73e56a08c3d8b004a.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-node/archive/ba0f96b1a9fc9232ed211e57835fd5018093069d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-shell": {
@@ -29,10 +29,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "c90fe652ffc9d72ee0257f40150c13d458739355",
-        "sha256": "16ri5slbig4v1166d2jvb0gf5qs9l671zfkz0zmg6vj9a2dlshf2",
+        "rev": "03b7568bebe587d1e45d402536953c6ea1dc2d99",
+        "sha256": "0drmqrw9h4as57lix51ddafw25wcvj3bs1wvxrn8gbff1ilghnjh",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/c90fe652ffc9d72ee0257f40150c13d458739355.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/03b7568bebe587d1e45d402536953c6ea1dc2d99.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": "v2020-04-28"
     },
@@ -66,10 +66,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "iohk-nix",
-        "rev": "d530a70491c2a3d59462724d76bf8a2c8b379eb2",
-        "sha256": "11hm4z07hpy7jjp0qgi6p2jvwgiyqqfhl7iz5v1vl57bp8qmszzc",
+        "rev": "f345d26508966e434d8db57d6c3b4ce4202c9fb5",
+        "sha256": "1xcar2r6jm68dp5s8kc2rii0rcg47w41qc1akazbngkj1x6hf1r2",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/iohk-nix/archive/d530a70491c2a3d59462724d76bf8a2c8b379eb2.tar.gz",
+        "url": "https://github.com/input-output-hk/iohk-nix/archive/f345d26508966e434d8db57d6c3b4ce4202c9fb5.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "js-chain-libs": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "1.3.0-STN2",
+  "version": "2.0.1",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
@@ -52,7 +52,7 @@
     "nix:flight": "NETWORK=mainnet nix-shell --argstr nodeImplementation cardano --argstr cluster mainnet_flight",
     "nix:selfnode": "NETWORK=selfnode nix-shell --argstr nodeImplementation cardano --argstr cluster selfnode",
     "nix:shelley_local": "NETWORK=shelley_testnet nix-shell --arg configOverride state-cluster/config.json --arg genesisOverride state-cluster/keys/genesis.json --argstr nodeImplementation cardano --argstr cluster local --arg useLocalNode true",
-    "nix:shelley_testnet": "NETWORK=shelley_testnet_v3 nix-shell --argstr nodeImplementation cardano --argstr cluster shelley_testnet_v3 --arg useLocalNode true",
+    "nix:shelley_testnet": "NETWORK=shelley_testnet_v6 nix-shell --argstr nodeImplementation cardano --argstr cluster shelley_testnet_v6",
     "nix:shelley_qa": "NETWORK=shelley_qa nix-shell --argstr nodeImplementation cardano --argstr cluster shelley_qa",
     "nix:staging": "NETWORK=staging nix-shell --argstr nodeImplementation cardano --argstr cluster staging",
     "nix:testnet": "NETWORK=testnet nix-shell --argstr nodeImplementation cardano --argstr cluster testnet",
@@ -173,7 +173,7 @@
     "blakejs": "1.1.0",
     "bs58": "4.0.1",
     "cardano-js": "0.4.5",
-    "cardano-launcher": "0.20200529.0",
+    "cardano-launcher": "0.20200722.0",
     "check-disk-space": "2.1.0",
     "chroma-js": "2.1.0",
     "classnames": "2.2.6",

release-build.nix

@@ -8,5 +8,5 @@ let
   pkgs = (import ./. {}).pkgs;
 in pkgs.runCommand "signed-release" {} ''
   mkdir $out
-  cp -v ${mkWindows "shelley_testnet_v3"}/*exe $out/
+  cp -v ${mkWindows "shelley_testnet_v6"}/*exe $out/
 ''

shell.nix

@@ -13,6 +13,7 @@
 , configOverride ? null
 , genesisOverride ? null
 , useLocalNode ? false
+, nivOnly ? false
 }:
 
 let
@@ -140,7 +141,7 @@ let
     name = "devops-shell";
     buildInputs = let
       inherit (localLib.iohkNix) niv;
-    in [ niv daedalusPkgs.cardano-node-cluster.start daedalusPkgs.cardano-node-cluster.stop ];
+    in if nivOnly then [ niv ] else [ niv daedalusPkgs.cardano-node-cluster.start daedalusPkgs.cardano-node-cluster.stop ];
     shellHook = ''
       export CARDANO_NODE_SOCKET_PATH=$(pwd)/state-cluster/bft1.socket
       echo "DevOps Tools" \

source/common/ipc/api.js

@@ -38,6 +38,10 @@ import type {
   ResumeDownloadResponse,
 } from '../types/downloadManager.types';
 import type { StoreMessage } from '../types/electron-store.types';
+import type {
+  IntrospectAddressRequest,
+  IntrospectAddressResponse,
+} from '../types/address-introspection.types';
 
 /**
  * ======================= IPC CHANNELS API =========================
@@ -320,3 +324,17 @@ export type DownloadMainResponse = DownloadResponse;
 export const RESUME_DOWNLOAD = 'RESUME_DOWNLOAD';
 export type ResumeDownloadRendererRequest = ResumeDownloadRequest;
 export type ResumeDownloadMainResponse = ResumeDownloadResponse | void;
+
+/**
+ * Channel for introspecting an address
+ */
+export const INTROSPECT_ADDRESS_CHANNEL = 'INTROSPECT_ADDRESS_CHANNEL';
+export type IntrospectAddressRendererRequest = IntrospectAddressRequest;
+export type IntrospectAddressMainResponse = IntrospectAddressResponse;
+
+/**
+ * Channel for checking block replay progress
+ */
+export const GET_BLOCK_REPLAY_STATUS_CHANNEL = 'GetBlockReplayProgressChannel';
+export type GetBlockReplayProgressRendererRequest = void;
+export type GetBlockReplayProgressMainResponse = number;