WIP: Fixing tests. You need to update the tests to test the equivalence

of the new txbody conten vs the old one

Author: Jimbo4350

cardano-api/cardano-api.cabal

@@ -227,15 +227,17 @@ library
     Cardano.Api.Experimental.Plutus.Internal.Script
     Cardano.Api.Experimental.Plutus.Internal.ScriptWitness
     Cardano.Api.Experimental.Plutus.Internal.Shim.LegacyScripts
+    Cardano.Api.Experimental.Script
     Cardano.Api.Experimental.Serialise.TextEnvelope.Internal
     Cardano.Api.Experimental.Tx.Internal.AnyWitness
-    Cardano.Api.Experimental.Tx.Internal.Body
+    Cardano.Api.Experimental.Tx.Internal.BodyContent.New
     Cardano.Api.Experimental.Tx.Internal.Certificate
     Cardano.Api.Experimental.Tx.Internal.Certificate.Compatible
     Cardano.Api.Experimental.Tx.Internal.Certificate.Type
     Cardano.Api.Experimental.Tx.Internal.Compatible
     Cardano.Api.Experimental.Tx.Internal.Fee
     Cardano.Api.Experimental.Tx.Internal.TxScriptWitnessRequirements
+    Cardano.Api.Experimental.Tx.Internal.Type
     Cardano.Api.Genesis.Internal
     Cardano.Api.Genesis.Internal.Parameters
     Cardano.Api.Governance.Internal.Action.ProposalProcedure
@@ -306,6 +308,7 @@ library gen
     Test.Gen.Cardano.Api
     Test.Gen.Cardano.Api.Byron
     Test.Gen.Cardano.Api.Era
+    Test.Gen.Cardano.Api.Experimental
     Test.Gen.Cardano.Api.Hardcoded
     Test.Gen.Cardano.Api.Metadata
     Test.Gen.Cardano.Api.Orphans

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

@@ -0,0 +1,17 @@
+module Test.Gen.Cardano.Api.Experimental
+  ( genScriptWitnessedTxIn
+  , genScriptWitnessedTxMintValue
+  )
+where
+
+import Cardano.Api.Experimental
+import Cardano.Api.Experimental.Tx.Internal.BodyContent.New
+import Cardano.Api (TxIn)
+import Hedgehog (Gen)
+
+genScriptWitnessedTxIn :: Gen [(TxIn, AnyWitness era)]
+genScriptWitnessedTxIn = undefined 
+
+
+genScriptWitnessedTxMintValue :: Gen (TxMintValue era)
+genScriptWitnessedTxMintValue = undefined

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

@@ -124,6 +124,12 @@ module Cardano.Api.Experimental.Tx
   , convertTxBodyToUnsignedTx
   , hashTxBody
 
+    -- * TxBodyContent
+  , TxBodyContent (..)
+  , defaultTxBodyContent
+  , setTxIns
+  , setTxMintValue
+
     -- * Witness
 
     -- ** Any witness (key, simple script, plutus script).
@@ -150,10 +156,7 @@ import Cardano.Api.Era.Internal.Core qualified as Api
 import Cardano.Api.Era.Internal.Eon.ShelleyBasedEra
 import Cardano.Api.Experimental.Era
 import Cardano.Api.Experimental.Tx.Internal.AnyWitness
-import Cardano.Api.Experimental.Tx.Internal.BodyContent.Old
-  ( extractAllIndexedPlutusScriptWitnesses
-  , makeUnsignedTx
-  )
+import Cardano.Api.Experimental.Tx.Internal.BodyContent.New
 import Cardano.Api.Experimental.Tx.Internal.TxScriptWitnessRequirements
 import Cardano.Api.Experimental.Tx.Internal.Type
 import Cardano.Api.HasTypeProxy (HasTypeProxy (..), Proxy, asType)

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

@@ -19,10 +19,15 @@ module Cardano.Api.Experimental.Tx.Internal.BodyContent.New
   , TxVotingProcedures (..)
   , TxWithdrawals (..)
   , TxBodyContent (..)
+  , defaultTxBodyContent
   , collectTxBodyScriptWitnessRequirements
-  , createUnsignedTx
+  , makeUnsignedTx
   , extractAllIndexedPlutusScriptWitnesses
   , txMintValueToValue
+
+    -- * Getters and Setters
+  , setTxIns
+  , setTxMintValue
   )
 where
 
@@ -71,6 +76,7 @@ import Control.Monad
 import Data.Functor
 import Data.List qualified as List
 import Data.Map.Ordered.Strict (OMap)
+import Data.Map.Ordered.Strict qualified as OMap
 import Data.Map.Strict (Map)
 import Data.Map.Strict qualified as Map
 import Data.Maybe
@@ -82,13 +88,13 @@ import Data.Set qualified as Set
 import GHC.Exts (IsList (..))
 import Lens.Micro
 
-createUnsignedTx
+makeUnsignedTx
   :: forall era
    . Era era
-  -> TxBodyContent CtxTx (LedgerEra era)
+  -> TxBodyContent (LedgerEra era)
   -> Either String (UnsignedTx era)
