From ade61c63f5506a3990af8e5b63798d5c2c8448d9 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Mon, 29 Apr 2024 15:42:07 -0400 Subject: [PATCH 1/2] Enable manual specification of execution units for voting and proposing plutus scripts --- cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs index 5b06f22b33..0afdb0b7a7 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs @@ -235,8 +235,8 @@ pTransactionBuildEstimateCmd era _envCli = do "Filepath of auxiliary script(s)") <*> many pMetadataFile <*> pFeatured (shelleyBasedToCardanoEra sbe) (optional pUpdateProposalFile) - <*> pVoteFiles sbe AutoBalance - <*> pProposalFiles sbe AutoBalance + <*> pVoteFiles sbe ManualBalance + <*> pProposalFiles sbe ManualBalance <*> pTxBodyFileOut pChangeAddress :: Parser TxOutChangeAddress From 6eff419ba98fc34ed3b63073c395119db6676ad0 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Mon, 29 Apr 2024 15:47:59 -0400 Subject: [PATCH 2/2] Update golden files --- .../cardano-cli-golden/files/golden/help.cli | 20 +++++++++------- .../conway_transaction_build-estimate.cli | 24 ++++++++++++------- 2 files changed, 28 insertions(+), 16 deletions(-) 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 ab634f0d39..53e5334645 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -8079,16 +8079,20 @@ Usage: cardano-cli conway transaction build-estimate ] [--vote-file FILE [--vote-script-file FILE - [ --vote-redeemer-cbor-file CBOR FILE - | --vote-redeemer-file JSON FILE - | --vote-redeemer-value JSON VALUE - ]]] + [ + ( --vote-redeemer-cbor-file CBOR FILE + | --vote-redeemer-file JSON FILE + | --vote-redeemer-value JSON VALUE + ) + --vote-execution-units (INT, INT)]]] [--proposal-file FILE [--proposal-script-file FILE - [ --proposal-redeemer-cbor-file CBOR FILE - | --proposal-redeemer-file JSON FILE - | --proposal-redeemer-value JSON VALUE - ]]] + [ + ( --proposal-redeemer-cbor-file CBOR FILE + | --proposal-redeemer-file JSON FILE + | --proposal-redeemer-value JSON VALUE + ) + --proposal-execution-units (INT, INT)]]] --out-file FILE Build a balanced transaction without access to a live node (automatically estimates fees) diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli index 92e98a86fd..b2a1c0c0e7 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli @@ -125,16 +125,20 @@ Usage: cardano-cli conway transaction build-estimate ] [--vote-file FILE [--vote-script-file FILE - [ --vote-redeemer-cbor-file CBOR FILE - | --vote-redeemer-file JSON FILE - | --vote-redeemer-value JSON VALUE - ]]] + [ + ( --vote-redeemer-cbor-file CBOR FILE + | --vote-redeemer-file JSON FILE + | --vote-redeemer-value JSON VALUE + ) + --vote-execution-units (INT, INT)]]] [--proposal-file FILE [--proposal-script-file FILE - [ --proposal-redeemer-cbor-file CBOR FILE - | --proposal-redeemer-file JSON FILE - | --proposal-redeemer-value JSON VALUE - ]]] + [ + ( --proposal-redeemer-cbor-file CBOR FILE + | --proposal-redeemer-file JSON FILE + | --proposal-redeemer-value JSON VALUE + ) + --proposal-execution-units (INT, INT)]]] --out-file FILE Build a balanced transaction without access to a live node (automatically estimates fees) @@ -430,6 +434,8 @@ Available options: The script redeemer, in JSON syntax. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --vote-execution-units (INT, INT) + The time and space units needed by the script. --proposal-file FILE Filepath of the proposal. --proposal-script-file FILE The file containing the script to witness a proposal @@ -443,5 +449,7 @@ Available options: The script redeemer, in JSON syntax. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --proposal-execution-units (INT, INT) + The time and space units needed by the script. --out-file FILE Output filepath of the JSON TxBody. -h,--help Show this help text