Integrate in preparation for cardano-node release 10.2.0

cabal.project

@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2024-10-11T15:49:11Z
-  , cardano-haskell-packages 2024-12-05T13:51:16Z
+  , hackage.haskell.org 2024-12-10T16:20:07Z
+  , cardano-haskell-packages 2024-12-18T14:29:04Z
 
 packages:
   cardano-cli
@@ -36,7 +36,9 @@ if os(windows)
   constraints: time ^>=1.14
   allow-newer: *:time
 
-constraints: any.text source
+-- Temporary workaround for problem with cabal-doctest
+constraints: Cabal <3.14
+
 -- Depending on C++ for just so slightly faster utf8 parsing is a bit annoying
 -- especially as it brings in all kinds of complications for GHC.
 package text
@@ -57,3 +59,41 @@ write-ghc-environment-files: always
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-network.git
+  tag: 4920b7a8e1a639e6b6a85611bef6d541e21d012a
+  --sha256: sha256-mrGXtC/mStln5KqoXlruKYl2vHYZhgw3biRlZm82h7A=
+  subdir:
+    cardano-client
+    cardano-ping
+    monoidal-synchronisation
+    network-mux
+    ntp-client
+    ouroboros-network
+    ouroboros-network-api
+    ouroboros-network-framework
+    ouroboros-network-mock
+    ouroboros-network-protocols
+    ouroboros-network-testing
+    quickcheck-monoids
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-consensus.git
+  tag: 038f9d6c5e4d6de7d2cfb2ac9e23d3b66c495418
+  --sha256: sha256-jzfJNLl8GfCTEP5ABpHZl6qps7U6NZi36UxYxooKH+A=
+  subdir:
+    ouroboros-consensus
+    ouroboros-consensus-cardano
+    ouroboros-consensus-protocol
+    ouroboros-consensus-diffusion
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-api.git
+  tag: 04ac6b36284ea823da0a7b88210c03b586f7f808
+  --sha256: sha256-LcZe9GcH2qRvNCk4leJHMLEX0KMiqbkYP4xACBE/znE=
+  subdir:
+    cardano-api

cardano-cli/cardano-cli.cabal

@@ -214,7 +214,7 @@ library
     cardano-crypto-wrapper ^>=1.5.1,
     cardano-data >=1.1,
     cardano-git-rev ^>=0.2.2,
-    cardano-ping ^>=0.5,
+    cardano-ping ^>=0.6,
     cardano-prelude,
     cardano-slotting ^>=0.2.0.0,
     cardano-strict-containers ^>=0.1,
@@ -288,7 +288,7 @@ library cardano-cli-test-lib
     exceptions,
     filepath,
     hedgehog,
-    hedgehog-extras ^>=0.6.1.0,
+    hedgehog-extras >=0.6.1 && <0.6.5.1,
     http-types,
     lifted-base,
     monad-control,
@@ -321,7 +321,7 @@ test-suite cardano-cli-test
     exceptions,
     filepath,
     hedgehog,
-    hedgehog-extras ^>=0.6.1.0,
+    hedgehog-extras >=0.6.1 && <0.6.5.1,
     monad-control,
     parsec,
     regex-tdfa,
@@ -392,7 +392,7 @@ test-suite cardano-cli-golden
     extra,
     filepath,
     hedgehog ^>=1.4,
-    hedgehog-extras ^>=0.6.1.0,
+    hedgehog-extras >=0.6.1 && <0.6.5.1,
     monad-control,
     regex-compat,
     regex-tdfa,

cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs

@@ -2907,12 +2907,12 @@ pEpochBoundRetirement =
             ]
       ]
 
-pNumberOfPools :: Parser Natural
+pNumberOfPools :: Parser Word16
 pNumberOfPools =
   Opt.option integralReader $
     mconcat
       [ Opt.long "number-of-pools"
-      , Opt.metavar "NATURAL"
+      , Opt.metavar "WORD16"
       , Opt.help "Desired number of pools."
       ]
 

cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs

@@ -815,7 +815,7 @@ updateOutputTemplate
 
     shelleyDelKeys =
       fromList
-        [ (gh, L.GenDelegPair gdh h)
+        [ (gh, L.GenDelegPair gdh $ L.toVRFVerKeyHash h)
         | ( GenesisKeyHash gh
             , (GenesisDelegateKeyHash gdh, VrfKeyHash h)
             ) <-
@@ -1142,7 +1142,7 @@ updateTemplate
 
     shelleyDelKeys =
       fromList
-        [ (gh, L.GenDelegPair gdh h)
+        [ (gh, L.GenDelegPair gdh $ L.toVRFVerKeyHash h)
         | ( GenesisKeyHash gh
             , (GenesisDelegateKeyHash gdh, VrfKeyHash h)
             ) <-

cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs

@@ -884,7 +884,7 @@ updateOutputTemplate
       L.Coin minUtxoVal = sgProtocolParams ^. L.ppMinUTxOValueL
     shelleyDelKeys =
       fromList
-        [ (gh, L.GenDelegPair gdh h)
+        [ (gh, L.GenDelegPair gdh $ L.toVRFVerKeyHash h)
         | ( GenesisKeyHash gh
             , (GenesisDelegateKeyHash gdh, VrfKeyHash h)
             ) <-

cardano-cli/src/Cardano/CLI/Helpers.hs

@@ -116,7 +116,7 @@ validateCBOR :: CBORObject -> LB.ByteString -> Either HelpersError Text
 validateCBOR cborObject bs =
   case cborObject of
     CBORBlockByron epochSlots -> do
-      void $ decodeCBOR bs (L.toPlainDecoder L.byronProtVer (Byron.decCBORABlockOrBoundary epochSlots))
+      void $ decodeCBOR bs (L.toPlainDecoder Nothing L.byronProtVer (Byron.decCBORABlockOrBoundary epochSlots))
       Right "Valid Byron block."
     CBORDelegationCertificateByron -> do
       void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s Byron.Certificate)