Fix non-test compilation errors

Author: carbolymer

cardano-api/cardano-api.cabal

@@ -326,10 +326,10 @@ library gen
     cardano-crypto-wrapper:{cardano-crypto-wrapper, testlib} ^>=1.7,
     cardano-ledger-alonzo >=1.8.1,
     cardano-ledger-babbage,
-    cardano-ledger-byron,
-    cardano-ledger-conway,
-    cardano-ledger-core >=1.14,
-    cardano-ledger-dijkstra >=0.1,
+    cardano-ledger-byron:{cardano-ledger-byron, testlib},
+    cardano-ledger-conway:{cardano-ledger-conway, testlib},
+    cardano-ledger-core:{cardano-ledger-core, testlib} >=1.17,
+    cardano-ledger-dijkstra:{cardano-ledger-dijkstra, testlib} >=0.1,
     cardano-ledger-mary,
     cardano-ledger-shelley >=1.13,
     cardano-strict-containers,

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

@@ -80,6 +80,7 @@ import Data.ByteString qualified as BS
 import Data.ByteString.Short qualified as SBS
 import Data.Foldable (Foldable (toList))
 import Data.Text (Text)
+import Lens.Micro ((^.))
 
 -- ----------------------------------------------------------------------------
 -- Blocks in an era
@@ -174,9 +175,7 @@ getShelleyBlockTxs
   -> [Tx era]
 getShelleyBlockTxs era (Ledger.Block _header txs) =
   [ ShelleyTx era txinblock
-  | txinblock <- toList (Ledger.fromTxSeq txs)
-  -- TODO: Need to Ledger.fromTxSeq -> txSeqBlockBodyL,
-  --       but the latter causes a blow-up of constraints
+  | txinblock <- toList (txs ^. Ledger.txSeqBlockBodyL)
   ]
 
 -- ----------------------------------------------------------------------------

cardano-api/src/Cardano/Api/Ledger/Internal/Reexport.hs

@@ -143,6 +143,7 @@ module Cardano.Api.Ledger.Internal.Reexport
   , EraGov
   , EraTx (witsTxL, bodyTxL)
   , Tx
+  , TopTx
   , TxDats (..)
   , costModelsValid
   , getCostModelParams
@@ -316,6 +317,7 @@ import Cardano.Ledger.Core
   , EraTxOut
   , PParams (..)
   , PoolCert (..)
+  , TopTx
   , Value
   , fromEraCBOR
   , ppMinFeeAL

cardano-api/src/Cardano/Api/LedgerState.hs

@@ -1792,7 +1792,7 @@ renderHash
   :: Cardano.Crypto.Hash.Class.Hash Cardano.Crypto.Hash.Blake2b.Blake2b_256 ByteString -> Text
 renderHash h = Text.decodeUtf8 $ Base16.encode (Cardano.Crypto.Hash.Class.hashToBytes h)
 
