[DDW-338] Fixes types, bumps cardano-launcher, adds CHANEGLOG

input-output-hk · Aug 11, 2020 · 0722453 · 0722453
1 parent 9e8646a
commit 0722453
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+## vNext
+
+### Features
+
+- Added SMASH support ([PR 2143](https://github.com/input-output-hk/daedalus/pull/2143))
+
 ## 2.1.0
 
 ### Features
@@ -9,8 +15,8 @@ Changelog
 
 ### Chores
 
-- Updated `cardano-wallet` to revision `4a4d0a65` 
-- Updated `cardano-wallet` to revision `d5b43356` 
+- Updated `cardano-wallet` to revision `4a4d0a65`
+- Updated `cardano-wallet` to revision `d5b43356`
 
 ## 2.0.1
 

diff --git a/nix/launcher-config.nix b/nix/launcher-config.nix
@@ -243,14 +243,14 @@ let
         legacyWalletDB
         legacySecretKey;
       syncTolerance = "300s";
+      smashUrl = envCfg.smashUrl or null;
       nodeConfig = {
         inherit kind;
         configurationDir = "";
         network = {
           configFile = mkConfigPath nodeConfigFiles "config.yaml";
           genesisFile = mkConfigPath nodeConfigFiles "genesis.json";
           topologyFile = mkConfigPath nodeConfigFiles "topology.yaml";
-          smashUrl = envCfg.smashUrl or null;
         };
         socketFile = if os != "windows" then "${dataDir}${dirSep}cardano-node.socket" else "\\\\.\\pipe\\cardano-node-${network}";
       } // (lib.optionalAttrs (network == "selfnode") {

diff --git a/package.json b/package.json
@@ -173,7 +173,7 @@
     "blakejs": "1.1.0",
     "bs58": "4.0.1",
     "cardano-js": "0.4.5",
-    "cardano-launcher": "0.20200722.0",
+    "cardano-launcher": "0.20200804.0",
     "check-disk-space": "2.1.0",
     "chroma-js": "2.1.0",
     "classnames": "2.2.6",

diff --git a/source/main/config.js b/source/main/config.js
@@ -75,6 +75,7 @@ export type LauncherConfig = {
   legacyWalletDB: string,
   isFlight: boolean,
   isStaging: boolean,
+  smashUrl: ?string,
 };
 
 type WindowOptionsType = {

diff --git a/yarn.lock b/yarn.lock
@@ -3656,9 +3656,9 @@ cardano-js@0.4.5:
     js-chain-libs-node "^0.3.0"
     ts-custom-error "^3.1.1"
 
-cardano-launcher@0.20200722.0:
-  version "0.20200722.0"
-  resolved "https://registry.yarnpkg.com/cardano-launcher/-/cardano-launcher-0.20200722.0.tgz#35acaa3e3d57997aa5ad434358a4d7fe5b7b85d1"
+cardano-launcher@0.20200804.0:
+  version "0.20200804.0"
+  resolved "https://registry.yarnpkg.com/cardano-launcher/-/cardano-launcher-0.20200804.0.tgz#631a147bf081e3b3117f4a68b5b5740b586ca33c"
   dependencies:
     get-port "^5.1.1"
     lodash "^4.17.19"