Update index states (#1449)

# Description

* Update index-states
* Remove some `allow-newer` stanzas.

Also note that:

- New code should be properly tested (even if it does not add new
features).
- The fix for a regression should include a test that reproduces said
regression.

Author: erikd

cabal.project

@@ -14,9 +14,9 @@ repository cardano-haskell-packages
 -- update either of these.
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2025-03-18T17:41:11Z
+  , hackage.haskell.org 2025-04-06T22:39:33Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2025-03-25T12:18:59Z
+  , cardano-haskell-packages 2025-04-07T00:07:03Z
 
 packages:
   ouroboros-consensus
@@ -52,23 +52,8 @@ if impl (ghc >= 9.12)
     , fin:base
     , ral:base
 
-    -- https://github.com/well-typed/cborg/pull/339
-    , cborg:base
-    , cborg:ghc-prim
-    , serialise:base
-    , serialise:ghc-prim
-
     -- https://github.com/haskellari/tree-diff/issues/97
     , tree-diff:base
 
     -- https://github.com/kapralVV/Unique/issues/11
     , Unique:hashable
-
-    -- https://github.com/fizruk/http-api-data/pull/146
-    , http-api-data:base
-
-    , ouroboros-network-protocols:base
-    , ouroboros-network-framework:base
-    , ouroboros-network-api:base
-    , network-mux:base
-    , ouroboros-network:base

flake.lock

@@ -572,7 +572,7 @@ library unstable-cardano-tools
     sop-extras,
     strict-sop-core,
     text,
-    text-builder,
+    text-builder >=0.6.10,
     transformers,
     transformers-except,
 

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

@@ -21,8 +21,8 @@ import           Data.Aeson as Aeson
 import qualified Data.ByteString.Lazy as BSL
 import           System.FilePath.Posix (takeExtension)
 import qualified System.IO as IO
-import qualified Text.Builder as Builder
-import           Text.Builder (Builder, decimal)
+import qualified TextBuilder as Builder
+import           TextBuilder (TextBuilder, decimal)
 
 {-------------------------------------------------------------------------------
   Output format
@@ -54,7 +54,7 @@ getOutputFormat Nothing         = pure CSV
 -------------------------------------------------------------------------------}
 
 -- | Separator used for CSV output.
-csvSeparator :: Builder
+csvSeparator :: TextBuilder
 csvSeparator = "\t"
 
 -- | Write a header for the data points.
@@ -97,7 +97,7 @@ writeMetadata  outFileHandle JSON lgrAppMode =
   Operations to assist CSV printing
 -------------------------------------------------------------------------------}
 
-dataPointCsvBuilder :: [(Builder, SlotDataPoint -> Builder)]
+dataPointCsvBuilder :: [(TextBuilder, SlotDataPoint -> TextBuilder)]
 dataPointCsvBuilder =
     [ ("slot"                  , decimal . unSlotNo . DP.slot)
     , ("slotGap"               , decimal . DP.slotGap)

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Analysis/BenchmarkLedgerOps/FileWriting.hs

@@ -11,8 +11,8 @@ import qualified Data.Aeson.Encoding as Aeson.Encoding
 import           Data.Int (Int64)
 import           Data.Word (Word32, Word64)
 import           GHC.Generics (Generic)
-import qualified Text.Builder as Builder
-import           Text.Builder (Builder)
+import qualified TextBuilder as Builder
+import           TextBuilder (TextBuilder)
 
 -- | Information about the time spent processing the block corresponding to
 -- 'slot', divided into the five major operations:
@@ -60,14 +60,14 @@ data SlotDataPoint =
       , blockStats      :: !BlockStats
       } deriving (Generic, Show)
 
-newtype BlockStats = BlockStats { unBlockStats :: [Builder] }
+newtype BlockStats = BlockStats { unBlockStats :: [TextBuilder] }
   deriving (Generic, Show)
 
 instance ToJSON BlockStats where
   -- We convert the blocks stats to a 'Vector Text'.
-  toJSON = toJSON . fmap Builder.run . unBlockStats
+  toJSON = toJSON . fmap Builder.toText . unBlockStats
 
-  toEncoding = Aeson.Encoding.list (Aeson.Encoding.text . Builder.run) . unBlockStats
+  toEncoding = Aeson.Encoding.list (Aeson.Encoding.text . Builder.toText) . unBlockStats
 
 instance ToJSON SlotDataPoint where
   toEncoding = Aeson.genericToEncoding Aeson.defaultOptions

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Analysis/BenchmarkLedgerOps/SlotDataPoint.hs

