Merge pull request #5411 from input-output-hk/sl/bump-plutus-ledger-api

8.2.0 version bumps
IntersectMBO · Jul 27, 2023 · 408d8ae · 408d8ae
2 parents 0f0a857 + b30697f
commit 408d8ae
Show file tree

Hide file tree

Showing 43 changed files with 197 additions and 193 deletions.
diff --git a/bench/cardano-topology/cardano-topology.cabal b/bench/cardano-topology/cardano-topology.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-topology
-version:                8.1.0
+version:                8.2.0
 synopsis:               A cardano topology generator
 description:            A cardano topology generator.
 category:               Cardano,
@@ -37,6 +37,6 @@ executable cardano-topology
                       , bytestring
                       , containers
                       , graphviz
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
                       , split
                       , text
diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   locli
-version:                1.29
+version:                1.30
 synopsis:               Cardano log analysis CLI
 description:            Cardano log analysis CLI.
 category:               Cardano,
@@ -116,7 +116,7 @@ library
                       , ghc
                       , gnuplot
                       , iohk-monitoring
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
                       , optparse-generic
                       , ouroboros-consensus
                       -- for Data.SOP.Strict:
@@ -155,7 +155,7 @@ executable locli
   build-depends:        aeson
                       , cardano-prelude
                       , locli
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
                       , text
                       , text-short
                       , transformers

diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal
@@ -1,6 +1,6 @@
 cabal-version:          3.0
 name:                   plutus-scripts-bench
-version:                1.0.0.0
+version:                1.0.0.1
 synopsis:               Plutus scripts used for benchmarking
 description:            Plutus scripts used for benchmarking.
 category:               Cardano,
@@ -100,5 +100,5 @@ executable gen-plutus
   build-depends:        base >=4.12 && <5
                       , bytestring
                       , filepath
-                      , optparse-applicative >= 0.16.0 && < 0.16.1
+                      , optparse-applicative
                       , plutus-scripts-bench
diff --git a/bench/trace-analyzer/trace-analyzer.cabal b/bench/trace-analyzer/trace-analyzer.cabal
@@ -40,7 +40,7 @@ executable trace-analyzer
   main-is:              trace-analyzer.hs
 
   build-depends:        aeson
-                      , optparse-applicative >= 0.16.0 && < 0.16.1
+                      , optparse-applicative
                       , text
                       , containers
                       , attoparsec

diff --git a/bench/tx-generator/src/Cardano/Benchmarking/OuroborosImports.hs b/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 (SigningKeyFile)
+import           Cardano.CLI.Types.Legacy (SigningKeyFile)
 
 import           Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlots (..),
                    LocalNodeConnectInfo (..), NetworkId (..), PaymentKey, SigningKey, SocketPath,

diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Setup/NixService.hs b/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 (FileDirection (..), SigningKeyFile)
+import           Cardano.CLI.Types.Legacy (FileDirection (..), SigningKeyFile)
 import           Cardano.Node.Configuration.NodeAddress (NodeIPv4Address)
 import           Cardano.Node.Types (AdjustFilePaths (..))
 

diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs b/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.Shelley.Run.Read (readFileScriptInAnyLang)
+import           Cardano.CLI.Run.Legacy.Read (readFileScriptInAnyLang)
 
 import           Cardano.Api
 import           Cardano.Api.Shelley (PlutusScript (..), ProtocolParameters (..), fromAlonzoExUnits,

diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Setup/SigningKey.hs b/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 (SigningKeyFile)
+import           Cardano.CLI.Types.Legacy (SigningKeyFile)
 
 import           Cardano.TxGenerator.Types (TxGenError (..))
 

diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   tx-generator
-version:                2.5
+version:                2.6
 synopsis:               A transaction workload generator for Cardano clusters
 description:            A transaction workload generator for Cardano clusters.
 category:               Cardano,
@@ -99,7 +99,7 @@ library
                       , bytestring
                       , cardano-api ^>= 8.8
                       , cardano-binary
-                      , cardano-cli ^>= 8.3
+                      , cardano-cli ^>= 8.4
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data
@@ -122,7 +122,7 @@ library
                       , mtl
                       , network
                       , network-mux
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
                       , ouroboros-consensus >= 0.6
                       , ouroboros-consensus-cardano >= 0.5
                       , ouroboros-consensus-diffusion >= 0.7.0
@@ -192,9 +192,9 @@ test-suite tx-generator-apitest
                       , aeson
                       , bytestring
                       , filepath
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
                       , cardano-api ^>= 8.8
-                      , cardano-cli ^>= 8.3
+                      , cardano-cli ^>= 8.4
                       , cardano-node
                       , plutus-tx
                       , transformers
@@ -208,9 +208,9 @@ test-suite tx-generator-apitest
                      , aeson
                      , bytestring
                      , filepath
-                     , optparse-applicative-fork ^>= 0.16.1
+                     , optparse-applicative-fork
                      , cardano-api ^>= 8.8
-                     , cardano-cli ^>= 8.3
+                     , cardano-cli ^>= 8.4
                      , cardano-node
                      , transformers
                      , transformers-except

diff --git a/cabal.project b/cabal.project
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2023-07-21T10:12:20Z
-  , cardano-haskell-packages 2023-07-21T12:48:43Z
+  , hackage.haskell.org 2023-07-27T01:34:31Z
+  , cardano-haskell-packages 2023-07-27T07:20:05Z
 
 packages:
   cardano-client-demo
@@ -38,6 +38,8 @@ package cardano-api
 
 package cardano-cli
   ghc-options: -Werror
+  -- TODO delete the following when the warning is fixed
+  ghc-options: -Wno-redundant-constraints
 
 package cardano-client-demo
   ghc-options: -Werror
@@ -106,10 +108,6 @@ allow-newer:
   text,
   ekg-forward
 
-constraints:
-  optparse-applicative >= 0.16.0 && < 0.16.1,
-  cardano-api < 8.8.1
-
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
diff --git a/cardano-client-demo/cardano-client-demo.cabal b/cardano-client-demo/cardano-client-demo.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-client-demo
-version:                0.1.0.0
+version:                0.1.0.1
 synopsis:               A simple demo cardano-node client application
 description:            This is intended to demonstrate how to write simple
                         applications that interact with the cardano-node,
@@ -102,7 +102,7 @@ executable stake-credential-history
                         containers,
                         FailT,
                         microlens,
-                        optparse-applicative >= 0.16.0 && < 0.16.1,
+                        optparse-applicative,
                         ouroboros-consensus-cardano,
                         text,
                         transformers,

diff --git a/cardano-node-capi/cardano-node-capi.cabal b/cardano-node-capi/cardano-node-capi.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node-capi
-version:                0.1.0.0
+version:                0.1.0.1
 synopsis:               FFI C library for Cardano
 description:            ffi c library around the full node.
 category:               Cardano,
@@ -24,5 +24,5 @@ library
                       , aeson                         >= 2.1.0.0
                       , bytestring
                       , cardano-node
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
   hs-source-dirs:       src
diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node-chairman
-version:                8.1.0
+version:                8.2.0
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,
@@ -49,7 +49,7 @@ executable cardano-node-chairman
                       , containers
                       , contra-tracer
                       , io-classes
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
                       , ouroboros-consensus >= 0.6
                       , ouroboros-network-api >= 0.3
                       , ouroboros-network-protocols >= 0.5

diff --git a/cardano-node/ChangeLog.md b/cardano-node/ChangeLog.md
@@ -1,6 +1,6 @@
 # Changelog for cardano-node
 
-# next version
+# 8.2.0 -- July 2023
 
 ### node changes
 
@@ -12,9 +12,18 @@
   `valency` flag.
 - Added `warmValency` optional to P2P Topology files.
 
-## 8.1.0
+## 8.1.2 -- July 2023
 
--
+- Update plutus interpreter
+
+## 8.1.1 -- June 2023
+
+- Address P2P Topology bug with non-DNS names in networking
+
+## 8.1.0 -- June 2023
+
+- Support Conway Era when ExperimentalHardForks enabled
+- `TickF` changes to improve epoch boundary
 
 ## 8.0.0 -- May 2023
 

diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node
-version:                8.1.1
+version:                8.2.0
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,
@@ -174,7 +174,7 @@ library
                       , network
                       , network-mux >= 0.4
                       , nothunks
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
                       , ouroboros-consensus >= 0.9
                       , ouroboros-consensus-cardano >= 0.7
                       , ouroboros-consensus-diffusion >= 0.7
@@ -221,7 +221,7 @@ executable cardano-node
                       , cardano-crypto-class
                       , cardano-git-rev
                       , cardano-node
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
                       , text >= 2.0
 
 test-suite cardano-node-test

diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-submit-api
-version:                3.1.2
+version:                3.1.3
 synopsis:               A web server that allows transactions to be POSTed to the cardano chain
 description:            A web server that allows transactions to be POSTed to the cardano chain.
 homepage:               https://github.com/input-output-hk/cardano-node
@@ -41,15 +41,15 @@ library
                       , bytestring
                       , cardano-api ^>= 8.8
                       , cardano-binary
-                      , cardano-cli ^>= 8.3
+                      , cardano-cli ^>= 8.4
                       , cardano-crypto-class ^>= 2.1
                       , cardano-ledger-byron ^>= 1.0
                       , formatting
                       , http-media
                       , iohk-monitoring
                       , mtl
                       , network
-                      , optparse-applicative-fork ^>= 0.16.1
+                      , optparse-applicative-fork
                       , ouroboros-consensus-cardano
                       , ouroboros-network ^>= 0.8.2.0
                       , ouroboros-network-protocols
@@ -85,8 +85,8 @@ executable cardano-submit-api
   hs-source-dirs:       app
   ghc-options:          -threaded -rtsopts "-with-rtsopts=-T -I0"
   build-depends:        base >= 4.14 && < 4.17
-                      , optparse-applicative-fork ^>= 0.16.1
-                      , cardano-cli ^>= 8.3
+                      , optparse-applicative-fork
+                      , cardano-cli ^>= 8.4
                       , cardano-crypto-class ^>= 2.1
                       , cardano-submit-api
 

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/CLI/Parsers.hs b/cardano-submit-api/src/Cardano/TxSubmit/CLI/Parsers.hs
@@ -9,8 +9,8 @@ module Cardano.TxSubmit.CLI.Parsers
 
 import           Cardano.Api (File (..), SocketPath)
 
-import           Cardano.CLI.Common.Parsers
 import           Cardano.CLI.Environment (EnvCli (..))
+import           Cardano.CLI.EraBased.Options.Common
 
 import           Cardano.TxSubmit.CLI.Types (ConfigFile (..), TxSubmitNodeParams (..))
 import           Cardano.TxSubmit.Rest.Parsers (pWebserverConfig)

diff --git a/cardano-testnet/app/cardano-testnet.hs b/cardano-testnet/app/cardano-testnet.hs
@@ -1,5 +1,6 @@
 module Main where
 
+import           Cardano.CLI.Environment (getEnvCli)
 import qualified Cardano.Crypto.Init as Crypto
 
 import qualified Options.Applicative as Opt
@@ -10,5 +11,6 @@ main :: IO ()
 main = do
   Crypto.cryptoInit
 
-  tNetCmd <- Opt.customExecParser pref opts
+  envCli <- getEnvCli
+  tNetCmd <- Opt.customExecParser pref (opts envCli)
   runTestnetCmd tNetCmd