Skip to content

Commit f7900cd

Browse files
karknukarknu
authored
Merge pull request #5691 from IntersectMBO/8.9.0
Release 8.9.0
2 parents f84edc0 + 5e8f21f commit f7900cd

File tree

37 files changed

+705
-254
lines changed

37 files changed

+705
-254
lines changed

‎.github/workflows/check-mainnet-config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
for f in "${test_files[@]}"; do
5151
nix_file="result/$f"
5252
repo_file="configuration/cardano/$f"
53-
if ! jq -e --argfile nix "$nix_file" --argfile repo "$repo_file" -n '$repo | reduce keys[] as $k (true; . and $repo[$k] == $nix[$k])' &>/dev/null ; then
53+
if ! jq -e --slurpfile nix "$nix_file" --slurpfile repo "$repo_file" -n '$repo | reduce keys[] as $k (true; . and $repo[$k] == $nix[$k])' &>/dev/null ; then
5454
echo "Nix file $nix_file does not have all the same top-level entries as the file from repository $repo_file"
5555
diff "$nix_file" "$repo_file"
5656
exit 1

‎.github/workflows/haskell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
env:
4040
# Modify this value to "invalidate" the cabal cache.
41-
CABAL_CACHE_VERSION: "2024-02-28"
41+
CABAL_CACHE_VERSION: "2024-02-29"
4242

4343
concurrency:
4444
group: >

‎bench/locli/locli.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ library
121121
, optparse-generic
122122
, ouroboros-consensus
123123
-- for Data.SOP.Strict:
124-
, ouroboros-network ^>= 0.11
124+
, ouroboros-network ^>= 0.12
125125
, ouroboros-network-api
126126
, process
127127
, quiet
@@ -175,7 +175,7 @@ test-suite test-locli
175175
build-depends: cardano-prelude
176176
, containers
177177
, hedgehog
178-
, hedgehog-extras ^>= 0.6.1.0
178+
, hedgehog-extras < 0.6.2
179179
, locli
180180
, text
181181

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ library
7373
-- IOG dependencies
7474
--------------------------
7575
build-depends:
76-
, cardano-api ^>= 8.39
76+
, cardano-api ^>= 8.39.2.0
7777
, plutus-ledger-api >=1.0.0
7878
, plutus-tx >=1.0.0
7979
, plutus-tx-plugin ^>=1.21

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ library
100100
, attoparsec-aeson
101101
, base16-bytestring
102102
, bytestring
103-
, cardano-api ^>= 8.39
103+
, cardano-api ^>= 8.39.2.0
104104
, cardano-binary
105-
, cardano-cli ^>= 8.20.2.0
105+
, cardano-cli ^>= 8.20.3.0
106106
, cardano-crypto-class
107107
, cardano-crypto-wrapper
108108
, cardano-data

‎cabal.project‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state:
16-
, hackage.haskell.org 2024-02-21T10:56:14Z
17-
, cardano-haskell-packages 2024-02-23T22:53:00Z
16+
, hackage.haskell.org 2024-02-27T08:06:51Z
17+
, cardano-haskell-packages 2024-02-26T17:55:44Z
1818

1919
packages:
2020
cardano-git-rev

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ chainSyncClient tracer sockPath chainsVar secParam = ChainSyncClient $ pure $
343343
}
344344
where
345345
clientStIdle :: ClientStIdle BlockInMode ChainPoint ChainTip IO ()
346-
clientStIdle = SendMsgRequestNext clientStNext (pure clientStNext)
346+
clientStIdle = SendMsgRequestNext (pure ()) clientStNext
347347

