Try #4612:

IntersectMBO · Jan 19, 2023 · e93c695 · e93c695
2 parents 72bc4ce + 262677a
commit e93c695
Show file tree

Hide file tree

Showing 49 changed files with 878 additions and 569 deletions.
diff --git a/bench/cardano-topology/cardano-topology.cabal b/bench/cardano-topology/cardano-topology.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                  cardano-topology
-version:               1.35.4
+version:               1.35.5
 description:           A cardano topology generator
 author:                IOHK
 maintainer:            operations@iohk.io

diff --git a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs
@@ -13,8 +13,8 @@ import           Cardano.Prelude (forever, liftIO)
 import           Prelude
 
 import           Codec.Serialise (DeserialiseFailure)
+import           Control.Concurrent.Class.MonadSTM.Strict (newTVarIO)
 import           Control.Monad.Class.MonadTimer (MonadTimer, threadDelay)
-import           Control.Monad.Class.MonadSTM.Strict (newTVarIO)
 import           Data.ByteString.Lazy (ByteString)
 import qualified Data.Map as Map
 import           Data.Proxy (Proxy (..))

diff --git a/bors.toml b/bors.toml
@@ -1,5 +1,5 @@
 status = [
-  "ci/push",
+  "ci/push/required",
 ]
 timeout_sec = 7200
 required_approvals = 1

diff --git a/cabal.project b/cabal.project
@@ -13,7 +13,7 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state: 2022-09-27T00:00:00Z
-index-state: cardano-haskell-packages 2022-10-25T20:00:00Z
+index-state: cardano-haskell-packages 2022-12-01T19:30:00Z
 
 packages:
     cardano-api
@@ -77,6 +77,7 @@ test-show-details: direct
 
 constraints:
     hedgehog >= 1.0
+  , hedgehog-extras == 0.2.0.0
   , bimap >= 0.4.0
   , libsystemd-journal >= 1.4.4
   , systemd >= 2.3.0
@@ -106,9 +107,32 @@ constraints:
   , plutus-ghc-stub == 8.6.5
   , word-array == 0.1.0.0
   , word-array == 0.1.0.0
+  , io-classes == 0.3.0.0
+  , typed-protocols == 0.1.0.1
+  , typed-protocols-examples == 0.1.0.1
+  , cardano-ledger-alonzo == 0.1.0.0
+  , cardano-ledger-babbage == 0.1.0.0
+  , cardano-ledger-byron == 0.1.0.0
+  , cardano-ledger-byron-test == 1.3.0
+  , cardano-ledger-conway == 0.1.0.0
+  , cardano-ledger-core == 0.1.0.0
+  , cardano-ledger-pretty == 0.1.0.0
+  , cardano-ledger-shelley == 0.1.0.0
+  , cardano-ledger-shelley-ma == 0.1.0.0
+  , cardano-ledger-shelley-test == 0.1.0.0
+  , cardano-crypto-test == 1.3.0
+  , cardano-crypto-wrapper == 1.3.0
+  , byron-spec-chain == 0.1.0.0
+  , byron-spec-ledger == 0.1.0.0
+  , set-algebra == 0.1.0.0
+  , small-steps == 0.1.0.0
+  , small-steps-test == 0.1.0.0
+  , vector-map == 0.1.0.0
+  , cardano-data == 0.1.0.0
+
 
 extra-packages:
-    ouroboros-consensus-cardano-tools == 0.1.0.0
+    ouroboros-consensus-cardano-tools == 0.1.0.1
 
 package snap-server
   flags: +openssl
@@ -128,23 +152,8 @@ allow-newer:
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
 
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/moo
-  tag: 8c487714fbfdea66188fcb85053e7e292e0cc348
-  --sha256: 1mdj218hgh7s5a6b9k14vg9i06zxah0wa42ycdgh245izs8nfv0x
-
--- Open PR upstream, maintainer unresponsive, hopefully short-lived fork.
--- TODO (mpj): release into CHaP as a patched version and delete
-source-repository-package
-  type: git
-  location: https://github.com/vshabanov/ekg-json
-  tag: 00ebe7211c981686e65730b7144fbf5350462608
-  --sha256: 1zvjm3pb38w0ijig5wk5mdkzcszpmlp5d4zxvks2jk1rkypi8gsm
-
 source-repository-package
   type: git
   location: https://github.com/denisshevchenko/threepenny-gui
   tag: 4ec92ded05ccf59ba4a874be4b404ac1b6d666b6
   --sha256: 00fvvaf4ir4hskq4a6gggbh2wmdvy8j8kn6s4m1p1vlh8m8mq514
-
diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-api
-version:                1.35.4
+version:                1.35.5
 description:            The cardano api
 author:                 IOHK
 maintainer:             operations@iohk.io
