Skip to content

Commit 67ad093

Browse files
committed
[LW-10808] Update cardano-node to 9.0.0
1 parent c30dced commit 67ad093

File tree

6 files changed

+24
-16
lines changed

6 files changed

+24
-16
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
- Fixed installation and running on Ubuntu 24.04 LTS with AppArmor enabled by removing the `chroot` ([PR 3207](https://github.com/input-output-hk/daedalus/pull/3207))
88

9+
### Chores
10+
11+
- Updated cardano-node to 9.0.0 (via cardano-wallet) ([PR 3212](https://github.com/input-output-hk/daedalus/pull/3212))
12+
913
## 5.4.0
1014

1115
### Fixes

flake.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
inputs = {
55
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
6-
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-05-05";
6+
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/master"; # FIXME: use real release
77
cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
88
cardano-playground.url = "github:input-output-hk/cardano-playground";
99
cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…

installers/common/MacInstaller.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,10 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
365365
forM_ ["config.yaml", "genesis.json", "topology.yaml" ] $ \f ->
366366
cp f (dataDir </> f)
367367
when (oCluster /= Selfnode) $ do
368-
forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json", "genesis-conway.json" ] $ \f ->
368+
forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json"] $ \f ->
369369
cp f (dataDir </> f)
370+
forM_ ["genesis-conway.json"] $ \f ->
371+
whenM (testfile f) $ cp f (dataDir </> f)
370372

371373
when (oCluster == Selfnode) $ do
372374
cp "signing.key" (dataDir </> "signing.key")

installers/common/WindowsInstaller.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Universum hiding (pass, writeFile, stdout, FilePath, die, view)
1313
import qualified Data.List as L
1414
import qualified Data.Text as T
1515
import Data.Yaml (decodeFileThrow)
16-
import Development.NSIS (Attrib (IconFile, IconIndex, RebootOK, Recursive, Required, StartOptions, Target),
16+
import Development.NSIS (Attrib (IconFile, IconIndex, RebootOK, Recursive, Required, StartOptions, Target, NonFatal),
1717
HKEY (HKLM), Level (Highest), Page (Directory, InstFiles), abort,
1818
constant, constantStr, createDirectory, createShortcut, delete,
1919
deleteRegKey, file, iff_, installDir, installDirRegKey,
@@ -225,7 +225,7 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
225225
file [] "topology.yaml"
226226
file [] "genesis.json"
227227
when (clusterName /= Selfnode) $ do
228-
file [] "genesis-conway.json"
228+
file [NonFatal] "genesis-conway.json"
229229
file [] "genesis-byron.json"
230230
file [] "genesis-shelley.json"
231231
file [] "genesis-alonzo.json"

nix/internal/launcher-config.nix

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,20 @@ let
3737
fromCardanoPlayground = envName: let
3838
originalFiles = builtins.path {
3939
name = "cardano-playground-config-${envName}";
40-
path = cardano-playground + ("/static/book.play.dev.cardano.org/environments/" + envName);
40+
path = cardano-playground + ("/static/book.play.dev.cardano.org/environments-pre/" + envName);
4141
};
4242

4343
originalNodeConfig = builtins.fromJSON (builtins.unsafeDiscardStringContext (
4444
builtins.readFile (originalFiles + "/config.json")));
4545

4646
nodeConfig = originalNodeConfig // {
47-
ConwayGenesisFile = originalFiles + "/" + originalNodeConfig.ConwayGenesisFile;
4847
AlonzoGenesisFile = originalFiles + "/" + originalNodeConfig.AlonzoGenesisFile;
4948
ByronGenesisFile = originalFiles + "/" + originalNodeConfig.ByronGenesisFile;
5049
ShelleyGenesisFile = originalFiles + "/" + originalNodeConfig.ShelleyGenesisFile;
5150
minSeverity = "Info"; # XXX: Needed for sync % updates.
52-
};
51+
} // (if originalNodeConfig ? ConwayGenesisFile then {
52+
ConwayGenesisFile = originalFiles + "/" + originalNodeConfig.ConwayGenesisFile;
53+
} else {});
5354
in {
5455
cluster = envName;
5556
networkName = envName;
@@ -227,12 +228,13 @@ let
227228
cliBin = mkBinPath "cardano-cli";
228229
nodeConfig = let
229230
nodeConfigAttrs = if (configOverride == null) then envCfg.nodeConfig else __fromJSON (__readFile configOverride);
230-
in builtins.toJSON (filterMonitoring (nodeConfigAttrs // (lib.optionalAttrs (!devShell || network == "local") {
231+
in builtins.toJSON (filterMonitoring (nodeConfigAttrs // (lib.optionalAttrs (!devShell || network == "local") ({
231232
ByronGenesisFile = "genesis-byron.json";
232233
ShelleyGenesisFile = "genesis-shelley.json";
233234
AlonzoGenesisFile = "genesis-alonzo.json";
235+
} // (if nodeConfigAttrs ? ConwayGenesisFile then {
234236
ConwayGenesisFile = "genesis-conway.json";
235-
})));
237+
} else {})))));
236238
genesisFile = let
237239
genesisFile'.selfnode = ../../utils/cardano/selfnode/genesis.json;
238240
genesisFile'.local = (__fromJSON nodeConfig).GenesisFile;

0 commit comments

Comments
 (0)