Refactor makeUnsignedTx

Author: Jimbo4350

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

@@ -14,6 +14,7 @@ module Cardano.Api.Experimental.Plutus.Internal.Shim.LegacyScripts
   ( convertToNewScriptWitness
   , legacyWitnessToScriptRequirements
   , legacyWitnessConversion
+  , obtainMonoidConstraint
   , toPlutusSLanguage
   )
 where
@@ -25,7 +26,9 @@ import Cardano.Api.Experimental.Plutus.Internal.Script
 import Cardano.Api.Experimental.Plutus.Internal.ScriptWitness
 import Cardano.Api.Experimental.Simple.Script
 import Cardano.Api.Experimental.Tx.Internal.AnyWitness
-import Cardano.Api.Experimental.Tx.Internal.TxScriptWitnessRequirements
+import Cardano.Api.Experimental.Tx.Internal.TxScriptWitnessRequirements hiding
+  ( obtainMonoidConstraint
+  )
 import Cardano.Api.Plutus.Internal.Script
   ( ExecutionUnits
   , Witness
@@ -214,6 +217,16 @@ obtainConstraints v =
     Old.PlutusScriptV3 -> id
     Old.PlutusScriptV4 -> id
 
+obtainMonoidConstraint
+  :: AlonzoEraOnwards era
+  -> (Monoid (TxScriptWitnessRequirements (ShelleyLedgerEra era)) => a)
+  -> a
+obtainMonoidConstraint eon = case eon of
+  AlonzoEraOnwardsAlonzo -> id
+  AlonzoEraOnwardsBabbage -> id
+  AlonzoEraOnwardsConway -> id
+  AlonzoEraOnwardsDijkstra -> id
+
 toPlutusSLanguage
   :: Old.PlutusScriptVersion lang -> L.SLanguage (Old.ToLedgerPlutusLanguage lang)
 toPlutusSLanguage = \case

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

@@ -125,11 +125,10 @@ makeUnsignedTx
   :: forall era
    . Era era
   -> TxBodyContent (LedgerEra era)
-  -> Either String (UnsignedTx era)
+  -> UnsignedTx era
 makeUnsignedTx DijkstraEra _ = error "makeUnsignedTx: Dijkstra era not supported yet"
 makeUnsignedTx era@ConwayEra bc = obtainCommonConstraints era $ do
-  TxScriptWitnessRequirements languages scripts datums redeemers <-
-    collectTxBodyScriptWitnessRequirements bc
+  let TxScriptWitnessRequirements languages scripts datums redeemers = collectTxBodyScriptWitnessRequirements bc
 
   -- cardano-api types
   let apiMintValue = txMintValue bc
@@ -187,7 +186,7 @@ makeUnsignedTx era@ConwayEra bc = obtainCommonConstraints era $ do
           & L.rdmrsTxWitsL .~ redeemers
 
   let eraSpecificTxBody = eraSpecificLedgerTxBody era ledgerTxBody bc
-  return . UnsignedTx $
+  UnsignedTx $
     L.mkBasicTx eraSpecificTxBody
       & L.witsTxL .~ scriptWitnesses
       & L.auxDataTxL .~ L.maybeToStrictMaybe (toAuxiliaryData (txMetadata bc) (txAuxScripts bc))
@@ -665,9 +664,7 @@ collectTxBodyScriptWitnessRequirements
   :: forall era
    . IsEra era
   => TxBodyContent (LedgerEra era)
-  -> Either
-       String
-       (TxScriptWitnessRequirements (LedgerEra era))
+  -> TxScriptWitnessRequirements (LedgerEra era)
 collectTxBodyScriptWitnessRequirements
   TxBodyContent
     { txIns
@@ -705,17 +702,16 @@ collectTxBodyScriptWitnessRequirements
           obtainMonoidConstraint (useEra @era) getTxScriptWitnessesRequirements $
             extractWitnessableProposals txProposalProcedures
 
-    return $
-      obtainMonoidConstraint (useEra @era) $
-        mconcat
-          [ supplementaldatums
-          , txInWits
-          , txWithdrawalWits
-          , txCertWits
-          , txMintWits
-          , txVotingWits
-          , txProposalWits
-          ]
+    obtainMonoidConstraint (useEra @era) $
+      mconcat
+        [ supplementaldatums
+        , txInWits
+        , txWithdrawalWits
+        , txCertWits
+        , txMintWits
+        , txVotingWits
+        , txProposalWits
+        ]
 
 obtainMonoidConstraint
   :: Era era

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

@@ -17,8 +17,7 @@ module Cardano.Api.Experimental.Tx.Internal.TxScriptWitnessRequirements
   )
 where
 
-import Cardano.Api.Era.Internal.Eon.AlonzoEraOnwards
-import Cardano.Api.Era.Internal.Eon.ShelleyBasedEra
+import Cardano.Api.Experimental.Era qualified as Exp
 import Cardano.Api.Experimental.Plutus.Internal.IndexedPlutusScriptWitness
 import Cardano.Api.Experimental.Tx.Internal.AnyWitness
 import Cardano.Api.Ledger qualified as L
@@ -92,14 +91,12 @@ getTxScriptWitnessesRequirements wits =
   mconcat $ map getTxScriptWitnessRequirements wits
 
 obtainMonoidConstraint
-  :: AlonzoEraOnwards era
-  -> (Monoid (TxScriptWitnessRequirements (ShelleyLedgerEra era)) => a)
+  :: Exp.Era era
+  -> (Monoid (TxScriptWitnessRequirements (Exp.LedgerEra era)) => a)
   -> a
 obtainMonoidConstraint eon = case eon of
-  AlonzoEraOnwardsAlonzo -> id
-  AlonzoEraOnwardsBabbage -> id
-  AlonzoEraOnwardsConway -> id
-  AlonzoEraOnwardsDijkstra -> id
+  Exp.ConwayEra -> id
+  Exp.DijkstraEra -> id
 
 extractExecutionUnits :: TxScriptWitnessRequirements era -> [ExecutionUnits]
 extractExecutionUnits (TxScriptWitnessRequirements _ _ _ redeemers) =

cardano-api/src/Cardano/Api/Tx/Internal/Body.hs

@@ -254,7 +254,9 @@ import Cardano.Api.Experimental.Plutus.Internal.IndexedPlutusScriptWitness
 import Cardano.Api.Experimental.Plutus.Internal.Shim.LegacyScripts
 import Cardano.Api.Experimental.Tx.Internal.Certificate qualified as Exp
 import Cardano.Api.Experimental.Tx.Internal.Certificate.Compatible (getTxCertWitness)
-import Cardano.Api.Experimental.Tx.Internal.TxScriptWitnessRequirements
+import Cardano.Api.Experimental.Tx.Internal.TxScriptWitnessRequirements hiding
+  ( obtainMonoidConstraint
+  )
 import Cardano.Api.Governance.Internal.Action.ProposalProcedure
 import Cardano.Api.Governance.Internal.Action.VotingProcedure
 import Cardano.Api.Key.Internal

cardano-api/test/cardano-api-test/Test/Cardano/Api/Experimental.hs

@@ -103,8 +103,8 @@ prop_created_transaction_with_both_apis_are_the_same = H.propertyOnce $ do
     txBodyContent <- exampleTxBodyContentExperimental era
     signingKey <- exampleSigningKey
 
-    unsignedTx <- H.evalEither $ Exp.makeUnsignedTx era txBodyContent
-    let witness = Exp.makeKeyWitness era unsignedTx (Api.WitnessPaymentKey signingKey)
+    let unsignedTx = Exp.makeUnsignedTx era txBodyContent
+        witness = Exp.makeKeyWitness era unsignedTx (Api.WitnessPaymentKey signingKey)
 
     let bootstrapWitnesses = []
         keyWitnesses = [witness]