Convert to use typesafe features in data types

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

@@ -97,9 +97,7 @@ module Test.Gen.Cardano.Api.Typed
   , genTxOutDatumHashUTxOContext
   , genTxOutValue
   , genTxReturnCollateral
-  , genTxScriptValidity
   , genTxTotalCollateral
-  , genTxUpdateProposal
   , genTxValidityLowerBound
   , genTxValidityRange
   , genTxValidityUpperBound
@@ -605,16 +603,6 @@ genCertificate =
     , StakeAddressDeregistrationCertificate <$> genStakeCredential
     ]
 
-genTxUpdateProposal :: CardanoEra era -> Gen (TxUpdateProposal era)
-genTxUpdateProposal era =
-  case updateProposalSupportedInEra era of
-    Nothing -> pure TxUpdateProposalNone
-    Just supported ->
-      Gen.choice
-        [ pure TxUpdateProposalNone
-        , TxUpdateProposal supported <$> genUpdateProposal era
-        ]
-
 genTxMintValue :: CardanoEra era -> Gen (TxMintValue BuildTx era)
 genTxMintValue era =
   case multiAssetSupportedInEra era of
@@ -641,9 +629,9 @@ genTxBodyContent era = do
   txProtocolParams <- BuildTxWith <$> Gen.maybe (genValidProtocolParameters era)
   txWithdrawals <- genTxWithdrawals era
   txCertificates <- genTxCertificates era
-  txUpdateProposal <- genTxUpdateProposal era
+  txUpdateProposal <- genFeatureValueInEra (genUpdateProposal era) era
   txMintValue <- genTxMintValue era
