From 4d7701908c7e6289114597c80d2ca37834726ad1 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Thu, 4 Jul 2024 15:19:46 +0200 Subject: [PATCH] Fix golden tests --- .../cardano-cli-golden/files/golden/help.cli | 170 +++++++++++++----- .../conway_transaction_build-estimate.cli | 65 ++++++- .../help/conway_transaction_build-raw.cli | 65 ++++++- .../golden/help/conway_transaction_build.cli | 59 +++++- .../help/legacy_transaction_build-raw.cli | 8 +- .../golden/help/legacy_transaction_build.cli | 59 +++++- .../golden/help/transaction_build-raw.cli | 8 +- .../files/golden/help/transaction_build.cli | 59 +++++- 8 files changed, 397 insertions(+), 96 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 2fe58598ba..3fd816ae96 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -7708,11 +7708,11 @@ Usage: cardano-cli conway transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -7721,11 +7721,11 @@ Usage: cardano-cli conway transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -7821,21 +7821,37 @@ Usage: cardano-cli conway transaction build-raw ] [--protocol-params-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ ( --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE ) - --vote-execution-units (INT, INT)]]] + --vote-execution-units (INT, INT)] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + --vote-reference-tx-in-execution-units (INT, INT) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ ( --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE ) - --proposal-execution-units (INT, INT)]]] + --proposal-execution-units (INT, INT)] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + --proposal-reference-tx-in-execution-units (INT, INT) + ]] [--current-treasury-value LOVELACE --treasury-donation LOVELACE] --out-file FILE @@ -7859,11 +7875,11 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -7871,11 +7887,11 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -7960,17 +7976,31 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH | --metadata-cbor-file FILE ] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -7993,11 +8023,11 @@ Usage: cardano-cli conway transaction build-estimate ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -8006,11 +8036,11 @@ Usage: cardano-cli conway transaction build-estimate | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -8106,21 +8136,37 @@ Usage: cardano-cli conway transaction build-estimate | --metadata-cbor-file FILE ] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ ( --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE ) - --vote-execution-units (INT, INT)]]] + --vote-execution-units (INT, INT)] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + --vote-reference-tx-in-execution-units (INT, INT) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ ( --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE ) - --proposal-execution-units (INT, INT)]]] + --proposal-execution-units (INT, INT)] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + --proposal-reference-tx-in-execution-units (INT, INT) + ]] [--current-treasury-value LOVELACE --treasury-donation LOVELACE] --out-file FILE @@ -10267,11 +10313,11 @@ Usage: cardano-cli legacy transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -10280,11 +10326,11 @@ Usage: cardano-cli legacy transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -10407,11 +10453,11 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -10419,11 +10465,11 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -10509,17 +10555,31 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH ] [--update-proposal-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -11508,11 +11568,11 @@ Usage: cardano-cli transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -11521,11 +11581,11 @@ Usage: cardano-cli transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -11643,11 +11703,11 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -11655,11 +11715,11 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -11745,17 +11805,31 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH ] [--update-proposal-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE 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 631c34b42d..4caabf9c91 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 @@ -11,11 +11,11 @@ Usage: cardano-cli conway transaction build-estimate ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -24,11 +24,11 @@ Usage: cardano-cli conway transaction build-estimate | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -124,21 +124,37 @@ Usage: cardano-cli conway transaction build-estimate | --metadata-cbor-file FILE ] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ ( --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE ) - --vote-execution-units (INT, INT)]]] + --vote-execution-units (INT, INT)] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + --vote-reference-tx-in-execution-units (INT, INT) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ ( --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE ) - --proposal-execution-units (INT, INT)]]] + --proposal-execution-units (INT, INT)] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + --proposal-reference-tx-in-execution-units (INT, INT) + ]] [--current-treasury-value LOVELACE --treasury-donation LOVELACE] --out-file FILE @@ -437,6 +453,22 @@ Available options: top-level strings and numbers. --vote-execution-units (INT, INT) The time and space units needed by the script. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. + --vote-reference-tx-in-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 @@ -452,6 +484,23 @@ Available options: top-level strings and numbers. --proposal-execution-units (INT, INT) The time and space units needed by the script. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. + --proposal-reference-tx-in-execution-units (INT, INT) + The time and space units needed by the script. --current-treasury-value LOVELACE The current treasury value. --treasury-donation LOVELACE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli index 21160033df..8a34ba8d4c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli @@ -7,11 +7,11 @@ Usage: cardano-cli conway transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -20,11 +20,11 @@ Usage: cardano-cli conway transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -120,21 +120,37 @@ Usage: cardano-cli conway transaction build-raw ] [--protocol-params-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ ( --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE ) - --vote-execution-units (INT, INT)]]] + --vote-execution-units (INT, INT)] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + --vote-reference-tx-in-execution-units (INT, INT) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ ( --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE ) - --proposal-execution-units (INT, INT)]]] + --proposal-execution-units (INT, INT)] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + --proposal-reference-tx-in-execution-units (INT, INT) + ]] [--current-treasury-value LOVELACE --treasury-donation LOVELACE] --out-file FILE @@ -422,6 +438,22 @@ Available options: top-level strings and numbers. --vote-execution-units (INT, INT) The time and space units needed by the script. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. + --vote-reference-tx-in-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 @@ -437,6 +469,23 @@ Available options: top-level strings and numbers. --proposal-execution-units (INT, INT) The time and space units needed by the script. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. + --proposal-reference-tx-in-execution-units (INT, INT) + The time and space units needed by the script. --current-treasury-value LOVELACE The current treasury value. --treasury-donation LOVELACE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli index 85450a9ecc..24450a10c5 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli @@ -13,11 +13,11 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -25,11 +25,11 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -114,17 +114,31 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH | --metadata-cbor-file FILE ] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -408,6 +422,20 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --proposal-file FILE Filepath of the proposal. --proposal-script-file FILE The file containing the script to witness a proposal @@ -421,6 +449,21 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --treasury-donation LOVELACE The donation to the treasury to perform. --out-file FILE Output filepath of the JSON TxBody. 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 8d4c1c0323..32a68972b5 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 @@ -14,11 +14,11 @@ Usage: cardano-cli legacy transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -27,11 +27,11 @@ Usage: cardano-cli legacy transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli index b025a10087..44d02588b1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli @@ -19,11 +19,11 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -31,11 +31,11 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -121,17 +121,31 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH ] [--update-proposal-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -422,6 +436,20 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --proposal-file FILE Filepath of the proposal. --proposal-script-file FILE The file containing the script to witness a proposal @@ -435,6 +463,21 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --treasury-donation LOVELACE The donation to the treasury to perform. --out-file FILE Output filepath of the JSON TxBody. 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 b4a45a09f8..75e445574f 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 @@ -12,11 +12,11 @@ Usage: cardano-cli transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -25,11 +25,11 @@ Usage: cardano-cli transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli index 7875ebc0ae..c03d260244 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli @@ -14,11 +14,11 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -26,11 +26,11 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -116,17 +116,31 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH ] [--update-proposal-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -417,6 +431,20 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --proposal-file FILE Filepath of the proposal. --proposal-script-file FILE The file containing the script to witness a proposal @@ -430,6 +458,21 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --treasury-donation LOVELACE The donation to the treasury to perform. --out-file FILE Output filepath of the JSON TxBody.