Merge pull request #3212 from input-output-hk/chore/LW-10808-cardano-node-9

[LW-10808] Update cardano-node to 9.1.0

Author: michalrus

CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Chores
 
+- Updated cardano-node to 9.1.0 (via cardano-wallet) ([PR 3212](https://github.com/input-output-hk/daedalus/pull/3212))
+
 - Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `7.1.3` and `@trezor/connect` to version `9.3.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3215))
 
 ## 5.4.0

flake.lock

@@ -3,9 +3,9 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
-    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-05-05";
+    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-07-27";
     cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
-    cardano-playground.url = "github:input-output-hk/cardano-playground";
+    cardano-playground.url = "github:input-output-hk/cardano-playground/next-2024-07-24";
     cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
     cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";
     cardano-shell.flake = false;

flake.nix

@@ -370,8 +370,10 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       forM_ ["config.yaml", "genesis.json", "topology.yaml" ] $ \f ->
         cp f (dataDir </> f)
       when (oCluster /= Selfnode) $ do
-        forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json", "genesis-conway.json" ] $ \f ->
+        forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json"] $ \f ->
           cp f (dataDir </> f)
+        forM_ ["genesis-conway.json"] $ \f ->
+          whenM (testfile f) $ cp f (dataDir </> f)
 
       when (oCluster == Selfnode) $ do
         cp "signing.key" (dataDir </> "signing.key")

installers/common/MacInstaller.hs

@@ -13,7 +13,7 @@ import           Universum hiding (pass, writeFile, stdout, FilePath, die, view)
 import qualified Data.List as L
 import qualified Data.Text as T
 import           Data.Yaml                 (decodeFileThrow)
-import           Development.NSIS (Attrib (IconFile, IconIndex, RebootOK, Recursive, Required, StartOptions, Target),
+import           Development.NSIS (Attrib (IconFile, IconIndex, RebootOK, Recursive, Required, StartOptions, Target, NonFatal),
                                    HKEY (HKLM), Level (Highest), Page (Directory, InstFiles), abort,
                                    constant, constantStr, createDirectory, createShortcut, delete,
                                    deleteRegKey, file, iff_, installDir, installDirRegKey,
@@ -225,7 +225,7 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                     file [] "topology.yaml"
                     file [] "genesis.json"
                     when (clusterName /= Selfnode) $ do
-                      file [] "genesis-conway.json"
+                      file [NonFatal] "genesis-conway.json"
                       file [] "genesis-byron.json"
                       file [] "genesis-shelley.json"
                       file [] "genesis-alonzo.json"

installers/common/WindowsInstaller.hs

@@ -44,12 +44,13 @@ let
       builtins.readFile (originalFiles + "/config.json")));
 
     nodeConfig = originalNodeConfig // {
-      ConwayGenesisFile  = originalFiles + "/" + originalNodeConfig.ConwayGenesisFile;
       AlonzoGenesisFile  = originalFiles + "/" + originalNodeConfig.AlonzoGenesisFile;
       ByronGenesisFile   = originalFiles + "/" + originalNodeConfig.ByronGenesisFile;
       ShelleyGenesisFile = originalFiles + "/" + originalNodeConfig.ShelleyGenesisFile;
       minSeverity = "Info";  # XXX: Needed for sync % updates.
-    };
+    } // (if originalNodeConfig ? ConwayGenesisFile then {
+      ConwayGenesisFile  = originalFiles + "/" + originalNodeConfig.ConwayGenesisFile;
+    } else {});
   in {
     cluster = envName;
     networkName = envName;
@@ -227,12 +228,13 @@ let
     cliBin = mkBinPath "cardano-cli";
     nodeConfig = let
       nodeConfigAttrs = if (configOverride == null) then envCfg.nodeConfig else __fromJSON (__readFile configOverride);
-    in builtins.toJSON (filterMonitoring (nodeConfigAttrs // (lib.optionalAttrs (!devShell || network == "local") {
+    in builtins.toJSON (filterMonitoring (nodeConfigAttrs // (lib.optionalAttrs (!devShell || network == "local") ({
       ByronGenesisFile = "genesis-byron.json";
       ShelleyGenesisFile = "genesis-shelley.json";
       AlonzoGenesisFile = "genesis-alonzo.json";
+    } // (if nodeConfigAttrs ? ConwayGenesisFile then {
       ConwayGenesisFile = "genesis-conway.json";
-    })));
+    } else {})))));
     genesisFile = let
       genesisFile'.selfnode = ../../utils/cardano/selfnode/genesis.json;
       genesisFile'.local = (__fromJSON nodeConfig).GenesisFile;