Build cardano-api

Author: aniketd

cardano-api/cardano-api.cabal

@@ -394,6 +394,7 @@ test-suite cardano-api-golden
     cardano-ledger-core:{cardano-ledger-core, testlib} >=1.14,
     cardano-ledger-shelley,
     cardano-ledger-shelley-test >=1.2.0.1,
+    cardano-protocol-tpraos,
     cardano-slotting ^>=0.2.0.0,
     containers,
     errors,

cardano-api/src/Cardano/Api/Internal/Address.hs

@@ -106,7 +106,6 @@ import Cardano.Chain.Common qualified as Byron
 import Cardano.Ledger.Address qualified as Shelley
 import Cardano.Ledger.BaseTypes qualified as Shelley
 import Cardano.Ledger.Credential qualified as Shelley
-import Cardano.Ledger.Crypto (StandardCrypto)
 import Cardano.Ledger.Plutus.TxInfo qualified as Plutus
 import PlutusLedgerApi.V1 qualified as PlutusAPI
 
@@ -188,8 +187,8 @@ data Address addrtype where
   -- in Shelley era and are thus supported from the Shelley era onwards
   ShelleyAddress
     :: Shelley.Network
-    -> Shelley.PaymentCredential StandardCrypto
-    -> Shelley.StakeReference StandardCrypto
+    -> Shelley.PaymentCredential
+    -> Shelley.StakeReference
     -> Address ShelleyAddr
 
 -- Note that the two ledger credential types here are parametrised by
@@ -231,7 +230,7 @@ instance SerialiseAsRawBytes (Address ByronAddr) where
       $ addr
 
   deserialiseFromRawBytes (AsAddress AsByronAddr) bs =
-    case Shelley.decodeAddr bs :: Maybe (Shelley.Addr StandardCrypto) of
+    case Shelley.decodeAddr bs :: Maybe Shelley.Addr of
       Nothing -> Left (SerialiseAsRawBytesError "Unable to deserialise Address ByronAddr")
       Just Shelley.Addr{} -> Left (SerialiseAsRawBytesError "Unable to deserialise Address ByronAddr")
       Just (Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)) ->
@@ -352,7 +351,7 @@ instance SerialiseAddress AddressAny where
     (AddressByron <$> deserialiseAddress (AsAddress AsByronAddr) t)
       <|> (AddressShelley <$> deserialiseAddress (AsAddress AsShelleyAddr) t)
 
-fromShelleyAddrToAny :: Shelley.Addr StandardCrypto -> AddressAny
+fromShelleyAddrToAny :: Shelley.Addr -> AddressAny
 fromShelleyAddrToAny (Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)) =
   AddressByron $ ByronAddress addr
 fromShelleyAddrToAny (Shelley.Addr nw pc scr) =
@@ -531,7 +530,7 @@ makeShelleyAddressInEra sbe nw pc scr =
 data StakeAddress where
   StakeAddress
     :: Shelley.Network
-    -> Shelley.StakeCredential StandardCrypto
+    -> Shelley.StakeCredential
     -> StakeAddress
   deriving (Eq, Ord, Show)
 
@@ -634,7 +633,7 @@ shelleyPayAddrToPlutusPubKHash (ShelleyAddress _ payCred _) =
 -- Internal conversion functions
 --
 
-toShelleyAddr :: AddressInEra era -> Shelley.Addr StandardCrypto
+toShelleyAddr :: AddressInEra era -> Shelley.Addr
 toShelleyAddr (AddressInEra ByronAddressInAnyEra (ByronAddress addr)) =
   Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)
 toShelleyAddr
@@ -644,7 +643,7 @@ toShelleyAddr
     ) =
     Shelley.Addr nw pc scr
 
