Skip to content

Commit 52b708f

Browse files
neilmayhewneilmayhew
authored
Merge pull request #6111 from IntersectMBO/nm/10.2.1
10.2.1 release preparation
2 parents dad33d9 + 1e58567 commit 52b708f

File tree

18 files changed

+106
-72
lines changed

18 files changed

+106
-72
lines changed

‎bench/plutus-scripts-bench/plutus-scripts-bench.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ library
8282
-- IOG dependencies
8383
--------------------------
8484
build-depends:
85-
, cardano-api ^>=10.6
85+
, cardano-api ^>=10.8
8686
, plutus-ledger-api ^>=1.37
8787
, plutus-tx ^>=1.37
8888
, plutus-tx-plugin ^>=1.37

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

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -133,38 +133,40 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec
133133
, NtN.peerSharing = ownPeerSharing
134134
, NtN.query = False
135135
}) $
136-
mkApp $
137-
NtN.nodeToNodeProtocols NtN.defaultMiniProtocolParameters
138-
NtN.NodeToNodeProtocols
139-
{ NtN.chainSyncProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
140-
runPeer
141-
mempty
142-
(cChainSyncCodec myCodecs)
143-
channel
144-
chainSyncPeerNull
145-
, NtN.blockFetchProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
146-
runPeer
147-
mempty
148-
(cBlockFetchCodec myCodecs)
149-
channel
150-
(blockFetchClientPeer blockFetchClientNull)
151-
, NtN.keepAliveProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \ctx channel ->
152-
kaClient n2nVer (remoteAddress $ micConnectionId ctx) channel
153-
, NtN.txSubmissionProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
154-
runPeer
155-
submissionTracer
156-
(cTxSubmission2Codec myCodecs)
157-
channel
158-
(txSubmissionClientPeer myTxSubClient)
159-
, NtN.peerSharingProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
136+
\n2nData ->
137+
mkApp $
138+
NtN.nodeToNodeProtocols NtN.defaultMiniProtocolParameters
139+
NtN.NodeToNodeProtocols
140+
{ NtN.chainSyncProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
160141
runPeer
142+
mempty
143+
(cChainSyncCodec myCodecs)
144+
channel
145+
chainSyncPeerNull
146+
, NtN.blockFetchProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
147+
runPeer
161148
mempty
162-
(cPeerSharingCodec myCodecs)
149+
(cBlockFetchCodec myCodecs)
163150
channel
164-
(peerSharingClientPeer peerSharingClientNull)
165-
}
166-
n2nVer
167-
ownPeerSharing
151+
(blockFetchClientPeer blockFetchClientNull)
152+
, NtN.keepAliveProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \ctx channel ->
153+
kaClient n2nVer (remoteAddress $ micConnectionId ctx) channel
154+
, NtN.txSubmissionProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
155+
runPeer
156+
submissionTracer
157+
(cTxSubmission2Codec myCodecs)
158+
channel
159+
(txSubmissionClientPeer myTxSubClient)
160+
, NtN.peerSharingProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
161+
runPeer
162+
mempty
163+
(cPeerSharingCodec myCodecs)
164+
channel
165+
(peerSharingClientPeer peerSharingClientNull)
166+
}
167+
n2nVer
168+
n2nData
169+
168170
-- Stolen from: Ouroboros/Consensus/Network/NodeToNode.hs
169171
kaClient
170172
:: Ord remotePeer

‎bench/tx-generator/tx-generator.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ library
106106
, attoparsec-aeson
107107
, base16-bytestring
108108
, bytestring
109-
, cardano-api ^>= 10.6
109+
, cardano-api ^>= 10.8
110110
, cardano-binary
111-
, cardano-cli ^>= 10.3
111+
, cardano-cli ^>= 10.4
112112
, cardano-crypto-class
113113
, cardano-crypto-wrapper
114114
, cardano-data

