Combine total collateral with plutus execution units

IntersectMBO · Apr 23, 2024 · edf7190 · edf7190
1 parent d32cd5c
commit edf7190
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs
@@ -150,8 +150,6 @@ data TransactionBuildEstimateCmdArgs era = TransactionBuildEstimateCmdArgs
     -- ^ Transaction inputs for collateral, only key witnesses, no scripts.
   , mReturnCollateral       :: !(Maybe TxOutShelleyBasedEra)
     -- ^ Return collateral
-  , totalCollateral         :: !Coin
-    -- ^ Total collateral
   , txouts                  :: ![TxOutAnyEra]
     -- ^ Normal outputs
   , changeAddress           :: !TxOutChangeAddress
@@ -166,8 +164,8 @@ data TransactionBuildEstimateCmdArgs era = TransactionBuildEstimateCmdArgs
     -- ^ Certificates with potential script witness
   , withdrawals             :: ![(StakeAddress, Coin, Maybe (ScriptWitnessFiles WitCtxStake))]
     -- ^ Withdrawals with potential script witness
-  , plutusExecutionUnits     :: !(Map ScriptWitnessIndex ExecutionUnits)
-    -- ^ Plutus script execution units
+  , plutusCollateralAndExecutionUnits :: !(Maybe (Coin, Map ScriptWitnessIndex ExecutionUnits))
+    -- ^ Total collateral and plutus script execution units
   , totalReferenceScriptSize :: !(Maybe Int)
     -- ^ Size of all reference scripts in bytes
   , metadataSchema           :: !TxMetadataJsonSchema

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs
@@ -219,15 +219,14 @@ pTransactionBuildEstimateCmd era _envCli = do
           <*> many pRequiredSigner
           <*> many pTxInCollateral
           <*> optional pReturnCollateral
-          <*> pTotalCollateral
           <*> many pTxOut
           <*> pChangeAddress
           <*> optional (pMintMultiAsset AutoBalance)
           <*> optional pInvalidBefore
           <*> pInvalidHereafter sbe
           <*> many (pCertificateFile AutoBalance)
           <*> many (pWithdrawal AutoBalance)
-          <*> pure mempty -- TOOD: Plutus execution units (Map ScriptWitnessIndex ExecutionUnits)
+          <*> optional ((,) <$> pTotalCollateral <*>  pure mempty) -- TOOD: Plutus execution units (Map ScriptWitnessIndex ExecutionUnits)
           <*> pure Nothing -- TODO: Total ref scripts size
           <*> pTxMetadataJsonSchema
           <*> many (pScriptFor

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
@@ -264,7 +264,6 @@ runTransactionBuildEstimateCmd
     , requiredSigners = reqSigners
     , txinsc = txInsCollateral
     , mReturnCollateral = mReturnColl
-    , totalCollateral
     , txouts
     , changeAddress = TxOutChangeAddress changeAddr
     , mValue
@@ -278,7 +277,7 @@ runTransactionBuildEstimateCmd
     , mUpdateProposalFile
     , voteFiles
     , proposalFiles
-    , plutusExecutionUnits
+    , plutusCollateralAndExecutionUnits
     , totalReferenceScriptSize
     , txBodyOutFile
     } = do
@@ -345,7 +344,7 @@ runTransactionBuildEstimateCmd
                      readOnlyRefIns
                      filteredTxinsc
                      mReturnCollateral
-                     (Just totalCollateral)
+                     Nothing -- TODO: Remove total collateral parameter from estimateBalancedTxBody
                      txOuts
                      mValidityLowerBound
                      mValidityUpperBound
@@ -362,12 +361,14 @@ runTransactionBuildEstimateCmd
   let stakeCredentialsToDeregisterMap = Map.fromList $ catMaybes [getStakeDeregistrationInfo cert | (cert,_) <- certsAndMaybeScriptWits]
       drepsToDeregisterMap = Map.fromList $ catMaybes [getDRepDeregistrationInfo cert | (cert,_) <- certsAndMaybeScriptWits]
       poolsToDeregister = Set.fromList $ catMaybes [getPoolDeregistrationInfo cert | (cert,_) <- certsAndMaybeScriptWits]
-
+      (totCol, pScriptExecUnits) = case plutusCollateralAndExecutionUnits of
+                                   Just (totalCollateral, plutusExecutionUnits) -> (totalCollateral, plutusExecutionUnits)
+                                   Nothing -> (0, mempty)
   BalancedTxBody _ balancedTxBody _ _ <-
     hoistEither $ first TxCmdFeeEstimationError $
       estimateBalancedTxBody eon txBodyContent (unLedgerProtocolParameters ledgerPParams) poolsToDeregister
                              stakeCredentialsToDeregisterMap drepsToDeregisterMap
-                             plutusExecutionUnits totalCollateral shelleyWitnesses (fromMaybe 0 mByronWitnesses)
+                             pScriptExecUnits totCol shelleyWitnesses (fromMaybe 0 mByronWitnesses)
                              (fromMaybe 0 totalReferenceScriptSize) (anyAddressInShelleyBasedEra sbe changeAddr)
                              totalUTxOValue