Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

protocol-(major|minor)-version disappears in conway's create-protocol-parameters-update command #437

Closed
wants to merge 1 commit into from
Closed

protocol-(major|minor)-version disappears in conway's create-protocol-parameters-update command #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ pCommonProtocolParameters =
<*> convertToLedger toNonNegativeIntervalOrErr (optional pPoolInfluence)
<*> convertToLedger toUnitIntervalOrErr (optional pTreasuryExpansion)
<*> convertToLedger toUnitIntervalOrErr (optional pMonetaryExpansion)
<*> convertToLedger mkProtocolVersionOrErr (optional pProtocolVersion)
<*> convertToLedger toShelleyLovelace (optional pMinPoolCost)


Expand All @@ -256,6 +255,11 @@ pDeprecatedAfterMaryPParams =
DeprecatedAfterMaryPParams
<$> convertToLedger toShelleyLovelace (optional pMinUTxOValue)

pDeprecatedAfterBabbagePParams :: Parser (DeprecatedAfterBabbagePParams ledgerera)
pDeprecatedAfterBabbagePParams =
DeprecatedAfterBabbagePParams
<$> convertToLedger mkProtocolVersionOrErr (optional pProtocolVersion)

pShelleyToAlonzoPParams :: Parser (ShelleyToAlonzoPParams ledgerera)
pShelleyToAlonzoPParams =
ShelleyToAlonzoPParams
Expand Down Expand Up @@ -302,26 +306,31 @@ dpGovActionProtocolParametersUpdate = \case
ShelleyEraBasedProtocolParametersUpdate
<$> pCommonProtocolParameters
<*> pDeprecatedAfterMaryPParams
<*> pDeprecatedAfterBabbagePParams
<*> pShelleyToAlonzoPParams
ShelleyBasedEraAllegra ->
AllegraEraBasedProtocolParametersUpdate
<$> pCommonProtocolParameters
<*> pDeprecatedAfterMaryPParams
<*> pShelleyToAlonzoPParams
<*> pDeprecatedAfterBabbagePParams
ShelleyBasedEraMary ->
MaryEraBasedProtocolParametersUpdate
<$> pCommonProtocolParameters
<*> pDeprecatedAfterMaryPParams
<*> pShelleyToAlonzoPParams
<*> pDeprecatedAfterBabbagePParams
ShelleyBasedEraAlonzo ->
AlonzoEraBasedProtocolParametersUpdate
<$> pCommonProtocolParameters
<*> pShelleyToAlonzoPParams
<*> pAlonzoOnwardsPParams
<*> pDeprecatedAfterBabbagePParams
ShelleyBasedEraBabbage ->
BabbageEraBasedProtocolParametersUpdate
<$> pCommonProtocolParameters
<*> pAlonzoOnwardsPParams
<*> pDeprecatedAfterBabbagePParams
<*> pIntroducedInBabbagePParams
ShelleyBasedEraConway ->
ConwayEraBasedProtocolParametersUpdate
Expand Down
26 changes: 12 additions & 14 deletions cardano-cli/test/cardano-cli-golden/files/golden/help.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,10 @@ Usage: cardano-cli shelley governance action create-protocol-parameters-update -
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--min-pool-cost NATURAL]
[--min-utxo-value NATURAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[ --extra-entropy HEX
| --reset-extra-entropy
]
Expand Down Expand Up @@ -1466,14 +1466,14 @@ Usage: cardano-cli allegra governance action create-protocol-parameters-update -
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--min-pool-cost NATURAL]
[--min-utxo-value NATURAL]
[ --extra-entropy HEX
| --reset-extra-entropy
]
[--decentralization-parameter RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
--out-file FILE

Create a protocol parameters update.
Expand Down Expand Up @@ -2589,14 +2589,14 @@ Usage: cardano-cli mary governance action create-protocol-parameters-update --ep
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--min-pool-cost NATURAL]
[--min-utxo-value NATURAL]
[ --extra-entropy HEX
| --reset-extra-entropy
]
[--decentralization-parameter RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
--out-file FILE

Create a protocol parameters update.
Expand Down Expand Up @@ -3695,8 +3695,6 @@ Usage: cardano-cli alonzo governance action create-protocol-parameters-update --
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--min-pool-cost NATURAL]
[ --extra-entropy HEX
| --reset-extra-entropy
Expand All @@ -3709,6 +3707,8 @@ Usage: cardano-cli alonzo governance action create-protocol-parameters-update --
[--max-value-size INT]
[--collateral-percent INT]
[--max-collateral-inputs INT]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
--out-file FILE

Create a protocol parameters update.
Expand Down Expand Up @@ -4828,8 +4828,6 @@ Usage: cardano-cli babbage governance action create-protocol-parameters-update -
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--min-pool-cost NATURAL]
[--price-execution-steps RATIONAL
--price-execution-memory RATIONAL]
Expand All @@ -4838,6 +4836,8 @@ Usage: cardano-cli babbage governance action create-protocol-parameters-update -
[--max-value-size INT]
[--collateral-percent INT]
[--max-collateral-inputs INT]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--utxo-cost-per-byte LOVELACE]
--out-file FILE

