Rebase and update SRPs

Author: aniketd

cabal.project

@@ -84,12 +84,23 @@ source-repository-package
   --sha256: sha256-TDEBINZ3SkhpRNomMdt53bR3gdzgkWR9jIlAr8yrU6o=
   subdir:
       cardano-crypto-class
+      cardano-slotting
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/plutus
+  tag: be9ccfc7f8ecc6ebc577dcf3374a30530ecdb168
+  --sha256: sha256-R7t5Luc1d9l2tXKg5Jgqye+vQAEONwCrQ9/JDkFCu9M=
+  subdir:
+    plutus-core
+    plutus-ledger-api
+    plutus-tx
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: 0d750d882181b12fad62ff28de056ee85c7e0c0e
-  --sha256: sha256-LLp+FHSuVG2IsnXDv0aGMRaX19+trs5AT1gql6oji0U=
+  tag: f5b35692b4d92d664187781a98b7af3fab445bad
+  --sha256: sha256-krYzn7ct6S52bGLC8vs5/pL421UbP0+jVjxwUhOcbcA=
   subdir:
       eras/allegra/impl
       eras/alonzo/impl
@@ -123,29 +134,19 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-consensus
-  tag: c97a657928adaebccf5f38484e910843af8c59e7
-  --sha256: sha256-LG29k3Ii3+yxkKskTjwlVZ99LJSzuWzUJYjDC5thyiw=
+  tag: 1e2c0fed8e81c15575bf3cd3aaa9b6efde328d8d
+  --sha256: sha256-osyNYXxJqg4MS6ISXtEneuYRb0xBIr5ztGmxvMyGTL4=
   subdir:
     ouroboros-consensus
     ouroboros-consensus-cardano
     ouroboros-consensus-protocol
     ouroboros-consensus-diffusion
 
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/plutus
-  tag: be9ccfc7f8ecc6ebc577dcf3374a30530ecdb168
-  --sha256: sha256-R7t5Luc1d9l2tXKg5Jgqye+vQAEONwCrQ9/JDkFCu9M=
-  subdir:
-    plutus-core
-    plutus-ledger-api
-    plutus-tx
-
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-api
-  tag: 21c3b09c461659008a93dd0b84aeb50de5b751c0
-  --sha256: sha256-zvK4qiEQlokkZvleEHEcZGUk5KTLbKL5dV195cJ6IxE=
+  tag: de211cac855cf7e9e1bcd668a86bc121057efcc1
+  --sha256: sha256-PX/NITXB65xIIS1enOeHbVZCq0CAksVM1kq24Uco1pg=
   subdir:
     cardano-api
     cardano-api-gen

cardano-cli/cardano-cli.cabal

@@ -245,7 +245,7 @@ library
     cardano-git-rev ^>=0.2.2,
     cardano-ledger-api,
     cardano-ledger-core,
-    cardano-ping ^>=0.7,
+    cardano-ping ^>=0.8,
     cardano-prelude,
     cardano-protocol-tpraos,
     cardano-slotting ^>=0.2.0.0,

cardano-cli/src/Cardano/CLI/Compatible/StakePool/Run.hs

@@ -110,7 +110,7 @@ runStakePoolRegistrationCertificateCmd
 createStakePoolRegistrationRequirements
   :: ()
   => ShelleyBasedEra era
-  -> L.PoolParams (L.EraCrypto (ShelleyLedgerEra era))
+  -> L.PoolParams
   -> StakePoolRegistrationRequirements era
 createStakePoolRegistrationRequirements sbe pparams =
   caseShelleyToBabbageOrConwayEraOnwards

cardano-cli/src/Cardano/CLI/EraBased/Common/Option.hs

