WIP

Author: Jimbo4350

cardano-api/cardano-api.cabal

@@ -77,8 +77,6 @@ library
     Cardano.Api.Internal.Eon.ShelleyBasedEra
     Cardano.Api.Internal.Eras
     Cardano.Api.Internal.Error
-    Cardano.Api.Internal.Experimental.Eras
-    Cardano.Api.Internal.Experimental.Tx
     Cardano.Api.Internal.Fees
     Cardano.Api.Internal.Genesis
     Cardano.Api.Internal.GenesisParameters
@@ -200,6 +198,15 @@ library
     Cardano.Api.Internal.Eon.ShelleyToMaryEra
     Cardano.Api.Internal.Eras.Case
     Cardano.Api.Internal.Eras.Core
+    Cardano.Api.Internal.Experimental.Eras
+    Cardano.Api.Internal.Experimental.Plutus.IndexedPlutusScriptWitness
+    Cardano.Api.Internal.Experimental.Plutus.Script
+    Cardano.Api.Internal.Experimental.Plutus.ScriptWitness
+    Cardano.Api.Internal.Experimental.Plutus.Shim.LegacyScripts
+    Cardano.Api.Internal.Experimental.Simple.Script
+    Cardano.Api.Internal.Experimental.Tx
+    Cardano.Api.Internal.Experimental.Witness.AnyWitness
+    Cardano.Api.Internal.Experimental.Witness.TxScriptWitnessRequirements
     Cardano.Api.Internal.Feature
     Cardano.Api.Internal.Governance.Actions.ProposalProcedure
     Cardano.Api.Internal.Governance.Actions.VotingProcedure
@@ -248,6 +255,7 @@ library
     Cardano.Api.Internal.SerialiseUsing
     Cardano.Api.Internal.SpecialByron
     Cardano.Api.Internal.StakePoolMetadata
+    Cardano.Api.Internal.Tx.BuildTxWith
     Cardano.Api.Internal.Tx.UTxO
     Cardano.Api.Internal.TxIn
     Cardano.Api.Internal.TxMetadata

cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs

@@ -169,6 +169,7 @@ import qualified Data.ByteString.Base16 as Base16
 import           Data.Ratio (Ratio, (%))
 import           Data.String
 import Test.Gen.Cardano.Api.Hardcoded
+import Data.Typeable
 import           Data.Word (Word16, Word32, Word64)
 import           GHC.Exts (IsList (..))
 import           GHC.Stack
@@ -707,7 +708,7 @@ genTxWithdrawals =
           ]
     )
 
-genTxCertificates :: CardanoEra era -> Gen (TxCertificates BuildTx era)
+genTxCertificates :: Typeable era => CardanoEra era -> Gen (TxCertificates BuildTx era)
 genTxCertificates =
   inEonForEra
     (pure TxCertificatesNone)
@@ -720,7 +721,7 @@ genTxCertificates =
           ]
     )
 
-genCertificate :: forall era. ShelleyBasedEra era -> Gen (Certificate era)
+genCertificate :: forall era. Typeable era => ShelleyBasedEra era -> Gen (Certificate era)
 genCertificate sbe =
   Gen.choice
     $ catMaybes
@@ -871,7 +872,7 @@ genTxMintValue =
         , pure $ TxMintValue w (fromList assets)
         ]
 
-genTxBodyContent :: ShelleyBasedEra era -> Gen (TxBodyContent BuildTx era)
+genTxBodyContent :: Typeable era => ShelleyBasedEra era -> Gen (TxBodyContent BuildTx era)
 genTxBodyContent sbe = do
   let era = toCardanoEra sbe
   txIns <-
@@ -992,7 +993,8 @@ genWitnessesByron = Gen.list (Range.constant 1 10) genByronKeyWitness
 
 -- | This generator validates generated 'TxBodyContent' and backtracks when the generated body
 -- fails the validation. That also means that it is quite slow.
-genValidTxBody :: ShelleyBasedEra era
+genValidTxBody :: Typeable era 
+               => ShelleyBasedEra era
                -> Gen (TxBody era, TxBodyContent BuildTx era) -- ^ validated 'TxBody' and 'TxBodyContent'
 genValidTxBody sbe =
   Gen.mapMaybe
