Fix compilation errors in cardano-api

Author: palas

cardano-api/src/Cardano/Api/Era/Internal/Eon/AlonzoEraOnwards.hs

@@ -29,7 +29,6 @@ import Cardano.Binary
 import Cardano.Crypto.Hash.Blake2b qualified as Blake2b
 import Cardano.Crypto.Hash.Class qualified as C
 import Cardano.Crypto.VRF qualified as C
-import Cardano.Ledger.Allegra.Scripts qualified as L
 import Cardano.Ledger.Alonzo.Plutus.Context qualified as Plutus
 import Cardano.Ledger.Alonzo.Scripts qualified as L
 import Cardano.Ledger.Alonzo.Tx qualified as L
@@ -107,7 +106,6 @@ type AlonzoEraOnwardsConstraints era =
   , L.EraUTxO (ShelleyLedgerEra era)
   , L.HashAnnotated (L.TxBody (ShelleyLedgerEra era)) L.EraIndependentTxBody
   , L.MaryEraTxBody (ShelleyLedgerEra era)
-  , L.NativeScript (ShelleyLedgerEra era) ~ L.Timelock (ShelleyLedgerEra era)
   , Plutus.EraPlutusContext (ShelleyLedgerEra era)
   , L.Script (ShelleyLedgerEra era) ~ L.AlonzoScript (ShelleyLedgerEra era)
   , L.ScriptsNeeded (ShelleyLedgerEra era) ~ L.AlonzoScriptsNeeded (ShelleyLedgerEra era)

cardano-api/src/Cardano/Api/Experimental/Era.hs

@@ -311,7 +311,6 @@ type EraCommonConstraints era =
   , L.EraUTxO (LedgerEra era)
   , L.Value (LedgerEra era) ~ L.MaryValue
   , FromCBOR (ChainDepState (ConsensusProtocol era))
-  , L.NativeScript (LedgerEra era) ~ L.Timelock (LedgerEra era)
   , PraosProtocolSupportsNode (ConsensusProtocol era)
   , ShelleyLedgerEra era ~ LedgerEra era
   , ToJSON (ChainDepState (ConsensusProtocol era))

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

@@ -37,6 +37,7 @@ import Cardano.Binary qualified as CBOR
 import Cardano.Ledger.Alonzo.Scripts qualified as L
 import Cardano.Ledger.BaseTypes (Version)
 import Cardano.Ledger.Core qualified as L
+import Cardano.Ledger.Dijkstra.Scripts (upgradeTimelock)
 import Cardano.Ledger.Plutus.Language qualified as L
 
 import Data.Text qualified as Text
@@ -96,7 +97,12 @@ convertToNewScriptWitness eon (Old.SimpleScriptWitness _ scriptOrRefInput) witne
 
 convertTotimelock
   :: AlonzoEraOnwards era -> Old.SimpleScript -> L.NativeScript (ShelleyLedgerEra era)
-convertTotimelock eon s = alonzoEraOnwardsConstraints eon $ Old.toAllegraTimelock s
+convertTotimelock eon s =
+  case eon of
+    AlonzoEraOnwardsAlonzo -> alonzoEraOnwardsConstraints eon $ Old.toAllegraTimelock s
+    AlonzoEraOnwardsBabbage -> alonzoEraOnwardsConstraints eon $ Old.toAllegraTimelock s
+    AlonzoEraOnwardsConway -> alonzoEraOnwardsConstraints eon $ Old.toAllegraTimelock s
+    AlonzoEraOnwardsDijkstra -> upgradeTimelock $ alonzoEraOnwardsConstraints AlonzoEraOnwardsConway $ Old.toAllegraTimelock s
 
 createPlutusScriptDatum
   :: Witnessable thing era

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

@@ -2286,7 +2286,7 @@ getLedgerTablesUTxOValues sbe tbs =
       -> Map TxIn (TxOut CtxUTxO era)
     ejectTables idx =
       let Consensus.LedgerTables (Ledger.ValuesMK values) = HFC.ejectLedgerTables idx tbs
-       in Map.mapKeys fromShelleyTxIn $ Map.map (fromShelleyTxOut sbe) values
+       in Map.mapKeys (fromShelleyTxIn . Shelley.getOriginalTxIn) $ Map.map (fromShelleyTxOut sbe) values
    in
     case sbe of
       ShelleyBasedEraShelley -> ejectTables (IS IZ)

cardano-api/src/Cardano/Api/Plutus/Internal/Script.hs

@@ -147,6 +147,7 @@ import Cardano.Ledger.BaseTypes (StrictMaybe (..))
 import Cardano.Ledger.Binary qualified as Binary (decCBOR, decodeFullAnnotator)
 import Cardano.Ledger.Conway.Scripts qualified as Conway
 import Cardano.Ledger.Core qualified as Ledger
+import Cardano.Ledger.Dijkstra.Scripts (upgradeTimelock)
 import Cardano.Ledger.Dijkstra.Scripts qualified as Dijkstra
 import Cardano.Ledger.Keys qualified as Shelley
 import Cardano.Ledger.Plutus.Language qualified as Plutus
@@ -1242,7 +1243,7 @@ toShelleyScript (ScriptInEra langInEra (SimpleScript script)) =
     SimpleScriptInAlonzo -> Alonzo.NativeScript (toAllegraTimelock script)
     SimpleScriptInBabbage -> Alonzo.NativeScript (toAllegraTimelock script)
     SimpleScriptInConway -> Alonzo.NativeScript (toAllegraTimelock script)
-    SimpleScriptInDijkstra -> Alonzo.NativeScript (toAllegraTimelock script)
+    SimpleScriptInDijkstra -> Alonzo.NativeScript (upgradeTimelock $ toAllegraTimelock script)
 toShelleyScript
   ( ScriptInEra
       langInEra