@@ -32,10 +32,10 @@ import Cardano.CLI.EraBased.Script.Withdrawal.Type (CliWithdrawalScriptRequireme
 import Cardano.CLI.EraBased.Script.Withdrawal.Type qualified as Withdrawal
 import Cardano.CLI.Parser
 import Cardano.CLI.Read
-import Cardano.CLI.Types.Common
-import Cardano.CLI.Types.Governance
-import Cardano.CLI.Types.Key
-import Cardano.CLI.Types.Key.VerificationKey
+import Cardano.CLI.Type.Common
+import Cardano.CLI.Type.Governance
+import Cardano.CLI.Type.Key
+import Cardano.CLI.Type.Key.VerificationKey
 import Cardano.Ledger.BaseTypes (NonZero, nonZero)
 
 import Control.Monad (void, when)

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

@@ -23,10 +23,9 @@ import Cardano.CLI.EraBased.Governance.Actions.Command qualified as Cmd
 import Cardano.CLI.EraIndependent.Hash.Internal.Common (getByteStringFromURL, httpsAndIpfsSchemes)
 import Cardano.CLI.Json.Friendly
 import Cardano.CLI.Read
-import Cardano.CLI.Run.Hash (getByteStringFromURL, httpsAndIpfsSchemes)
 import Cardano.CLI.Type.Common
-import Cardano.CLI.Type.Errors.GovernanceActionsError
-import Cardano.CLI.Type.Errors.HashCmdError (FetchURLError)
+import Cardano.CLI.Type.Error.GovernanceActionsError
+import Cardano.CLI.Type.Error.HashCmdError (FetchURLError)
 import Cardano.CLI.Type.Key
 import Cardano.Ledger.Hashes qualified as L
 

cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Internal/Common.hs

@@ -24,6 +24,7 @@ import Cardano.CLI.Type.Common
   , SupportedSchemes
   )
 import Cardano.CLI.Type.Error.HashCmdError
+import Cardano.Ledger.Hashes qualified as L (hashAnnotated)
 import Cardano.Prelude (first)
 
 import Control.Exception (throw)

cardano-cli/src/Cardano/CLI/EraIndependent/Hash/Run.hs

@@ -23,6 +23,7 @@ import Cardano.CLI.Type.Common
 import Cardano.CLI.Type.Error.HashCmdError
 import Cardano.Crypto.Hash (hashToTextAsHex)
 import Cardano.Crypto.Hash qualified as Crypto
+import Cardano.Ledger.Hashes qualified as L
 import Cardano.Prelude (ByteString)
 
 import Data.ByteString qualified as BS
@@ -57,7 +58,7 @@ runHashAnchorDataCmd Cmd.HashAnchorDataCmdArgs{toHash, hashGoal} = do
       Cmd.AnchorDataHashSourceText text -> return $ Text.encodeUtf8 text
       Cmd.AnchorDataHashSourceURL urlText ->
         fetchURLToHashCmdError $ getByteStringFromURL allSchemes $ L.urlToText urlText
-  let hash = L.hashAnchorData anchorData
+  let hash = L.hashAnnotated anchorData
   case hashGoal of
     Cmd.CheckHash expectedHash
       | hash /= expectedHash ->
@@ -67,7 +68,7 @@ runHashAnchorDataCmd Cmd.HashAnchorDataCmdArgs{toHash, hashGoal} = do
     Cmd.HashToFile outFile -> writeHash (Just outFile) hash
     Cmd.HashToStdout -> writeHash Nothing hash
  where
-  writeHash :: Maybe (File () Out) -> L.SafeHash L.StandardCrypto i -> ExceptT HashCmdError IO ()
+  writeHash :: Maybe (File () Out) -> L.SafeHash i -> ExceptT HashCmdError IO ()
   writeHash mOutFile hash = do
     firstExceptT HashWriteFileError $
       newExceptT $

cardano-cli/src/Cardano/CLI/Orphan.hs

@@ -12,13 +12,18 @@ import Cardano.Api
 import Cardano.Api.Ledger qualified as L
 import Cardano.Api.Shelley (VotesMergingConflict, scriptDataToJsonDetailedSchema)
 
+import Cardano.Ledger.CertState qualified as L
+
 import Data.Aeson
 
 instance Error (VotesMergingConflict era) where
   prettyError = pretty . show
 
 -- TODO upstream this orphaned instance to the ledger
-instance (L.EraTxOut ledgerera, L.EraGov ledgerera) => ToJSON (L.NewEpochState ledgerera) where
+instance
+  (L.EraTxOut ledgerera, L.EraGov ledgerera, L.EraCertState ledgerera)
+  => ToJSON (L.NewEpochState ledgerera)
+  where
   toJSON (L.NewEpochState nesEL nesBprev nesBCur nesEs nesRu nesPd _stashedAvvm) =
     object
       [ "currentEpoch" .= nesEL