-toShelleyStakeAddr :: StakeAddress -> Shelley.RewardAccount StandardCrypto
+toShelleyStakeAddr :: StakeAddress -> Shelley.RewardAccount
 toShelleyStakeAddr (StakeAddress nw sc) =
   Shelley.RewardAccount
     { Shelley.raNetwork = nw
@@ -653,23 +652,23 @@ toShelleyStakeAddr (StakeAddress nw sc) =
 
 toShelleyPaymentCredential
   :: PaymentCredential
-  -> Shelley.PaymentCredential StandardCrypto
+  -> Shelley.PaymentCredential
 toShelleyPaymentCredential (PaymentCredentialByKey (PaymentKeyHash kh)) =
   Shelley.KeyHashObj kh
 toShelleyPaymentCredential (PaymentCredentialByScript sh) =
   Shelley.ScriptHashObj (toShelleyScriptHash sh)
 
 toShelleyStakeCredential
   :: StakeCredential
-  -> Shelley.StakeCredential StandardCrypto
+  -> Shelley.StakeCredential
 toShelleyStakeCredential (StakeCredentialByKey (StakeKeyHash kh)) =
   Shelley.KeyHashObj kh
 toShelleyStakeCredential (StakeCredentialByScript sh) =
   Shelley.ScriptHashObj (toShelleyScriptHash sh)
 
 toShelleyStakeReference
   :: StakeAddressReference
-  -> Shelley.StakeReference StandardCrypto
+  -> Shelley.StakeReference
 toShelleyStakeReference (StakeAddressByValue stakecred) =
   Shelley.StakeRefBase (toShelleyStakeCredential stakecred)
 toShelleyStakeReference (StakeAddressByPointer ptr) =
@@ -680,7 +679,7 @@ toShelleyStakeReference NoStakeAddress =
 fromShelleyAddrIsSbe
   :: ()
   => ShelleyBasedEra era
-  -> Shelley.Addr StandardCrypto
+  -> Shelley.Addr
   -> AddressInEra era
 fromShelleyAddrIsSbe sbe = \case
   Shelley.AddrBootstrap (Shelley.BootstrapAddress addr) ->
@@ -690,7 +689,7 @@ fromShelleyAddrIsSbe sbe = \case
 
 fromShelleyAddr
   :: ShelleyBasedEra era
-  -> Shelley.Addr StandardCrypto
+  -> Shelley.Addr
   -> AddressInEra era
 fromShelleyAddr _ (Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)) =
   AddressInEra ByronAddressInAnyEra (ByronAddress addr)
@@ -699,27 +698,27 @@ fromShelleyAddr sBasedEra (Shelley.Addr nw pc scr) =
     (ShelleyAddressInEra sBasedEra)
     (ShelleyAddress nw pc scr)
 
-fromShelleyStakeAddr :: Shelley.RewardAccount StandardCrypto -> StakeAddress
+fromShelleyStakeAddr :: Shelley.RewardAccount -> StakeAddress
 fromShelleyStakeAddr (Shelley.RewardAccount nw sc) = StakeAddress nw sc
 
 fromShelleyStakeCredential
-  :: Shelley.StakeCredential StandardCrypto
+  :: Shelley.StakeCredential
   -> StakeCredential
 fromShelleyStakeCredential (Shelley.KeyHashObj kh) =
   StakeCredentialByKey (StakeKeyHash kh)
 fromShelleyStakeCredential (Shelley.ScriptHashObj sh) =
   StakeCredentialByScript (fromShelleyScriptHash sh)
 
 fromShelleyPaymentCredential
-  :: Shelley.PaymentCredential StandardCrypto
+  :: Shelley.PaymentCredential
   -> PaymentCredential
 fromShelleyPaymentCredential (Shelley.KeyHashObj kh) =
   PaymentCredentialByKey (PaymentKeyHash kh)
 fromShelleyPaymentCredential (Shelley.ScriptHashObj sh) =
   PaymentCredentialByScript (ScriptHash sh)
 
 fromShelleyStakeReference
-  :: Shelley.StakeReference StandardCrypto
+  :: Shelley.StakeReference
   -> StakeAddressReference
 fromShelleyStakeReference (Shelley.StakeRefBase stakecred) =
   StakeAddressByValue (fromShelleyStakeCredential stakecred)

cardano-api/src/Cardano/Api/Internal/Anchor.hs

@@ -5,8 +5,7 @@ module Cardano.Api.Internal.Anchor
 where
 
 import Cardano.Ledger.BaseTypes qualified as L
-import Cardano.Ledger.Crypto qualified as Crypto
-import Cardano.Ledger.SafeHash qualified as L
+import Cardano.Ledger.Hashes qualified as L
 
 -- | The URL to build the anchor to pass to DRep registration certificate
 newtype AnchorUrl = AnchorUrl
@@ -16,6 +15,6 @@ newtype AnchorUrl = AnchorUrl
 
 -- | The hash to build the anchor to pass to DRep registration certificate
 newtype AnchorDataHash = AnchorDataHash
