Merge pull request #6143 from IntersectMBO/aniketd/release-10-3

Release 10.3

Author: aniketd

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

@@ -40,7 +40,10 @@ jobs:
         test_files=(
           'mainnet-alonzo-genesis.json'
           'mainnet-byron-genesis.json'
+          'mainnet-checkpoints.json'
+          'mainnet-config-bp.json'
           'mainnet-config.json'
+          'mainnet-peer-snapshot.json'
           'mainnet-shelley-genesis.json'
           'mainnet-topology.json'
         )

bench/locli/locli.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   locli
-version:                2.1
+version:                2.1.1
 synopsis:               Cardano log analysis CLI
 description:            Cardano log analysis CLI.
 category:               Cardano,
@@ -126,7 +126,7 @@ library
                       , hashable
                       , optparse-applicative-fork >= 0.18.1
                       , ouroboros-consensus
-                      , ouroboros-network-api ^>= 0.12
+                      , ouroboros-network-api ^>= 0.13
                       , sop-core
                       , split
                       , sqlite-easy >= 1.1.0.1

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

@@ -1,6 +1,6 @@
 cabal-version:          3.0
 name:                   plutus-scripts-bench
-version:                1.0.4.2
+version:                1.0.4.3
 synopsis:               Plutus scripts used for benchmarking
 description:            Plutus scripts used for benchmarking.
 category:               Cardano,
@@ -82,10 +82,10 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>=10.11
-    , plutus-ledger-api       ^>=1.40
-    , plutus-tx               ^>=1.40
-    , plutus-tx-plugin        ^>=1.40
+    , cardano-api             ^>=10.13.1
+    , plutus-ledger-api       ^>=1.43
+    , plutus-tx               ^>=1.43
+    , plutus-tx-plugin        ^>=1.43
 
   ------------------------
   -- Non-IOG dependencies

bench/tx-generator/CHANGELOG.md

@@ -1,10 +1,17 @@
 # ChangeLog
 
+## 2.15 -- Mar 2025
+
+* 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.
+* Port `ProtocolParameters` type and typeclass instances from `cardano-api` into new module `Cardano.Api.Internal`, removing dependency on the deprecated API type.
+* Bump for Node 10.3
+
 ## 2.14.2 -- Oct 2024
 
 * Bump for Node 10
 
 ## 2.14.1 -- June 2024
+
 * A new NixSvcOptions field is introduced: `_nix_keepalive`
   and it's propagated down to the `kaClient` that does keepalives.
   This makes keepalive timeouts configurable.

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

@@ -4,29 +4,30 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
+
 module Cardano.Benchmarking.Script.Aeson
 where
 
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Char8 as BS (lines)
-import qualified Data.ByteString.Lazy as BSL
-import           Data.Text (Text)
-import           GHC.Generics (Generic)
+import           Cardano.Api
+
+import           Cardano.Benchmarking.Script.Types
+import           Cardano.TxGenerator.Internal.Orphans ()
+import           Cardano.TxGenerator.ProtocolParameters (ProtocolParameters)
+import           Cardano.TxGenerator.Types
+
 import           Prelude
-import           System.Exit
 
 import           Data.Aeson as Aeson
 import           Data.Aeson.Encode.Pretty
 import           Data.Aeson.Parser as Aeson (json)
 import qualified Data.Attoparsec.ByteString as Atto
+import qualified Data.ByteString as BS
+import qualified Data.ByteString.Char8 as BS (lines)
+import qualified Data.ByteString.Lazy as BSL
+import           Data.Text (Text)
 import qualified Data.Yaml as Yaml (encode)
-
-import           Cardano.Api
-import           Cardano.Api.Internal.ProtocolParameters (ProtocolParameters)
-
-import           Cardano.Benchmarking.Script.Types
-import           Cardano.TxGenerator.Internal.Orphans ()
-import           Cardano.TxGenerator.Types
+import           GHC.Generics (Generic)
+import           System.Exit
 
 testJSONRoundTrip :: [Action] -> Maybe String
 testJSONRoundTrip l = case fromJSON $ toJSON l of

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

@@ -18,10 +18,8 @@
 module Cardano.Benchmarking.Script.Core
 where
 
-import           Cardano.Api hiding (toLedgerPParams, fromLedgerPParams)
-import           Cardano.Api.Shelley (PlutusScriptOrReferenceInput (..),
-                   ShelleyLedgerEra)
-import           Cardano.Api.Internal.ProtocolParameters (toLedgerPParams, fromLedgerPParams, ProtocolParameters, convertToLedgerProtocolParameters, protocolParamPrices, protocolParamMaxTxExUnits)
+import           Cardano.Api
+import           Cardano.Api.Shelley (PlutusScriptOrReferenceInput (..), ShelleyLedgerEra)
 
 import           Cardano.Benchmarking.GeneratorTx as GeneratorTx (AsyncBenchmarkControl)
 import qualified Cardano.Benchmarking.GeneratorTx as GeneratorTx (waitBenchmark, walletBenchmark)
@@ -46,6 +44,7 @@ import           Cardano.TxGenerator.Fund as Fund
 import qualified Cardano.TxGenerator.FundQueue as FundQueue
 import qualified Cardano.TxGenerator.Genesis as Genesis
 import           Cardano.TxGenerator.PlutusContext