-newtype StakeCred = StakeCred {_unStakeCred :: Ledger.Credential 'Ledger.Staking}
+newtype StakeCred = StakeCred {_unStakeCred :: Ledger.Credential Ledger.Staking}
   deriving (Eq, Ord)
 
 data Env = Env
@@ -2096,7 +2096,7 @@ nextEpochEligibleLeadershipSlots sbe sGen serCurrEpochState ptclState poolid (Vr
         snapshot = ShelleyAPI.ssStakeMark $ ShelleyAPI.esSnapshots cEstate
         markSnapshotPoolDistr
           :: Map
-               (SL.KeyHash 'SL.StakePool)
+               (SL.KeyHash SL.StakePool)
                SL.IndividualPoolStake
         markSnapshotPoolDistr = ShelleyAPI.unPoolDistr . ShelleyAPI.calculatePoolDistr $ snapshot
 
@@ -2133,7 +2133,7 @@ isLeadingSlotsTPraos
   => Set SlotNo
   -> PoolId
   -> Map
-       (SL.KeyHash 'SL.StakePool)
+       (SL.KeyHash SL.StakePool)
        SL.IndividualPoolStake
   -> Consensus.Nonce
   -> Crypto.SignKeyVRF v
@@ -2158,7 +2158,7 @@ isLeadingSlotsPraos
   => Set SlotNo
   -> PoolId
   -> Map
-       (SL.KeyHash 'SL.StakePool)
+       (SL.KeyHash SL.StakePool)
        SL.IndividualPoolStake
   -> Consensus.Nonce
   -> Crypto.SignKeyVRF (Crypto.VRF Consensus.StandardCrypto)

cardano-api/src/Cardano/Api/LedgerState/Internal/LedgerEvent.hs

@@ -72,7 +72,7 @@ data LedgerEvent
       Ledger.TxId
       (Set (Ledger.Voter, Ledger.GovActionId))
       -- ^ Votes that were replaced in this tx.
-      (Set (Ledger.Credential 'Ledger.DRepRole))
+      (Set (Ledger.Credential Ledger.DRepRole))
       -- ^ Any votes from these DReps in this or in previous txs are removed
   | -- | The current state of governance matters at the epoch boundary.
     -- I.E the current constitution, committee, protocol parameters, etc.
@@ -110,7 +110,7 @@ data PoolReapDetails = PoolReapDetails
 
 convertRetiredPoolsMap
   :: Map
-       Ledger.StakeCredential
+       (Ledger.Credential Ledger.Staking)
        (Map (Ledger.KeyHash Ledger.StakePool) (Ledger.CompactForm Ledger.Coin))
   -> Map StakeCredential (Map (Hash StakePoolKey) L.Coin)
 convertRetiredPoolsMap =

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

@@ -429,7 +429,7 @@ queryDRepStakeDistribution eon = querySbe eon . QueryDRepStakeDistr
 
 querySPOStakeDistribution
   :: ConwayEraOnwards era
-  -> Set (L.KeyHash 'L.StakePool)
+  -> Set (L.KeyHash L.StakePool)
   -- ^ An empty SPO key hash set means that distributions for all SPOs will be returned
   -> LocalStateQueryExpr
        block
@@ -439,7 +439,7 @@ querySPOStakeDistribution
        IO
        ( Either
            UnsupportedNtcVersionError
-           (Either EraMismatch (Map (L.KeyHash 'L.StakePool) L.Coin))
+           (Either EraMismatch (Map (L.KeyHash L.StakePool) L.Coin))
        )
 querySPOStakeDistribution eon = querySbe eon . QuerySPOStakeDistr
 
@@ -507,7 +507,7 @@ queryProposals eon = querySbe eon . QueryProposals
 queryStakePoolDefaultVote
   :: forall era block point r
    . ConwayEraOnwards era
-  -> L.KeyHash 'L.StakePool
+  -> L.KeyHash L.StakePool
   -> LocalStateQueryExpr
        block
        point

cardano-api/src/Cardano/Api/Query/Internal/Type/QueryInMode.hs

@@ -301,8 +301,8 @@ data QueryInShelleyBasedEra era result where
     :: Set Ledger.DRep
     -> QueryInShelleyBasedEra era (Map Ledger.DRep L.Coin)
   QuerySPOStakeDistr
-    :: Set (Ledger.KeyHash 'Ledger.StakePool)
-    -> QueryInShelleyBasedEra era (Map (Ledger.KeyHash 'Ledger.StakePool) L.Coin)
+    :: Set (Ledger.KeyHash Ledger.StakePool)
+    -> QueryInShelleyBasedEra era (Map (Ledger.KeyHash Ledger.StakePool) L.Coin)
   QueryCommitteeMembersState
     :: Set (Shelley.Credential Shelley.ColdCommitteeRole)
     -> Set (Shelley.Credential Shelley.HotCommitteeRole)
@@ -317,7 +317,7 @@ data QueryInShelleyBasedEra era result where
   QueryLedgerPeerSnapshot
     :: QueryInShelleyBasedEra era (Serialised LedgerPeerSnapshot)
   QueryStakePoolDefaultVote
-    :: Ledger.KeyHash 'Ledger.StakePool
+    :: Ledger.KeyHash Ledger.StakePool
     -> QueryInShelleyBasedEra era L.DefaultVote
 
 deriving instance Show (QueryInShelleyBasedEra era result)
@@ -501,7 +501,7 @@ fromShelleyDelegations =
     . toList
 
 fromShelleyRewardAccounts
-  :: Map (Shelley.Credential 'Core.Staking) L.Coin
+  :: Map (Shelley.Credential Core.Staking) L.Coin
   -> Map StakeCredential L.Coin
 fromShelleyRewardAccounts =
   -- TODO: write an appropriate property to show it is safe to use

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

@@ -1622,7 +1622,9 @@ fromLedgerTxInsCollateral sbe body =
     sbe
 
 fromLedgerTxInsReference
-  :: ShelleyBasedEra era -> Ledger.TxBody Ledger.TopTx (ShelleyLedgerEra era) -> TxInsReference ViewTx era
+  :: ShelleyBasedEra era
+  -> Ledger.TxBody Ledger.TopTx (ShelleyLedgerEra era)
+  -> TxInsReference ViewTx era
 fromLedgerTxInsReference sbe txBody =
   caseShelleyToAlonzoOrBabbageEraOnwards
     (const TxInsReferenceNone)
@@ -1913,13 +1915,13 @@ convMintValue txMintValue = do
   multiAsset
 
 convExtraKeyWitnesses
-  :: TxExtraKeyWitnesses era -> Set (Shelley.KeyHash Shelley.Witness)
+  :: TxExtraKeyWitnesses era -> Set (Shelley.KeyHash Shelley.Guard)
 convExtraKeyWitnesses txExtraKeyWits =
   case txExtraKeyWits of
     TxExtraKeyWitnessesNone -> Set.empty
     TxExtraKeyWitnesses _ khs ->
       fromList
-        [ Shelley.asWitness kh
+        [ Shelley.coerceKeyRole kh
         | PaymentKeyHash kh <- khs
         ]
 

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

@@ -836,12 +836,12 @@ evaluateTransactionBalance sbe pp poolids stakeDelegDeposits drepDelegDeposits u
   isRegPool kh = StakePoolKeyHash kh `Set.member` poolids
 
   lookupDelegDeposit
-    :: Ledger.Credential 'Ledger.Staking -> Maybe L.Coin
+    :: Ledger.Credential Ledger.Staking -> Maybe L.Coin
   lookupDelegDeposit stakeCred =
     Map.lookup (fromShelleyStakeCredential stakeCred) stakeDelegDeposits
 
   lookupDRepDeposit
-    :: Ledger.Credential 'Ledger.DRepRole -> Maybe L.Coin
+    :: Ledger.Credential Ledger.DRepRole -> Maybe L.Coin
   lookupDRepDeposit drepCred =
     Map.lookup drepCred drepDelegDeposits