Merge pull request #2618 from input-output-hk/release-with-master

Merge release/4.2.0 into master

Author: nikolaglumac

.gitignore

@@ -100,7 +100,9 @@ cardano-wallet-http-bridge
 jcli
 /jormungandr
 cardano-http-bridge
+cardano-cli
 cardano-node
+cardano-wallet
 
 # JS Launcher
 utils/js-launcher/state

.tm_properties

@@ -0,0 +1 @@
+excludeDirectories = "{$excludeDirectories,dist,logs,node_modules,translations/messages}"

CHANGELOG.md

@@ -1,6 +1,34 @@
 Changelog
 =========
 
+## 4.2.0
+
+### Features
+
+- Added voting registration with Trezor ([PR 2615](https://github.com/input-output-hk/daedalus/pull/2615))
+- Added voting registration with Ledger ([PR 2538](https://github.com/input-output-hk/daedalus/pull/2538))
+
+## 4.2.0-FC1
+
+### Features
+
+- Implemented sharing multi-signature public key ([PR 2604](https://github.com/input-output-hk/daedalus/pull/2604))
+- Implemented the expandable token view ([PR 2589](https://github.com/input-output-hk/daedalus/pull/2589), [PR 2609](https://github.com/input-output-hk/daedalus/pull/2609))
+
+### Fixes
+
+- Fixed asset amount validation ([PR 2472](https://github.com/input-output-hk/daedalus/pull/2472))
+- Fixed incorrect global instances in scss files ([PR 2593](https://github.com/input-output-hk/daedalus/pull/2593))
+- Fixed "shelley-qa" network issue on "Delegation" wizard ([PR 2595](https://github.com/input-output-hk/daedalus/pull/2595))
+- Fixed Trezor transaction native tokens grouping issue ([PR 2594](https://github.com/input-output-hk/daedalus/pull/2594))
+- Fixed notes field visibility for software wallets on Share Wallet Address dialog ([PR 2582](https://github.com/input-output-hk/daedalus/pull/2582))
+
+### Chores
+
+- Disabled Fund5 voting registration ([PR 2608](https://github.com/input-output-hk/daedalus/pull/2608))
+- Updated Fund5 registaration start date ([PR 2607](https://github.com/input-output-hk/daedalus/pull/2607))
+- Removed Jormungandr integration and legacy clusters ([PR 2579](https://github.com/input-output-hk/daedalus/pull/2579))
+
 ## 4.1.0
 
 ### Features

README.md

@@ -4,7 +4,6 @@
 
 # Daedalus
 [![Build status](https://badge.buildkite.com/e173494257519752d79bb52c7859df6277c6d759b217b68384.svg?branch=master)](https://buildkite.com/input-output-hk/daedalus)
-[![Windows build status](https://ci.appveyor.com/api/projects/status/github/input-output-hk/daedalus?branch=master&svg=true)](https://ci.appveyor.com/project/input-output/daedalus)
 [![Release](https://img.shields.io/github/release/input-output-hk/daedalus.svg)](https://github.com/input-output-hk/daedalus/releases)
 
 Daedalus - Cryptocurrency Wallet
@@ -89,20 +88,7 @@ Daedalus - Cryptocurrency Wallet
 1. Run `yarn nix:staging` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
 
-#### Shelley Local
-
-1. Run `nix-shell -A devops` from `daedalus`.
-2. Run `start-cluster` to launch the cluster (run `stop-cluster` to stop it).
-3. Run `yarn nix:shelley_local` from `daedalus` in a separate Terminal window.
-4. Run `yarn dev` from the subsequent `nix-shell`
-5. Once Daedalus has started, and has gotten past the loading screen, run `yarn shelley:wallet:importer` from a new terminal window. This is only required if you wish to import some funded wallets.
-
-#### Shelley Testnet
-
-1. Run `yarn nix:shelley_testnet` from `daedalus`.
-2. Run `yarn dev` from the subsequent `nix-shell`
-
-#### Shelley QA Testnet
+#### Shelley QA
 
 1. Run `yarn nix:shelley_qa` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
@@ -138,31 +124,7 @@ http://localhost:65432/metadata/query
 ```
 ... and expect a "200 OK" response.
 
-
-### Running Daedalus with Jormungandr
-
-#### ITN Selfnode
-
-1. Run `yarn nix:itn_selfnode` from `daedalus`.
-2. Run `yarn dev` from the subsequent `nix-shell`
-3. Once Daedalus has started, and has gotten past the loading screen, run `yarn itn:shelley:wallet:importer` from a new terminal window. This is only required if you wish to import some funded wallets. It is also possible to import funded legacy wallets by running `yarn itn:byron:wallet:importer` script.
-
-#### ITN Rewards V1
-
-1. Run `yarn nix:itn` from `daedalus`.
-2. Run `yarn dev` from the subsequent `nix-shell`
-
-#### QA Testnet
-
-1. Run `yarn nix:qa` from `daedalus`.
-2. Run `yarn dev` from the subsequent `nix-shell`
-
-#### Nightly Testnet
-
-1. Run `yarn nix:nightly` from `daedalus`.
-2. Run `yarn dev` from the subsequent `nix-shell`
-
-### Updating upstream dependencies (cardano-wallet, cardano-node & Jormungandr)
+### Updating upstream dependencies (cardano-wallet, cardano-node, and iohk-nix)
 
 `Niv` is used to manage the version of upstream dependencies. The versions of these dependencies can be seen in `nix/sources.json`.
 
@@ -208,7 +170,7 @@ externals: ['bootstrap']
 ## Testing
 
 You can find more details regarding tests setup within
-[Running Daedalus acceptance tests](https://github.com/input-output-hk/daedalus/blob/master/features/README.md) README file.
+[Running Daedalus acceptance tests](https://github.com/input-output-hk/daedalus/blob/master/tests/README.md) README file.
 
 **Notes:** Be aware that only a single Daedalus instance can run per state directory.
 So you have to exit any development instances before running tests!

appveyor.yml

@@ -1,9 +1,5 @@
-let
-  itn_clusters = [ "itn_rewards_v1"  "qa" "nightly" "itn_selfnode" ];
-  getDefaultBackend = cluster: if (builtins.elem cluster itn_clusters) then "jormungandr" else "cardano";
-in
 { target ? builtins.currentSystem
-, nodeImplementation ? (getDefaultBackend cluster)
+, nodeImplementation ? "cardano"
 , localLib ? import ./lib.nix { inherit nodeImplementation; }
 , cluster ? "mainnet"
 , version ? "versionNotSet"
@@ -55,7 +51,6 @@ let
   ostable.x86_64-darwin = "macos64";
   packages = self: {
     inherit cluster pkgs version target nodeImplementation;
-    jormungandrLib = localLib.iohkNix.jormungandrLib;
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
@@ -76,7 +71,6 @@ let
 
     sources = localLib.sources;
     bridgeTable = {
-      jormungandr = self.callPackage ./nix/jormungandr-bridge.nix {};
       cardano = self.callPackage ./nix/cardano-bridge.nix {
         cardano-wallet = self.cardano-wallet.cardano-wallet;
         cardanoWalletPkgs = self.cardano-wallet.pkgs;
@@ -123,19 +117,13 @@ let
     nsis = nsisNixPkgs.callPackage ./nix/nsis.nix {};
 
     launcherConfigs = self.callPackage ./nix/launcher-config.nix {
-      inherit (self) jormungandrLib;
       inherit devShell topologyOverride configOverride genesisOverride;
       network = cluster;
       os = ostable.${target};
       backend = nodeImplementation;
       runCommandNative = pkgsNative.runCommand;
     };
 
-    itnClustersFile = writeTextFile {
-      name = "itn-clusters";
-      text = concatStringsSep " " itn_clusters;
-    };
-
     unsignedUnpackedCardano = self.daedalus-bridge; # TODO
     unpackedCardano = if dummyInstaller then self.dummyUnpacked else (if needSignedBinaries then self.signedCardano else self.unsignedUnpackedCardano);
     signFile = file: let
@@ -207,7 +195,7 @@ let
     '';
 
     nsisFiles = let
-      nodeImplementation' = if nodeImplementation == "jormungandr" then nodeImplementation else "${nodeImplementation}";
+      nodeImplementation' = "${nodeImplementation}";
     in pkgs.runCommand "nsis-files" {
       buildInputs = [ self.daedalus-installer pkgs.glibcLocales ];
     } ''

cardano-sl-src.json

@@ -40,7 +40,7 @@ macBuildSpec = do
                  { oOS = Win64
                  , oBackend = Cardano daedalusBridge
                  , oBuildJob = Just (BuildJob "test")
-                 , oCluster = Nightly
+                 , oCluster = Testnet
                  , oAppName = "Daedalus"
                  , oOutputDir = out
                  , oTestInstaller = testInstaller False
@@ -123,8 +123,8 @@ utilSpec = do
 
   describe "Package filename generation" $ do
     it "generates a good filename for windows" $ do
-      let f = packageFileName Win64 Nightly (Version "0.4.2") (Cardano "") "9.9" (Just "job.id")
-      f `shouldBe` (fromText "daedalus-0.4.2-cardano-sl-9.9-nightly-windows-job.id.exe")
+      let f = packageFileName Win64 Testnet (Version "0.4.2") (Cardano "") "9.9" (Just "job.id")
+      f `shouldBe` (fromText "daedalus-0.4.2-cardano-sl-9.9-testnet-windows-job.id.exe")
 
 ----------------------------------------------------------------------------
 -- Tests for Hydra downloading (yes it's in the AppVeyor module)

default.nix

@@ -94,10 +94,9 @@ optionsParser detectedOS = Options
   <*> (optional $ optPath       "signing-config"      'k' "the path to the json file describing the product signing config")
 
 backendOptionParser :: Parser Backend
-backendOptionParser = enableJormungandr <|> cardano
+backendOptionParser = cardano
   where
     cardano = Cardano <$> optPath "cardano" 'S' "Use Cardano backend with given Daedalus bridge path"
-    enableJormungandr = Jormungandr <$> optPath  "jormungandr" 'j' "use Jormungandr backend"
 
 -- | Render a FilePath with POSIX-style forward slashes, which is the
 -- Dhall syntax.