Merge pull request #59 from input-output-hk/next-2025-02-27

Node 10.2.1, Dbsync 13.6.0.5, Mithril v2513

Author: johnalotoski

flake.lock

@@ -25,7 +25,7 @@
     services-flake.url = "github:juspay/services-flake";
 
     # Cardano related inputs
-    capkgs.url = "github:input-output-hk/capkgs/input-addressed";
+    capkgs.url = "github:input-output-hk/capkgs";
     empty-flake.url = "github:input-output-hk/empty-flake";
     haskell-nix.url = "github:input-output-hk/haskell.nix";
     iohk-nix.url = "github:input-output-hk/iohk-nix";

flake.nix

@@ -187,6 +187,7 @@
         [
           config.cardano-parts.pkgs.bech32
           cardano-cli
+          cardano-node
           config.cardano-parts.pkgs.db-analyser
           config.cardano-parts.pkgs.db-synthesizer
           config.cardano-parts.pkgs.db-truncater

flake/nixosModules/profile-cardano-node-group.nix

@@ -104,11 +104,17 @@
         };
       };
 
+      # With the introduction of SRV records, the port field is optional in the
+      # json struct, and if missing or set to null, the address will be treated
+      # as a SRV record.
       mkBasicProducers = producer: let
         extraCfg = removeAttrs producer ["address" "port"];
       in
         {
-          accessPoints = [{inherit (producer) address port;}];
+          accessPoints = [
+            ({inherit (producer) address;}
+              // optionalAttrs (producer ? port && producer.port != null) {inherit (producer) port;})
+          ];
         }
         // extraCfg;
 
@@ -256,6 +262,10 @@
               Additional attributes beyond address and port in the attribute set will be appended
               as extra config to the accessPoint list.
 
+              If the port is not provided or set to null, it will not be
+              included in the json converted struct and node will consider the
+              address to be an SRV record.
+
               If further customization is required add the extra producers directly to the
               services.cardano-node.producers option.
             '';
@@ -279,6 +289,10 @@
               Additional attributes beyond address and port in the attribute set will be appended
               as extra config to the accessPoints list.
 
+              If the port is not provided or set to null, it will not be
+              included in the json converted struct and node will consider the
+              address to be an SRV record.
+
               If further customization is required, add the extra public producers directly to the
               services.cardano-node.publicProducers option.
             '';

flake/nixosModules/profile-cardano-node-topology.nix

@@ -426,56 +426,56 @@ in
         pkgsSubmodule = submodule {
           options = foldl' recursiveUpdate {} [
             # TODO: Fix the missing meta/version info upstream
-            (mkPkg "bech32" caPkgs."bech32-input-output-hk-cardano-node-10-1-4-1f63dbf")
+            (mkPkg "bech32" caPkgs."bech32-input-output-hk-cardano-node-10-2-1-52b708f")
             (mkPkg "blockperf" caPkgs.blockperf-cardano-foundation-blockperf-main-87f6f67)
             (mkPkg "cardano-address" caPkgs.cardano-address-cardano-foundation-cardano-wallet-v2024-11-18-9eb5f59)
-            (mkPkg "cardano-cli" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-1-4-1f63dbf" // {version = "10.1.1.0";}))
+            (mkPkg "cardano-cli" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.4.0.0";}))
             (mkPkg "cardano-cli-ng" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.4.0.0";}))
-            (mkPkg "cardano-db-sync" (recursiveUpdate caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-6-0-4-0b7c281" {meta.mainProgram = "cardano-db-sync";}))
-            (mkPkg "cardano-db-sync-ng" (recursiveUpdate caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-6-0-4-0b7c281" {meta.mainProgram = "cardano-db-sync";}))
-            (mkPkg "cardano-db-tool" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-6-0-4-0b7c281")
-            (mkPkg "cardano-db-tool-ng" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-6-0-4-0b7c281")
+            (mkPkg "cardano-db-sync" (recursiveUpdate caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-6-0-5-cb61094" {meta.mainProgram = "cardano-db-sync";}))
+            (mkPkg "cardano-db-sync-ng" (recursiveUpdate caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-6-0-5-cb61094" {meta.mainProgram = "cardano-db-sync";}))
+            (mkPkg "cardano-db-tool" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-6-0-5-cb61094")
+            (mkPkg "cardano-db-tool-ng" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-6-0-5-cb61094")
 
             # For tmp local faucet testing:
             # (mkPkg "cardano-faucet" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet")
             # (mkPkg "cardano-faucet-ng" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet")
             (mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d")
             (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d")
 
-            (mkPkg "cardano-node" (caPkgs."cardano-node-input-output-hk-cardano-node-10-1-4-1f63dbf" // {version = "10.1.4";}))
+            (mkPkg "cardano-node" (caPkgs."cardano-node-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.2.1";}))
             (mkPkg "cardano-node-ng" (caPkgs."cardano-node-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.2.1";}))
             (mkPkg "cardano-ogmios" caPkgs.ogmios-input-output-hk-cardano-ogmios-v6-3-0-8ab5fd6)
-            (mkPkg "cardano-smash" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-6-0-4-0b7c281)
-            (mkPkg "cardano-smash-ng" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-6-0-4-0b7c281)
-            (mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-input-output-hk-cardano-node-10-1-4-1f63dbf")
+            (mkPkg "cardano-smash" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-6-0-5-cb61094)
+            (mkPkg "cardano-smash-ng" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-6-0-5-cb61094)
+            (mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-input-output-hk-cardano-node-10-2-1-52b708f")
             (mkPkg "cardano-submit-api-ng" caPkgs."cardano-submit-api-input-output-hk-cardano-node-10-2-1-52b708f")
-            (mkPkg "cardano-testnet" caPkgs."cardano-testnet-input-output-hk-cardano-node-10-1-4-1f63dbf")
+            (mkPkg "cardano-testnet" caPkgs."cardano-testnet-input-output-hk-cardano-node-10-2-1-52b708f")
             (mkPkg "cardano-testnet-ng" caPkgs."cardano-testnet-input-output-hk-cardano-node-10-2-1-52b708f")
-            (mkPkg "cardano-tracer" caPkgs."cardano-tracer-input-output-hk-cardano-node-10-1-4-1f63dbf")
+            (mkPkg "cardano-tracer" caPkgs."cardano-tracer-input-output-hk-cardano-node-10-2-1-52b708f")
             (mkPkg "cardano-tracer-ng" caPkgs."cardano-tracer-input-output-hk-cardano-node-10-2-1-52b708f")
             (mkPkg "cardano-wallet" (caPkgs.cardano-wallet-cardano-foundation-cardano-wallet-v2024-11-18-9eb5f59
               // {
                 pname = "cardano-wallet";
                 meta.description = "HTTP server and command-line for managing UTxOs and HD wallets in Cardano.";
               }))
             (mkPkg "cc-sign" caPkgs.cc-sign-IntersectMBO-credential-manager-0-1-2-0-081cc8c)
-            (mkPkg "db-analyser" caPkgs."db-analyser-input-output-hk-cardano-node-10-1-4-1f63dbf")
+            (mkPkg "db-analyser" caPkgs."db-analyser-input-output-hk-cardano-node-10-2-1-52b708f")
             (mkPkg "db-analyser-ng" caPkgs."db-analyser-input-output-hk-cardano-node-10-2-1-52b708f")
-            (mkPkg "db-synthesizer" caPkgs."db-synthesizer-input-output-hk-cardano-node-10-1-4-1f63dbf")
+            (mkPkg "db-synthesizer" caPkgs."db-synthesizer-input-output-hk-cardano-node-10-2-1-52b708f")
             (mkPkg "db-synthesizer-ng" caPkgs."db-synthesizer-input-output-hk-cardano-node-10-2-1-52b708f")
-            (mkPkg "db-truncater" caPkgs."db-truncater-input-output-hk-cardano-node-10-1-4-1f63dbf")
+            (mkPkg "db-truncater" caPkgs."db-truncater-input-output-hk-cardano-node-10-2-1-52b708f")
             (mkPkg "db-truncater-ng" caPkgs."db-truncater-input-output-hk-cardano-node-10-2-1-52b708f")
-            (mkPkg "isd" caPkgs.isd-isd-project-isd-v0-3-0-01ffd84)
-            (mkPkg "process-compose" caPkgs.process-compose-F1bonacc1-process-compose-v0-80-0-26bf212)
+            (mkPkg "isd" caPkgs.isd-isd-project-isd-v0-5-1-51d52a2)
+            (mkPkg "process-compose" caPkgs.process-compose-F1bonacc1-process-compose-v1-46-0-6a1799e)
             (mkPkg "metadata-server" caPkgs.metadata-server-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
             (mkPkg "metadata-sync" caPkgs.metadata-sync-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
             (mkPkg "metadata-validator-github" caPkgs.metadata-validator-github-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
             (mkPkg "metadata-webhook" caPkgs.metadata-webhook-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
-            (mkPkg "mithril-client-cli" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-2506-0-pre-2627f17 {meta.mainProgram = "mithril-client";}))
-            (mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-unstable-9ef0fd4 {meta.mainProgram = "mithril-client";}))
+            (mkPkg "mithril-client-cli" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-2513-0-pre-1fb85a7 {meta.mainProgram = "mithril-client";}))
+            (mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-unstable-0d66de9 {meta.mainProgram = "mithril-client";}))
             # To update once capkgs builds and caches 2506 signer successfully
-            (mkPkg "mithril-signer" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2450-0-pre-c6c7eba {meta.mainProgram = "mithril-signer";}))
-            (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2450-0-pre-c6c7eba {meta.mainProgram = "mithril-signer";}))
+            (mkPkg "mithril-signer" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2513-0-pre-1fb85a7 {meta.mainProgram = "mithril-signer";}))
+            (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-unstable-0d66de9 {meta.mainProgram = "mithril-signer";}))
             (mkPkg "orchestrator-cli" caPkgs.orchestrator-cli-IntersectMBO-credential-manager-0-1-2-0-081cc8c)
             (mkPkg "token-metadata-creator" (recursiveUpdate caPkgs.token-metadata-creator-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d {meta.mainProgram = "token-metadata-creator";}))
             (mkPkg "tx-bundle" caPkgs.tx-bundle-IntersectMBO-credential-manager-0-1-2-0-081cc8c)

flakeModules/pkgs.nix

@@ -220,7 +220,7 @@ flake @ {inputs, ...}: {
             sleep 5
           done
 
-          while ! "$CLI" ping -c 1 -u "$SOCKET" -m "${envBinCfgs.${env}.magic}" &> /dev/null; do
+          while ! "$CLI" query tip --socket-path "$SOCKET" --testnet-magic "${envBinCfgs.${env}.magic}" &> /dev/null; do
             echo "$(date -u --rfc-3339=seconds): Waiting 5 seconds for the socket to become active at $SOCKET"
             sleep 5
           done