@@ -27,7 +27,7 @@ import qualified Ouroboros.Consensus.Byron.Ledger as Byron
 import           Ouroboros.Consensus.Byron.Node (PBftSignatureThreshold (..),
                      ProtocolParamsByron (..), protocolInfoByron)
 import           Ouroboros.Consensus.Node.ProtocolInfo
-import           Text.Builder (decimal)
+import           TextBuilder (decimal)
 
 instance HasAnalysis ByronBlock where
     countTxOutputs = aBlockOrBoundary (const 0) countTxOutputsByron

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Block/Byron.hs

@@ -74,8 +74,8 @@ import           Ouroboros.Consensus.Shelley.Ledger.Block (IsShelleyBlock,
 import           Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol ()
 import           System.Directory (makeAbsolute)
 import           System.FilePath (takeDirectory, (</>))
-import qualified Text.Builder as Builder
-import           Text.Builder (Builder)
+import qualified TextBuilder as Builder
+import           TextBuilder (TextBuilder)
 
 analyseBlock ::
      (forall blk. HasAnalysis blk => blk -> a)
@@ -299,9 +299,9 @@ instance HasAnalysis (CardanoBlock StandardCrypto) where
 
 dispatch ::
      LedgerState (CardanoBlock StandardCrypto)
-  -> (LedgerState ByronBlock -> IO Builder)
-  -> (forall proto era. LedgerState (ShelleyBlock proto era) -> IO Builder)
-  -> IO Builder
+  -> (LedgerState ByronBlock -> IO TextBuilder)
+  -> (forall proto era. LedgerState (ShelleyBlock proto era) -> IO TextBuilder)
+  -> IO TextBuilder
 dispatch cardanoSt fByron fShelley =
     hcollapse $
         hap (   fn k_fByron
@@ -320,13 +320,13 @@ dispatch cardanoSt fByron fShelley =
     k_fShelley ::
          forall proto era.
          LedgerState (ShelleyBlock proto era)
-      -> K (IO Builder) (ShelleyBlock proto era)
+      -> K (IO TextBuilder) (ShelleyBlock proto era)
     k_fShelley = K . fShelley
 
 applyToByronUtxo ::
-    (Map Byron.UTxO.CompactTxIn Byron.UTxO.CompactTxOut -> IO Builder)
+    (Map Byron.UTxO.CompactTxIn Byron.UTxO.CompactTxOut -> IO TextBuilder)
   -> LedgerState ByronBlock
-  -> IO Builder
+  -> IO TextBuilder
 applyToByronUtxo f st  =
    f $ getByronUtxo st
 
@@ -337,9 +337,9 @@ getByronUtxo = Byron.UTxO.unUTxO
              . Byron.Ledger.byronLedgerState
 
 applyToShelleyBasedUtxo ::
-     (Map TxIn (TxOut era) -> IO Builder)
+     (Map TxIn (TxOut era) -> IO TextBuilder)
   -> LedgerState (ShelleyBlock proto era)
-  -> IO Builder
+  -> IO TextBuilder
 applyToShelleyBasedUtxo f st = do
     f $ getShelleyBasedUtxo st
 

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Block/Cardano.hs

@@ -47,7 +47,7 @@ import qualified Ouroboros.Consensus.Shelley.Ledger.Block as Shelley
 import           Ouroboros.Consensus.Shelley.Node (Nonce (..),
                      ProtocolParamsShelleyBased (..), ShelleyGenesis,
                      protocolInfoShelley)
-import           Text.Builder (decimal)
+import           TextBuilder (decimal)
 
 -- | Usable for each Shelley-based era
 instance ( ShelleyCompatible proto era

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Block/Shelley.hs

@@ -10,14 +10,14 @@
 -- correspondence between headers and data, we usually specify a CSV
 -- builder as:
 --
--- > [(Builder, a -> IO Builder)]
+-- > [(TextBuilder, a -> IO TextBuilder)]
 --
 -- where each first component of each tuple in the list represents a
 -- header, and each second component determines how the value that
 -- corresponds to that header is computed, given a certain value that
 -- is needed to compute a row in the resulting CSV.
 --
--- We use 'Text.Builder' to efficiently intercalate values with the CSV 'Separator'.
+-- We use 'TextBuilder' to efficiently intercalate values with the CSV 'Separator'.
 --
 module Cardano.Tools.DBAnalyser.CSV (
     Separator (Separator, unSeparator)
@@ -32,37 +32,37 @@ module Cardano.Tools.DBAnalyser.CSV (
 import           Data.String (IsString)
 import qualified Data.Text.IO as Text.IO
 import qualified System.IO as IO
-import qualified Text.Builder as Builder
-import           Text.Builder (Builder)
+import qualified TextBuilder as TextBuilder
+import           TextBuilder (TextBuilder)
 
-newtype Separator = Separator { unSeparator :: Builder }
+newtype Separator = Separator { unSeparator :: TextBuilder }
   deriving (Show, IsString, Monoid, Semigroup)
 
-writeHeaderLine :: IO.Handle -> Separator -> [(Builder, a)] -> IO ()
+writeHeaderLine :: IO.Handle -> Separator -> [(TextBuilder, a)] -> IO ()
 writeHeaderLine handle (Separator separator) =
       Text.IO.hPutStrLn handle
-    . Builder.run
-    . Builder.intercalate separator
+    . TextBuilder.toText
+    . TextBuilder.intercalate separator
     . fmap fst
 
-writeLine :: IO.Handle -> Separator -> [Builder] -> IO ()
+writeLine :: IO.Handle -> Separator -> [TextBuilder] -> IO ()
 writeLine handle (Separator separator) =
       Text.IO.hPutStrLn handle
-    . Builder.run
-    . Builder.intercalate separator
+    . TextBuilder.toText
+    . TextBuilder.intercalate separator
 
-computeAndWriteLine :: IO.Handle -> Separator -> [(a, b -> IO Builder)] -> b -> IO ()
-computeAndWriteLine handle separator csvBuilder b = do
-  computeColumns (fmap snd csvBuilder) b >>= writeLine handle separator
+computeAndWriteLine :: IO.Handle -> Separator -> [(a, b -> IO TextBuilder)] -> b -> IO ()
+computeAndWriteLine handle separator csvTextBuilder b = do
+  computeColumns (fmap snd csvTextBuilder) b >>= writeLine handle separator
 
-computeAndWriteLinePure :: IO.Handle -> Separator -> [(a, b -> Builder)] -> b -> IO ()
-computeAndWriteLinePure handle separator csvBuilder b =
-    writeLine handle separator $ computeColumnsPure (fmap snd csvBuilder) b
+computeAndWriteLinePure :: IO.Handle -> Separator -> [(a, b -> TextBuilder)] -> b -> IO ()
+computeAndWriteLinePure handle separator csvTextBuilder b =
+    writeLine handle separator $ computeColumnsPure (fmap snd csvTextBuilder) b
 
-computeColumns :: [a -> IO Builder] -> a -> IO [Builder]
-computeColumns fBuilders a =
-  sequence $ fmap ($ a) fBuilders
+computeColumns :: [a -> IO TextBuilder] -> a -> IO [TextBuilder]
+computeColumns fTextBuilders a =
+  sequence $ fmap ($ a) fTextBuilders
 
-computeColumnsPure :: [a -> Builder] -> a -> [Builder]
-computeColumnsPure fBuilders a =
-  fmap ($ a) fBuilders
+computeColumnsPure :: [a -> TextBuilder] -> a -> [TextBuilder]
+computeColumnsPure fTextBuilders a =
+  fmap ($ a) fTextBuilders

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/CSV.hs

@@ -15,7 +15,7 @@ import           Ouroboros.Consensus.Ledger.Abstract
 import           Ouroboros.Consensus.Node.ProtocolInfo
 import           Ouroboros.Consensus.Storage.Serialisation (SizeInBytes)
 import           Ouroboros.Consensus.Util.Condense (Condense)
-import           Text.Builder (Builder)
+import           TextBuilder (TextBuilder)
 
 {-------------------------------------------------------------------------------
   HasAnalysis
@@ -37,7 +37,7 @@ class (HasAnnTip blk, GetPrevHash blk, Condense (HeaderHash blk)) => HasAnalysis
   emitTraces     :: WithLedgerState blk -> [String]
 
   -- | This method was introduced for the sake of the 'BenchmarkLedgerOps' pass.
-  blockStats     :: blk -> [Builder]
+  blockStats     :: blk -> [TextBuilder]
 
   -- | This function allows to define different metrics about block application.
   --
@@ -56,7 +56,7 @@ class (HasAnnTip blk, GetPrevHash blk, Condense (HeaderHash blk)) => HasAnalysis
   -- The block application metrics are mapped to an IO action because
   -- certain metrics such as the size of data need to be performed in
   -- the IO monad.
-  blockApplicationMetrics :: [(Builder, WithLedgerState blk -> IO Builder)]
+  blockApplicationMetrics :: [(TextBuilder, WithLedgerState blk -> IO TextBuilder)]
 
 class HasProtocolInfo blk where
   data Args blk