diff --git a/CHANGELOG.md b/CHANGELOG.md index 15cb69436b..d18fed5fc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/flake.lock b/flake.lock index c78ed879d6..0df724831d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,36 +1,19 @@ { "nodes": { - "cardano-node-override": { - "flake": false, - "locked": { - "lastModified": 1725255033, - "narHash": "sha256-VIwEjpaGk09+dAcKELjLSR2OP3qBCWTGHpd0SBjgbVc=", - "owner": "IntersectMBO", - "repo": "cardano-node", - "rev": "efd560070aaf042d1eb4680ae37fc607c7742319", - "type": "github" - }, - "original": { - "owner": "IntersectMBO", - "ref": "9.1.1", - "repo": "cardano-node", - "type": "github" - } - }, "cardano-playground": { "flake": false, "locked": { - "lastModified": 1721869644, - "narHash": "sha256-2qPZuuXtNi7kRPCFHv1Zvno/FIH0dOyg3Zqeywt77WQ=", + "lastModified": 1730399380, + "narHash": "sha256-VxZBbgV4faFuVMheKeJAZ03qkL16mILVAnNqDbZIsAM=", "owner": "input-output-hk", "repo": "cardano-playground", - "rev": "c3042e1669ad9e5af43622972913614d6b934488", + "rev": "49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "next-2024-07-24", "repo": "cardano-playground", + "rev": "49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26", "type": "github" } }, @@ -54,16 +37,16 @@ "cardano-wallet-unpatched": { "flake": false, "locked": { - "lastModified": 1722103243, - "narHash": "sha256-2Ilm37Lt0nnFOgVx9AFIf8go6JfKhPoE9Im7H5sscxM=", + "lastModified": 1731946435, + "narHash": "sha256-vCnp2dV+mAQIt25i8VRYNmLHAH1YZfK1bsBNNrvqJSo=", "owner": "cardano-foundation", "repo": "cardano-wallet", - "rev": "ceb90fcac0e7ddf9e30705ce1e9d5780222fc3fd", + "rev": "9eb5f59c328163ca061a20f47519686b6f118d74", "type": "github" }, "original": { "owner": "cardano-foundation", - "ref": "v2024-07-27", + "ref": "v2024-11-18", "repo": "cardano-wallet", "type": "github" } @@ -118,7 +101,6 @@ }, "root": { "inputs": { - "cardano-node-override": "cardano-node-override", "cardano-playground": "cardano-playground", "cardano-shell": "cardano-shell", "cardano-wallet-unpatched": "cardano-wallet-unpatched", diff --git a/flake.nix b/flake.nix index 815c92086d..0e2f2f8bee 100644 --- a/flake.nix +++ b/flake.nix @@ -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; diff --git a/installers/common/WindowsInstaller.hs b/installers/common/WindowsInstaller.hs index 36dde9442b..669638aa45 100644 --- a/installers/common/WindowsInstaller.hs +++ b/installers/common/WindowsInstaller.hs @@ -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" @@ -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" diff --git a/nix/internal/common.nix b/nix/internal/common.nix index 1a4408ca6b..1c59b81927 100644 --- a/nix/internal/common.nix +++ b/nix/internal/common.nix @@ -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" {} ''