Skip to content

Commit cdb45dd

Browse files
crocodile-dentistcrocodile-dentist
authored
Merge pull request #5998 from IntersectMBO/mwojtowicz/release/node-9.3
cardano-node 10.0 release
2 parents 5f73911 + 1abdd47 commit cdb45dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+741
-440
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: plutus-scripts-bench
3-
version: 1.0.4.0
3+
version: 1.0.4.1
44
synopsis: Plutus scripts used for benchmarking
55
description: Plutus scripts used for benchmarking.
66
category: Cardano,
@@ -80,10 +80,10 @@ library
8080
-- IOG dependencies
8181
--------------------------
8282
build-depends:
83-
, cardano-api ^>=9.3
84-
, plutus-ledger-api ^>=1.32
85-
, plutus-tx ^>=1.32
86-
, plutus-tx-plugin ^>=1.32
83+
, cardano-api ^>=10.0
84+
, plutus-ledger-api ^>=1.36
85+
, plutus-tx ^>=1.36
86+
, plutus-tx-plugin ^>=1.36
8787

8888
------------------------
8989
-- Non-IOG dependencies

‎bench/tx-generator/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ChangeLog
22

3+
## 2.14.2 -- Oct 2024
4+
5+
* Bump for Node 10
6+
37
## 2.14.1 -- June 2024
48
* A new NixSvcOptions field is introduced: `_nix_keepalive`
59
and it's propagated down to the `kaClient` that does keepalives.

‎bench/tx-generator/src/Cardano/Benchmarking/Command.hs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import Data.Foldable as Fold (forM_)
5252
import Data.List as List (unwords)
5353
import Data.Time.Format as Time (defaultTimeLocale, formatTime)
5454
import Data.Time.Clock.System as Time (getSystemTime, systemToUTCTime)
55+
import Foreign.C (Errno(..))
5556
import GHC.Weak as Weak (deRefWeak)
5657