-createUnsignedTx DijkstraEra _ = error "makeUnsignedTx: Dijkstra era not supported yet"
-createUnsignedTx era@ConwayEra bc = obtainCommonConstraints era $ do
+makeUnsignedTx DijkstraEra _ = error "makeUnsignedTx: Dijkstra era not supported yet"
+makeUnsignedTx era@ConwayEra bc = obtainCommonConstraints era $ do
   TxScriptWitnessRequirements languages scripts datums redeemers <-
     collectTxBodyScriptWitnessRequirements bc
 
@@ -158,7 +164,7 @@ convTxIns :: [(TxIn, AnyWitness era)] -> Set L.TxIn
 convTxIns inputs =
   Set.fromList [toShelleyTxIn txin | (txin, _) <- inputs]
 
-convCollateralTxIns :: TxBodyContent ctx era -> Set L.TxIn
+convCollateralTxIns :: TxBodyContent (LedgerEra era) -> Set L.TxIn
 convCollateralTxIns b =
   fromList (map toShelleyTxIn $ txInsCollateral b)
 
@@ -245,7 +251,7 @@ toAuxiliaryData txMData ss' =
 eraSpecificLedgerTxBody
   :: Era era
   -> L.TxBody (LedgerEra era)
-  -> TxBodyContent ctx (LedgerEra era)
+  -> TxBodyContent (LedgerEra era)
   -> L.TxBody (LedgerEra era)
 eraSpecificLedgerTxBody era ledgerbody bc =
   body era
@@ -319,12 +325,15 @@ newtype TxCertificates era
 -- This is incorrect. Only scripts can witness minting!
 newtype TxMintValue era
   = TxMintValue
-      ( Map
-          PolicyId
-          ( PolicyAssets
-          , AnyWitness era
-          )
-      )
+  { unTxMintValue
+      :: ( Map
+             PolicyId
+             ( PolicyAssets
+             , AnyWitness era
+             )
+         )
+  }
+  deriving (Eq, Show)
 
 -- | Convert 'TxMintValue' to a more handy 'Value'.
 txMintValueToValue :: TxMintValue era -> Value
@@ -346,12 +355,12 @@ data TxVotingProcedures era
       (L.VotingProcedures era)
       (Map L.Voter (AnyWitness era))
 
-data TxBodyContent ctx era
+data TxBodyContent era
   = TxBodyContent
   { txIns :: [(TxIn, AnyWitness era)]
   , txInsCollateral :: [TxIn]
   , txInsReference :: TxInsReference era
-  , txOuts :: [TxOut ctx era]
+  , txOuts :: [TxOut CtxTx era]
   , txCollateral :: Maybe (TxCollateral era)
   , txFee :: L.Coin
   , txValidityLowerBound :: Maybe L.SlotNo
@@ -372,10 +381,36 @@ data TxBodyContent ctx era
     -- -- ^ Treasury donation to perform
   }
 
+defaultTxBodyContent
+  :: TxBodyContent (LedgerEra era)
+defaultTxBodyContent =
+  TxBodyContent
+    { txIns = []
+    , txInsCollateral = []
+    , txInsReference = TxInsReference mempty Set.empty
+    , txOuts = []
+    , txCollateral = Nothing
+    , txFee = 0
+    , txValidityLowerBound = Nothing
+    , txValidityUpperBound = Nothing
+    , txMetadata = TxMetadata mempty
+    , txAuxScripts = []
+    , txExtraKeyWits = TxExtraKeyWitnesses []
+    , txProtocolParams = Nothing
+    , txWithdrawals = TxWithdrawals mempty
+    , txCertificates = TxCertificates OMap.empty
+    , txMintValue = TxMintValue mempty
+    , txScriptValidity = ScriptValid
+    , txProposalProcedures = Nothing
+    , txVotingProcedures = Nothing
+    , txCurrentTreasuryValue = Nothing
+    , txTreasuryDonation = Nothing
+    }
+
 extractAllIndexedPlutusScriptWitnesses
-  :: forall era ctx
+  :: forall era
    . Era era
-  -> TxBodyContent ctx (LedgerEra era)
+  -> TxBodyContent (LedgerEra era)
   -> Either
        CBOR.DecoderError
        [AnyIndexedPlutusScriptWitness (LedgerEra era)]
@@ -506,7 +541,7 @@ extractWitnessableProposals (Just txPropProcedures) =
 collectTxBodyScriptWitnessRequirements
   :: forall era
    . IsEra era
-  => TxBodyContent CtxTx (LedgerEra era)
+  => TxBodyContent (LedgerEra era)
   -> Either
        String
        (TxScriptWitnessRequirements (LedgerEra era))
@@ -591,3 +626,11 @@ getDatums txInsRef txOutsFromTx = do
     L.TxDats $
       fromList $
         refInDatums <> txOutsDats
+
+-- Getters and Setters
+
+setTxIns :: [(TxIn, AnyWitness era)] -> TxBodyContent era -> TxBodyContent era
+setTxIns v txBodyContent = txBodyContent{txIns = v}
+
+setTxMintValue :: TxMintValue era -> TxBodyContent era -> TxBodyContent era
+setTxMintValue v txBodyContent = txBodyContent{txMintValue = v}