From 13142cba52d3bd9bb0cfa7379d95ef5b3aeab253 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Fri, 21 Jun 2024 15:42:15 +0200 Subject: [PATCH] Fix #796 - make --fee mandatory in legacy transaction build-raw --- cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs | 2 +- cardano-cli/src/Cardano/CLI/Legacy/Options.hs | 2 +- cardano-cli/src/Cardano/CLI/Legacy/Run/Transaction.hs | 5 ++--- cardano-cli/test/cardano-cli-golden/files/golden/help.cli | 4 ++-- .../files/golden/help/legacy_transaction_build-raw.cli | 2 +- .../files/golden/help/transaction_build-raw.cli | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs index a4d1d06719..e41add55ce 100644 --- 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 index b3b2771452..277b0a9bd5 100644 --- 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 index ce417c3e78..5375cb058d 100644 --- 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 index 20d08ac01a..6ebcf9bc7e 100644 --- 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 index 09ca96e82b..8d4c1c0323 100644 --- 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 index 56fcfd7174..b4a45a09f8 100644 --- 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 [