5758
import System.Posix.Signals as Sig (Handler (CatchInfo),
@@ -64,6 +65,7 @@ import GHC.Conc.Sync as Conc (threadLabel)
6465
#endif
6566

6667
#ifdef UNIX
68+
deriving instance Show Errno
6769
deriving instance Show SignalInfo
6870
deriving instance Show SignalSpecificInfo
6971
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec
102102
OuroborosApplication $ fold bundle
103103

104104
n2nVer :: NodeToNodeVersion
105-
n2nVer = NodeToNodeV_12
105+
n2nVer = NodeToNodeV_14
106106
blkN2nVer :: BlockNodeToNodeVersion blk
107107
blkN2nVer = supportedVers Map.! n2nVer
108108
supportedVers :: Map.Map NodeToNodeVersion (BlockNodeToNodeVersion blk)

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
{-# LANGUAGE OverloadedStrings #-}
1212
{-# LANGUAGE RankNTypes #-}
1313
{-# LANGUAGE ScopedTypeVariables #-}
14-
{-# LANGUAGE TypeApplications #-}
15-
{-# LANGUAGE TypeOperators #-}
1614
{-# LANGUAGE UndecidableInstances #-}
1715

1816
{-# OPTIONS_GHC -Wno-unticked-promoted-constructors #-}
@@ -26,10 +24,11 @@ module Cardano.Benchmarking.GeneratorTx.SubmissionClient
2624
) where
2725

2826
import Cardano.Api hiding (Active)
29-
import Cardano.Api.Shelley (fromShelleyTxId, toConsensusGenTx)
27+
import Cardano.Api.Shelley (fromShelleyTxId, toConsensusGenTx, Tx (..))
3028

3129
import Cardano.Benchmarking.LogTypes
3230
import Cardano.Benchmarking.Types
31+
import qualified Cardano.Ledger.Core as Ledger
3332
import Cardano.Logging
3433
import Cardano.Prelude hiding (ByteString, atomically, retry, state, threadDelay)
3534
import Cardano.Tracing.OrphanInstances.Byron ()
@@ -40,7 +39,7 @@ import Cardano.Tracing.OrphanInstances.Shelley ()
4039
import qualified Ouroboros.Consensus.Cardano as Consensus (CardanoBlock)
4140
import qualified Ouroboros.Consensus.Cardano.Block as Block
4241
(TxId (GenTxIdAllegra, GenTxIdAlonzo, GenTxIdBabbage, GenTxIdConway, GenTxIdMary, GenTxIdShelley))
43-
import Ouroboros.Consensus.Ledger.SupportsMempool (GenTx, GenTxId, txInBlockSize)
42+
import Ouroboros.Consensus.Ledger.SupportsMempool (GenTx, GenTxId)
4443
import qualified Ouroboros.Consensus.Ledger.SupportsMempool as Mempool
4544
import Ouroboros.Consensus.Shelley.Eras (StandardCrypto)
4645
import qualified Ouroboros.Consensus.Shelley.Ledger.Mempool as Mempool (TxId (ShelleyTxId))
@@ -57,6 +56,8 @@ import qualified Data.List as L
5756
import qualified Data.List.Extra as L
5857
import qualified Data.List.NonEmpty as NE
5958
import qualified Data.Text as T
59+
import Lens.Micro ((^.))
60+
6061
type CardanoBlock = Consensus.CardanoBlock StandardCrypto
6162

6263
data SubmissionThreadStats
@@ -85,10 +86,9 @@ type LocalState era = (TxSource era, UnAcked (Tx era), SubmissionThreadStats)
8586
type EndOfProtocolCallback m = SubmissionThreadStats -> m ()
8687

8788
txSubmissionClient
88-
:: forall m era tx.
89+
:: forall m era.
8990
( MonadIO m, MonadFail m
9091
, IsShelleyBasedEra era
91-
, tx ~ Tx era
9292
)
9393
=> Trace m NodeToNodeSubmissionTrace
9494
-> Trace m (TraceBenchTxSubmit TxId)
@@ -110,11 +110,11 @@ txSubmissionClient tr bmtr initialTxSource endOfProtocolCallback =
110110
traceWith bmtr $ SubmissionClientDiscardAcknowledged (getTxId . getTxBody <$> acked)
111111
return (txSource, UnAcked stillUnacked, newStats)
112112

113-
queueNewTxs :: [tx] -> LocalState era -> LocalState era
113+
queueNewTxs :: [Tx era] -> LocalState era -> LocalState era
114114
queueNewTxs newTxs (txSource, UnAcked unAcked, stats)
115115
= (txSource, UnAcked (newTxs <> unAcked), stats)
116116

117-
client ::LocalState era -> ClientStIdle (GenTxId CardanoBlock) (GenTx CardanoBlock) m ()
117+
client :: LocalState era -> ClientStIdle (GenTxId CardanoBlock) (GenTx CardanoBlock) m ()
118118

119119
client localState = ClientStIdle
120120
{ recvMsgRequestTxIds = requestTxIds localState
@@ -177,12 +177,15 @@ txSubmissionClient tr bmtr initialTxSource endOfProtocolCallback =
177177
, stsUnavailable =
178178
stsUnavailable stats + Unav (length missIds)}))
179179

180-
txToIdSize :: tx -> (GenTxId CardanoBlock, SizeInBytes)
181-
txToIdSize = (Mempool.txId &&& (SizeInBytes . txInBlockSize)) . toGenTx
182-
183-
toGenTx :: tx -> GenTx CardanoBlock
184-
toGenTx tx = toConsensusGenTx $ TxInMode (shelleyBasedEra @era) tx
180+
txToIdSize :: Tx era -> (GenTxId CardanoBlock, SizeInBytes)
181+
txToIdSize = (Mempool.txId . toGenTx) &&& (SizeInBytes . fromInteger . getTxSize)
182+
where
183+
getTxSize :: Tx era -> Integer
184+
getTxSize (ShelleyTx sbe tx) =
185+
shelleyBasedEraConstraints sbe $ tx ^. Ledger.sizeTxF
185186

187+
toGenTx :: Tx era -> GenTx CardanoBlock
188+
toGenTx tx = toConsensusGenTx $ TxInMode shelleyBasedEra tx
186189

187190
fromGenTxId :: GenTxId CardanoBlock -> TxId
188191
fromGenTxId (Block.GenTxIdShelley (Mempool.ShelleyTxId i)) = fromShelleyTxId i

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

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

33
name: tx-generator
4-
version: 2.14.1
4+
version: 2.14.2
55
synopsis: A transaction workload generator for Cardano clusters
66
description: A transaction workload generator for Cardano clusters.
77
category: Cardano,
@@ -106,9 +106,9 @@ library
106106
, attoparsec-aeson
107107
, base16-bytestring
108108
, bytestring
109-
, cardano-api ^>= 9.3
109+
, cardano-api ^>= 10.0
110110
, cardano-binary
111-
, cardano-cli ^>= 9.4
111+
, cardano-cli ^>= 10.0
112112
, cardano-crypto-class
113113
, cardano-crypto-wrapper
114114
, cardano-data
@@ -129,6 +129,7 @@ library
129129
, generic-monoid
130130
, ghc-prim
131131
, io-classes
132+
, microlens
132133
, mtl
133134
, network
134135
, network-mux

‎cabal.project‎

Lines changed: 3 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-09-05T18:39:40Z
17-
, cardano-haskell-packages 2024-09-10T12:51:27Z
16+
, hackage.haskell.org 2024-10-10T00:52:24Z
17+
, cardano-haskell-packages 2024-10-17T12:07:57Z
1818

1919
packages:
2020
cardano-node
@@ -59,6 +59,7 @@ package plutus-scripts-bench
5959

6060
constraints:
6161
, wai-extra < 3.1.15
62+
, Cabal < 3.14
6263

6364
allow-newer:
6465
, katip:Win32

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

Lines changed: 3 additions & 3 deletions
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: 9.0.0
4+
version: 10.0.0
55
synopsis: The cardano full node
66
description: The cardano full node.
77
category: Cardano,
@@ -44,7 +44,7 @@ executable cardano-node-chairman
4444
build-depends: cardano-api
4545
, cardano-crypto-class
4646
, cardano-git-rev ^>= 0.2.2
47-
, cardano-node ^>= 9.2
47+
, cardano-node ^>= 10.0
4848
, cardano-prelude
4949
, containers
5050
, contra-tracer
@@ -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 ^>= 9.4
92+
, cardano-cli:cardano-cli ^>= 10.0
9393
, cardano-node-chairman:cardano-node-chairman

‎cardano-node/cardano-node.cabal‎

Lines changed: 11 additions & 11 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: 9.2.0
4+
version: 10.0
55
synopsis: The cardano full node
66
description: The cardano full node.
77
category: Cardano,
@@ -38,8 +38,8 @@ common project-config
3838
-Wpartial-fields
3939
-Wredundant-constraints
4040
-Wunused-packages
41-
common maybe-Win32
42-
if os(windows)
41+
common maybe-Win32
42+
if os(windows)
4343
build-depends: Win32
4444

4545
common maybe-unix
@@ -55,7 +55,7 @@ common text
5555
library
5656
import: project-config
5757
, maybe-unix
58-
, maybe-Win32
58+
, maybe-Win32
5959
, text
6060
if flag(unexpected_thunks)
6161
cpp-options: -DUNEXPECTED_THUNKS
@@ -145,7 +145,7 @@ library
145145
, async
146146
, base16-bytestring
147147
, bytestring
148-
, cardano-api ^>= 9.3
148+
, cardano-api ^>= 10.0
149149
, cardano-crypto-class
150150
, cardano-crypto-wrapper
151151
, cardano-git-rev ^>=0.2.2
@@ -186,14 +186,14 @@ library
186186
, network-mux >= 0.4
187187
, nothunks
188188
, optparse-applicative-fork >= 0.18.1
189-
, ouroboros-consensus ^>= 0.20
190-
, ouroboros-consensus-cardano ^>= 0.19
191-
, ouroboros-consensus-diffusion ^>= 0.17
189+
, ouroboros-consensus ^>= 0.21
190+
, ouroboros-consensus-cardano ^>= 0.20
191+
, ouroboros-consensus-diffusion ^>= 0.18
192192
, ouroboros-consensus-protocol
193-
, ouroboros-network-api ^>= 0.9
193+
, ouroboros-network-api ^>= 0.10
194194
, ouroboros-network ^>= 0.17
195195
, ouroboros-network-framework
196-
, ouroboros-network-protocols ^>= 0.10
196+
, ouroboros-network-protocols ^>= 0.11
197197
, prettyprinter
198198
, prettyprinter-ansi-terminal
199199
, psqueues
@@ -207,7 +207,7 @@ library
207207
, strict-stm
208208
, time
209209
, trace-dispatcher ^>= 2.7.0
210-
, trace-forward ^>= 2.2.7
210+
, trace-forward ^>= 2.2.8
211211
, trace-resources ^>= 0.2.2
212212
, tracer-transformers
213213
, transformers

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import Cardano.Node.Protocol.Types (Protocol (..))
3131
import Cardano.Node.Types
3232
import Cardano.Tracing.Config
3333
import Cardano.Tracing.OrphanInstances.Network ()
34-
import Ouroboros.Consensus.Mempool (MempoolCapacityBytes (..),
35-
MempoolCapacityBytesOverride (..))
34+
import Ouroboros.Consensus.Ledger.SupportsMempool
35+
import Ouroboros.Consensus.Mempool (MempoolCapacityBytesOverride (..))
3636
import Ouroboros.Consensus.Node (NodeDatabasePaths (..))
3737
import qualified Ouroboros.Consensus.Node as Consensus (NetworkP2PMode (..))
3838
import Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (NumOfDiskSnapshots (..),
@@ -361,7 +361,7 @@ instance FromJSON PartialNodeConfiguration where
361361
where
362362
parseMempoolCapacityBytesOverride v = parseNoOverride <|> parseOverride
363363
where
364-
parseNoOverride = fmap (MempoolCapacityBytesOverride . MempoolCapacityBytes) <$> v .:? "MempoolCapacityBytesOverride"
364+
parseNoOverride = fmap (MempoolCapacityBytesOverride . ByteSize32) <$> v .:? "MempoolCapacityBytesOverride"
365365
parseOverride = do
366366
maybeString :: Maybe String <- v .:? "MempoolCapacityBytesOverride"
367367
case maybeString of

0 commit comments

Comments
 (0)