Merge pull request #247 from input-output-hk/coot/cardano-ledger-conw…

…ay-1.8

Update cardano-cli to newer cardano-ledger

.github/workflows/haskell.yml

@@ -20,7 +20,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-08-29"
+      CABAL_CACHE_VERSION: "2023-09-12"
 
     concurrency:
       group: >

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-08T19:56:09Z
-  , cardano-haskell-packages 2023-09-06T08:30:00Z
+  , cardano-haskell-packages 2023-09-12T15:59:42Z
 
 packages:
   cardano-cli
@@ -43,4 +43,3 @@ write-ghc-environment-files: always
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
-

cardano-cli/cardano-cli.cabal

@@ -200,11 +200,11 @@ library
                       , binary
                       , bytestring
                       , canonical-json
-                      , cardano-api ^>= 8.19
+                      , cardano-api ^>= 8.20
                       , cardano-binary
                       , cardano-crypto
                       , cardano-crypto-class ^>= 2.1.2
-                      , cardano-crypto-wrapper ^>= 1.5
+                      , cardano-crypto-wrapper ^>= 1.5.1
                       , cardano-data >= 1.0
                       , cardano-git-rev
                       , cardano-ledger-alonzo >= 1.3.1.1
@@ -248,7 +248,6 @@ library
                       , transformers-except ^>= 0.1.3
                       , unliftio-core
                       , utf8-string
-                      , vector
                       , yaml
 
 executable cardano-cli
@@ -290,11 +289,11 @@ test-suite cardano-cli-test
                       , base16-bytestring
                       , bech32 >= 1.1.0
                       , bytestring
-                      , cardano-api:{cardano-api, internal} ^>= 8.19
+                      , cardano-api:{cardano-api, internal}
                       , cardano-api-gen ^>= 8.2.0.0
                       , cardano-cli
                       , cardano-cli:cardano-cli-test-lib
-                      , cardano-slotting ^>= 0.1
+                      , cardano-slotting
                       , containers
                       , filepath
                       , hedgehog
@@ -334,12 +333,12 @@ test-suite cardano-cli-golden
   build-depends:        aeson >= 1.5.6.0
                       , base16-bytestring
                       , bytestring
-                      , cardano-api:{cardano-api, gen} ^>= 8.19
+                      , cardano-api:{cardano-api, gen}
                       , cardano-binary
                       , cardano-cli
                       , cardano-cli:cardano-cli-test-lib
-                      , cardano-crypto-wrapper ^>= 1.5.1
-                      , cardano-ledger-byron ^>= 1.0.0.2
+                      , cardano-crypto-wrapper
+                      , cardano-ledger-byron
                       , cborg
                       , containers
                       , filepath

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Query.hs

@@ -112,7 +112,9 @@ runQueryDRepStakeDistribution w (DRepStakeDistributionQueryCmd socketPath (AnyCo
       cEra = conwayEraOnwardsToCardanoEra w
       cMode = consensusModeOnly cModeParams
 
-  let drepFromVrfKey = fmap Ledger.DRepCredential . firstExceptT GovernanceQueryDRepKeyError . getDRepCredentialFromVerKeyHashOrFile
+  let drepFromVrfKey = fmap Ledger.DRepCredential
+                     . firstExceptT GovernanceQueryDRepKeyError
+                     . getDRepCredentialFromVerKeyHashOrFile
   dreps <- Set.fromList <$> mapM drepFromVrfKey drepKeys
 
   eraInMode <- toEraInMode cEra cMode

cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs

@@ -32,6 +32,7 @@ module Cardano.CLI.EraBased.Run.Query
   , DelegationsAndRewards(..)
   , renderQueryCmdError
   , renderLocalStateQueryError
+  , renderOpCertIntervalInformation
   , percentage
   ) where
 
@@ -78,13 +79,11 @@ import           Control.Monad.Trans.Except
 import           Control.Monad.Trans.Except.Extra
 import           Data.Aeson as Aeson
 import           Data.Aeson.Encode.Pretty (encodePretty)
-import           Data.Aeson.Types as Aeson
 import           Data.Bifunctor (Bifunctor (..))
 import qualified Data.ByteString.Lazy.Char8 as LBS
 import           Data.Coerce (coerce)
 import           Data.Function ((&))
 import           Data.Functor ((<&>))
-import           Data.List (nub)
 import qualified Data.List as List
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
@@ -97,7 +96,6 @@ import qualified Data.Text.Encoding as Text
 import qualified Data.Text.IO as T
 import qualified Data.Text.IO as Text
 import           Data.Time.Clock
-import qualified Data.Vector as Vector
 import           Numeric (showEFloat)
 import           Prettyprinter
 import qualified System.IO as IO
@@ -1198,62 +1196,6 @@ printStakeDistribution stakeDistrib = do
        , showEFloat (Just 3) (fromRational stakeFraction :: Double) ""
        ]
 
