Skip to content

Commit 8aaa929

Browse files
aniketdaniketd
authored
Merge pull request #6143 from IntersectMBO/aniketd/release-10-3
Release 10.3
2 parents aec5698 + 3a026c7 commit 8aaa929

File tree

151 files changed

+20807
-1525
lines changed

Some content is hidden

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

151 files changed

+20807
-1525
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ jobs:
4040
test_files=(
4141
'mainnet-alonzo-genesis.json'
4242
'mainnet-byron-genesis.json'
43+
'mainnet-checkpoints.json'
44+
'mainnet-config-bp.json'
4345
'mainnet-config.json'
46+
'mainnet-peer-snapshot.json'
4447
'mainnet-shelley-genesis.json'
4548
'mainnet-topology.json'
4649
)

‎bench/locli/locli.cabal

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

33
name: locli
4-
version: 2.1
4+
version: 2.1.1
55
synopsis: Cardano log analysis CLI
66
description: Cardano log analysis CLI.
77
category: Cardano,
@@ -126,7 +126,7 @@ library
126126
, hashable
127127
, optparse-applicative-fork >= 0.18.1
128128
, ouroboros-consensus
129-
, ouroboros-network-api ^>= 0.12
129+
, ouroboros-network-api ^>= 0.13
130130
, sop-core
131131
, split
132132
, sqlite-easy >= 1.1.0.1

‎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.2
3+
version: 1.0.4.3
44
synopsis: Plutus scripts used for benchmarking
55
description: Plutus scripts used for benchmarking.
66
category: Cardano,
@@ -82,10 +82,10 @@ library
8282
-- IOG dependencies
8383
--------------------------
8484
build-depends:
85-
, cardano-api ^>=10.11
86-
, plutus-ledger-api ^>=1.40
87-
, plutus-tx ^>=1.40
88-
, plutus-tx-plugin ^>=1.40
85+
, cardano-api ^>=10.13.1
86+
, plutus-ledger-api ^>=1.43
87+
, plutus-tx ^>=1.43
88+
, plutus-tx-plugin ^>=1.43
8989

9090
------------------------
9191
-- Non-IOG dependencies

‎bench/tx-generator/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
# ChangeLog
22

3+
## 2.15 -- Mar 2025
4+
5+
* A new cabal flag `withplutuslib` is added, enabling import and re-compilation of Plutus scripts from `plutus-scripts-bench` - default: false; use for dev/test of new benchmarks only.
6+
* Port `ProtocolParameters` type and typeclass instances from `cardano-api` into new module `Cardano.Api.Internal`, removing dependency on the deprecated API type.
7+
* Bump for Node 10.3
8+
39
## 2.14.2 -- Oct 2024
410

511
* Bump for Node 10
612

713
## 2.14.1 -- June 2024
14+
815
* A new NixSvcOptions field is introduced: `_nix_keepalive`
916
and it's propagated down to the `kaClient` that does keepalives.
1017
This makes keepalive timeouts configurable.

