Merge pull request #5442 from input-output-hk/nfrisby/preparing-8.3.0-pre

preparing 8.3.0 pre

Author: disassembler

.github/workflows/haskell.yml

@@ -31,7 +31,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-07-28"
+      CABAL_CACHE_VERSION: "2023-09-05"
 
       # Modify this value to "invalidate" the secp cache.
       SECP_CACHE_VERSION: "2022-12-30"

bench/locli/locli.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   locli
-version:                1.31
+version:                1.32
 synopsis:               Cardano log analysis CLI
 description:            Cardano log analysis CLI.
 category:               Cardano,

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

@@ -1,6 +1,6 @@
 cabal-version:          3.0
 name:                   plutus-scripts-bench
-version:                1.0.0.1
+version:                1.0.0.2
 synopsis:               Plutus scripts used for benchmarking
 description:            Plutus scripts used for benchmarking.
 category:               Cardano,
@@ -72,7 +72,7 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api ^>= 8.12
+    , cardano-api >= 8.16.3 && < 8.17
     , plutus-ledger-api       >=1.0.0
     , plutus-tx               >=1.0.0
     , plutus-tx-plugin        >=1.0.0

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

@@ -36,7 +36,7 @@ import           Cardano.Node.Configuration.Logging (LoggingLayer)
 import           Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
 
 import           Cardano.Api.Shelley (CardanoMode)
-import           Cardano.CLI.Types.Legacy (SigningKeyFile)
+import           Cardano.CLI.Types.Common (SigningKeyFile)
 
 import           Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlots (..),
                    LocalNodeConnectInfo (..), NetworkId (..), PaymentKey, SigningKey, SocketPath,

bench/tx-generator/src/Cardano/TxGenerator/Setup/NixService.hs

@@ -20,7 +20,7 @@ import           Data.List.NonEmpty (NonEmpty)
 import           Data.Maybe (fromMaybe)
 import           GHC.Generics (Generic)
 
-import           Cardano.CLI.Types.Legacy (FileDirection (..), SigningKeyFile)
+import           Cardano.CLI.Types.Common (FileDirection (..), SigningKeyFile)
 import           Cardano.Node.Configuration.NodeAddress (NodeIPv4Address)
 import           Cardano.Node.Types (AdjustFilePaths (..))
 

bench/tx-generator/src/Cardano/TxGenerator/Setup/NodeConfig.hs

@@ -12,7 +12,7 @@ import           Control.Monad.Trans.Except (runExceptT)
 import           Data.Bifunctor (first)
 import           Data.Monoid
 
-import           Ouroboros.Consensus.Cardano (ProtocolParamsShelleyBased (..))
+import qualified Ouroboros.Consensus.Cardano as Consensus
 
 import           Cardano.Api (BlockType (..), ProtocolInfoArgs (..))
 import           Cardano.Node.Configuration.POM
@@ -32,10 +32,12 @@ getGenesis :: SomeConsensusProtocol -> ShelleyGenesis
 getGenesis (SomeConsensusProtocol CardanoBlockType proto)
     = genesis
   where
-    ProtocolInfoArgsCardano
-      _
-      ProtocolParamsShelleyBased{shelleyBasedGenesis = genesis}
-      _ _ _ _ _ _ _ _ _ _ _ _ = proto
+    ProtocolInfoArgsCardano Consensus.CardanoProtocolParams
+      { Consensus.paramsShelleyBased =
+          Consensus.ProtocolParamsShelleyBased
+            { Consensus.shelleyBasedGenesis = genesis
+            }
+      } = proto
 
 -- | extract the path to genesis file from a NodeConfiguration for Cardano protocol
 getGenesisPath :: NodeConfiguration -> Maybe GenesisFile

bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs

@@ -18,7 +18,7 @@ import           Control.Monad.Trans.Except
 import           Control.Monad.Trans.Except.Extra
 import           Control.Monad.Writer (runWriter)
 
-import           Cardano.CLI.Run.Legacy.Read (readFileScriptInAnyLang)
+import           Cardano.CLI.Read (readFileScriptInAnyLang)
 
 import           Cardano.Api
 import           Cardano.Api.Shelley (PlutusScript (..), ProtocolParameters (..), fromAlonzoExUnits,

bench/tx-generator/src/Cardano/TxGenerator/Setup/SigningKey.hs

@@ -16,7 +16,7 @@ import qualified Data.ByteString as BS (ByteString)
 import           Data.ByteString.Base16 as Base16 (decode)
 
 import           Cardano.Api
-import           Cardano.CLI.Types.Legacy (SigningKeyFile)
+import           Cardano.CLI.Types.Common (SigningKeyFile)
 
 import           Cardano.TxGenerator.Types (TxGenError (..))
 

bench/tx-generator/tx-generator.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   tx-generator
-version:                2.6
+version:                2.7
 synopsis:               A transaction workload generator for Cardano clusters
 description:            A transaction workload generator for Cardano clusters.
 category:               Cardano,
@@ -97,9 +97,9 @@ library
                       , attoparsec
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.12
+                      , cardano-api >= 8.16.3 && < 8.17
                       , cardano-binary
-                      , cardano-cli ^>= 8.5
+                      , cardano-cli ^>= 8.6.1
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data
@@ -193,8 +193,8 @@ test-suite tx-generator-apitest
                       , bytestring
                       , filepath
                       , optparse-applicative-fork
-                      , cardano-api ^>= 8.12
-                      , cardano-cli ^>= 8.5
+                      , cardano-api >= 8.16.3 && < 8.17
+                      , cardano-cli ^>= 8.6.1
                       , cardano-node
                       , plutus-tx
                       , transformers
@@ -209,8 +209,8 @@ test-suite tx-generator-apitest
                      , bytestring
                      , filepath
                      , optparse-applicative-fork
-                     , cardano-api ^>= 8.12
-                     , cardano-cli ^>= 8.5
+                     , cardano-api >= 8.16.3 && < 8.17
+                     , cardano-cli ^>= 8.6.1
                      , cardano-node
                      , transformers
                      , transformers-except

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2023-08-09T22:19:16Z
-  , cardano-haskell-packages 2023-08-09T14:21:51Z
+  , cardano-haskell-packages 2023-09-01T20:45:06Z
 
 packages:
   cardano-git-rev
@@ -99,3 +99,7 @@ write-ghc-environment-files: always
 
 package snap-server
   flags: +openssl
+
+-- IMPORTANT
+-- Do NOT add more source-repository-package stanzas here unless they are strictly
+-- temporary! Please read the section in CONTRIBUTING about updating dependencies.