--- | A mapping of Shelley reward accounts to both the stake pool that they
--- delegate to and their reward account balance.
--- TODO: Move to cardano-api
-newtype DelegationsAndRewards
-  = DelegationsAndRewards (Map StakeAddress Lovelace, Map StakeAddress PoolId)
-    deriving (Eq, Show)
-
-
-mergeDelegsAndRewards :: DelegationsAndRewards -> [(StakeAddress, Maybe Lovelace, Maybe PoolId)]
-mergeDelegsAndRewards (DelegationsAndRewards (rewardsMap, delegMap)) =
- [ (stakeAddr, Map.lookup stakeAddr rewardsMap, Map.lookup stakeAddr delegMap)
- | stakeAddr <- nub $ Map.keys rewardsMap ++ Map.keys delegMap
- ]
-
-
-instance ToJSON DelegationsAndRewards where
-  toJSON delegsAndRwds =
-      Aeson.Array . Vector.fromList
-        . map delegAndRwdToJson $ mergeDelegsAndRewards delegsAndRwds
-    where
-      delegAndRwdToJson :: (StakeAddress, Maybe Lovelace, Maybe PoolId) -> Aeson.Value
-      delegAndRwdToJson (addr, mRewards, mPoolId) =
-        Aeson.object
-          [ "address" .= addr
-          , "delegation" .= mPoolId
-          , "rewardAccountBalance" .= mRewards
-          ]
-
-instance FromJSON DelegationsAndRewards where
-  parseJSON = withArray "DelegationsAndRewards" $ \arr -> do
-    let vals = Vector.toList arr
-    decoded <- mapM decodeObject vals
-    pure $ zipper decoded
-    where
-      zipper :: [(StakeAddress, Maybe Lovelace, Maybe PoolId)]
-              -> DelegationsAndRewards
-      zipper l = do
-        let maps = [ ( maybe mempty (Map.singleton sa) delegAmt
-                     , maybe mempty (Map.singleton sa) mPool
-                     )
-                   | (sa, delegAmt, mPool) <- l
-                   ]
-        DelegationsAndRewards
-          $ foldl
-              (\(amtA, delegA) (amtB, delegB) -> (amtA <> amtB, delegA <> delegB))
-              (mempty, mempty)
-              maps
-
-      decodeObject :: Aeson.Value
-                   -> Aeson.Parser (StakeAddress, Maybe Lovelace, Maybe PoolId)
-      decodeObject  = withObject "DelegationsAndRewards" $ \o -> do
-        address <- o .: "address"
-        delegation <- o .:? "delegation"
-        rewardAccountBalance <- o .:? "rewardAccountBalance"
-        pure (address, rewardAccountBalance, delegation)
-
 runQueryLeadershipScheduleCmd
   :: SocketPath
   -> AnyConsensusModeParams

cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs

@@ -242,7 +242,7 @@ runTxBuildCmd
             & onLeft (left . TxCmdQueryConvenienceError . AcqFailure)
             & onLeft (left . TxCmdQueryConvenienceError . QceUnsupportedNtcVersion)
 
-          (nodeEraUTxO, _, eraHistory, systemStart, _, _) <-
+          (nodeEraUTxO, _, eraHistory, systemStart, _, _, _) <-
             lift (executeLocalStateQueryExpr localNodeConnInfo Nothing (queryStateForBalancedTx nodeEra allTxInputs []))
               & onLeft (left . TxCmdQueryConvenienceError . AcqFailure)
               & onLeft (left . TxCmdQueryConvenienceError)
@@ -566,7 +566,7 @@ runTxBuild
               TxCertificates _ cs _ -> cs
               _ -> []
 
-      (txEraUtxo, pparams, eraHistory, systemStart, stakePools, stakeDelegDeposits) <-
+      (txEraUtxo, pparams, eraHistory, systemStart, stakePools, stakeDelegDeposits, drepDelegDeposits) <-
         lift (executeLocalStateQueryExpr localNodeConnInfo Nothing $ queryStateForBalancedTx nodeEra allTxInputs certs)
           & onLeft (left . TxCmdQueryConvenienceError . AcqFailure)
           & onLeft (left . TxCmdQueryConvenienceError)
@@ -611,8 +611,8 @@ runTxBuild
         firstExceptT TxCmdBalanceTxBody
           . hoistEither
           $ makeTransactionBodyAutoBalance systemStart (toLedgerEpochInfo eraHistory)
-                                           pparams stakePools stakeDelegDeposits txEraUtxo
-                                           txBodyContent cAddr mOverrideWits
+                                           pparams stakePools stakeDelegDeposits drepDelegDeposits
+                                           txEraUtxo txBodyContent cAddr mOverrideWits
 
       liftIO $ putStrLn $ "Estimated transaction fee: " <> (show fee :: String)
 

cardano-cli/test/cardano-cli-test/Test/Cli/JSON.hs

@@ -8,7 +8,6 @@ module Test.Cli.JSON
 
 import           Cardano.Api.Shelley
 
-import           Cardano.CLI.EraBased.Run.Query
 import           Cardano.CLI.Types.Common
 import           Cardano.CLI.Types.Output (QueryKesPeriodInfoOutput (..), createOpCertIntervalInfo)