‎bench/tx-generator/src/Cardano/Benchmarking/Script/Aeson.hs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,30 @@
44
{-# LANGUAGE GADTs #-}
55
{-# LANGUAGE ScopedTypeVariables #-}
66
{-# LANGUAGE StandaloneDeriving #-}
7+
78
module Cardano.Benchmarking.Script.Aeson
89
where
910

10-
import qualified Data.ByteString as BS
11-
import qualified Data.ByteString.Char8 as BS (lines)
12-
import qualified Data.ByteString.Lazy as BSL
13-
import Data.Text (Text)
14-
import GHC.Generics (Generic)
11+
import Cardano.Api
12+
13+
import Cardano.Benchmarking.Script.Types
14+
import Cardano.TxGenerator.Internal.Orphans ()
15+
import Cardano.TxGenerator.ProtocolParameters (ProtocolParameters)
16+
import Cardano.TxGenerator.Types
17+
1518
import Prelude
16-
import System.Exit
1719

1820
import Data.Aeson as Aeson
1921
import Data.Aeson.Encode.Pretty
2022
import Data.Aeson.Parser as Aeson (json)
2123
import qualified Data.Attoparsec.ByteString as Atto
24+
import qualified Data.ByteString as BS
25+
import qualified Data.ByteString.Char8 as BS (lines)
26+
import qualified Data.ByteString.Lazy as BSL
27+
import Data.Text (Text)
2228
import qualified Data.Yaml as Yaml (encode)
23-
24-
import Cardano.Api
25-
import Cardano.Api.Internal.ProtocolParameters (ProtocolParameters)
26-
27-
import Cardano.Benchmarking.Script.Types
28-
import Cardano.TxGenerator.Internal.Orphans ()
29-
import Cardano.TxGenerator.Types
29+
import GHC.Generics (Generic)
30+
import System.Exit
3031

3132
testJSONRoundTrip :: [Action] -> Maybe String
3233
testJSONRoundTrip l = case fromJSON $ toJSON l of

‎bench/tx-generator/src/Cardano/Benchmarking/Script/Core.hs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
module Cardano.Benchmarking.Script.Core
1919
where
2020

21-
import Cardano.Api hiding (toLedgerPParams, fromLedgerPParams)
22-
import Cardano.Api.Shelley (PlutusScriptOrReferenceInput (..),
23-
ShelleyLedgerEra)
24-
import Cardano.Api.Internal.ProtocolParameters (toLedgerPParams, fromLedgerPParams, ProtocolParameters, convertToLedgerProtocolParameters, protocolParamPrices, protocolParamMaxTxExUnits)
21+
import Cardano.Api
22+
import Cardano.Api.Shelley (PlutusScriptOrReferenceInput (..), ShelleyLedgerEra)
2523

2624
import Cardano.Benchmarking.GeneratorTx as GeneratorTx (AsyncBenchmarkControl)
2725
import qualified Cardano.Benchmarking.GeneratorTx as GeneratorTx (waitBenchmark, walletBenchmark)
@@ -46,6 +44,7 @@ import Cardano.TxGenerator.Fund as Fund
4644
import qualified Cardano.TxGenerator.FundQueue as FundQueue
4745
import qualified Cardano.TxGenerator.Genesis as Genesis
4846
import Cardano.TxGenerator.PlutusContext
47+
import Cardano.TxGenerator.ProtocolParameters
4948
import Cardano.TxGenerator.Setup.Plutus as Plutus
5049
import Cardano.TxGenerator.Setup.SigningKey
5150
import Cardano.TxGenerator.Tx

‎bench/tx-generator/src/Cardano/Benchmarking/Script/Env.hs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ import Cardano.Benchmarking.OuroborosImports (NetworkId, PaymentKey, S
7171
SigningKey)
7272
import Cardano.Benchmarking.Script.Types
7373
import Cardano.Benchmarking.Wallet
74-
import Cardano.Ledger.Crypto (StandardCrypto)
7574
import Cardano.Logging
7675
import Cardano.Node.Protocol.Types (SomeConsensusProtocol)
7776
import Cardano.TxGenerator.PlutusContext (PlutusBudgetSummary)
@@ -101,7 +100,7 @@ data Env = Env { -- | 'Cardano.Api.ProtocolParameters' is ultimately
101100
-- wrapped by 'ProtocolParameterMode' which itself is
102101
-- a sort of custom 'Maybe'.
103102
protoParams :: Maybe ProtocolParameterMode
104-
, envGenesis :: Maybe (ShelleyGenesis StandardCrypto)
103+
, envGenesis :: Maybe ShelleyGenesis
105104
, envProtocol :: Maybe SomeConsensusProtocol
106105
, envNetworkId :: Maybe NetworkId
107106
, envSocketPath :: Maybe FilePath
@@ -190,7 +189,7 @@ setBenchTracers val = do
190189
liftIO $ STM.atomically do STM.writeTVar btTVar $ Just val
191190

192191
-- | Write accessor for `envGenesis`.
193-
setEnvGenesis :: ShelleyGenesis StandardCrypto -> ActionM ()
192+
setEnvGenesis :: ShelleyGenesis -> ActionM ()
194193
setEnvGenesis val = modifyEnv (\e -> e { envGenesis = Just val })
195194

196195
-- | Write accessor for `envKeys`.
@@ -266,7 +265,7 @@ getBenchTracers = do
266265
pure $ error errMsg
267266

268267
-- | Read accessor for `envGenesis`.
269-
getEnvGenesis :: ActionM (ShelleyGenesis StandardCrypto)
268+
getEnvGenesis :: ActionM ShelleyGenesis
270269
getEnvGenesis = getEnvVal envGenesis "Genesis"
271270

272271
-- | Read accessor for `envKeys`.

‎bench/tx-generator/src/Cardano/Benchmarking/Script/Types.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ module Cardano.Benchmarking.Script.Types (
4040

4141
import Cardano.Api
4242
import qualified Cardano.Api.Ledger as L
43-
import Cardano.Api.Internal.ProtocolParameters (ProtocolParameters)
4443

4544
import Cardano.Benchmarking.OuroborosImports (SigningKeyFile)
4645
import Cardano.Node.Configuration.NodeAddress (NodeIPv4Address)
46+
import Cardano.TxGenerator.ProtocolParameters (ProtocolParameters)
4747
import Cardano.TxGenerator.Setup.NixService (NodeDescription)
4848
import Cardano.TxGenerator.Types
4949

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ generatorTracer ::
6767
-> Maybe (Trace IO FormattedMessage)
6868
-> IO (Trace IO a)
6969
generatorTracer tracerName mbTrStdout mbTrForward = do
70-
forwardTrace <- case mbTrForward of
71-
Nothing -> mempty
72-
Just trForward -> forwardFormatter Nothing trForward
73-
stdoutTrace <- case mbTrStdout of
74-
Nothing -> mempty
75-
Just trForward -> machineFormatter Nothing trForward
70+
forwardTrace <- maybe mempty forwardFormatter mbTrForward
71+
stdoutTrace <- maybe mempty machineFormatter mbTrStdout
7672
let tr = forwardTrace <> stdoutTrace
7773
tr' <- withDetailsFromConfig tr
7874
pure $ withInnerNames $ appendPrefixName tracerName tr'
@@ -175,7 +171,7 @@ initialTraceConfig = TraceConfig {
175171
, setMaxDetail TracerNameConnect
176172
, setMaxDetail TracerNameSubmit
177173
]
178-
, tcForwarder = Just defaultForwarder
174+
, tcForwarder = Just defaultForwarder {tofConnQueueSize = 2048, tofDisconnQueueSize = 4096}
179175
, tcNodeName = Nothing
180176
, tcPeerFrequency = Just 2000 -- Every 2 seconds
181177
, tcResourceFrequency = Just 1000 -- Every second

‎bench/tx-generator/src/Cardano/TxGenerator/PlutusContext.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ module Cardano.TxGenerator.PlutusContext
2626
where
2727

2828
import Cardano.Api
29-
import Cardano.Api.Internal.ProtocolParameters (ProtocolParameters (..))
3029

3130
import Cardano.Ledger.Coin (Coin)
31+
import Cardano.TxGenerator.ProtocolParameters
3232
import Cardano.TxGenerator.Setup.Plutus (preExecutePlutusScript)
3333
import Cardano.TxGenerator.Types
3434

@@ -39,7 +39,6 @@ import Data.Ord (comparing)
3939
import GHC.Generics (Generic)
4040
import GHC.Natural (Natural)
4141

42-
4342
-- | This collects information describing the budget. It's only
4443
-- directly referenced in "Cardano.Benchmarking.Script.Env" to supply
4544
-- accessors as the state in an `Cardano.Benchmarking.Script.ActionM`

0 commit comments

Comments
 (0)