Update to node 10.6

Author: kderme

cabal.project

@@ -10,8 +10,8 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2025-08-03T21:32:16Z
-  , cardano-haskell-packages 2025-07-30T14:13:57Z
+  , hackage.haskell.org 2025-10-17T00:26:22Z
+  , cardano-haskell-packages 2025-11-07T15:42:47Z
 
 packages:
   cardano-db
@@ -75,7 +75,6 @@ constraints:
   -- then clashes with the `show` in `Prelude`.
   , text < 2.1.2
 
-  , cardano-node ^>= 10.4
 
 if impl (ghc >= 9.12)
   allow-newer:
@@ -86,3 +85,14 @@ if impl (ghc >= 9.12)
 -- when using the "cabal" wrapper script provided by nix-shell.
 -- --------------------------- 8< --------------------------
 -- Please do not put any `source-repository-package` clause above this line.
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-node
+  tag: f5ac0eb01b56af80e8d430828ff6000b6abb92e9
+  --sha256: sha256-pm+lbEiRdQesnkaXmzn58aWlBhD29l7QHGNtJiDlzuA=
+  subdir:
+    cardano-node
+    trace-dispatcher
+    trace-forward
+    trace-resources

cardano-chain-gen/cardano-chain-gen.cabal

@@ -97,10 +97,9 @@ library
                       , plutus-ledger-api:{plutus-ledger-api-testlib}
                       , serialise
                       , strict-sop-core
-                      , strict-stm
+                      , io-classes:strict-stm
                       , text
                       , typed-protocols
-                      , typed-protocols-stateful
 
 test-suite cardano-chain-gen
   type:                 exitcode-stdio-1.0
@@ -161,7 +160,6 @@ test-suite cardano-chain-gen
                       , async
                       , base
                       , bytestring
-                      , cardano-api
                       , cardano-crypto-class
                       , cardano-db
                       , cardano-db-sync
@@ -185,7 +183,6 @@ test-suite cardano-chain-gen
                       , int-cast
                       , silently
                       , stm
-                      , strict-stm
                       , tasty
                       , tasty-quickcheck
                       , text

cardano-chain-gen/src/Cardano/Mock/ChainSync/Server.hs

@@ -51,8 +51,8 @@ import Data.Maybe (fromJust)
 import Data.Void (Void)
 import qualified Network.Mux as Mux
 import Network.TypedProtocol.Peer (Peer (..))
-import Network.TypedProtocol.Stateful.Codec ()
-import qualified Network.TypedProtocol.Stateful.Peer as St
+-- import Network.TypedProtocol.Stateful.Codec ()
+-- import qualified Network.TypedProtocol.Stateful.Peer as St
 import Ouroboros.Consensus.Block (CodecConfig, HasHeader, Point, StandardHash, castPoint)
 import Ouroboros.Consensus.Config (TopLevelConfig, configCodec)
 import Ouroboros.Consensus.Ledger.Query (BlockQuery, BlockSupportsLedgerQuery, QueryFootprint (..), ShowQuery)
@@ -92,8 +92,7 @@ import Ouroboros.Network.IOManager (IOManager)
 import qualified Ouroboros.Network.IOManager as IOManager
 import Ouroboros.Network.Magic (NetworkMagic)
 import Ouroboros.Network.Mux (OuroborosApplicationWithMinimalCtx)
