Skip to content

Commit 037542e

Browse files
iohk-bors[bot]michaelpjcoot
authored
Merge #4612
4612: Cardano Node 1.35.6 aka Single Relay P2P release r=coot a=coot Update `ouroboros-network-0.2.0.0`. This also cherry-picked CI commits: * e745ca8 from #4184 * #4513 * #4526 * #4590 Co-authored-by: Michael Peyton Jones <[email protected]> Co-authored-by: Marcin Szamotulski <[email protected]>
2 parents ee6b352 + 7152517 commit 037542e

File tree

40 files changed

+476
-177
lines changed

40 files changed

+476
-177
lines changed

‎bench/cardano-topology/cardano-topology.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-topology
4-
version: 1.35.5
4+
version: 1.35.6
55
description: A cardano topology generator
66
author: IOHK
77
maintainer: [email protected]

‎bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import Cardano.Prelude (forever, liftIO)
1313
import Prelude
1414

1515
import Codec.Serialise (DeserialiseFailure)
16+
import Control.Concurrent.Class.MonadSTM.Strict (newTVarIO)
1617
import Control.Monad.Class.MonadTimer (MonadTimer, threadDelay)
17-
import Control.Monad.Class.MonadSTM.Strict (newTVarIO)
1818
import Data.ByteString.Lazy (ByteString)
1919
import qualified Data.Map as Map
2020
import Data.Proxy (Proxy (..))

‎cabal.project

+5-23
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ constraints:
114114
, cardano-protocol-tpraos == 0.1.0.0
115115
, cardano-slotting == 0.1.0.0
116116
, contra-tracer == 0.1.0.0
117-
, ekg-forward == 0.1.0
118117
, generic-monoid == 0.1.0.1
119118
, goblins == 0.2.0.0
120119
, iohk-monitoring ==0.1.11.0
@@ -125,17 +124,13 @@ constraints:
125124
, lobemo-scribe-systemd == 0.1.0.0
126125
, measures == 0.1.0.0
127126
, monoidal-synchronisation == 0.1.0.1
128-
, network-mux == 0.1.0.1
129127
, non-integral == 0.1.0.0
130128
, orphans-deriving-via == 0.1.0.0
131-
, ouroboros-consensus == 0.1.0.1
129+
, ouroboros-consensus == 0.1.0.3
132130
, ouroboros-consensus-byron == 0.1.0.1
133-
, ouroboros-consensus-cardano == 0.1.0.1
131+
, ouroboros-consensus-cardano == 0.2.0.0
134132
, ouroboros-consensus-protocol == 0.1.0.1
135133
, ouroboros-consensus-shelley == 0.1.0.1
136-
, ouroboros-network == 0.1.0.1
137-
, ouroboros-network-framework == 0.1.0.1
138-
, ouroboros-network-testing == 0.1.0.1
139134
, plutus-core == 1.0.0.1
140135
, plutus-ghc-stub == 8.6.5
141136
, plutus-ledger-api == 1.0.0.1
@@ -147,12 +142,13 @@ constraints:
147142
, small-steps-test == 0.1.0.0
148143
, strict-containers == 0.1.0.0
149144
, tracer-transformers == 0.1.0.1
150-
, typed-protocols == 0.1.0.0
151-
, typed-protocols-cborg == 0.1.0.0
152145
, vector-map == 0.1.0.0
153146
, Win32-network == 0.1.0.0
154147
, wl-pprint-annotated == 0.1.0.1
155148
, word-array == 0.1.0.0
149+
, io-classes == 0.3.0.0
150+
, typed-protocols == 0.1.0.1
151+
, typed-protocols-examples == 0.1.0.1
156152

157153
extra-packages:
158154
ouroboros-consensus-cardano-tools == 0.1.0.1
@@ -175,20 +171,6 @@ allow-newer:
175171
-- Do NOT add more source-repository-package stanzas here unless they are strictly
176172
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
177173

178-
source-repository-package
179-
type: git
180-
location: https://github.com/input-output-hk/moo
181-
tag: 8c487714fbfdea66188fcb85053e7e292e0cc348
182-
--sha256: 1mdj218hgh7s5a6b9k14vg9i06zxah0wa42ycdgh245izs8nfv0x
183-
184-
-- Open PR upstream, maintainer unresponsive, hopefully short-lived fork.
185-
-- TODO (mpj): release into CHaP as a patched version and delete
186-
source-repository-package
187-
type: git
188-
location: https://github.com/vshabanov/ekg-json
189-
tag: 00ebe7211c981686e65730b7144fbf5350462608
190-
--sha256: 1zvjm3pb38w0ijig5wk5mdkzcszpmlp5d4zxvks2jk1rkypi8gsm
191-
192174
source-repository-package
193175
type: git
194176
location: https://github.com/denisshevchenko/threepenny-gui

