diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal index c0caa4f558..685cc4c027 100644 --- a/cardano-api/cardano-api.cabal +++ b/cardano-api/cardano-api.cabal @@ -287,7 +287,7 @@ library gen , cardano-ledger-byron-test >= 1.5 , cardano-ledger-core:{cardano-ledger-core, testlib} >= 1.8.0 , cardano-ledger-shelley >= 1.7.0 - , cardano-ledger-conway:{cardano-ledger-conway, testlib} >= 1.10.0 + , cardano-ledger-conway:testlib >= 1.10.0 , containers , filepath , hedgehog >= 1.1 diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs index 6ab7b84d20..280e98196c 100644 --- a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs +++ b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs @@ -152,7 +152,6 @@ import qualified Cardano.Crypto.Hash.Class as CRYPTO import qualified Cardano.Crypto.Seed as Crypto import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo import qualified Cardano.Ledger.BaseTypes as Ledger -import qualified Cardano.Ledger.Conway.Governance as L import qualified Cardano.Ledger.Core as Ledger import Cardano.Ledger.SafeHash (unsafeMakeSafeHash) diff --git a/cardano-api/internal/Cardano/Api/ReexposeLedger.hs b/cardano-api/internal/Cardano/Api/ReexposeLedger.hs index 536d6475e3..8e184b2eee 100644 --- a/cardano-api/internal/Cardano/Api/ReexposeLedger.hs +++ b/cardano-api/internal/Cardano/Api/ReexposeLedger.hs @@ -2,12 +2,21 @@ module Cardano.Api.ReexposeLedger ( Credential (..) + , credToText , KeyHash(..) , KeyRole(..) + , VKey (..) , ShelleyTxCert(..) , ShelleyDelegCert(..) , ShelleyEraTxCert(..) + , PState (..) , GenesisDelegCert(..) + , GenDelegPair(..) + , StakeReference (..) + , WitVKey (..) + , hashKey + , hashVerKeyVRF + , hashWithSerialiser , PoolParams (..) , HasKeyRole , MIRPot(..) @@ -36,7 +45,8 @@ module Cardano.Api.ReexposeLedger -- Core , Coin (..) - , EraCrypto + , EraPParams (..) + , Era (..) , Network(..) , PoolCert(..) , PParams(..) @@ -46,6 +56,7 @@ module Cardano.Api.ReexposeLedger , toDeltaCoin , toEraCBOR , fromEraCBOR + , ppMinUTxOValueL -- Conway , Anchor(..) @@ -56,11 +67,14 @@ module Cardano.Api.ReexposeLedger , ConwayDelegCert(..) , ConwayEraTxCert(..) , ConwayGovCert(..) + , ConwayGenesis , GovState , GovActionId(..) , Vote (..) , Voter (..) , VotingProcedure(..) + , ProposalProcedure(..) + , VotingProcedures(..) , PoolVotingThresholds(..) , DRepVotingThresholds(..) , dvtPPNetworkGroupL @@ -74,8 +88,19 @@ module Cardano.Api.ReexposeLedger , csCommitteeCredsL -- Byron - , Annotated + , Annotated(..) , Byron.Tx(..) + , byronProtVer + , serialize' + , toPlainDecoder + , toCBOR + , fromCBOR + , ByteSpan (..) + , slice + , Decoder + + -- Shelley + , secondsToNominalDiffTimeMicro -- Babbage , CoinPerByte (..) @@ -83,12 +108,16 @@ module Cardano.Api.ReexposeLedger -- Alonzo , CoinPerWord (..) , Prices(..) + , CostModels + , AlonzoGenesis + , ppPricesL -- Base , boundRational , unboundRational , DnsName , dnsToText + , EpochInterval(..) , textToDns , Url , urlToText @@ -97,21 +126,33 @@ module Cardano.Api.ReexposeLedger , ProtVer(..) , strictMaybeToMaybe , maybeToStrictMaybe + , AnchorData(..) + , hashAnchorData + , UnitInterval + , mkVersion + , NonNegativeInterval -- Crypto , hashToBytes , hashFromBytes , Crypto , StandardCrypto + , ADDRHASH -- Slotting , EpochNo(..) + + -- SafeHash + , SafeHash + , unsafeMakeSafeHash + , extractHash ) where import qualified Cardano.Chain.UTxO as Byron import Cardano.Crypto.Hash.Class (hashFromBytes, hashToBytes) -import Cardano.Ledger.Alonzo.Core (CoinPerWord (..), PParamsUpdate (..)) -import Cardano.Ledger.Alonzo.Scripts (Prices (..)) +import Cardano.Ledger.Alonzo.Core (CoinPerWord (..), PParamsUpdate (..), ppPricesL) +import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis) +import Cardano.Ledger.Alonzo.Scripts (CostModels, Prices (..)) import Cardano.Ledger.Api.Tx.Cert (pattern AuthCommitteeHotKeyTxCert, pattern DelegStakeTxCert, pattern DelegTxCert, pattern GenesisDelegTxCert, pattern MirTxCert, pattern RegDRepTxCert, pattern RegDepositDelegTxCert, @@ -119,26 +160,38 @@ import Cardano.Ledger.Api.Tx.Cert (pattern AuthCommitteeHotKeyTxCert, pattern ResignCommitteeColdTxCert, pattern RetirePoolTxCert, pattern UnRegDRepTxCert, pattern UnRegDepositTxCert, pattern UnRegTxCert) import Cardano.Ledger.Babbage.Core (CoinPerByte (..)) -import Cardano.Ledger.BaseTypes (DnsName, Network (..), ProtVer (..), StrictMaybe (..), - Url, boundRational, dnsToText, maybeToStrictMaybe, portToWord16, - strictMaybeToMaybe, textToDns, textToUrl, unboundRational, urlToText) -import Cardano.Ledger.Binary (Annotated (..)) +import Cardano.Ledger.BaseTypes (AnchorData (..), DnsName, EpochInterval (..), + Network (..), NonNegativeInterval, ProtVer (..), StrictMaybe (..), UnitInterval, + Url, boundRational, dnsToText, hashAnchorData, maybeToStrictMaybe, mkVersion, + portToWord16, strictMaybeToMaybe, textToDns, textToUrl, unboundRational, + urlToText) +import Cardano.Ledger.Binary (Annotated (..), ByteSpan (..), byronProtVer, fromCBOR, + serialize', slice, toCBOR, toPlainDecoder) +import Cardano.Ledger.Binary.Plain (Decoder) import Cardano.Ledger.CertState (DRepState, csCommitteeCredsL) import Cardano.Ledger.Coin (Coin (..), addDeltaCoin, toDeltaCoin) import Cardano.Ledger.Conway.Core (DRepVotingThresholds (..), PoolVotingThresholds (..), dvtPPEconomicGroupL, dvtPPGovGroupL, dvtPPNetworkGroupL, dvtPPTechnicalGroupL, dvtUpdateToConstitutionL) +import Cardano.Ledger.Conway.Genesis (ConwayGenesis) import Cardano.Ledger.Conway.Governance (Anchor (..), GovActionId (..), GovState, - Vote (..), Voter (..), VotingProcedure (..)) + ProposalProcedure (..), Vote (..), Voter (..), VotingProcedure (..), + VotingProcedures (..)) import Cardano.Ledger.Conway.TxCert (ConwayDelegCert (..), ConwayEraTxCert (..), ConwayGovCert (..), ConwayTxCert (..), Delegatee (..), pattern UpdateDRepTxCert) -import Cardano.Ledger.Core (EraCrypto, PParams (..), PoolCert (..), Value, fromEraCBOR, - toEraCBOR) -import Cardano.Ledger.Credential (Credential (..)) -import Cardano.Ledger.Crypto (Crypto, StandardCrypto) +import Cardano.Ledger.Core (Era (..), EraPParams (..), PParams (..), PoolCert (..), Value, + fromEraCBOR, ppMinUTxOValueL, toEraCBOR) +import Cardano.Ledger.Credential (Credential (..), credToText) +import Cardano.Ledger.Crypto (ADDRHASH, Crypto, StandardCrypto) import Cardano.Ledger.DRep (DRep (..), drepAnchorL, drepDepositL, drepExpiryL) -import Cardano.Ledger.Keys (HasKeyRole, KeyHash (..), KeyRole (..)) +import Cardano.Ledger.Keys (HasKeyRole, KeyHash (..), KeyRole (..), VKey (..), + hashWithSerialiser) import Cardano.Ledger.PoolParams (PoolMetadata (..), PoolParams (..), StakePoolRelay (..)) +import Cardano.Ledger.SafeHash (SafeHash, extractHash, unsafeMakeSafeHash) +import Cardano.Ledger.Shelley.API (GenDelegPair (..), StakeReference (..), WitVKey (..), + hashKey, hashVerKeyVRF) +import Cardano.Ledger.Shelley.Genesis (secondsToNominalDiffTimeMicro) +import Cardano.Ledger.Shelley.LedgerState (PState (..)) import Cardano.Ledger.Shelley.TxCert (EraTxCert (..), GenesisDelegCert (..), MIRCert (..), MIRPot (..), MIRTarget (..), ShelleyDelegCert (..), ShelleyEraTxCert (..), ShelleyTxCert (..))