-import Ouroboros.Network.NodeToClient (NodeToClientVersionData (..))
-import qualified Ouroboros.Network.NodeToClient as NodeToClient
+import Ouroboros.Network.NodeToClient
 import Ouroboros.Network.NodeToNode (Versions)
 import Ouroboros.Network.Protocol.ChainSync.Server (
   ChainSyncServer (..),
@@ -107,6 +106,7 @@ import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as LocalStateQu
 import Ouroboros.Network.Snocket (LocalAddress, LocalSnocket, LocalSocket (..))
 import qualified Ouroboros.Network.Snocket as Snocket
 import Ouroboros.Network.Util.ShowProxy (Proxy (..), ShowProxy (..))
+import Ouroboros.Network.Socket
 
 {- HLINT ignore "Use readTVarIO" -}
 
@@ -213,16 +213,16 @@ runLocalServer ::
   StrictTVar IO (ChainProducerState blk) ->
   IO ()
 runLocalServer iom codecConfig netMagic localDomainSock chainProdState =
+  withSnocket nullTracer noAttenuation Map.empty $ \localSocket localSnocket -> do
+
   withSnocket iom localDomainSock $ \localSocket localSnocket -> do
-    networkState <- NodeToClient.newNetworkMutableState
     _ <-
-      NodeToClient.withServer
+      runServer
         localSnocket
-        NodeToClient.nullNetworkServerTracers -- debuggingNetworkServerTracers
-        networkState
+        nullNetworkConnectTracers -- debuggingNetworkServerTracers
         localSocket
         (versions chainProdState)
-        NodeToClient.networkErrorPolicies
+        networkErrorPolicies
     pure ()
   where
     versions ::
@@ -263,8 +263,7 @@ runLocalServer iom codecConfig netMagic localDomainSock chainProdState =
             nullTracer -- TODO add a tracer!
             (cChainSyncCodec codecs)
             channel
-            $ chainSyncServerPeer
-            $ chainSyncServer state codecConfig blockVersion
+            (chainSyncServerPeer $ chainSyncServer state codecConfig blockVersion)
 
         txSubmitServer ::
           localPeer ->
@@ -282,12 +281,11 @@ runLocalServer iom codecConfig netMagic localDomainSock chainProdState =
           Channel IO ByteString ->
           IO ((), Maybe ByteString)
         stateQueryServer _them channel =
-          St.runPeer
+          runPeer
             nullTracer
             (cStateQueryCodec codecs)
             channel
-            LocalStateQuery.StateIdle
-            (St.Effect (forever $ threadDelay 3_600_000_000))
+            (LocalStateQuery.StateIdle (Effect (forever $ threadDelay 3_600_000_000)))
 
         txMonitorServer ::
           localPeer ->

cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Generic.hs

@@ -138,17 +138,16 @@ resolveStakeCreds indx st = case indx of
     rewardAccs =
       Map.toList $
         UMap.rewardMap $
-          dsUnified dstate
+          dsAccounts dstate
 
     poolParams :: Map (KeyHash 'StakePool) PoolParams
     poolParams =
-      psStakePoolParams $
         let certState =
               lsCertState $
                 esLState $
                   nesEs $
                     Consensus.shelleyLedgerState st
-         in certState ^. certPStateL
+         in certState ^. certPStateL . psStakePoolsL
 
     delegs = UMap.sPoolMap $ dsUnified dstate
 
@@ -185,28 +184,26 @@ resolvePool pix st = case pix of
   PoolIndexNew n -> unregisteredPools !! n
   where
     poolParams =
-      Map.elems $
-        psStakePoolParams $
           let certState =
                 lsCertState $
                   esLState $
                     nesEs $
                       Consensus.shelleyLedgerState st
-           in certState ^. certPStateL
+           in Map.elems (certState ^. certPStateL . psStakePoolsL)
 
 allPoolStakeCert :: EraCertState era => LedgerState (ShelleyBlock p era) mk -> [ShelleyTxCert era]
 allPoolStakeCert st =
   ShelleyTxCertDelegCert . ShelleyRegCert <$> nub creds
   where
+    poolParms :: Int
     poolParms =
-      Map.elems $
-        psStakePoolParams $
-          let certState =
+          let certState :: Int
+              certState =
                 lsCertState $
                   esLState $
                     nesEs $
                       Consensus.shelleyLedgerState st
-           in certState ^. certPStateL
+           in Map.elems (certState ^. certPStateL . psStakePoolsL)
     creds = concatMap getPoolStakeCreds poolParms
 
 getPoolStakeCreds :: PoolParams -> [StakeCredential]

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

@@ -255,8 +255,9 @@ mkConfig staticDir mutableDir cmdLineArgs config = do
   genCfg <- runOrThrowIO $ runExceptT (readCardanoGenesisConfig config)
   let (pInfoDbSync, _) = mkProtocolInfoCardano genCfg []
   creds <- mkShelleyCredentials $ cfgDir </> "pools" </> "bulk1.creds"
-  let (pInfoForger, forging) = mkProtocolInfoCardano genCfg creds
-  forging' <- forging
+  let (pInfoForger, mkForgings) = mkProtocolInfoCardano genCfg creds
+  forgings <- mkForgings
+  forgings' <- mapM mkBlockForging forgings
   syncPars <- mkSyncNodeParams staticDir mutableDir cmdLineArgs
   pure $ Config (Consensus.pInfoConfig pInfoDbSync) pInfoDbSync pInfoForger forging' syncPars
 

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

@@ -77,6 +77,7 @@ library
                         Cardano.DbSync.Era.Shelley.Generic.Tx.Alonzo
                         Cardano.DbSync.Era.Shelley.Generic.Tx.Babbage
                         Cardano.DbSync.Era.Shelley.Generic.Tx.Conway
+                        Cardano.DbSync.Era.Shelley.Generic.Tx.Dijkstra
                         Cardano.DbSync.Era.Shelley.Generic.Tx.Mary
                         Cardano.DbSync.Era.Shelley.Generic.Tx.Shelley
                         Cardano.DbSync.Era.Shelley.Generic.Tx.Types
@@ -162,6 +163,7 @@ library
                       , cardano-ledger-core
                       , cardano-ledger-conway >= 1.17.3
                       , cardano-ledger-binary
+                      , cardano-ledger-dijkstra
                       , cardano-ledger-mary
                       , cardano-ledger-shelley >= 1.12.3.0
                       , cardano-node
@@ -205,10 +207,10 @@ library
                       , small-steps
                       , stm
                       , strict
+                      , io-classes:strict-stm
                       , sop-core
                       , sop-extras
                       , strict-sop-core
-                      , strict-stm
                       , swagger2
                       , text
                       , time

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

@@ -80,6 +80,7 @@ storeUTxOFromLedger ::
 storeUTxOFromLedger env st = case ledgerState st of
   LedgerStateBabbage bts -> storeUTxO env (getUTxO bts)
   LedgerStateConway stc -> storeUTxO env (getUTxO stc)
+  LedgerStateDijkstra stc -> storeUTxO env (getUTxO stc)
   _otherwise -> liftIO $ logError trce "storeUTxOFromLedger is only supported after Babbage"
   where
     trce = getTrace env

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

@@ -38,6 +38,9 @@ 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 Cardano.Node.Protocol.Dijkstra
+import Control.Tracer (nullTracer)
+import Cardano.Prelude (second)
 
 -- Usually only one constructor, but may have two when we are preparing for a HFC event.
 data GenesisConfig
@@ -82,8 +85,8 @@ mkTopLevelConfig cfg = Consensus.pInfoConfig $ fst $ mkProtocolInfoCardano cfg [
 mkProtocolInfoCardano ::
   GenesisConfig ->
   [Consensus.ShelleyLeaderCredentials StandardCrypto] -> -- this is not empty only in tests
-  (ProtocolInfo CardanoBlock, IO [BlockForging IO CardanoBlock])
-mkProtocolInfoCardano genesisConfig shelleyCred =
+  (ProtocolInfo CardanoBlock, IO [MkBlockForging IO CardanoBlock])
+mkProtocolInfoCardano genesisConfig shelleyCred = second (\f -> f nullTracer) $
   protocolInfoCardano $
     CardanoProtocolParams
       { byronProtocolParams =
@@ -105,6 +108,7 @@ mkProtocolInfoCardano genesisConfig shelleyCred =
             shelleyGenesis
             alonzoGenesis
             conwayGenesis
+            emptyDijkstraGenesis -- TODO(Dijkstra)
       , cardanoHardForkTriggers =
           Consensus.CardanoHardForkTriggers'
             { triggerHardForkShelley = dncShelleyHardFork dnc
@@ -113,6 +117,7 @@ mkProtocolInfoCardano genesisConfig shelleyCred =
             , triggerHardForkAlonzo = dncAlonzoHardFork dnc
             , triggerHardForkBabbage = dncBabbageHardFork dnc
             , triggerHardForkConway = dncConwayHardFork dnc
+            , triggerHardForkDijkstra = Consensus.CardanoTriggerHardForkAtDefaultVersion -- TODO(Dijkstra)
             }
       , cardanoCheckpoints = emptyCheckpointsMap
       }

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

@@ -197,6 +197,9 @@ insertBlock syncEnv cblk applyRes firstAfterRollback tookSnapshot = do
     BlockConway blk ->
       insertBlockUniversal' $
         Generic.fromConwayBlock (ioPlutusExtra iopts) (getPrices applyResult) blk
+    BlockDijkstra blk ->
+      insertBlockUniversal' $
+        Generic.fromDijkstraBlock (ioPlutusExtra iopts) (getPrices applyResult) blk
   -- update the epoch
   updateEpoch details isNewEpochEvent
   whenPruneTxOut syncEnv $

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

@@ -55,6 +55,7 @@ epochHandler syncEnv trce cache isNewEpochEvent (BlockDetails cblk details) =
     BlockAlonzo {} -> epochSlotTimecheck
     BlockBabbage {} -> epochSlotTimecheck
     BlockConway {} -> epochSlotTimecheck
+    BlockDijkstra {} -> epochSlotTimecheck
   where
     -- What we do here is completely independent of Shelley/Allegra/Mary eras.
     epochSlotTimecheck :: ExceptT SyncNodeError DB.DbM ()