@@ -140,8 +140,8 @@ library
                       , ouroboros-consensus-cardano
                       , ouroboros-consensus-protocol
                       , ouroboros-consensus-shelley
-                      , ouroboros-network
-                      , ouroboros-network-framework
+                      , ouroboros-network ^>= 0.3
+                      , ouroboros-network-framework ^>= 0.2
                       , parsec
                       , plutus-ledger-api
                       , prettyprinter

diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-cli
-version:                1.35.4
+version:                1.35.5
 description:            The Cardano command-line interface.
 author:                 IOHK
 maintainer:             operations@iohk.io

diff --git a/cardano-node-chairman/app/Cardano/Chairman.hs b/cardano-node-chairman/app/Cardano/Chairman.hs
@@ -14,8 +14,8 @@ module Cardano.Chairman (chairmanTest) where
 import           Cardano.Prelude hiding (ByteString, STM, atomically, catch, option, show, throwIO)
 import           Prelude (String, error, show)
 
+import           Control.Concurrent.Class.MonadSTM.Strict
 import           Control.Monad.Class.MonadAsync
-import           Control.Monad.Class.MonadSTM.Strict
 import           Control.Monad.Class.MonadThrow
 import           Control.Monad.Class.MonadTimer
 import           Control.Tracer

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:                1.35.4
+version:                1.35.5
 description:            The cardano full node
 author:                 IOHK
 maintainer:             operations@iohk.io

diff --git a/cardano-node/ChangeLog.md b/cardano-node/ChangeLog.md
@@ -1,5 +1,37 @@
 # Changelog for cardano-node
 
+## 1.35.5 -- January 2023
+
+### node changes
+
+None
+
+### consensus changes
+
+None
+
+### network changes
+
+- 'EnableP2P' configuration option does not require
+  'TestEnableDevelopmentNetworkProtocols' any more.  We support running at most
+  one p2p relay, if an SPO is running at least two relays.
+
+- Added 'DemoteLocalAsynchronous' warning trace.  It indicates that a remote
+  local root peer was demoted to cold (either due to connection error or
+  misbehaviour). (input-output-hk/ouroboros-network#4127)
+
+- New P2P topology file format, see [issue #4563][#4563] or the [config
+  files][understanding-config-files] documentation.  The old p2p topology
+  format will be supported for next two major releases of the node (the last
+  major version which will support it is `1.37`). (#4563)
+
+[#4563]: https://github.com/input-output-hk/cardano-node/issues/4563
+[understanding-config-files]: https://github.com/input-output-hk/cardano-node/blob/master/doc/getting-started/understanding-config-files.md
+
+### ledger changes
+
+None
+
 ## 1.35.4 -- October 2022
 
 ### node changes

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:                1.35.4
+version:                1.35.5
 description:            The cardano full node
 author:                 IOHK
 maintainer:             operations@iohk.io
@@ -94,6 +94,7 @@ library
                        Cardano.Node.Tracing.Tracers.BlockReplayProgress
                        Cardano.Node.Tracing.Tracers.ChainDB
                        Cardano.Node.Tracing.Tracers.Consensus
+                       Cardano.Node.Tracing.Tracers.ConsensusStartupException
                        Cardano.Node.Tracing.Tracers.Diffusion
                        Cardano.Node.Tracing.Tracers.KESInfo
                        Cardano.Node.Tracing.Tracers.StartLeadershipCheck
@@ -160,16 +161,16 @@ library
                       , lobemo-backend-monitoring
                       , lobemo-backend-trace-forwarder
                       , network
-                      , network-mux
+                      , network-mux ^>= 0.2
                       , nothunks
                       , optparse-applicative-fork
-                      , ouroboros-consensus
+                      , ouroboros-consensus ^>= 0.1.0.3
                       , ouroboros-consensus-byron
-                      , ouroboros-consensus-cardano
+                      , ouroboros-consensus-cardano ^>= 0.2
                       , ouroboros-consensus-protocol
                       , ouroboros-consensus-shelley
-                      , ouroboros-network
-                      , ouroboros-network-framework
+                      , ouroboros-network  ^>= 0.3
+                      , ouroboros-network-framework ^>= 0.2
                       , psqueues
                       , safe-exceptions
                       , scientific
@@ -216,6 +217,7 @@ test-suite cardano-node-test
   type:                 exitcode-stdio-1.0
 
   build-depends:        aeson             >= 1.5.6.0
+                      , bytestring
                       , cardano-api
                       , cardano-node
                       , cardano-prelude
@@ -227,6 +229,7 @@ test-suite cardano-node-test
                       , ouroboros-consensus
                       , ouroboros-network
                       , time
+                      , vector
 
   other-modules:        Test.Cardano.Node.FilePermissions
                         Test.Cardano.Node.Gen