‎cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
1414
-- you need to run if you change them
1515
index-state:
1616
, hackage.haskell.org 2025-01-01T23:24:19Z
17-
, cardano-haskell-packages 2025-01-22T16:50:05Z
17+
, cardano-haskell-packages 2025-02-11T21:18:23Z
1818

1919
packages:
2020
cardano-node

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@ test-suite chairman-tests
8989
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
9090

9191
build-tool-depends: cardano-node:cardano-node
92-
, cardano-cli:cardano-cli ^>= 10.3
92+
, cardano-cli:cardano-cli ^>= 10.4
9393
, cardano-node-chairman:cardano-node-chairman

‎cardano-node/cardano-node.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-node
4-
version: 10.2
4+
version: 10.2.1
55
synopsis: The cardano full node
66
description: The cardano full node.
77
category: Cardano,
@@ -145,7 +145,7 @@ library
145145
, async
146146
, base16-bytestring
147147
, bytestring
148-
, cardano-api ^>= 10.6
148+
, cardano-api ^>= 10.8
149149
, cardano-crypto-class
150150
, cardano-crypto-wrapper
151151
, cardano-git-rev ^>=0.2.2
@@ -188,10 +188,10 @@ library
188188
, optparse-applicative-fork >= 0.18.1
189189
, ouroboros-consensus ^>= 0.22
190190
, ouroboros-consensus-cardano ^>= 0.21
191-
, ouroboros-consensus-diffusion ^>= 0.19
191+
, ouroboros-consensus-diffusion ^>= 0.20
192192
, ouroboros-consensus-protocol
193193
, ouroboros-network-api ^>= 0.12
194-
, ouroboros-network ^>= 0.19
194+
, ouroboros-network ^>= 0.19.0.3
195195
, ouroboros-network-framework
196196
, ouroboros-network-protocols ^>= 0.13
197197
, prettyprinter