Expand Down Expand Up @@ -6044,8 +6044,6 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--min-pool-cost NATURAL]
[--price-execution-steps RATIONAL
--price-execution-memory RATIONAL]
Expand Down Expand Up @@ -7482,8 +7480,6 @@ Usage: cardano-cli latest governance action create-protocol-parameters-update --
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--min-pool-cost NATURAL]
[--price-execution-steps RATIONAL
--price-execution-memory RATIONAL]
Expand All @@ -7492,6 +7488,8 @@ Usage: cardano-cli latest governance action create-protocol-parameters-update --
[--max-value-size INT]
[--collateral-percent INT]
[--max-collateral-inputs INT]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--utxo-cost-per-byte LOVELACE]
--out-file FILE

Expand Down
18 changes: 9 additions & 9 deletions ...-golden/files/golden/help/allegra_governance_action_create-protocol-parameters-update.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ Usage: cardano-cli allegra governance action create-protocol-parameters-update -
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--min-pool-cost NATURAL]
[--min-utxo-value NATURAL]
[ --extra-entropy HEX
| --reset-extra-entropy
]
[--decentralization-parameter RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
--out-file FILE

Create a protocol parameters update.
Expand Down Expand Up @@ -53,19 +53,19 @@ Available options:
Treasury expansion.
--monetary-expansion RATIONAL
Monetary expansion.
--protocol-major-version NATURAL
Major protocol version. An increase indicates a hard
fork.
--protocol-minor-version NATURAL
Minor protocol version. An increase indicates a soft
fork (old software canvalidate but not produce new
blocks).
--min-pool-cost NATURAL The minimum allowed cost parameter for stake pools.
--min-utxo-value NATURAL The minimum allowed UTxO value (Shelley to Mary
eras).
--extra-entropy HEX Praos extra entropy seed, as a hex byte string.
--reset-extra-entropy Reset the Praos extra entropy to none.
--decentralization-parameter RATIONAL
Decentralization parameter.
--protocol-major-version NATURAL
Major protocol version. An increase indicates a hard
fork.
--protocol-minor-version NATURAL
Minor protocol version. An increase indicates a soft
fork (old software canvalidate but not produce new
blocks).
--out-file FILE The output file.
-h,--help Show this help text
18 changes: 9 additions & 9 deletions ...i-golden/files/golden/help/alonzo_governance_action_create-protocol-parameters-update.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ Usage: cardano-cli alonzo governance action create-protocol-parameters-update --
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
[--min-pool-cost NATURAL]
[ --extra-entropy HEX
| --reset-extra-entropy
Expand All @@ -26,6 +24,8 @@ Usage: cardano-cli alonzo governance action create-protocol-parameters-update --
[--max-value-size INT]
[--collateral-percent INT]
[--max-collateral-inputs INT]
[--protocol-major-version NATURAL
--protocol-minor-version NATURAL]
--out-file FILE

Create a protocol parameters update.
Expand Down Expand Up @@ -59,13 +59,6 @@ Available options:
Treasury expansion.
--monetary-expansion RATIONAL
Monetary expansion.
--protocol-major-version NATURAL
Major protocol version. An increase indicates a hard
fork.
--protocol-minor-version NATURAL
Minor protocol version. An increase indicates a soft
fork (old software canvalidate but not produce new
blocks).
--min-pool-cost NATURAL The minimum allowed cost parameter for stake pools.
--extra-entropy HEX Praos extra entropy seed, as a hex byte string.
--reset-extra-entropy Reset the Praos extra entropy to none.
Expand Down Expand Up @@ -95,5 +88,12 @@ Available options:
--max-collateral-inputs INT
The maximum number of collateral inputs allowed in a
transaction (from Alonzo era).
--protocol-major-version NATURAL
Major protocol version. An increase indicates a hard
fork.
--protocol-minor-version NATURAL
Minor protocol version. An increase indicates a soft
fork (old software canvalidate but not produce new
blocks).
--out-file FILE The output file.
-h,--help Show this help text
Loading
Loading