‎cardano-api/cardano-api.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-api
4-
version: 1.35.5
4+
version: 1.35.6
55
description: The cardano api
66
author: IOHK
77
maintainer: [email protected]
@@ -140,8 +140,8 @@ library
140140
, ouroboros-consensus-cardano
141141
, ouroboros-consensus-protocol
142142
, ouroboros-consensus-shelley
143-
, ouroboros-network
144-
, ouroboros-network-framework
143+
, ouroboros-network ^>= 0.3
144+
, ouroboros-network-framework ^>= 0.2
145145
, parsec
146146
, plutus-ledger-api
147147
, prettyprinter

‎cardano-cli/cardano-cli.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-cli
4-
version: 1.35.5
4+
version: 1.35.6
55
description: The Cardano command-line interface.
66
author: IOHK
77
maintainer: [email protected]

‎cardano-node-chairman/app/Cardano/Chairman.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ module Cardano.Chairman (chairmanTest) where
1414
import Cardano.Prelude hiding (ByteString, STM, atomically, catch, option, show, throwIO)
1515
import Prelude (String, error, show)
1616

17+
import Control.Concurrent.Class.MonadSTM.Strict
1718
import Control.Monad.Class.MonadAsync
18-
import Control.Monad.Class.MonadSTM.Strict
1919
import Control.Monad.Class.MonadThrow
2020
import Control.Monad.Class.MonadTimer
2121
import Control.Tracer

‎cardano-node-chairman/cardano-node-chairman.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-node-chairman
4-
version: 1.35.5
4+
version: 1.35.6
55
description: The cardano full node
66
author: IOHK
77
maintainer: [email protected]

‎cardano-node/ChangeLog.md

+32
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
# Changelog for cardano-node
22

3+
## 1.35.5 -- January 2023
4+
5+
### node changes
6+
7+
None
8+
9+
### consensus changes
10+
11+
None
12+
13+
### network changes
14+
15+
- 'EnableP2P' configuration option does not require
16+
'TestEnableDevelopmentNetworkProtocols' any more. We support running at most
17+
one p2p relay, if an SPO is running at least two relays.
18+
19+
- Added 'DemoteLocalAsynchronous' warning trace. It indicates that a remote
20+
local root peer was demoted to cold (either due to connection error or
21+
misbehaviour). (input-output-hk/ouroboros-network#4127)
22+
23+
- New P2P topology file format, see [issue #4563][#4563] or the [config
24+
files][understanding-config-files] documentation. The old p2p topology
25+
format will be supported for next two major releases of the node (the last
26+
major version which will support it is `1.37`). (#4563)
27+
28+
[#4563]: https://github.com/input-output-hk/cardano-node/issues/4563
29+
[understanding-config-files]: https://github.com/input-output-hk/cardano-node/blob/master/doc/getting-started/understanding-config-files.md
30+
31+
### ledger changes
32+
33+
None
34+
335
## 1.35.4 -- October 2022
436

537
### node changes

‎cardano-node/cardano-node.cabal

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-node
4-
version: 1.35.5
4+
version: 1.35.6
55
description: The cardano full node
66
author: IOHK
77
maintainer: [email protected]
@@ -94,6 +94,7 @@ library
9494
Cardano.Node.Tracing.Tracers.BlockReplayProgress
9595
Cardano.Node.Tracing.Tracers.ChainDB
9696
Cardano.Node.Tracing.Tracers.Consensus
97+
Cardano.Node.Tracing.Tracers.ConsensusStartupException
9798
Cardano.Node.Tracing.Tracers.Diffusion
9899
Cardano.Node.Tracing.Tracers.KESInfo
99100
Cardano.Node.Tracing.Tracers.StartLeadershipCheck
@@ -160,16 +161,16 @@ library
160161
, lobemo-backend-monitoring
161162
, lobemo-backend-trace-forwarder
162163
, network
163-
, network-mux
164+
, network-mux ^>= 0.2
164165
, nothunks
165166
, optparse-applicative-fork
166-
, ouroboros-consensus
167+
, ouroboros-consensus ^>= 0.1.0.3
167168
, ouroboros-consensus-byron
168-
, ouroboros-consensus-cardano
169+
, ouroboros-consensus-cardano ^>= 0.2
169170
, ouroboros-consensus-protocol
170171
, ouroboros-consensus-shelley
171-
, ouroboros-network
172-
, ouroboros-network-framework
172+
, ouroboros-network ^>= 0.3
173+
, ouroboros-network-framework ^>= 0.2
173174
, psqueues
174175
, safe-exceptions
175176
, scientific
@@ -216,6 +217,7 @@ test-suite cardano-node-test
216217
type: exitcode-stdio-1.0
217218

218219
build-depends: aeson >= 1.5.6.0
220+
, bytestring
219221
, cardano-api
220222
, cardano-node
221223
, cardano-prelude
@@ -227,6 +229,7 @@ test-suite cardano-node-test
227229
, ouroboros-consensus
228230
, ouroboros-network
229231
, time
232+
, vector
230233

231234
other-modules: Test.Cardano.Node.FilePermissions
232235
Test.Cardano.Node.Gen

0 commit comments

Comments
 (0)