-  txScriptValidity <- genTxScriptValidity era
+  txScriptValidity <- genFeatureValueInEra genScriptValidity era
 
   pure $ TxBodyContent
     { Api.txIns
@@ -718,11 +706,6 @@ genFeatureValueInEra gen =
   featureInEra (pure NoFeatureValue) $ \witness ->
     pure NoFeatureValue <|> fmap (FeatureValue witness) gen
 
-genTxScriptValidity :: CardanoEra era -> Gen (TxScriptValidity era)
-genTxScriptValidity era = case txScriptValiditySupportedInCardanoEra era of
-  Nothing -> pure TxScriptValidityNone
-  Just witness -> TxScriptValidity witness <$> genScriptValidity
-
 genScriptValidity :: Gen ScriptValidity
 genScriptValidity = Gen.element [ScriptInvalid, ScriptValid]
 

cardano-api/internal/Cardano/Api/Fees.hs

@@ -44,6 +44,7 @@ import           Cardano.Api.Address
 import           Cardano.Api.Certificate
 import           Cardano.Api.Eras
 import           Cardano.Api.Error
+import           Cardano.Api.Feature
 import           Cardano.Api.NetworkId
 import           Cardano.Api.ProtocolParameters
 import           Cardano.Api.Query
@@ -303,9 +304,9 @@ estimateTransactionKeyWitnessCount TxBodyContent {
       _ -> 0
 
   + case txUpdateProposal of
-      TxUpdateProposal _ (UpdateProposal updatePerGenesisKey _)
+      FeatureValue _ (UpdateProposal updatePerGenesisKey _)
         -> Map.size updatePerGenesisKey
-      _ -> 0
+      NoFeatureValue -> 0
 
 
 -- ----------------------------------------------------------------------------
@@ -674,7 +675,7 @@ evaluateTransactionBalance bpp poolids stakeDelegDeposits utxo
                    => ShelleyEraTxBody ledgerera
                    => LedgerEraConstraints ledgerera
                    => LedgerMultiAssetConstraints ledgerera
-                   => MultiAssetSupportedInEra era
+                   => MultiAssetFeature era
                    -> TxOutValue era
     evalMultiAsset evidence =
       TxOutValue evidence . fromMaryValue $
@@ -690,7 +691,7 @@ evaluateTransactionBalance bpp poolids stakeDelegDeposits utxo
                 => ShelleyEraTxBody ledgerera
                 => LedgerEraConstraints ledgerera
                 => LedgerAdaOnlyConstraints ledgerera
-                => OnlyAdaSupportedInEra era
+                => OnlyAdaFeature era
                 -> TxOutValue era
     evalAdaOnly evidence =
      TxOutAdaOnly evidence . fromShelleyLovelace
@@ -709,13 +710,13 @@ evaluateTransactionBalance bpp poolids stakeDelegDeposits utxo
           => LedgerAdaOnlyConstraints ledgerera
           => LedgerPParamsConstraints ledgerera
           => LedgerTxBodyConstraints ledgerera
-          => OnlyAdaSupportedInEra era
+          => OnlyAdaFeature era
           -> a)
       -> (   LedgerEraConstraints ledgerera
           => LedgerMultiAssetConstraints ledgerera
           => LedgerPParamsConstraints ledgerera
           => LedgerTxBodyConstraints ledgerera
-          => MultiAssetSupportedInEra era
+          => MultiAssetFeature era
           -> a)
       -> a
     withLedgerConstraints ShelleyBasedEraShelley f _ = f AdaOnlyInShelleyEra
@@ -939,7 +940,7 @@ makeTransactionBodyAutoBalance systemstart history pparams poolids stakeDelegDep
       case Map.mapEither id exUnitsMap of
         (failures, exUnitsMap') ->
           handleExUnitsErrors
-            (txScriptValidityToScriptValidity (txScriptValidity txbodycontent))
+            (valueOrDefault defaultScriptValidity (txScriptValidity txbodycontent))
             failures
             exUnitsMap'
 

cardano-api/internal/Cardano/Api/Tx.hs

@@ -50,6 +50,7 @@ module Cardano.Api.Tx (
 import           Cardano.Api.Address
 import           Cardano.Api.Certificate
 import           Cardano.Api.Eras
+import           Cardano.Api.Feature
 import           Cardano.Api.HasTypeProxy
 import           Cardano.Api.Keys.Byron
 import           Cardano.Api.Keys.Class
@@ -490,13 +491,13 @@ getTxBody (ShelleyTx era tx') =
                     (Map.elems scriptWits)
                     TxBodyNoScriptData
                     (strictMaybeToMaybe txAuxData)
-                    TxScriptValidityNone
+                    NoFeatureValue
 
     getAlonzoTxBody :: forall ledgerera.
                        ShelleyLedgerEra era ~ ledgerera
                     => L.AlonzoEraTx ledgerera
                     => ScriptDataSupportedInEra era
-                    -> TxScriptValiditySupportedInEra era
+                    -> TxScriptValidityFeature era
                     -> L.Tx ledgerera
                     -> TxBody era
     getAlonzoTxBody scriptDataInEra txScriptValidityInEra tx =
@@ -510,7 +511,7 @@ getTxBody (ShelleyTx era tx') =
                     (Map.elems scriptWits)
                     (TxBodyScriptData scriptDataInEra datsWits redeemerWits)
                     (strictMaybeToMaybe txAuxData)
-                    (TxScriptValidity txScriptValidityInEra (isValidToScriptValidity isValid))
+                    (FeatureValue txScriptValidityInEra (isValidToScriptValidity isValid))
 
 getTxWitnesses :: forall era. Tx era -> [KeyWitness era]
 getTxWitnesses (ByronTx Byron.ATxAux { Byron.aTaWitness = witnesses }) =
@@ -607,7 +608,7 @@ makeSignedTransaction witnesses (ShelleyTxBody era txbody
         (txCommon
          & L.witsTxL . L.datsTxWitsL .~ datums
          & L.witsTxL . L.rdmrsTxWitsL .~ redeemers
-         & L.isValidTxL .~ txScriptValidityToIsValid scriptValidity)
+         & L.isValidTxL .~ scriptValidityToIsValid (valueOrDefault defaultScriptValidity scriptValidity))
       where
         (datums, redeemers) =
           case txscriptdata of