348348
clientStNext :: ClientStNext BlockInMode ChainPoint ChainTip IO ()
349349
clientStNext = ClientStNext

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ executable cardano-node-chairman
4444
build-depends: cardano-api
4545
, cardano-crypto-class
4646
, cardano-git-rev
47-
, cardano-node ^>= 8.8
47+
, cardano-node ^>= 8.9
4848
, cardano-prelude
4949
, containers
5050
, contra-tracer
@@ -72,7 +72,7 @@ test-suite chairman-tests
7272
, cardano-crypto-class ^>= 2.1.2
7373
, filepath
7474
, hedgehog
75-
, hedgehog-extras ^>= 0.6.1.0
75+
, hedgehog-extras < 0.6.2
7676
, network
7777
, process
7878
, random
@@ -88,5 +88,5 @@ test-suite chairman-tests
8888
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
8989

9090
build-tool-depends: cardano-node:cardano-node
91-
, cardano-cli:cardano-cli ^>= 8.20.2.0
91+
, cardano-cli:cardano-cli ^>= 8.20.3.0
9292
, cardano-node-chairman:cardano-node-chairman

‎cardano-node/cardano-node.cabal‎

Lines changed: 8 additions & 8 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: 8.8.1
4+
version: 8.9.0
55
synopsis: The cardano full node
66
description: The cardano full node.
77
category: Cardano,
@@ -144,7 +144,7 @@ library
144144
, async
145145
, base16-bytestring
146146
, bytestring
147-
, cardano-api ^>= 8.39
147+
, cardano-api ^>= 8.39.2.0
148148
, cardano-crypto-class
149149
, cardano-crypto-wrapper
150150
, cardano-git-rev
@@ -171,7 +171,7 @@ library
171171
, formatting
172172
, generic-data
173173
, hostname
174-
, io-classes >= 0.3
174+
, io-classes >= 1.4
175175
, iohk-monitoring
176176
, iproute
177177
, lobemo-backend-aggregation
@@ -183,14 +183,14 @@ library
183183
, network-mux >= 0.4
184184
, nothunks
185185
, optparse-applicative-fork >= 0.18.1
186-
, ouroboros-consensus ^>= 0.15
187-
, ouroboros-consensus-cardano ^>= 0.13
188-
, ouroboros-consensus-diffusion ^>= 0.10
186+
, ouroboros-consensus ^>= 0.16
187+
, ouroboros-consensus-cardano ^>= 0.14
188+
, ouroboros-consensus-diffusion ^>= 0.11
189189
, ouroboros-consensus-protocol
190190
, ouroboros-network-api
191-
, ouroboros-network ^>= 0.11
191+
, ouroboros-network ^>= 0.12
192192
, ouroboros-network-framework
193-
, ouroboros-network-protocols ^>= 0.7
193+
, ouroboros-network-protocols ^>= 0.8
194194
, prettyprinter
195195
, prettyprinter-ansi-terminal
196196
, psqueues

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ import Cardano.Tracing.OrphanInstances.Network ()
3434
import Ouroboros.Consensus.Mempool (MempoolCapacityBytes (..),
3535
MempoolCapacityBytesOverride (..))
3636
import qualified Ouroboros.Consensus.Node as Consensus (NetworkP2PMode (..))
37-
import Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (SnapshotInterval (..))
37+
import Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (NumOfDiskSnapshots (..),
38+
SnapshotInterval (..))
3839
import Ouroboros.Network.NodeToNode (AcceptedConnectionsLimit (..), DiffusionMode (..))
3940
import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
4041

@@ -101,8 +102,9 @@ data NodeConfiguration
101102
, ncProtocolConfig :: !NodeProtocolConfiguration
102103

103104
-- Node parameters, not protocol-specific:
104-
, ncDiffusionMode :: !DiffusionMode
105-
, ncSnapshotInterval :: !SnapshotInterval
105+
, ncDiffusionMode :: !DiffusionMode
106+
, ncNumOfDiskSnapshots :: !NumOfDiskSnapshots
107+
, ncSnapshotInterval :: !SnapshotInterval
106108

107109
-- | During the development and integration of new network protocols
108110
-- (node-to-node and node-to-client) we wish to be able to test them
@@ -182,8 +184,9 @@ data PartialNodeConfiguration
182184
, pncProtocolConfig :: !(Last NodeProtocolConfiguration)
183185

