Skip to content

Commit

Permalink
Merge pull request #744 from IntersectMBO/jordan/enable-manual-execut…
Browse files Browse the repository at this point in the history 
…ion-unit-balancing-votes-proposals

Enable manual specification of execution units for plutus voting and proposing scripts
  • Loading branch information
@Jimbo4350
Jimbo4350 authored Apr 30, 2024
2 parents 8d97919 + 6eff419 commit 4bdbc16
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 18 deletions.
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 12 additions & 8 deletions cardano-cli/test/cardano-cli-golden/files/golden/help.cli
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 16 additions & 8 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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

0 comments on commit 4bdbc16

Please sign in to comment.