Skip to content

Commit

Permalink
Merge pull request #986 from IntersectMBO/neilmayhew/release-srp
Browse files Browse the repository at this point in the history 
Integrate in preparation for cardano-node release 10.2.0
  • Loading branch information
@carbolymer
carbolymer authored Jan 15, 2025
2 parents 17f950a + 2b86066 commit eecd898
Show file tree
Hide file tree
Showing 23 changed files with 62 additions and 74 deletions.
6 changes: 3 additions & 3 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ repository cardano-haskell-packages
-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state:
, hackage.haskell.org 2024-12-23T00:00:00Z
, cardano-haskell-packages 2024-12-20T15:52:56Z
, hackage.haskell.org 2024-12-24T12:56:48Z
, cardano-haskell-packages 2025-01-15T09:59:24Z

packages:
cardano-cli
Expand All @@ -36,7 +36,6 @@ if os(windows)
constraints: time ^>=1.14
allow-newer: *:time

constraints: any.text source
-- Depending on C++ for just so slightly faster utf8 parsing is a bit annoying
-- especially as it brings in all kinds of complications for GHC.
package text
Expand All @@ -60,3 +59,4 @@ write-ghc-environment-files: always
-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.

4 changes: 2 additions & 2 deletions cardano-cli/cardano-cli.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,14 @@ library
binary,
bytestring,
canonical-json,
cardano-api ^>=10.5,
cardano-api ^>=10.6,
cardano-binary,
cardano-crypto,
cardano-crypto-class ^>=2.1.2,
cardano-crypto-wrapper ^>=1.5.1,
cardano-data >=1.1,
cardano-git-rev ^>=0.2.2,
cardano-ping ^>=0.5,
cardano-ping ^>=0.7,
cardano-prelude,
cardano-slotting ^>=0.2.0.0,
cardano-strict-containers ^>=0.1,
Expand Down
3 changes: 2 additions & 1 deletion cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ runCompatibleTransactionCmd

signedTx <-
firstExceptT CompatiblePParamsConversionError . hoistEither $
createCompatibleSignedTx sbe ins allOuts allKeyWits fee protocolUpdates votes
-- FIXME https://github.com/IntersectMBO/cardano-cli/pull/972
createCompatibleSignedTx sbe ins allOuts allKeyWits fee protocolUpdates votes TxCertificatesNone

firstExceptT CompatibleFileError $
newExceptT $
Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2922,12 +2922,12 @@ pEpochBoundRetirement =
]
]

pNumberOfPools :: Parser Natural
pNumberOfPools :: Parser Word16
pNumberOfPools =
Opt.option integralReader $
mconcat
[ Opt.long "number-of-pools"
, Opt.metavar "NATURAL"
, Opt.metavar "WORD16"
, Opt.help "Desired number of pools."
]

Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ updateOutputTemplate

shelleyDelKeys =
fromList
[ (gh, L.GenDelegPair gdh h)
[ (gh, L.GenDelegPair gdh $ L.toVRFVerKeyHash h)
| ( GenesisKeyHash gh
, (GenesisDelegateKeyHash gdh, VrfKeyHash h)
) <-
Expand Down Expand Up @@ -1142,7 +1142,7 @@ updateTemplate

shelleyDelKeys =
fromList
[ (gh, L.GenDelegPair gdh h)
[ (gh, L.GenDelegPair gdh $ L.toVRFVerKeyHash h)
| ( GenesisKeyHash gh
, (GenesisDelegateKeyHash gdh, VrfKeyHash h)
) <-
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ updateOutputTemplate
L.Coin minUtxoVal = sgProtocolParams ^. L.ppMinUTxOValueL
shelleyDelKeys =
fromList
[ (gh, L.GenDelegPair gdh h)
[ (gh, L.GenDelegPair gdh $ L.toVRFVerKeyHash h)
| ( GenesisKeyHash gh
, (GenesisDelegateKeyHash gdh, VrfKeyHash h)
) <-
Expand Down
3 changes: 2 additions & 1 deletion cardano-cli/src/Cardano/CLI/Helpers.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ validateCBOR :: CBORObject -> LB.ByteString -> Either HelpersError Text
validateCBOR cborObject bs =
case cborObject of
CBORBlockByron epochSlots -> do
void $ decodeCBOR bs (L.toPlainDecoder L.byronProtVer (Byron.decCBORABlockOrBoundary epochSlots))
void $
decodeCBOR bs (L.toPlainDecoder Nothing L.byronProtVer (Byron.decCBORABlockOrBoundary epochSlots))
Right "Valid Byron block."
CBORDelegationCertificateByron -> do
void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s Byron.Certificate)
Expand Down
28 changes: 14 additions & 14 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 @@ -517,7 +517,7 @@ Usage: cardano-cli legacy governance create-update-proposal --out-file FILEPATH
[--pool-reg-deposit NATURAL]
[--min-pool-cost NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--monetary-expansion RATIONAL]
[--treasury-expansion RATIONAL]
Expand Down Expand Up @@ -1276,7 +1276,7 @@ Usage: cardano-cli shelley governance action create-protocol-parameters-update -
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -2328,7 +2328,7 @@ Usage: cardano-cli allegra governance action create-protocol-parameters-update -
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -3378,7 +3378,7 @@ Usage: cardano-cli mary governance action create-protocol-parameters-update --ep
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -4420,7 +4420,7 @@ Usage: cardano-cli alonzo governance action create-protocol-parameters-update --
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -5502,7 +5502,7 @@ Usage: cardano-cli babbage governance action create-protocol-parameters-update -
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -6917,7 +6917,7 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -8939,7 +8939,7 @@ Usage: cardano-cli latest governance action create-protocol-parameters-update
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -10832,7 +10832,7 @@ Usage: cardano-cli compatible shelley governance action create-protocol-paramete
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -10946,7 +10946,7 @@ Usage: cardano-cli compatible allegra governance action create-protocol-paramete
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -11060,7 +11060,7 @@ Usage: cardano-cli compatible mary governance action create-protocol-parameters-
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -11182,7 +11182,7 @@ Usage: cardano-cli compatible alonzo governance action create-protocol-parameter
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -11317,7 +11317,7 @@ Usage: cardano-cli compatible babbage governance action create-protocol-paramete
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -11563,7 +11563,7 @@ Usage: cardano-cli compatible conway governance action create-protocol-parameter
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down
5 changes: 2 additions & 3 deletions ...-golden/files/golden/help/allegra_governance_action_create-protocol-parameters-update.cli
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Usage: cardano-cli allegra governance action create-protocol-parameters-update -
[--key-reg-deposit-amt NATURAL]
[--pool-reg-deposit NATURAL]
[--pool-retirement-epoch-interval WORD32]
[--number-of-pools NATURAL]
[--number-of-pools WORD16]
[--pool-influence RATIONAL]
[--treasury-expansion RATIONAL]
[--monetary-expansion RATIONAL]
Expand Down Expand Up @@ -45,8 +45,7 @@ Available options:
The amount of a pool registration deposit.
--pool-retirement-epoch-interval WORD32
Epoch interval of pool retirement.
--number-of-pools NATURAL
Desired number of pools.
--number-of-pools WORD16 Desired number of pools.
--pool-influence RATIONAL
Pool influence.
--treasury-expansion RATIONAL
Expand Down
Loading

0 comments on commit eecd898

Please sign in to comment.