184186
-- Node parameters, not protocol-specific:
185-
, pncDiffusionMode :: !(Last DiffusionMode)
186-
, pncSnapshotInterval :: !(Last SnapshotInterval)
187+
, pncDiffusionMode :: !(Last DiffusionMode )
188+
, pncNumOfDiskSnapshots :: !(Last NumOfDiskSnapshots)
189+
, pncSnapshotInterval :: !(Last SnapshotInterval)
187190
, pncExperimentalProtocolsEnabled :: !(Last Bool)
188191

189192
-- BlockFetch configuration
@@ -241,6 +244,8 @@ instance FromJSON PartialNodeConfiguration where
241244
pncSocketPath <- Last <$> v .:? "SocketPath"
242245
pncDiffusionMode
243246
<- Last . fmap getDiffusionMode <$> v .:? "DiffusionMode"
247+
pncNumOfDiskSnapshots
248+
<- Last . fmap RequestedNumOfDiskSnapshots <$> v .:? "NumOfDiskSnapshots"
244249
pncSnapshotInterval
245250
<- Last . fmap RequestedSnapshotInterval <$> v .:? "SnapshotInterval"
246251
pncExperimentalProtocolsEnabled <- fmap Last $ do
@@ -320,6 +325,7 @@ instance FromJSON PartialNodeConfiguration where
320325
pncProtocolConfig
321326
, pncSocketConfig = Last . Just $ SocketConfig mempty mempty mempty pncSocketPath
322327
, pncDiffusionMode
328+
, pncNumOfDiskSnapshots
323329
, pncSnapshotInterval
324330
, pncExperimentalProtocolsEnabled
325331
, pncMaxConcurrencyBulkSync
@@ -490,6 +496,7 @@ defaultPartialNodeConfiguration =
490496
, pncLoggingSwitch = Last $ Just True
491497
, pncSocketConfig = Last . Just $ SocketConfig mempty mempty mempty mempty
492498
, pncDiffusionMode = Last $ Just InitiatorAndResponderDiffusionMode
499+
, pncNumOfDiskSnapshots = Last $ Just DefaultNumOfDiskSnapshots
493500
, pncSnapshotInterval = Last $ Just DefaultSnapshotInterval
494501
, pncExperimentalProtocolsEnabled = Last $ Just False
495502
, pncTopologyFile = Last . Just $ TopologyFile "configuration/cardano/mainnet-topology.json"
@@ -541,6 +548,7 @@ makeNodeConfiguration pnc = do
541548
logMetrics <- lastToEither "Missing LogMetrics" $ pncLogMetrics pnc
542549
traceConfig <- first Text.unpack $ partialTraceSelectionToEither $ pncTraceConfig pnc
543550
diffusionMode <- lastToEither "Missing DiffusionMode" $ pncDiffusionMode pnc
551+
numOfDiskSnapshots <- lastToEither "Missing NumOfDiskSnapshots" $ pncNumOfDiskSnapshots pnc
544552
snapshotInterval <- lastToEither "Missing SnapshotInterval" $ pncSnapshotInterval pnc
545553
shutdownConfig <- lastToEither "Missing ShutdownConfig" $ pncShutdownConfig pnc
546554
socketConfig <- lastToEither "Missing SocketConfig" $ pncSocketConfig pnc
@@ -609,6 +617,7 @@ makeNodeConfiguration pnc = do
609617
, ncProtocolConfig = protocolConfig
610618
, ncSocketConfig = socketConfig
611619
, ncDiffusionMode = diffusionMode
620+
, ncNumOfDiskSnapshots = numOfDiskSnapshots
612621
, ncSnapshotInterval = snapshotInterval
613622
, ncExperimentalProtocolsEnabled = experimentalProtocols
614623
, ncMaxConcurrencyBulkSync = getLast $ pncMaxConcurrencyBulkSync pnc

0 commit comments

Comments
 (0)