+import           Cardano.TxGenerator.ProtocolParameters
 import           Cardano.TxGenerator.Setup.Plutus as Plutus
 import           Cardano.TxGenerator.Setup.SigningKey
 import           Cardano.TxGenerator.Tx

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

@@ -71,7 +71,6 @@ import           Cardano.Benchmarking.OuroborosImports (NetworkId, PaymentKey, S
                    SigningKey)
 import           Cardano.Benchmarking.Script.Types
 import           Cardano.Benchmarking.Wallet
-import           Cardano.Ledger.Crypto (StandardCrypto)
 import           Cardano.Logging
 import           Cardano.Node.Protocol.Types (SomeConsensusProtocol)
 import           Cardano.TxGenerator.PlutusContext (PlutusBudgetSummary)
@@ -101,7 +100,7 @@ data Env = Env { -- | 'Cardano.Api.ProtocolParameters' is ultimately
                  -- wrapped by 'ProtocolParameterMode' which itself is
                  -- a sort of custom 'Maybe'.
                  protoParams :: Maybe ProtocolParameterMode
-               , envGenesis :: Maybe (ShelleyGenesis StandardCrypto)
+               , envGenesis :: Maybe ShelleyGenesis
                , envProtocol :: Maybe SomeConsensusProtocol
                , envNetworkId :: Maybe NetworkId
                , envSocketPath :: Maybe FilePath
@@ -190,7 +189,7 @@ setBenchTracers val = do
   liftIO $ STM.atomically do STM.writeTVar btTVar $ Just val
 
 -- | Write accessor for `envGenesis`.
-setEnvGenesis :: ShelleyGenesis StandardCrypto -> ActionM ()
+setEnvGenesis :: ShelleyGenesis -> ActionM ()
 setEnvGenesis val = modifyEnv (\e -> e { envGenesis = Just val })
 
 -- | Write accessor for `envKeys`.
@@ -266,7 +265,7 @@ getBenchTracers = do
       pure $ error errMsg
 
 -- | Read accessor for `envGenesis`.
-getEnvGenesis :: ActionM (ShelleyGenesis StandardCrypto)
+getEnvGenesis :: ActionM ShelleyGenesis
 getEnvGenesis = getEnvVal envGenesis "Genesis"
 
 -- | Read accessor for `envKeys`.

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

@@ -40,10 +40,10 @@ module Cardano.Benchmarking.Script.Types (
 
 import           Cardano.Api
 import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Internal.ProtocolParameters (ProtocolParameters)
 
 import           Cardano.Benchmarking.OuroborosImports (SigningKeyFile)
 import           Cardano.Node.Configuration.NodeAddress (NodeIPv4Address)
+import           Cardano.TxGenerator.ProtocolParameters (ProtocolParameters)
 import           Cardano.TxGenerator.Setup.NixService (NodeDescription)
 import           Cardano.TxGenerator.Types
 

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

@@ -67,12 +67,8 @@ generatorTracer ::
   -> Maybe (Trace IO FormattedMessage)
   -> IO (Trace IO a)
 generatorTracer tracerName mbTrStdout mbTrForward = do
-  forwardTrace <- case mbTrForward of
-                        Nothing -> mempty
-                        Just trForward -> forwardFormatter Nothing trForward
-  stdoutTrace  <- case mbTrStdout of
-                        Nothing -> mempty
-                        Just trForward -> machineFormatter Nothing trForward
+  forwardTrace <- maybe mempty forwardFormatter mbTrForward
+  stdoutTrace  <- maybe mempty machineFormatter mbTrStdout
   let tr = forwardTrace <> stdoutTrace
   tr'  <- withDetailsFromConfig tr
   pure $ withInnerNames $ appendPrefixName tracerName tr'
@@ -175,7 +171,7 @@ initialTraceConfig = TraceConfig {
           , setMaxDetail TracerNameConnect
           , setMaxDetail TracerNameSubmit
           ]
-    , tcForwarder = Just defaultForwarder
+    , tcForwarder = Just defaultForwarder {tofConnQueueSize = 2048, tofDisconnQueueSize = 4096}
     , tcNodeName = Nothing
     , tcPeerFrequency = Just 2000 -- Every 2 seconds
     , tcResourceFrequency = Just 1000 -- Every second

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

@@ -26,9 +26,9 @@ module  Cardano.TxGenerator.PlutusContext
         where
 
 import           Cardano.Api
-import           Cardano.Api.Internal.ProtocolParameters (ProtocolParameters (..))
 
 import           Cardano.Ledger.Coin (Coin)
+import           Cardano.TxGenerator.ProtocolParameters
 import           Cardano.TxGenerator.Setup.Plutus (preExecutePlutusScript)
 import           Cardano.TxGenerator.Types
 
@@ -39,7 +39,6 @@ import           Data.Ord (comparing)
 import           GHC.Generics (Generic)
 import           GHC.Natural (Natural)
 
-
 -- | This collects information describing the budget. It's only
 -- directly referenced in "Cardano.Benchmarking.Script.Env" to supply
 -- accessors as the state in an `Cardano.Benchmarking.Script.ActionM`