Merge pull request #5808 from IntersectMBO/lucsanszky/integration-8.11

Integrations for `node-8.11.0` release
IntersectMBO · May 15, 2024 · 38c7f1c · 38c7f1c
2 parents cd6c8d2 + b1d33e8
commit 38c7f1c
Show file tree

Hide file tree

Showing 49 changed files with 1,776 additions and 596 deletions.
diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   locli
-version:                1.34
+version:                1.35
 synopsis:               Cardano log analysis CLI
 description:            Cardano log analysis CLI.
 category:               Cardano,
@@ -121,7 +121,7 @@ library
                       , optparse-generic
                       , ouroboros-consensus
                       -- for Data.SOP.Strict:
-                      , ouroboros-network ^>= 0.14
+                      , ouroboros-network ^>= 0.16
                       , ouroboros-network-api
                       , process
                       , quiet

diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal
@@ -1,6 +1,6 @@
 cabal-version:          3.0
 name:                   plutus-scripts-bench
-version:                1.0.2.0
+version:                1.0.2.1
 synopsis:               Plutus scripts used for benchmarking
 description:            Plutus scripts used for benchmarking.
 category:               Cardano,
@@ -74,10 +74,10 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>= 8.44
+    , cardano-api             ^>= 8.46
     , plutus-ledger-api       >=1.0.0
     , plutus-tx               >=1.0.0
-    , plutus-tx-plugin        ^>=1.23
+    , plutus-tx-plugin        ^>=1.27
 
   ------------------------
   -- Non-IOG dependencies

diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs b/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs
@@ -16,6 +16,7 @@ module Cardano.TxGenerator.Setup.Plutus
 
 import           Data.Bifunctor
 import           Data.ByteString.Short (ShortByteString)
+import           Data.Int (Int64)
 import           Data.Map.Strict as Map (lookup)
 
 import           Control.Monad.Trans.Except
