claude: prototype-2026w27 wip

Author: johnalotoski

cabal.project

@@ -10,11 +10,11 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2026-03-26T20:21:33Z
-  , cardano-haskell-packages 2026-05-02T16:21:41Z
-active-repositories:
-  , :rest
-  , cardano-haskell-packages:override
+  , hackage.haskell.org 2026-06-29T22:49:53Z
+  , cardano-haskell-packages 2026-06-29T12:05:19Z
+-- No cardano-haskell-packages:override here (cardano-node doesn't use it either):
+-- it would mask newer Hackage-only versions, e.g. cuddle >= 1.8 needed by the
+-- SRP cardano-ledger-binary while CHaP still tops out at cuddle 1.2.
 
 packages:
   cardano-db
@@ -23,6 +23,11 @@ packages:
   cardano-db-tool
   cardano-smash-server
   cardano-chain-gen
+  -- Vendored from input-output-hk/iohk-monitoring-framework (master @ 1c8a7704,
+  -- i.e. iohk-monitoring 0.2.1.2) and ported to contra-tracer >= 0.2.1, which the
+  -- leios-prototype network stack requires but upstream iohk-monitoring rejects.
+  vendor/iohk-monitoring
+  vendor/tracer-transformers
 
 package cardano-chain-gen
   ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -Wunused-imports -Wunused-packages
@@ -105,9 +110,9 @@ if impl (ghc >= 9.12)
 
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-node
-  tag: 16b6bae87f5afeead5ae8c15d4a93b36b5a5b142
-  --sha256: 1p87vw47a14sm6k5p7ixda77p8yghmx95v3g02awqqf9d5df2wab
+  location: https://github.com/IntersectMBO/cardano-node
+  tag: 3cc6340a896eadee5cdbf2b256751d23dc267ba3
+  --sha256: sha256-f6jw2opMNOu98UPzRJmSlDI4HkXBK25HjWaRgRG6WCE=
   subdir:
     cardano-node
     trace-forward
@@ -116,23 +121,37 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/ouroboros-consensus
-  tag: eddb8b78de9e5f0d45dbf1410289f8e491c515ab
-  --sha256: sha256-ypNFYzmf6RcdQIuVPh8dPYSQEPoVlLyU1OCnjPAP2cc=
+  tag: 63d4d4e3c7ffb1911a63a65e7a84dc5132f82137
+  --sha256: sha256-sTsafdrdo/WQ9a+nL/ed2kc5zKhTYW9HaJO7g260fBk=
 
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-ledger
-  tag: c47305fcf47bd77437b837d0dfb9cb4181bfbc77
-  --sha256: 1db2xc2gs44g5035srqzgqkbv3a2yacmvnwchd1jnjrfkibnxnak
+  tag: 9edd1c664054803348e5f9edfa13529e4e844284
+  --sha256: sha256-TkgeO5d1p18VwTMtuNY8SsPZXXyn1HIrZBZ4IHVTWuE=
   subdir:
+    libs/cardano-data
+    libs/cardano-ledger-api
+    libs/small-steps
+    libs/cardano-ledger-binary
     libs/cardano-ledger-core
+    libs/cardano-protocol-tpraos
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/test-suite
+    eras/mary/impl
+    eras/allegra/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/conway/impl
     eras/dijkstra/impl
 
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/ouroboros-network
-  tag: ff3e39af5aa51d4d89c23c72d67716fd9bfcc516
-  --sha256: 00havv7igm3pjkw954mmz2s8wh4ki6pk9d2rnn1srx135xb3zp0a
+  tag: 4b3ab7664f609a1aee0f0c24dcfcfd0ab899fc42
+  --sha256: sha256-fIqpI2whstetodpiONmUDVgnhTpzXeq1/gmzuHItK5A=
   subdir:
     ouroboros-network
     cardano-diffusion
@@ -141,37 +160,37 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-api
-  tag: 38add439ea702046e0633eae8cf828b3c1215162
-  --sha256: 1pn41ggm06bzbrs9cyab6by92j43gyx7644p6l0kfhljdqszx26s
+  tag: 28e2f4f085eceee4cb63c3eb9103a80e3852ce7a
+  --sha256: sha256-9Wugp6Cd+ERSc8kfIUDFbq3QjuhIr1gu6rRSV3Yo/9M=
   subdir:
     cardano-api
     cardano-api-gen
+    cardano-rpc
 
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-cli
-  tag: 4f0907405ad4faa9323f2ee543ea404a8a57421d
-  --sha256: sha256-wxCFJ7KNgBMtUMa21MQjC1+KiPLoV0Sbz9GOPWZ2mtc=
+  tag: 97a1258f9654478dff6c7e7497fcc693213b1a36
+  --sha256: sha256-e2mxwfy2pN3itQIx0+1j2XV7JTNKckIpfzaN6rOtZn0=
   subdir:
     cardano-cli
 
-if impl(ghc >= 9.12)
-  -- GHC 9.12 support - master branch
-  source-repository-package
-    type: git
-    location: https://github.com/google/proto-lens
-    tag: 13ce67409ad87e8c29eea58b31aa37f44e82457c
-    --sha256: sha256-8XPGLheOo5ZStL7YD5x29GechWFjubw+in5GsUrKWPc=
-    subdir:
-      discrimination-ieee754
-      proto-lens-arbitrary
-      proto-lens-benchmarks
-      proto-lens-discrimination
-      proto-lens-optparse
-      proto-lens-protobuf-types
-      proto-lens-protoc
-      proto-lens-runtime
-      proto-lens-setup
-      proto-lens-tests-dep
-      proto-lens-tests
-      proto-lens
+source-repository-package
+  type: git
+  location: https://github.com/f-f/kes-agent.git
+  tag: 32c1ed675d22a30735d9f22f7afa436a3ef3e64a
+  --sha256: sha256-o7hFX1JnraS6Xq0WoXQwd9Z8GsPPv0Ls2DWvZ08o0ZU=
+  subdir:
+    kes-agent
+    kes-agent-crypto
+
+source-repository-package
+  type: git
+  location: https://github.com/f-f/ekg-forward
+  tag: b24b3aba2806ce223c62f8ce3e267ec92dcc52e2
+  --sha256: sha256-s5Hxxm04HmFVmdBjAnFEsJEhTqr5Z/uiB4K1s2VaVwE=
+
+-- The former ghc >= 9.12 proto-lens source-repository-package was removed:
+-- haskell.nix picks up SRP stanzas regardless of the surrounding `if impl`
+-- guard, and its proto-lens 0.7.1.6 conflicts with cardano-rpc's
+-- proto-lens >= 0.7.1.7 requirement.

cardano-chain-gen/test/Test/Cardano/Db/Mock/Config.hs

@@ -262,10 +262,10 @@ withConfig :: FilePath -> FilePath -> CommandLineArgs -> SyncNodeConfig -> (Conf
 withConfig staticDir mutableDir cmdLineArgs config action = do
   let cfgDir = mkConfigDir staticDir
   genCfg <- runOrThrowIO $ runExceptT (readCardanoGenesisConfig config)
-  let (pInfoDbSync, _) = mkProtocolInfoCardano genCfg []
+  (pInfoDbSync, _) <- mkProtocolInfoCardano genCfg []
   cryptoInit
   creds <- mkShelleyCredentials $ cfgDir </> "pools" </> "bulk1.creds"
-  let (pInfoForger, mkForgings) = mkProtocolInfoCardano genCfg creds
+  (pInfoForger, mkForgings) <- mkProtocolInfoCardano genCfg creds
   bracket
     (allocateRes mkForgings)
     (mapM finalize)

cardano-db-sync/cardano-db-sync.cabal

@@ -202,6 +202,7 @@ library
                       , network
                       , lifted-base
                       , memory
+                      , mempack
                       , microlens
                       , network-mux
                       , ouroboros-consensus

cardano-db-sync/src/Cardano/DbSync/Api.hs

@@ -444,14 +444,15 @@ mkSyncEnvFromConfig metricsSetters trce dbEnv syncOptions genCfg syncNodeConfigF
               , " /= "
               , textShow (Shelley.sgSystemStart $ scConfig sCfg)
               ]
-      | otherwise ->
+      | otherwise -> do
+          pInfo <- fst <$> mkProtocolInfoCardano genCfg []
           Right
             <$> mkSyncEnv
               metricsSetters
               trce
               dbEnv
               syncOptions
-              (fst $ mkProtocolInfoCardano genCfg [])
+              pInfo
               (Shelley.sgNetworkId $ scConfig sCfg)
               (Shelley.sgMaxLovelaceSupply $ scConfig sCfg)
               (NetworkMagic . unProtocolMagicId $ Byron.configProtocolMagicId bCfg)

cardano-db-sync/src/Cardano/DbSync/Config/Cardano.hs

@@ -41,6 +41,10 @@ import Ouroboros.Consensus.Config (TopLevelConfig (..), emptyCheckpointsMap)
 import Ouroboros.Consensus.Node.ProtocolInfo (ProtocolInfo)
 import qualified Ouroboros.Consensus.Node.ProtocolInfo as Consensus
 import Ouroboros.Consensus.Shelley.Node (ShelleyGenesis (..))
+import System.FS.API (SomeHasFS (..))
+import System.FS.API.Types (MountPoint (MountPoint))
+import System.FS.IO (ioHasFS)
+import System.FilePath (takeDirectory)
 
 -- Usually only one constructor, but may have two when we are preparing for a HFC event.
 data GenesisConfig
@@ -73,8 +77,8 @@ readCardanoGenesisConfig enc =
 
 -- -------------------------------------------------------------------------------------------------
 
-mkTopLevelConfig :: GenesisConfig -> TopLevelConfig CardanoBlock
-mkTopLevelConfig cfg = Consensus.pInfoConfig $ fst $ mkProtocolInfoCardano cfg []
+mkTopLevelConfig :: GenesisConfig -> IO (TopLevelConfig CardanoBlock)
+mkTopLevelConfig cfg = Consensus.pInfoConfig . fst <$> mkProtocolInfoCardano cfg []
 
 -- Need a concrete type for 'm' ('IO') to make the type checker happy.
 
@@ -85,10 +89,11 @@ mkTopLevelConfig cfg = Consensus.pInfoConfig $ fst $ mkProtocolInfoCardano cfg [
 mkProtocolInfoCardano ::
   GenesisConfig ->
   [Consensus.ShelleyLeaderCredentials StandardCrypto] -> -- this is not empty only in tests
-  (ProtocolInfo CardanoBlock, IO [MkBlockForging IO CardanoBlock])
+  IO (ProtocolInfo CardanoBlock, IO [MkBlockForging IO CardanoBlock])
 mkProtocolInfoCardano genesisConfig shelleyCred =
-  second (\f -> f nullTracer) $
-    protocolInfoCardano $
+  second (\f -> f nullTracer)
+    <$> protocolInfoCardano
+      shelleyGenesisFS
       CardanoProtocolParams
         { byronProtocolParams =
             Consensus.ProtocolParamsByron
@@ -130,6 +135,14 @@ mkProtocolInfoCardano genesisConfig shelleyCred =
       alonzoGenesis
       conwayGenesis = genesisConfig
 
+    -- Mirrors cardano-node: the consensus layer uses this filesystem (rooted at
+    -- the directory holding the Shelley genesis) to resolve ledger InjectionData
+    -- referenced from sgExtraConfig when building the initial ledger state.
+    shelleyGenesisFS :: SomeHasFS IO
+    shelleyGenesisFS =
+      SomeHasFS . ioHasFS . MountPoint . takeDirectory . unGenesisFile $
+        dncShelleyGenesisFile dnc
+
 shelleyPraosNonce :: GenesisHashShelley -> Nonce
 shelleyPraosNonce hsh = Nonce (Crypto.castHash . unGenesisHashShelley $ hsh)
 

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Metadata.hs

@@ -27,10 +27,12 @@ import qualified Data.Aeson as Aeson
 import qualified Data.Aeson.Key as Aeson
 import qualified Data.Aeson.Text as Aeson.Text
 import qualified Data.ByteString.Base16 as Base16
+import qualified Data.ByteString.Short as SBS
 import qualified Data.Map.Strict as Map
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text
 import qualified Data.Text.Lazy as Text.Lazy
+import Data.MemPack.Buffer (byteArrayToShortByteString)
 import Data.Tuple.Extra (both)
 import qualified Data.Vector as Vector
 import Ouroboros.Consensus.Cardano.Block (AllegraEra, MaryEra, ShelleyEra)
@@ -101,7 +103,7 @@ bytesPrefix = "0x"
 fromMetadatum :: Shelley.Metadatum -> TxMetadataValue
 fromMetadatum = \case
   Shelley.I x -> TxMetaNumber x
-  Shelley.B x -> TxMetaBytes x
+  Shelley.B x -> TxMetaBytes (SBS.fromShort (byteArrayToShortByteString x))
   Shelley.S x -> TxMetaText x
   Shelley.List xs -> TxMetaList $ map fromMetadatum xs
   Shelley.Map xs -> TxMetaMap $ map (both fromMetadatum) xs

cardano-db-sync/src/Cardano/DbSync/Tracing/ToObjectOrphans.hs

@@ -1,35 +1,81 @@
+{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Cardano.DbSync.Tracing.ToObjectOrphans () where
 
 import Cardano.BM.Data.Severity (Severity (..))
 import Cardano.BM.Data.Tracer
 import Cardano.Client.Subscription (SubscriptionTrace (..))
-import Cardano.Tracing.OrphanInstances.Network ()
 import Data.Aeson ((.=))
 import Data.Text (Text)
 import qualified Data.Text as Text
+import qualified Network.Mux as Mux
+import Network.TypedProtocol.Codec (AnyMessage)
 import Ouroboros.Consensus.Byron.Ledger.Block (ByronBlock)
 import Ouroboros.Network.Block (Point (..), Tip (..))
 import Ouroboros.Network.Driver (TraceSendRecv (..))
 import Ouroboros.Network.Protocol.ChainSync.Type (ChainSync)
 
+-- The instances for 'TraceSendRecv' and 'Mux.WithBearer' used to come from
+-- cardano-node's Cardano.Tracing.OrphanInstances.Network, which was removed
+-- along with the rest of the legacy tracing system, so they are defined
+-- locally here instead.
+
+instance HasPrivacyAnnotation (TraceSendRecv a)
+instance HasSeverityAnnotation (TraceSendRecv a) where
+  getSeverityAnnotation _ = Debug
+
+instance Show (AnyMessage ps) => ToObject (TraceSendRecv ps) where
+  toObject _verb (TraceSendMsg msg) =
+    mconcat
+      [ "kind" .= ("Send" :: String)
+      , "msg" .= show msg
+      ]
+  toObject _verb (TraceRecvMsg msg) =
+    mconcat
+      [ "kind" .= ("Recv" :: String)
+      , "msg" .= show msg
+      ]
+
 instance HasTextFormatter (TraceSendRecv (ChainSync blk (Point blk) (Tip blk))) where
   formatText _ = Text.pack . show
 
+instance
+  Show (AnyMessage (ChainSync blk (Point blk) (Tip blk))) =>
+  Transformable Text IO (TraceSendRecv (ChainSync blk (Point blk) (Tip blk)))
+  where
+  trTransformer = trStructuredText
+
+instance HasPrivacyAnnotation (Mux.WithBearer peer a)
+instance HasSeverityAnnotation (Mux.WithBearer peer a) where
+  getSeverityAnnotation _ = Debug
+
+instance (Show peer, Show a) => ToObject (Mux.WithBearer peer a) where
+  toObject _verb (Mux.WithBearer peer ev) =
+    mconcat
+      [ "kind" .= ("WithBearer" :: String)
+      , "bearer" .= show peer
+      , "event" .= show ev
+      ]
+
+instance (Show peer, Show a) => HasTextFormatter (Mux.WithBearer peer a) where
+  formatText (Mux.WithBearer peer ev) _o =
+    "Bearer on " <> Text.pack (show peer) <> " event: " <> Text.pack (show ev)
+
+instance (Show peer, Show a) => Transformable Text IO (Mux.WithBearer peer a) where
+  trTransformer = trStructuredText
+
 instance ToObject ByronBlock where
   toObject _verb msg =
     mconcat
       [ "kind" .= ("ByronBlock" :: String)
       , "event" .= show msg
       ]
 
-instance Transformable Text IO (TraceSendRecv (ChainSync blk (Point blk) (Tip blk))) where
-  trTransformer = trStructuredText
-
 instance HasPrivacyAnnotation (SubscriptionTrace a)
 instance HasSeverityAnnotation (SubscriptionTrace a) where
   getSeverityAnnotation (SubscriptionResult _) = Info

cardano-db-sync/src/Cardano/DbSync/Util/Cbor.hs

@@ -9,14 +9,16 @@ import Cardano.Ledger.Binary.Encoding (serialize')
 import Cardano.Ledger.Binary.Version (shelleyProtVer)
 import Cardano.Ledger.Shelley.TxAuxData (Metadatum (..))
 import Cardano.Prelude
+import qualified Data.ByteString.Short as SBS
+import Data.MemPack.Buffer (byteArrayFromShortByteString, byteArrayToShortByteString)
 import Prelude ()
 
 serialiseTxMetadataToCbor :: Map Word64 TxMetadataValue -> ByteString
 serialiseTxMetadataToCbor = serialize' shelleyProtVer . map toShelleyMetadatum
   where
     toShelleyMetadatum :: TxMetadataValue -> Metadatum
     toShelleyMetadatum (TxMetaNumber n) = I n
-    toShelleyMetadatum (TxMetaBytes b) = B b
+    toShelleyMetadatum (TxMetaBytes b) = B (byteArrayFromShortByteString (SBS.toShort b))
     toShelleyMetadatum (TxMetaText s) = S s
     toShelleyMetadatum (TxMetaList xs) = List $ map toShelleyMetadatum xs
     toShelleyMetadatum (TxMetaMap ms) =
@@ -29,7 +31,7 @@ deserialiseTxMetadataFromCbor =
   where
     fromShelleyMetadatum :: Metadatum -> TxMetadataValue
     fromShelleyMetadatum (I n) = TxMetaNumber n
-    fromShelleyMetadatum (B b) = TxMetaBytes b
+    fromShelleyMetadatum (B b) = TxMetaBytes (SBS.fromShort (byteArrayToShortByteString b))
     fromShelleyMetadatum (S s) = TxMetaText s
     fromShelleyMetadatum (List xs) = TxMetaList $ map fromShelleyMetadatum xs
     fromShelleyMetadatum (Map ms) =