diff --git a/CHANGELOG.md b/CHANGELOG.md index 7584158e43..863226e374 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/flake.lock b/flake.lock index 98b249dd86..937f253337 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,16 @@ "cardano-playground": { "flake": false, "locked": { - "lastModified": 1710374728, - "narHash": "sha256-nk79ZQLHGHPLXEYeJhZLWQWsa+wzOxxu4SuY9sKVG5c=", + "lastModified": 1721869644, + "narHash": "sha256-2qPZuuXtNi7kRPCFHv1Zvno/FIH0dOyg3Zqeywt77WQ=", "owner": "input-output-hk", "repo": "cardano-playground", - "rev": "aa1d456c5e926cc07094a26f2c480773f206e4e8", + "rev": "c3042e1669ad9e5af43622972913614d6b934488", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "next-2024-07-24", "repo": "cardano-playground", "type": "github" } @@ -36,16 +37,16 @@ "cardano-wallet-unpatched": { "flake": false, "locked": { - "lastModified": 1714939252, - "narHash": "sha256-9n5/ufTrkT3RPF6S2diepEuEDKImEfCM6NbepoCLU2I=", + "lastModified": 1722103243, + "narHash": "sha256-2Ilm37Lt0nnFOgVx9AFIf8go6JfKhPoE9Im7H5sscxM=", "owner": "cardano-foundation", "repo": "cardano-wallet", - "rev": "85c53a2f8c6cb10d2d44ab045b3c5e4fb7155e7a", + "rev": "ceb90fcac0e7ddf9e30705ce1e9d5780222fc3fd", "type": "github" }, "original": { "owner": "cardano-foundation", - "ref": "v2024-05-05", + "ref": "v2024-07-27", "repo": "cardano-wallet", "type": "github" } diff --git a/flake.nix b/flake.nix index 33e8a131f9..919fcc8a3a 100644 --- a/flake.nix +++ b/flake.nix @@ -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; diff --git a/installers/common/MacInstaller.hs b/installers/common/MacInstaller.hs index fad490745e..8c37f4c2b6 100644 --- a/installers/common/MacInstaller.hs +++ b/installers/common/MacInstaller.hs @@ -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") diff --git a/installers/common/WindowsInstaller.hs b/installers/common/WindowsInstaller.hs index 11b1d4e1d1..36dde9442b 100644 --- a/installers/common/WindowsInstaller.hs +++ b/installers/common/WindowsInstaller.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" diff --git a/nix/internal/launcher-config.nix b/nix/internal/launcher-config.nix index 9586c1c367..e553d2a13f 100644 --- a/nix/internal/launcher-config.nix +++ b/nix/internal/launcher-config.nix @@ -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;