@@ -204,13 +205,13 @@ preExecutePlutusV2 (major, _minor) (PlutusScript _ (PlutusScriptSerialised scrip
       , PlutusV2.txInfoFee = mempty
       , PlutusV2.txInfoMint = mempty
       , PlutusV2.txInfoDCert = []
-      , PlutusV2.txInfoWdrl = PlutusV2.fromList []
+      , PlutusV2.txInfoWdrl = PlutusV2.unsafeFromList []
       , PlutusV2.txInfoValidRange = PlutusV2.always
       , PlutusV2.txInfoSignatories = []
-      , PlutusV2.txInfoData = PlutusV2.fromList []
+      , PlutusV2.txInfoData = PlutusV2.unsafeFromList []
       , PlutusV2.txInfoId = PlutusV2.TxId ""
       , PlutusV2.txInfoReferenceInputs = []
-      , PlutusV2.txInfoRedeemers = PlutusV2.fromList []
+      , PlutusV2.txInfoRedeemers = PlutusV2.unsafeFromList []
       }
 
 preExecutePlutusV3 ::
@@ -255,18 +256,18 @@ preExecutePlutusV3 (major, _minor) (PlutusScript _ (PlutusScriptSerialised (scri
       , PlutusV3.txInfoFee = 0
       , PlutusV3.txInfoMint = mempty
       , PlutusV3.txInfoTxCerts = []
-      , PlutusV3.txInfoWdrl = PlutusV3.fromList []
+      , PlutusV3.txInfoWdrl = PlutusV3.unsafeFromList []
       , PlutusV3.txInfoValidRange = PlutusV3.always
       , PlutusV3.txInfoSignatories = []
-      , PlutusV3.txInfoData = PlutusV3.fromList []
+      , PlutusV3.txInfoData = PlutusV3.unsafeFromList []
       , PlutusV3.txInfoId = PlutusV3.TxId ""
       , PlutusV3.txInfoReferenceInputs = []
-      , PlutusV3.txInfoRedeemers = PlutusV3.fromList []
+      , PlutusV3.txInfoRedeemers = PlutusV3.unsafeFromList []
       , PlutusV3.txInfoVotes = AssocMap.empty
       , PlutusV3.txInfoProposalProcedures = []
       , PlutusV3.txInfoCurrentTreasuryAmount = Nothing
       , PlutusV3.txInfoTreasuryDonation = Nothing
       }
 
-flattenCostModel :: CostModel -> [Integer]
+flattenCostModel :: CostModel -> [Int64]
 flattenCostModel (CostModel cm) = cm
diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   tx-generator
-version:                2.11
+version:                2.12
 synopsis:               A transaction workload generator for Cardano clusters
 description:            A transaction workload generator for Cardano clusters.
 category:               Cardano,
@@ -100,9 +100,9 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.44
+                      , cardano-api ^>= 8.46
                       , cardano-binary
-                      , cardano-cli ^>= 8.22
+                      , cardano-cli ^>= 8.23
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data

diff --git a/cabal.project b/cabal.project
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-03-26T06:28:59Z
-  , cardano-haskell-packages 2024-04-11T09:29:53Z
+  , cardano-haskell-packages 2024-05-14T16:00:00Z
 
 packages:
   cardano-node

diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node-chairman
-version:                8.6.1
+version:                8.11.0
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,
@@ -44,7 +44,7 @@ executable cardano-node-chairman
   build-depends:        cardano-api
                       , cardano-crypto-class
                       , cardano-git-rev ^>=0.2.2
-                      , cardano-node ^>= 8.10
+                      , cardano-node ^>= 8.11
                       , cardano-prelude
                       , containers
                       , contra-tracer
@@ -88,5 +88,5 @@ test-suite chairman-tests
   ghc-options:          -threaded -rtsopts "-with-rtsopts=-N -T"
 
   build-tool-depends:   cardano-node:cardano-node
-                      , cardano-cli:cardano-cli ^>= 8.22.0.0
+                      , cardano-cli:cardano-cli ^>= 8.23.0.0
                       , cardano-node-chairman:cardano-node-chairman
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node
-version:                8.10.1
+version:                8.11.0
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,
@@ -144,7 +144,7 @@ library
                       , async
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.44
+                      , cardano-api ^>= 8.46
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>=0.2.2
@@ -183,12 +183,12 @@ library
                       , network-mux >= 0.4
                       , nothunks
                       , optparse-applicative-fork >= 0.18.1
-                      , ouroboros-consensus ^>= 0.17
-                      , ouroboros-consensus-cardano ^>= 0.15
-                      , ouroboros-consensus-diffusion ^>= 0.15
+                      , ouroboros-consensus ^>= 0.18
+                      , ouroboros-consensus-cardano ^>= 0.16
+                      , ouroboros-consensus-diffusion ^>= 0.16
                       , ouroboros-consensus-protocol
                       , ouroboros-network-api ^>= 0.7.1
-                      , ouroboros-network ^>= 0.14
+                      , ouroboros-network ^>= 0.16
                       , ouroboros-network-framework
                       , ouroboros-network-protocols ^>= 0.8
                       , prettyprinter

diff --git a/cardano-node/src/Cardano/Node/Run.hs b/cardano-node/src/Cardano/Node/Run.hs
@@ -90,12 +90,13 @@ import           Cardano.Tracing.Config (TraceOptions (..), TraceSelection (..))
 import qualified Ouroboros.Consensus.Config as Consensus
 import           Ouroboros.Consensus.Config.SupportsNode (ConfigSupportsNode (..))
 import           Ouroboros.Consensus.Node (DiskPolicyArgs (..), NetworkP2PMode (..),
-                   RunNodeArgs (..), StdRunNodeArgs (..), stdChainSyncTimeout)
+                   RunNodeArgs (..), StdRunNodeArgs (..))
 import qualified Ouroboros.Consensus.Node as Node (getChainDB, run)
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion
 import           Ouroboros.Consensus.Node.ProtocolInfo
 import           Ouroboros.Consensus.Util.Orphans ()
 import qualified Ouroboros.Network.Diffusion as Diffusion
+import qualified Ouroboros.Network.Diffusion.Configuration as Configuration
 import qualified Ouroboros.Network.Diffusion.NonP2P as NonP2P
 import qualified Ouroboros.Network.Diffusion.P2P as P2P
 import           Ouroboros.Network.NodeToClient (LocalAddress (..), LocalSocket (..))
@@ -592,7 +593,7 @@ handleSimpleNode blockType runP p2pMode tracers nc onKernel = do
   customizeChainSyncTimeout = case ncChainSyncIdleTimeout nc of
     NoTimeoutOverride -> Nothing
     TimeoutOverride t -> Just $ do
-      cst <- stdChainSyncTimeout
+      cst <- Configuration.defaultChainSyncTimeout
       pure $ case t of
         0 ->
           cst { idleTimeout = Nothing }

diff --git a/cardano-node/src/Cardano/Node/Tracing/Consistency.hs b/cardano-node/src/Cardano/Node/Tracing/Consistency.hs
@@ -62,7 +62,7 @@ import qualified Ouroboros.Network.NodeToClient as NtC
 import           Ouroboros.Network.NodeToNode (ErrorPolicyTrace (..), RemoteAddress, WithAddr (..))
 import qualified Ouroboros.Network.NodeToNode as NtN
 import           Ouroboros.Network.PeerSelection.Governor (DebugPeerSelection (..),
-                   PeerSelectionCounters (..), TracePeerSelection (..))
+                   PeerSelectionCounters, TracePeerSelection (..))
 import           Ouroboros.Network.PeerSelection.LedgerPeers (TraceLedgerPeers)
 import           Ouroboros.Network.PeerSelection.PeerStateActions (PeerSelectionActionsTrace (..))
 import           Ouroboros.Network.PeerSelection.RootPeersDNS.LocalRootPeers

diff --git a/cardano-node/src/Cardano/Node/Tracing/Documentation.hs b/cardano-node/src/Cardano/Node/Tracing/Documentation.hs
@@ -71,7 +71,7 @@ import qualified Ouroboros.Network.NodeToClient as NtC
 import           Ouroboros.Network.NodeToNode (ErrorPolicyTrace (..), RemoteAddress, WithAddr (..))
 import qualified Ouroboros.Network.NodeToNode as NtN
 import           Ouroboros.Network.PeerSelection.Governor (DebugPeerSelection (..),
-                   PeerSelectionCounters (..), TracePeerSelection (..))
+                   PeerSelectionCounters, TracePeerSelection (..))
 import           Ouroboros.Network.PeerSelection.LedgerPeers (TraceLedgerPeers)
 import           Ouroboros.Network.PeerSelection.PeerStateActions (PeerSelectionActionsTrace (..))
 import           Ouroboros.Network.PeerSelection.RootPeersDNS.LocalRootPeers