Merge pull request #3294 from input-output-hk/chore/node-10-5-1

Update `cardano-node` to 10.5.1 and support `peer-snapshot.json`

Author: michalrus

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## vNext
+
+### Chores
+
+- Update `cardano-node` to 10.5.1 and support `peer-snapshot.json` ([PR 3294](https://github.com/input-output-hk/daedalus/pull/3294))
+
 ## 7.2.0
 
 ### Fixes

flake.lock

@@ -5,11 +5,11 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
     cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2025-03-31";
     cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
-    cardano-node-override.url = "github:IntersectMBO/cardano-node/10.2.1";
+    cardano-node-override.url = "github:IntersectMBO/cardano-node/10.5.1";
     cardano-node-override.flake = false;
-    cardano-playground.url = "github:input-output-hk/cardano-playground/d3322dce0ab1c00386adc93899aabe9252342b54";
+    cardano-playground.url = "github:input-output-hk/cardano-playground/56ebfef5595c43014029b039ade01b0ef06233e0";
     cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
-    cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";
+    cardano-shell.url = "github:input-output-hk/cardano-shell/79f48aa3aa8007a1597cbedc22031eab1f05decd";
     cardano-shell.flake = false;
     tullia.url = "github:input-output-hk/tullia";
     tullia.flake = false; # otherwie, +1k dependencies in flake.lock…

flake.nix

@@ -213,6 +213,9 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                   detailPrint "Removing previously installed version"
                   rmdir [Recursive] "$INSTDIR"
 
+                -- FIXME: Let's make it recursively take all files from a single install directory…
+                -- FIXME: Why the repetition?
+
                 iff_ (fileExists "$APPDATA\\$InstallDir\\Wallet-1.0\\open\\*.*") $
                     rmdir [] "$APPDATA\\$InstallDir\\Wallet-1.0\\open"
                 case oBackend of
@@ -224,11 +227,14 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                     file [] "config.yaml"
                     file [] "topology.yaml"
                     file [] "genesis.json"
+                    when (clusterName == Mainnet) $ do
+                      file [] "checkpoints.json"
                     when (clusterName /= Selfnode) $ do
                       file [NonFatal] "genesis-conway.json"
                       file [] "genesis-byron.json"
                       file [] "genesis-shelley.json"
                       file [] "genesis-alonzo.json"
+                      file [] "peer-snapshot.json"
                     file [] "libsodium-23.dll"
                     file [] "libsecp256k1-2.dll"
                     when (clusterName == Selfnode) $ do
@@ -240,16 +246,16 @@ 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 [] "libmcfgthread-minimal-1.dll"
                 file [] "libgcc_s_seh-1.dll"
                 file [] "zlib1.dll"
+                file [] "liblmdb.dll"
+                file [] "libz.dll"
                 --file [] "cardano-x509-certificates.exe"
                 --file [] "log-config-prod.yaml"
                 --file [] "wallet-topology.yaml"

installers/common/WindowsInstaller.hs

@@ -166,7 +166,7 @@ in rec {
     )
   '';
 
-  bundle-cardano-launcher = mkBundle "cardano-launcher" (common.cardano-shell.haskellPackages.cardano-launcher.components.exes.cardano-launcher + "/bin/cardano-launcher");
+  bundle-cardano-launcher = mkBundle "cardano-launcher" (common.cardano-launcher + "/bin/cardano-launcher");
   bundle-cardano-node     = mkBundle "cardano-node"     (lib.getExe common.cardano-node);
   bundle-cardano-cli      = mkBundle "cardano-cli"      (lib.getExe common.cardano-cli);
   bundle-cardano-address  = mkBundle "cardano-address"  (lib.getExe common.cardano-address);
@@ -289,15 +289,15 @@ in rec {
       echo "Preparing files ..."
       cp installers/launcher-config.yaml "$dataDir"/
 
-      cp -r ${bundle-cardano-launcher}/. "$dir"/
-      cp -r ${bundle-cardano-node    }/. "$dir"/
-      cp -r ${bundle-cardano-cli     }/. "$dir"/
-      cp -r ${bundle-cardano-address }/. "$dir"/
-      cp -r ${bundle-cardano-wallet  }/. "$dir"/
+      cp -r ${bundle-cardano-launcher}/. "$dir"/ && chmod -R +w "$dir/"
+      cp -r ${bundle-cardano-node    }/. "$dir"/ && chmod -R +w "$dir/"
+      cp -r ${bundle-cardano-cli     }/. "$dir"/ && chmod -R +w "$dir/"
+      cp -r ${bundle-cardano-address }/. "$dir"/ && chmod -R +w "$dir/"
+      cp -r ${bundle-cardano-wallet  }/. "$dir"/ && chmod -R +w "$dir/"
 
       ${lib.optionalString (cluster == "selfnode") ''
-        cp -r ${bundle-mock-token-metadata-server}/. "$dir"/
-        cp -r ${bundle-local-cluster             }/. "$dir"/
+        cp -r ${bundle-mock-token-metadata-server}/. "$dir"/ && chmod -R +w "$dir/"
+        cp -r ${bundle-local-cluster             }/. "$dir"/ && chmod -R +w "$dir/"
       ''}
 
       cp installers/{config.yaml,genesis.json,topology.yaml} "$dataDir"/

nix/internal/any-darwin.nix

@@ -1,4 +1,4 @@
-{ target, runCommandCC, cardano-wallet, cardano-node, cardano-shell, cardano-cli, cardano-address, lib, local-cluster ? null, mock-token-metadata-server, darwin }:
+{ target, runCommandCC, cardano-wallet, cardano-node, cardano-launcher, cardano-cli, cardano-address, lib, local-cluster ? null, mock-token-metadata-server, darwin }:
 
 runCommandCC "daedalus-cardano-bridge" {
   passthru = {
@@ -11,7 +11,7 @@ runCommandCC "daedalus-cardano-bridge" {
   echo ${cardano-wallet.version} > $out/version
   cp ${cardano-wallet}/bin/* .
   cp -f ${cardano-address}/bin/cardano-address* .
-  cp -f ${cardano-shell.haskellPackages.cardano-launcher.components.exes.cardano-launcher}/bin/* .
+  cp -f ${cardano-launcher}/bin/* .
   cp -f ${cardano-node}/bin/* .
   cp -f ${cardano-cli}/bin/cardano-cli* .
   ${lib.optionalString (local-cluster != null) ''
@@ -31,13 +31,6 @@ runCommandCC "daedalus-cardano-bridge" {
     cp -f ${mock-token-metadata-server}/bin/* . || true
     cp -f ${./../../utils/cardano/selfnode}/token-metadata.json .
   ''}
-  ${lib.optionalString (target == "x86_64-linux") ''
-    chmod +w -R .
-    for x in cardano-launcher; do
-      $STRIP $x
-      patchelf --shrink-rpath $x
-    done
-  ''}
   ${lib.optionalString (target == "aarch64-darwin") ''
     chmod +w -R .
     for x in cardano-address cardano-node cardano-launcher cardano-cli cardano-wallet; do

nix/internal/cardano-bridge.nix

@@ -72,20 +72,19 @@ rec {
   daedalus-bridge = pkgs.lib.genAttrs sourceLib.installerClusters (cluster: import ./cardano-bridge.nix {
     target = targetSystem;
     inherit (pkgs) lib runCommandCC darwin;
-    inherit cardano-wallet cardano-node cardano-shell cardano-cli cardano-address mock-token-metadata-server;
+    inherit cardano-wallet cardano-node cardano-launcher cardano-cli cardano-address mock-token-metadata-server;
     local-cluster = if cluster == "selfnode" then walletPackages.local-cluster else null;
   });
 
   inherit (walletPackages) cardano-wallet cardano-address mock-token-metadata-server;
 
   inherit (nodePackages) cardano-node cardano-cli;
 
-  cardano-shell = import inputs.cardano-shell {
-    inherit (pkgs) system;
-    crossSystem = {
-      x86_64-windows = pkgs.lib.systems.examples.mingwW64;
-    }.${targetSystem} or null;
-  };
+  cardano-shell = (flake-compat {
+    src = inputs.cardano-shell;
+  }).defaultNix;
+
+  cardano-launcher = cardano-shell.hydraJobs.cardano-launcher.${targetSystem};
 
   cardanoNodeVersion = cardano-node.identifier.version + "-" + builtins.substring 0 9 nodeFlake.rev;
 

nix/internal/common.nix

@@ -43,7 +43,7 @@ let
   fromCardanoPlayground = envName: let
     originalFiles = builtins.path {
       name = "cardano-playground-config-${envName}";
-      path = cardano-playground + ("/static/book.play.dev.cardano.org/environments/" + envName);
+      path = cardano-playground + ("/docs/environments/" + envName);
     };
 
     originalNodeConfig = builtins.fromJSON (builtins.unsafeDiscardStringContext (
@@ -63,8 +63,11 @@ let
     cardanoEnv = {
       inherit nodeConfig;
       topologyFile = originalFiles + "/topology.json";
+      peerSnapshotFile = originalFiles + "/peer-snapshot.json";
       metadataUrl = tokenMetadataServers.${envName};
-    };
+    } // (let
+      checkpointsFile = originalFiles + "/checkpoints.json";
+    in if builtins.pathExists checkpointsFile then { inherit checkpointsFile; } else {});
   };
 
   dirSep = if os == "windows" then "\\" else "/";
@@ -267,6 +270,12 @@ let
       cp ${genesisFile} $out/genesis.json
       cp $nodeConfigPath $out/config.yaml
       cp $topologyFile $out/topology.yaml
+      ${lib.optionalString (envCfg ? peerSnapshotFile) ''
+        cp ${envCfg.peerSnapshotFile} $out/peer-snapshot.json
+      ''}
+      ${lib.optionalString (envCfg ? checkpointsFile) ''
+        cp ${envCfg.checkpointsFile} $out/checkpoints.json
+      ''}
       ${lib.optionalString (network == "selfnode") ''
         cp ${envCfg.delegationCertificate} $out/delegation.cert
         cp ${envCfg.signingKey} $out/signing.key

nix/internal/launcher-config.nix

@@ -167,7 +167,7 @@ in rec {
     inherit version;
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-7+vNhYbrizqhoIDL6vN7vE+Gq2duoYW5adMgOpJgw2w=";
+    outputHash = "sha256-6RVneGKjsEMYGfZSYg5mMafjl0itdZQXtzLPRdrawII=";
     buildInputs = [];
     dontUnpack = true;
     dontConfigure = true;