Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LW-10808] Update cardano-node to 9.1.0 #3212

Merged
merged 6 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion installers/common/MacInstaller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions installers/common/WindowsInstaller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 6 additions & 4 deletions nix/internal/launcher-config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down