Bump to node 8.1.1

Author: kderme

cabal.project

@@ -10,8 +10,8 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2023-04-29T00:00:00Z
-  , cardano-haskell-packages 2023-04-30T00:28:07Z
+  , hackage.haskell.org 2023-05-10T10:34:57Z
+  , cardano-haskell-packages 2023-06-06T08:18:38Z
 
 packages:
   cardano-db
@@ -67,11 +67,9 @@ package snap-server
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 69a117b7be3db0f4ce6d9fc5cd4c16a2a409dcb8
+  tag: 6f79e5c3ea109a70cd01910368e011635767305a
   --sha256: 1yaf3jk6rgmivgi730ljd8sjpdnzasncxnj8ypgzcdshyp1id25q
   subdir:
-    cardano-api
-    cardano-cli
     cardano-git-rev
     cardano-node
     trace-dispatcher

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

@@ -184,7 +184,6 @@ test-suite cardano-chain-gen
                       , base                            >= 4.14         && < 4.17
                       , bytestring
                       , cardano-api
-                      , cardano-cli
                       , cardano-crypto-class
                       , cardano-db
                       , cardano-db-sync

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

@@ -223,7 +223,7 @@ runLocalServer iom codecConfig netMagic localDomainSock chainProdState =
           blockVersion = fromJust $ Map.lookup version allVersions
        in simpleSingletonVersions
             version
-            (NodeToClientVersionData netMagic)
+            (NodeToClientVersionData netMagic False)
             (NTC.responder version $ mkApps state version blockVersion (NTC.defaultCodecs codecConfig blockVersion version))
 
     mkApps ::

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

@@ -38,7 +38,7 @@ import Cardano.Ledger.Shelley.LedgerState hiding (LedgerState)
 import Cardano.Ledger.Shelley.TxBody
 import Cardano.Ledger.Shelley.UTxO
 import Cardano.Ledger.TxIn (TxIn (..))
-import qualified Cardano.Ledger.UMapCompact as UMap
+import qualified Cardano.Ledger.UMap as UMap
 import Cardano.Mock.Forging.Tx.Alonzo.ScriptsExamples
 import Cardano.Mock.Forging.Types
 import Cardano.Prelude hiding (length, (.))
@@ -124,25 +124,25 @@ resolveStakeCreds indx st = case indx of
       Map.toList $
         UMap.rewView $
           dsUnified $
-            dpsDState $
-              lsDPState $
+            certDState $
+              lsCertState $
                 esLState $
                   nesEs $
                     Consensus.shelleyLedgerState st
 
     poolParams =
       psStakePoolParams $
-        dpsPState $
-          lsDPState $
+        certPState $
+          lsCertState $
             esLState $
               nesEs $
                 Consensus.shelleyLedgerState st
 
     delegs = UMap.delView $ dsUnified dstate
 
     dstate =
-      dpsDState $
-        lsDPState $
+      certDState $
+        lsCertState $
           esLState $
             nesEs $
               Consensus.shelleyLedgerState st
@@ -174,8 +174,8 @@ resolvePool pix st = case pix of
     poolParams =
       Map.elems $
         psStakePoolParams $
-          dpsPState $
-            lsDPState $
+          certPState $
+            lsCertState $
               esLState $
                 nesEs $
                   Consensus.shelleyLedgerState st
@@ -187,8 +187,8 @@ allPoolStakeCert st =
     poolParms =
       Map.elems $
         psStakePoolParams $
-          dpsPState $
-            lsDPState $
+          certPState $
+            lsCertState $
               esLState $
                 nesEs $
                   Consensus.shelleyLedgerState st

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

