[wip] assorted integration work

Author: geo2a

cardano-api/src/Cardano/Api/Experimental/Plutus/Internal/Shim/LegacyScripts.hs

@@ -50,6 +50,7 @@ import Cardano.Ledger.BaseTypes (Version)
 import Cardano.Ledger.Core qualified as L
 import Cardano.Ledger.Dijkstra.Scripts qualified as Dijkstra
 import Cardano.Ledger.Plutus.Language qualified as L
+import Cardano.Ledger.Mary.Value qualified as L
 
 import Data.Text qualified as Text
 import Data.Typeable

cardano-api/src/Cardano/Api/Experimental/Simple/Script.hs

@@ -49,7 +49,7 @@ instance
     r <-
       CBOR.runAnnotator
         <$> CBOR.decodeFull' (L.eraProtVerHigh @era) bs
-    return $ SimpleScript $ r $ CBOR.Full $ BS.fromStrict bs
+    SimpleScript <$> (r $ CBOR.Full $ BS.fromStrict bs)
 
 -- TODO: We should also deserialize the JSON representation of simple scripts.
 deserialiseSimpleScript

cardano-api/src/Cardano/Api/Experimental/Tx/Internal/BodyContent/New.hs

@@ -173,9 +173,9 @@ makeUnsignedTx era@ConwayEra bc = obtainCommonConstraints era $ do
           & L.totalCollateralTxBodyL .~ L.maybeToStrictMaybe totCollateral
           & L.collateralReturnTxBodyL .~ L.maybeToStrictMaybe retCollateral
           & L.feeTxBodyL .~ fee
-          & L.vldtTxBodyL . L.invalidBeforeL .~ txValidityLowerBound bc
-          & L.vldtTxBodyL . L.invalidHereAfterL .~ txValidityUpperBound bc
-          & L.reqSignerHashesTxBodyL .~ setReqSignerHashes
+          & L.vldtTxBodyL . L.invalidBeforeL .~ (L.maybeToStrictMaybe $ txValidityLowerBound bc)
+          & L.vldtTxBodyL . L.invalidHereAfterL .~ (L.maybeToStrictMaybe $ txValidityUpperBound bc)
+          & L.reqSignerHashesTxBodyL .~ undefined --TODO(10.7): setReqSignerHashes
           & L.scriptIntegrityHashTxBodyL .~ scriptIntegrityHash
           & L.withdrawalsTxBodyL .~ withdrawals
           & L.certsTxBodyL .~ certs
@@ -288,9 +288,9 @@ toAuxiliaryData txMData ss' =
 
 eraSpecificLedgerTxBody
   :: Era era
-  -> L.TxBody (LedgerEra era)
+  -> L.TxBody L.TopTx (LedgerEra era)
   -> TxBodyContent (LedgerEra era)
-  -> L.TxBody (LedgerEra era)
+  -> L.TxBody L.TopTx (LedgerEra era)
 eraSpecificLedgerTxBody era ledgerbody bc =
   body era
  where

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

@@ -551,12 +551,12 @@ evaluateTransactionBalance pp poolids stakeDelegDeposits drepDelegDeposits utxo
   isRegPool kh = Api.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
 
@@ -1059,7 +1059,7 @@ indexWitnessedTxProposalProcedures (TxProposalProcedures proposals) = do
     | (ix, (proposal, anyWitness)) <- allProposalsList
     ]
 
-toUnsigned :: forall era. Era era -> L.Tx (LedgerEra era) -> UnsignedTx era
+toUnsigned :: forall era. Era era -> L.Tx L.TopTx (LedgerEra era) -> UnsignedTx era
 toUnsigned e tx =
   obtainCommonConstraints e $
     UnsignedTx tx
@@ -1075,7 +1075,7 @@ evaluateTransactionExecutionUnits
   -> LedgerEpochInfo
   -> L.PParams (LedgerEra era)
   -> L.UTxO (LedgerEra era)
-  -> L.Tx (LedgerEra era)
+  -> L.Tx L.TopTx (LedgerEra era)
   -> Map ScriptWitnessIndex (Either ScriptExecutionError (EvalTxExecutionUnitsLog, ExecutionUnits))
 evaluateTransactionExecutionUnits systemstart epochInfo pp utxo tx =
   obtainCommonConstraints (useEra @era) $