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.

Sign up for GitHub

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-11505] Update cardano-node to 10.1.2 #3229

Merged
merged 7 commits into from
Nov 20, 2024
Merged

[LW-11505] Update cardano-node to 10.1.2 #3229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70d4d03
[LW-11505] Update `cardano-wallet` to v2024-09-03
michalrus Sep 12, 2024
89f0a33
[LW-11505] Update `cardano-node` to 9.2.0 via `cardano-wallet` v2024-…
michalrus Oct 4, 2024
bf4616b
[LW-11505] Update `cardano-node` to 9.2.1 via `cardano-wallet` v2024-…
michalrus Oct 4, 2024
712e24d
[LW-11505] Update `cardano-node` to 10.1.1 via `cardano-wallet` `ba7d…
michalrus Nov 4, 2024
c0ed247
[LW-11505] Update `cardano-node` to 10.1.2
michalrus Nov 7, 2024
e2ffb9a
[LW-11505] Fix the Windows installer
michalrus Nov 7, 2024
9ca544d
[LW-11505] Update `cardano-wallet` to `v2024-11-18`
michalrus Nov 19, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## vNext

### Chores

- Update `cardano-node` to 10.1.1 via `cardano-wallet` v2024-11-18 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229))

## 6.0.2

### Fixes
Expand Down
34 changes: 8 additions & 26 deletions flake.lock
View file
Open in desktop

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

6 changes: 2 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@

inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-07-27";
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-11-18";
cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
cardano-node-override.url = "github:IntersectMBO/cardano-node/9.1.1";
cardano-node-override.flake = false;
cardano-playground.url = "github:input-output-hk/cardano-playground/next-2024-07-24";
cardano-playground.url = "github:input-output-hk/cardano-playground/49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26";
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
6 changes: 4 additions & 2 deletions installers/common/WindowsInstaller.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,6 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
file [] "genesis-alonzo.json"
file [] "libsodium-23.dll"
file [] "libsecp256k1-2.dll"
file [] "libssl-3-x64.dll"
file [] "libcrypto-3-x64.dll"
when (clusterName == Selfnode) $ do
file [] "signing.key"
file [] "delegation.cert"
Expand All @@ -242,10 +240,14 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
file [] "mock-token-metadata-server.exe"
file [] "token-metadata.json"
file [] "cardano-launcher.exe"
file [] "libatomic-1.dll"
file [] "libffi-8.dll"
file [] "libgmp-10.dll"
file [] "libstdc++-6.dll"
file [] "mcfgthread-12.dll"
file [] "libmcfgthread-1.dll"
file [] "libquadmath-0.dll"
file [] "libssp-0.dll"
file [] "libgcc_s_seh-1.dll"
file [] "zlib1.dll"
--file [] "cardano-x509-certificates.exe"
Expand Down
2 changes: 1 addition & 1 deletion nix/internal/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ rec {
}).defaultNix;

nodeFlake = let
unpatched = inputs.cardano-node-override;
unpatched = walletFlake.inputs.cardano-node-runtime;
in (flake-compat {
src = {
outPath = toString (pkgs.runCommand "source" {} ''
Expand Down