@@ -1003,7 +1005,7 @@ genValidTxBody sbe =
     (genTxBodyContent sbe)
 
 -- | Partial! This function will throw an error when the generated transaction is invalid.
-genTxBody :: HasCallStack => ShelleyBasedEra era -> Gen (TxBody era)
+genTxBody :: (HasCallStack, Typeable era) => ShelleyBasedEra era -> Gen (TxBody era)
 genTxBody era = do
   res <- Api.createTransactionBody era <$> genTxBodyContent era
   case res of
@@ -1042,15 +1044,15 @@ genScriptValidity :: Gen ScriptValidity
 genScriptValidity = Gen.element [ScriptInvalid, ScriptValid]
 
 genTx
-  :: ()
+  :: Typeable era
   => ShelleyBasedEra era
   -> Gen (Tx era)
 genTx era =
   makeSignedTransaction
     <$> genWitnesses era
     <*> (fst <$> genValidTxBody era)
 
-genWitnesses :: ShelleyBasedEra era -> Gen [KeyWitness era]
+genWitnesses :: Typeable era => ShelleyBasedEra era -> Gen [KeyWitness era]
 genWitnesses sbe = do
   bsWits <- Gen.list (Range.constant 0 10) (genShelleyBootstrapWitness sbe)
   keyWits <- Gen.list (Range.constant 0 10) (genShelleyKeyWitness sbe)
@@ -1095,7 +1097,7 @@ genWitnessNetworkIdOrByronAddress =
     ]
 
 genShelleyBootstrapWitness
-  :: ()
+  :: Typeable era
   => ShelleyBasedEra era
   -> Gen (KeyWitness era)
 genShelleyBootstrapWitness sbe =
@@ -1104,8 +1106,10 @@ genShelleyBootstrapWitness sbe =
     <*> (fst <$> genValidTxBody sbe)
     <*> genSigningKey AsByronKey
 
+ 
 genShelleyKeyWitness
   :: ()
+  => Typeable era
   => ShelleyBasedEra era
   -> Gen (KeyWitness era)
 genShelleyKeyWitness sbe =
@@ -1114,7 +1118,7 @@ genShelleyKeyWitness sbe =
     <*> genShelleyWitnessSigningKey
 
 genShelleyWitness
-  :: ()
+  :: Typeable era
   => ShelleyBasedEra era
   -> Gen (KeyWitness era)
 genShelleyWitness sbe =
@@ -1135,7 +1139,7 @@ genShelleyWitnessSigningKey =
     ]
 
 genCardanoKeyWitness
-  :: ()
+  :: Typeable era
   => ShelleyBasedEra era
   -> Gen (KeyWitness era)
 genCardanoKeyWitness = genShelleyWitness

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

@@ -29,6 +29,7 @@ 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
@@ -103,6 +104,7 @@ type AlonzoEraOnwardsConstraints era =
   , L.EraUTxO (ShelleyLedgerEra era)
   , L.HashAnnotated (L.TxBody (ShelleyLedgerEra era)) L.EraIndependentTxBody L.StandardCrypto
   , 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/Internal/Experimental/Eras.hs

@@ -32,6 +32,7 @@ module Cardano.Api.Internal.Experimental.Eras
   )
 where
 
+import Cardano.Api.Internal.Eon.AlonzoEraOnwards
 import Cardano.Api.Internal.Eon.BabbageEraOnwards
 import Cardano.Api.Internal.Eon.Convert
 import Cardano.Api.Internal.Eon.ShelleyBasedEra (ShelleyBasedEra (..), ShelleyLedgerEra)
@@ -206,6 +207,11 @@ instance Convert Era ShelleyBasedEra where
     BabbageEra -> ShelleyBasedEraBabbage
     ConwayEra -> ShelleyBasedEraConway
 
+instance Convert Era AlonzoEraOnwards where
+  convert = \case
+    BabbageEra -> AlonzoEraOnwardsBabbage
+    ConwayEra -> AlonzoEraOnwardsConway
+
 instance Convert Era BabbageEraOnwards where
   convert = \case
     BabbageEra -> BabbageEraOnwardsBabbage