‎cardano-node/src/Cardano/Node/Configuration/POM.hs

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ import Ouroboros.Consensus.Node.Genesis (GenesisConfig, GenesisConfigF
4242
import Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (Flag, NumOfDiskSnapshots (..),
4343
SnapshotInterval (..))
4444
import Ouroboros.Network.Diffusion.Configuration as Configuration
45+
import qualified Ouroboros.Network.PeerSelection.Governor as PeerSelection
4546

46-
import Control.Monad (when)
47+
import Control.Monad (when, unless)
4748
import Data.Aeson
4849
import qualified Data.Aeson.Types as Aeson
4950
import Data.Bifunctor (Bifunctor (..))
@@ -702,6 +703,32 @@ makeNodeConfiguration pnc = do
702703
$ pncGenesisConfigFlags pnc
703704
let ncGenesisConfig = mkGenesisConfig mGenesisConfigFlags
704705

706+
let deadlineTargets =
707+
PeerSelectionTargets {
708+
targetNumberOfRootPeers = ncDeadlineTargetOfRootPeers,
709+
targetNumberOfKnownPeers = ncDeadlineTargetOfKnownPeers,
710+
targetNumberOfEstablishedPeers = ncDeadlineTargetOfEstablishedPeers,
711+
targetNumberOfActivePeers = ncDeadlineTargetOfActivePeers,
712+
targetNumberOfKnownBigLedgerPeers = ncDeadlineTargetOfKnownBigLedgerPeers,
713+
targetNumberOfEstablishedBigLedgerPeers = ncDeadlineTargetOfEstablishedBigLedgerPeers,
714+
targetNumberOfActiveBigLedgerPeers = ncDeadlineTargetOfActiveBigLedgerPeers }
715+
syncTargets = deadlineTargets {
716+
targetNumberOfActivePeers = ncSyncTargetOfActivePeers,
717+
targetNumberOfKnownBigLedgerPeers = ncSyncTargetOfKnownBigLedgerPeers,
718+
targetNumberOfEstablishedBigLedgerPeers = ncSyncTargetOfEstablishedBigLedgerPeers,
719+
targetNumberOfActiveBigLedgerPeers = ncSyncTargetOfActiveBigLedgerPeers }
720+
721+
unless (PeerSelection.sanePeerSelectionTargets deadlineTargets
722+
&& PeerSelection.sanePeerSelectionTargets syncTargets) $
723+
Left $ "Invalid peer selection targets. Ensure that targets satisfy the "
724+
<> "inequalities of known >= established >= active >= 0"
725+
<> "for both deadline and sync target groups. The deadline groups start with "
726+
<> "TargetNumber... while the sync group starts with SyncTarget... "
727+
<> "Additionally, TargetNumberOfEstablishedPeers >= SyncTargetNumberOfActivePeers. "
728+
<> "Within each group, the category of big ledger peers is treated independently, "
729+
<> "but it too must satisfy the same inequality. Refer to cardano-node wiki page "
730+
<> "'understanding config files' for details."
731+
705732
-- TODO: This is not mandatory
706733
experimentalProtocols <-
707734
lastToEither "Missing ExperimentalProtocolsEnabled" $

‎cardano-node/src/Cardano/Node/Run.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -939,10 +939,7 @@ mkP2PArguments NodeConfiguration {
939939
targetNumberOfEstablishedBigLedgerPeers = ncDeadlineTargetOfEstablishedBigLedgerPeers,
940940
targetNumberOfActiveBigLedgerPeers = ncDeadlineTargetOfActiveBigLedgerPeers
941941
}
942-
syncTargets = PeerSelectionTargets {
943-
targetNumberOfRootPeers = 0,
944-
targetNumberOfKnownPeers = 0,
945-
targetNumberOfEstablishedPeers = 0,
942+
syncTargets = deadlineTargets {
946943
targetNumberOfActivePeers = ncSyncTargetOfActivePeers,
947944
targetNumberOfKnownBigLedgerPeers = ncSyncTargetOfKnownBigLedgerPeers,
948945
targetNumberOfEstablishedBigLedgerPeers = ncSyncTargetOfEstablishedBigLedgerPeers,

‎cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,19 +1754,19 @@ instance (Aeson.ToJSONKey peerAddr, ToJSON peerAddr, Ord peerAddr, Show peerAddr
17541754

17551755
instance ToJSON PeerSelectionTargets where
17561756
toJSON (PeerSelectionTargets
1757-
nRootLedgerPeers
1758-
nKnownLedgerPeers
1759-
nEstablishedLedgerPeers
1760-
nActiveLedgerPeers
1757+
nRootPeers
1758+
nKnownPeers
1759+
nEstablishedPeers
1760+
nActivePeers
17611761
nKnownBigLedgerPeers
17621762
nEstablishedBigLedgerPeers
17631763
nActiveBigLedgerPeers
17641764
) =
17651765
Aeson.object [ "kind" .= String "PeerSelectionTargets"
1766-
, "targetRootLedgerPeers" .= nRootLedgerPeers
1767-
, "targetKnownLedgerPeers" .= nKnownLedgerPeers
1768-
, "targetEstablishedLedgerPeers" .= nEstablishedLedgerPeers
1769-
, "targetActiveLedgerPeers" .= nActiveLedgerPeers
1766+
, "targetRootPeers" .= nRootPeers
1767+
, "targetKnownPeers" .= nKnownPeers
1768+
, "targetEstablishedPeers" .= nEstablishedPeers
1769+
, "targetActivePeers" .= nActivePeers
17701770

17711771
, "targetKnownBigLedgerPeers" .= nKnownBigLedgerPeers
17721772
, "targetEstablishedBigLedgerPeers" .= nEstablishedBigLedgerPeers

‎cardano-submit-api/cardano-submit-api.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ library
3939
, aeson
4040
, async
4141
, bytestring
42-
, cardano-api ^>= 10.6
42+
, cardano-api ^>= 10.8
4343
, cardano-binary
44-
, cardano-cli ^>= 10.3
44+
, cardano-cli ^>= 10.4
4545
, cardano-crypto-class ^>= 2.1.2
4646
, http-media
4747
, iohk-monitoring

0 commit comments

Comments
 (0)