diff --git a/cardano-api/src/Cardano/Api/Typed.hs b/cardano-api/src/Cardano/Api/Typed.hs index fe5c1df59e6..fec06899ea4 100644 --- a/cardano-api/src/Cardano/Api/Typed.hs +++ b/cardano-api/src/Cardano/Api/Typed.hs @@ -443,11 +443,11 @@ import qualified Shelley.Spec.Ledger.OCert as Shelley import qualified Shelley.Spec.Ledger.PParams as Shelley import qualified Shelley.Spec.Ledger.Scripts as Shelley import qualified Shelley.Spec.Ledger.Tx as Shelley -import qualified Shelley.Spec.Ledger.TxData as Shelley +import qualified Shelley.Spec.Ledger.TxBody as Shelley import qualified Shelley.Spec.Ledger.UTxO as Shelley -- Types we will re-export as-is -import Shelley.Spec.Ledger.TxData (MIRPot (..)) +import Shelley.Spec.Ledger.TxBody (MIRPot (..)) -- TODO: replace the above with --import qualified Cardano.Api.Byron as Byron @@ -1810,7 +1810,7 @@ makeMIRCertificate mirpot amounts = . Shelley.DCertMir $ Shelley.MIRCert mirpot - (Map.fromListWith (+) + (Map.fromListWith (<>) [ (toShelleyStakeCredential sc, toShelleyLovelace v) | (sc, v) <- amounts ]) diff --git a/cardano-node/src/Cardano/Tracing/ConvertTxId.hs b/cardano-node/src/Cardano/Tracing/ConvertTxId.hs index 4016286186c..387b07508f9 100644 --- a/cardano-node/src/Cardano/Tracing/ConvertTxId.hs +++ b/cardano-node/src/Cardano/Tracing/ConvertTxId.hs @@ -21,7 +21,7 @@ import Ouroboros.Consensus.Ledger.SupportsMempool (GenTx) import Ouroboros.Consensus.Shelley.Ledger.Block (ShelleyBlock) import Ouroboros.Consensus.Shelley.Ledger.Mempool (TxId (..)) import Ouroboros.Consensus.TypeFamilyWrappers -import qualified Shelley.Spec.Ledger.TxData as Shelley +import qualified Shelley.Spec.Ledger.TxBody as Shelley -- | Convert a transaction ID to raw bytes. class ConvertTxId blk where diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs index dad92657fe1..45bc24e2eac 100644 --- a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs +++ b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs @@ -78,7 +78,8 @@ import Shelley.Spec.Ledger.STS.Tick import Shelley.Spec.Ledger.STS.Tickn import Shelley.Spec.Ledger.STS.Updn import Shelley.Spec.Ledger.STS.Utxo -import Shelley.Spec.Ledger.TxData (MIRPot (..), TxId (..), TxIn (..), TxOut (..)) +import Shelley.Spec.Ledger.STS.Utxow +import Shelley.Spec.Ledger.TxBody (MIRPot (..), TxId (..), TxIn (..), TxOut (..)) {- HLINT ignore "Use :" -}