Merge pull request #797 from IntersectMBO/mgalazyn/fix/make-fee-manda…

…tory-in-legacy-transaction-build-raw Make --fee mandatory in legacy transaction build-raw
IntersectMBO · Jun 24, 2024 · 0e085e6 · 0e085e6
2 parents 127f71f + 13142cb
commit 0e085e6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs
@@ -38,7 +38,7 @@ data LegacyTransactionCmds
       -- ^ Transaction lower bound
       (Maybe SlotNo)
       -- ^ Transaction upper bound
-      (Maybe Coin)
+      Coin
       -- ^ Tx fee
       [(CertificateFile, Maybe (ScriptWitnessFiles WitCtxStake))]
       -- ^ Certificates with potential script witness

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
@@ -364,7 +364,7 @@ pTransaction envCli =
       <*> optional (pMintMultiAsset ManualBalance)
       <*> optional pInvalidBefore
       <*> optional pLegacyInvalidHereafter
-      <*> optional pTxFee
+      <*> pTxFee
       <*> many (pCertificateFile ManualBalance )
       <*> many (pWithdrawal ManualBalance)
       <*> pTxMetadataJsonSchema

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/Transaction.hs
@@ -22,7 +22,6 @@ import           Cardano.CLI.Types.Errors.TxValidationError
 import           Cardano.CLI.Types.Governance
 
 import           Data.Function
-import           Data.Maybe
 
 runLegacyTransactionCmds :: LegacyTransactionCmds -> ExceptT TxCmdError IO ()
 runLegacyTransactionCmds = \case
@@ -135,7 +134,7 @@ runLegacyTransactionBuildRawCmd :: ()
   -> Maybe (Value, [ScriptWitnessFiles WitCtxMint]) -- ^ Multi-Asset value with script witness
   -> Maybe SlotNo -- ^ Validity lower bound
   -> Maybe SlotNo -- ^ Validity upper bound
-  -> Maybe Coin -- ^ Tx fee
+  -> Coin -- ^ Tx fee
   -> [(CertificateFile, Maybe (ScriptWitnessFiles WitCtxStake))]
   -> [(StakeAddress, Coin, Maybe (ScriptWitnessFiles WitCtxStake))]
   -> TxMetadataJsonSchema
@@ -176,7 +175,7 @@ runLegacyTransactionBuildRawCmd
        runTransactionBuildRawCmd
          ( Cmd.TransactionBuildRawCmdArgs
              sbe mScriptValidity txins readOnlyRefIns txinsc mReturnColl
-             mTotColl reqSigners txouts mValue mLowBound upperBound (fromMaybe 0 fee) certs wdrls
+             mTotColl reqSigners txouts mValue mLowBound upperBound fee certs wdrls
              metadataSchema scriptFiles metadataFiles mProtocolParamsFile mUpdateProposalFile [] []
              outFile
          )

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -10319,7 +10319,7 @@ Usage: cardano-cli legacy transaction build-raw
                                                     )]
                                                   [--invalid-before SLOT]
                                                   [--invalid-hereafter SLOT]
-                                                  [--fee LOVELACE]
+                                                  --fee LOVELACE
                                                   [--certificate-file FILE
                                                     [ --certificate-script-file FILE
                                                       [
@@ -11555,7 +11555,7 @@ Usage: cardano-cli transaction build-raw
                                              )]
                                            [--invalid-before SLOT]
                                            [--invalid-hereafter SLOT]
-                                           [--fee LOVELACE]
+                                           --fee LOVELACE
                                            [--certificate-file FILE
                                              [ --certificate-script-file FILE
                                                [

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli
@@ -81,7 +81,7 @@ Usage: cardano-cli legacy transaction build-raw
                                                     )]
                                                   [--invalid-before SLOT]
                                                   [--invalid-hereafter SLOT]
-                                                  [--fee LOVELACE]
+                                                  --fee LOVELACE
                                                   [--certificate-file FILE
                                                     [ --certificate-script-file FILE
                                                       [

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli
@@ -79,7 +79,7 @@ Usage: cardano-cli transaction build-raw
                                              )]
                                            [--invalid-before SLOT]
                                            [--invalid-hereafter SLOT]
-                                           [--fee LOVELACE]
+                                           --fee LOVELACE
                                            [--certificate-file FILE
                                              [ --certificate-script-file FILE
                                                [