-  { unAnchorDataHash :: L.SafeHash Crypto.StandardCrypto L.AnchorData
+  { unAnchorDataHash :: L.SafeHash L.AnchorData
   }
   deriving (Eq, Show)

cardano-api/src/Cardano/Api/Internal/Block.hs

@@ -63,9 +63,9 @@ import Cardano.Api.Internal.Tx.Sign
 
 import Cardano.Crypto.Hash.Class qualified as Crypto
 import Cardano.Crypto.Hashing qualified
-import Cardano.Ledger.Api qualified as L
 import Cardano.Ledger.Block qualified as Ledger
 import Cardano.Ledger.Core qualified as Ledger
+import Cardano.Protocol.Crypto qualified as L
 import Cardano.Slotting.Block (BlockNo)
 import Cardano.Slotting.Slot (EpochNo, SlotNo, WithOrigin (..))
 import Ouroboros.Consensus.Block qualified as Consensus

cardano-api/src/Cardano/Api/Internal/Certificate.hs

@@ -90,7 +90,6 @@ import Cardano.Api.Internal.HasTypeProxy
 import Cardano.Api.Internal.Keys.Praos
 import Cardano.Api.Internal.Keys.Shelley
 import Cardano.Api.Internal.Pretty (Doc)
-import Cardano.Api.Internal.ReexposeLedger (EraCrypto, StandardCrypto)
 import Cardano.Api.Internal.ReexposeLedger qualified as Ledger
 import Cardano.Api.Internal.Script
 import Cardano.Api.Internal.SerialiseCBOR
@@ -295,7 +294,7 @@ data StakeDelegationRequirements era where
   StakeDelegationRequirementsConwayOnwards
     :: ConwayEraOnwards era
     -> StakeCredential
-    -> Ledger.Delegatee (EraCrypto (ShelleyLedgerEra era))
+    -> Ledger.Delegatee
     -> StakeDelegationRequirements era
   StakeDelegationRequirementsPreConway
     :: ShelleyToBabbageEra era
@@ -317,11 +316,11 @@ makeStakeAddressDelegationCertificate = \case
 data StakePoolRegistrationRequirements era where
   StakePoolRegistrationRequirementsConwayOnwards
     :: ConwayEraOnwards era
-    -> Ledger.PoolParams (EraCrypto (ShelleyLedgerEra era))
+    -> Ledger.PoolParams
     -> StakePoolRegistrationRequirements era
   StakePoolRegistrationRequirementsPreConway
     :: ShelleyToBabbageEra era
-    -> Ledger.PoolParams (EraCrypto (ShelleyLedgerEra era))
+    -> Ledger.PoolParams
     -> StakePoolRegistrationRequirements era
 
 makeStakePoolRegistrationCertificate
@@ -390,7 +389,7 @@ data MirCertificateRequirements era where
   MirCertificateRequirements
     :: ShelleyToBabbageEra era
     -> Ledger.MIRPot
-    -> Ledger.MIRTarget (EraCrypto (ShelleyLedgerEra era))
+    -> Ledger.MIRTarget
     -> MirCertificateRequirements era
 
 makeMIRCertificate
@@ -405,14 +404,14 @@ makeMIRCertificate (MirCertificateRequirements atMostEra mirPot mirTarget) =
 data DRepRegistrationRequirements era where
   DRepRegistrationRequirements
     :: ConwayEraOnwards era
-    -> (Ledger.Credential Ledger.DRepRole (EraCrypto (ShelleyLedgerEra era)))
+    -> (Ledger.Credential Ledger.DRepRole)
     -> L.Coin
     -> DRepRegistrationRequirements era
 
 makeDrepRegistrationCertificate
   :: ()
   => DRepRegistrationRequirements era
-  -> Maybe (Ledger.Anchor (EraCrypto (ShelleyLedgerEra era)))
+  -> Maybe Ledger.Anchor
   -> Certificate era
 makeDrepRegistrationCertificate (DRepRegistrationRequirements conwayOnwards vcred deposit) anchor =
   ConwayCertificate conwayOnwards
@@ -422,8 +421,8 @@ makeDrepRegistrationCertificate (DRepRegistrationRequirements conwayOnwards vcre
 data CommitteeHotKeyAuthorizationRequirements era where
   CommitteeHotKeyAuthorizationRequirements
     :: ConwayEraOnwards era
-    -> Ledger.Credential Ledger.ColdCommitteeRole (EraCrypto (ShelleyLedgerEra era))
-    -> Ledger.Credential Ledger.HotCommitteeRole (EraCrypto (ShelleyLedgerEra era))
+    -> Ledger.Credential Ledger.ColdCommitteeRole
+    -> Ledger.Credential Ledger.HotCommitteeRole
     -> CommitteeHotKeyAuthorizationRequirements era
 
 makeCommitteeHotKeyAuthorizationCertificate
@@ -438,8 +437,8 @@ makeCommitteeHotKeyAuthorizationCertificate (CommitteeHotKeyAuthorizationRequire
 data CommitteeColdkeyResignationRequirements era where
   CommitteeColdkeyResignationRequirements
     :: ConwayEraOnwards era
-    -> Ledger.Credential Ledger.ColdCommitteeRole (EraCrypto (ShelleyLedgerEra era))
-    -> Maybe (Ledger.Anchor (EraCrypto (ShelleyLedgerEra era)))
+    -> Ledger.Credential Ledger.ColdCommitteeRole
+    -> Maybe Ledger.Anchor
     -> CommitteeColdkeyResignationRequirements era
 
 makeCommitteeColdkeyResignationCertificate
@@ -456,7 +455,7 @@ makeCommitteeColdkeyResignationCertificate (CommitteeColdkeyResignationRequireme
 data DRepUnregistrationRequirements era where
   DRepUnregistrationRequirements
     :: ConwayEraOnwards era
-    -> (Ledger.Credential Ledger.DRepRole (EraCrypto (ShelleyLedgerEra era)))
+    -> (Ledger.Credential Ledger.DRepRole)
     -> L.Coin
     -> DRepUnregistrationRequirements era
 
@@ -473,7 +472,7 @@ makeStakeAddressAndDRepDelegationCertificate
   :: ()
   => ConwayEraOnwards era
   -> StakeCredential
-  -> Ledger.Delegatee (EraCrypto (ShelleyLedgerEra era))
+  -> Ledger.Delegatee
   -> L.Coin
   -> Certificate era
 makeStakeAddressAndDRepDelegationCertificate w cred delegatee deposit =
@@ -484,12 +483,12 @@ makeStakeAddressAndDRepDelegationCertificate w cred delegatee deposit =
 data DRepUpdateRequirements era where
   DRepUpdateRequirements
     :: ConwayEraOnwards era
-    -> Ledger.Credential Ledger.DRepRole (EraCrypto (ShelleyLedgerEra era))
+    -> Ledger.Credential Ledger.DRepRole
     -> DRepUpdateRequirements era
 
 makeDrepUpdateCertificate
   :: DRepUpdateRequirements era
-  -> Maybe (Ledger.Anchor (EraCrypto (ShelleyLedgerEra era)))
+  -> Maybe Ledger.Anchor
   -> Certificate era
 makeDrepUpdateCertificate (DRepUpdateRequirements conwayOnwards vcred) mAnchor =
   ConwayCertificate conwayOnwards
@@ -556,7 +555,7 @@ filterUnRegCreds =
         Ledger.UnRegTxCert cred -> Just cred
 
 filterUnRegDRepCreds
-  :: Certificate era -> Maybe (Ledger.Credential Ledger.DRepRole Ledger.StandardCrypto)
+  :: Certificate era -> Maybe (Ledger.Credential Ledger.DRepRole)
 filterUnRegDRepCreds = \case
   ShelleyRelatedCertificate _ _ -> Nothing
   ConwayCertificate cEra conwayCert -> conwayEraOnwardsConstraints cEra $
@@ -599,7 +598,7 @@ fromShelleyCertificate
 fromShelleyCertificate =
   caseShelleyToBabbageOrConwayEraOnwards ShelleyRelatedCertificate ConwayCertificate
 
-toShelleyPoolParams :: StakePoolParameters -> Ledger.PoolParams StandardCrypto
+toShelleyPoolParams :: StakePoolParameters -> Ledger.PoolParams
 toShelleyPoolParams
   StakePoolParameters
     { stakePoolId = StakePoolKeyHash poolkh
@@ -672,7 +671,7 @@ toShelleyPoolParams
         Ledger.textToUrl (Text.length url) url
 
 fromShelleyPoolParams
-  :: Ledger.PoolParams StandardCrypto
+  :: Ledger.PoolParams
   -> StakePoolParameters
 fromShelleyPoolParams
   Ledger.PoolParams
@@ -751,7 +750,7 @@ instance Error AnchorDataFromCertificateError where
 -- means that the certificate does not contain anchor data.
 getAnchorDataFromCertificate
   :: Certificate era
-  -> Either AnchorDataFromCertificateError (Maybe (Ledger.Anchor StandardCrypto))
+  -> Either AnchorDataFromCertificateError (Maybe Ledger.Anchor)
 getAnchorDataFromCertificate c =
   case c of
     ShelleyRelatedCertificate stbe scert ->
@@ -784,7 +783,7 @@ getAnchorDataFromCertificate c =
   anchorDataFromPoolMetadata
     :: MonadError AnchorDataFromCertificateError m
     => Ledger.PoolMetadata
-    -> m (Maybe (Ledger.Anchor StandardCrypto))
+    -> m (Maybe Ledger.Anchor)
   anchorDataFromPoolMetadata (Ledger.PoolMetadata{Ledger.pmUrl = url, Ledger.pmHash = hashBytes}) = do
     hash <-
       maybe (throwError $ InvalidPoolMetadataHashError url hashBytes) return $

cardano-api/src/Cardano/Api/Internal/Compatible/Tx.hs

@@ -225,7 +225,6 @@ addWitnesses witnesses (ShelleyTx sbe tx) =
   txCommon
     :: forall ledgerera
      . ShelleyLedgerEra era ~ ledgerera
-    => L.EraCrypto ledgerera ~ L.StandardCrypto
     => L.EraTx ledgerera
     => L.Tx ledgerera
   txCommon =

cardano-api/src/Cardano/Api/Internal/Convenience/Construction.hs

@@ -25,7 +25,6 @@ import Cardano.Api.Internal.Tx.Sign
 import Cardano.Api.Internal.Tx.UTxO (UTxO (..))
 import Cardano.Api.Internal.Utils
 
-import Cardano.Ledger.Api qualified as L
 import Cardano.Ledger.Coin qualified as L
 import Cardano.Ledger.Credential qualified as L
 import Cardano.Ledger.Keys qualified as L
@@ -57,7 +56,7 @@ constructBalancedTx
   -> Set PoolId
   -- ^ The set of registered stake pools
   -> Map.Map StakeCredential L.Coin
-  -> Map.Map (L.Credential L.DRepRole L.StandardCrypto) L.Coin
+  -> Map.Map (L.Credential L.DRepRole) L.Coin
   -> [ShelleyWitnessSigningKey]
   -> Either (TxBodyErrorAutoBalance era) (Tx era)
 constructBalancedTx

cardano-api/src/Cardano/Api/Internal/Convenience/Query.hs

@@ -38,7 +38,6 @@ import Cardano.Api.Internal.Tx.Body
 import Cardano.Api.Internal.Tx.UTxO
 import Cardano.Api.Internal.Utils
 
-import Cardano.Ledger.Api qualified as L
 import Cardano.Ledger.CertState (DRepState (..))
 import Cardano.Ledger.Coin qualified as L
 import Cardano.Ledger.Credential qualified as L
@@ -113,7 +112,7 @@ queryStateForBalancedTx
            , SystemStart
            , Set PoolId
            , Map StakeCredential L.Coin
-           , Map (L.Credential L.DRepRole L.StandardCrypto) L.Coin
+           , Map (L.Credential L.DRepRole) L.Coin
            , Maybe (Featured ConwayEraOnwards era TxCurrentTreasuryValue)
            )
        )

cardano-api/src/Cardano/Api/Internal/DRepMetadata.hs

@@ -23,8 +23,7 @@ import Cardano.Api.Internal.Script
 import Cardano.Api.Internal.SerialiseRaw
 
 import Cardano.Crypto.Hash.Class qualified as Crypto
-import Cardano.Ledger.Crypto (StandardCrypto)
-import Cardano.Ledger.Keys qualified as Shelley
+import Cardano.Ledger.Hashes (HASH)
 
 import Data.ByteString (ByteString)
 import Data.Either.Combinators (maybeToRight)
@@ -39,7 +38,7 @@ newtype DRepMetadata = DRepMetadata
   }
   deriving (Eq, Show)
 
-newtype instance Hash DRepMetadata = DRepMetadataHash (Shelley.Hash StandardCrypto ByteString)
+newtype instance Hash DRepMetadata = DRepMetadataHash (Crypto.Hash HASH ByteString)
   deriving (Eq, Show)
 
 instance HasTypeProxy DRepMetadata where