@@ -27,7 +27,6 @@ module Test.Cardano.Db.Mock.Config (
   queryDBSync,
   recreateDir,
   rootTestDir,
-  setupTestsDir,
   stopDBSync,
   stopDBSyncIfRunning,
   startDBSync,
@@ -38,10 +37,7 @@ module Test.Cardano.Db.Mock.Config (
   withFullConfig',
 ) where
 
-import Cardano.Api (NetworkId (..), NetworkMagic (..))
-import Cardano.CLI.Shelley.Commands (GenesisCmd (..))
-import qualified Cardano.CLI.Shelley.Commands as CLI
-import qualified Cardano.CLI.Shelley.Run.Genesis as CLI
+import Cardano.Api (NetworkMagic (..))
 import qualified Cardano.Db as Db
 import Cardano.DbSync
 import Cardano.DbSync.Config
@@ -205,26 +201,6 @@ getPoolLayer env = do
       nullTracer
       pool
 
-setupTestsDir :: FilePath -> IO ()
-setupTestsDir dir = do
-  eitherM (panic . textShow) pure $
-    runExceptT $
-      CLI.runGenesisCmd $
-        GenesisCreateStaked
-          (CLI.GenesisDir dir)
-          3
-          3
-          3
-          3
-          Nothing
-          (Just 3000000)
-          3000000
-          (Testnet $ NetworkMagic 42)
-          1
-          3
-          0
-          Nothing
-
 mkConfig :: FilePath -> FilePath -> CommandLineArgs -> IO Config
 mkConfig staticDir mutableDir cmdLineArgs = do
   config <- readSyncNodeConfig $ ConfigFile (staticDir </> "test-db-sync-config.json")

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

@@ -7,7 +7,6 @@ module Cardano.DbSync.Config.Alonzo (
   readAlonzoGenesisConfig,
 ) where
 
-import Cardano.Api.Orphans ()
 import qualified Cardano.Crypto.Hash as Crypto
 import Cardano.Db (textShow)
 import Cardano.DbSync.Config.Types

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

@@ -287,6 +287,7 @@ mkTxScript (hsh, script) =
         Alonzo.TimelockScript {} -> Timelock
         Alonzo.PlutusScript Alonzo.PlutusV1 _s -> PlutusV1
         Alonzo.PlutusScript Alonzo.PlutusV2 _s -> PlutusV2
+        Alonzo.PlutusScript Alonzo.PlutusV3 _s -> PlutusV3
 
     timelockJsonScript :: Maybe ByteString
     timelockJsonScript =

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

@@ -702,8 +702,8 @@ getRegisteredPoolShelley ::
 getRegisteredPoolShelley lState =
   Map.keysSet $
     Shelley.psStakePoolParams $
-      Shelley.dpsPState $
-        Shelley.lsDPState $
+      Shelley.certPState $
+        Shelley.lsCertState $
           Shelley.esLState $
             Shelley.nesEs $
               Consensus.shelleyLedgerState lState

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

@@ -59,9 +59,9 @@ import Ouroboros.Consensus.Cardano.Node ()
 
 import Ouroboros.Consensus.Config (configCodec)
 import Ouroboros.Consensus.Network.NodeToClient (
-  ClientCodecs,
   Codecs' (..),
   cChainSyncCodec,
+  clientCodecs,
   cStateQueryCodec,
   cTxSubmissionCodec,
  )
@@ -118,6 +118,7 @@ import Ouroboros.Network.Protocol.ChainSync.Type (ChainSync)
 import Ouroboros.Network.Protocol.LocalStateQuery.Client (localStateQueryClientPeer)
 import qualified Ouroboros.Network.Snocket as Snocket
 import Ouroboros.Network.Subscription (SubscriptionTrace)
+import Ouroboros.Consensus.Node.NetworkProtocolVersion (BlockNodeToClientVersion, supportedNodeToClientVersions)
 
 runSyncNodeClient ::
   MetricSetters ->
@@ -132,15 +133,18 @@ runSyncNodeClient metricsSetters syncEnv iomgr trce tc (SocketPath socketPath) =
   void $
     subscribe
       (localSnocket iomgr)
-      codecConfig
       (envNetworkMagic syncEnv)
+      (supportedNodeToClientVersions (Proxy @CardanoBlock))
       networkSubscriptionTracers
       clientSubscriptionParams
-      (dbSyncProtocols syncEnv metricsSetters tc)
+      (dbSyncProtocols syncEnv metricsSetters tc codecConfig)
   where
     codecConfig :: CodecConfig CardanoBlock
     codecConfig = configCodec $ getTopLevelConfig syncEnv
 
+--    nonExperimentalVersions =
+--      filter (\a -> Just a <= snd (lastReleasedNodeVersion Proxy)) $ supportedNodeToClientVersions (Proxy @CardanoBlock)
+
     clientSubscriptionParams =
       ClientSubscriptionParams
         { cspAddress = Snocket.localAddressFromPath socketPath
@@ -178,11 +182,12 @@ dbSyncProtocols ::
   SyncEnv ->
   MetricSetters ->
   ThreadChannels ->
+  CodecConfig CardanoBlock ->
   Network.NodeToClientVersion ->
-  ClientCodecs CardanoBlock IO ->
+  BlockNodeToClientVersion CardanoBlock ->
   ConnectionId LocalAddress ->
   NodeToClientProtocols 'InitiatorMode BSL.ByteString IO () Void
-dbSyncProtocols syncEnv metricsSetters tc _version codecs _connectionId =
+dbSyncProtocols syncEnv metricsSetters tc codecConfig version bversion _connectionId =
   NodeToClientProtocols
     { localChainSyncProtocol = localChainSyncPtcl
     , localTxSubmissionProtocol = dummylocalTxSubmit
@@ -191,6 +196,8 @@ dbSyncProtocols syncEnv metricsSetters tc _version codecs _connectionId =
         InitiatorProtocolOnly $ MuxPeer Logging.nullTracer (cTxMonitorCodec codecs) localTxMonitorPeerNull
     }
   where
+    codecs = clientCodecs codecConfig bversion version
+
     localChainSyncTracer :: Tracer IO (TraceSendRecv (ChainSync CardanoBlock (Point CardanoBlock) (Tip CardanoBlock)))
     localChainSyncTracer = toLogObject $ appendName "ChainSync" tracer
 

cardano-db/cardano-db.cabal

@@ -126,7 +126,7 @@ test-suite test
                       , cardano-db
                       , cardano-ledger-byron
                       , cardano-ledger-core
-                      , cardano-ledger-mary == 1.1.0.0
+                      , cardano-ledger-mary
                       , persistent
                       , hedgehog
                       , text