Propagate TxTotalCollateral and TxReturnCollateral to cardano-cli

without integrating total collateral and collatural return functionality to cardano-cli
IntersectMBO · Apr 12, 2022 · e01d46f · e01d46f
1 parent ce40420
commit e01d46f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/cardano-api/gen/Gen/Cardano/Api/Typed.hs b/cardano-api/gen/Gen/Cardano/Api/Typed.hs
@@ -85,7 +85,6 @@ import           Hedgehog (Gen, Range)
 import qualified Hedgehog.Gen as Gen
 import qualified Hedgehog.Range as Range
 
-import           Cardano.Api.TxBody (totalAndReturnCollateralSupportedInEra)
 import qualified Cardano.Crypto.Hash.Class as CRYPTO
 import           Cardano.Ledger.SafeHash (unsafeMakeSafeHash)
 import           Gen.Cardano.Api.Metadata (genTxMetadata)

diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs
@@ -236,6 +236,7 @@ module Cardano.Api (
     certificatesSupportedInEra,
     updateProposalSupportedInEra,
     scriptDataSupportedInEra,
+    totalAndReturnCollateralSupportedInEra,
 
     -- ** Fee calculation
     transactionFee,

diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs
@@ -151,6 +151,8 @@ txSpendGenesisUTxOByronPBFT gc nId sk (ByronAddress bAddr) outs = do
             ]
             TxInsCollateralNone
             outs
+            TxTotalCollateralNone
+            TxReturnCollateralNone
             (TxFeeImplicit TxFeesImplicitInByronEra)
             ( TxValidityNoLowerBound
             , TxValidityNoUpperBound ValidityNoUpperBoundInByronEra
@@ -190,6 +192,8 @@ txSpendUTxOByronPBFT nId sk txIns outs = do
                      ]
                      TxInsCollateralNone
                      outs
+                     TxTotalCollateralNone
+                     TxReturnCollateralNone
                      (TxFeeImplicit TxFeesImplicitInByronEra)
                      ( TxValidityNoLowerBound
                      , TxValidityNoUpperBound ValidityNoUpperBoundInByronEra

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
@@ -378,6 +378,8 @@ runTxBuildRaw (AnyCardanoEra era)
         <*> validateTxInsCollateral
                            era inputsCollateral
         <*> validateTxOuts era txouts
+        <*> pure TxTotalCollateralNone
+        <*> pure TxReturnCollateralNone
         <*> validateTxFee  era mFee
         <*> ((,) <$> validateTxValidityLowerBound era mLowerBound
                  <*> validateTxValidityUpperBound era mUpperBound)
@@ -455,6 +457,8 @@ runTxBuild (AnyCardanoEra era) (AnyConsensusModeParams cModeParams) networkId mS
           <$> validateTxIns               era txins
           <*> validateTxInsCollateral     era txinsc
           <*> validateTxOuts              era txouts
+          <*> pure TxTotalCollateralNone -- TODO: Babbage era
+          <*> pure TxReturnCollateralNone -- TODO: Babbage era
           <*> validateTxFee               era dummyFee
           <*> ((,) <$> validateTxValidityLowerBound era mLowerBound
                    <*> validateTxValidityUpperBound era mUpperBound)