From 2abaa8a81511aae2d111b1ce4d5e9fb16ca31360 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Sat, 4 Jan 2025 08:50:08 -0700 Subject: [PATCH 1/9] Update Hackage and CHaP indexes and flake inputs --- cabal.project | 4 ++-- flake.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cabal.project b/cabal.project index 78564acb13..ef740520da 100644 --- a/cabal.project +++ b/cabal.project @@ -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-08T16:35:32Z packages: cardano-cli diff --git a/flake.lock b/flake.lock index a1948e1c8b..6dddfe24e1 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1734943824, - "narHash": "sha256-kcyysnPJbjdJOmtTldC08xj2Ttp2XcY6ecbYOYdwkmY=", + "lastModified": 1736355014, + "narHash": "sha256-2eKlS3k8Up/2oxDSBrw5aoXHFhBq+WV1HwjWwjetom4=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "6ec767f1afd771816c5f3b383d0e1d3b577d72fe", + "rev": "b7f0f0885cd6f507cc767263488f4a07ebdd79d1", "type": "github" }, "original": { @@ -173,11 +173,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1735000115, - "narHash": "sha256-AD7eLqep078dAwEPbzOoDibBCeStIsR3E3duABV9ngI=", + "lastModified": 1736382484, + "narHash": "sha256-z1wBpMV1uqkZKCo4q4aXVwHcinYtwD0LHI5AEDtpnVA=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "fa91f38232daa08fb13ba1633d37b81ab3f6aef6", + "rev": "db572909cbd9ea2179284e594e04a0ec6e480ce0", "type": "github" }, "original": { From 9870f3ad0e0531237f10164a85e831c51dec1ced Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Thu, 21 Nov 2024 17:18:11 -0700 Subject: [PATCH 2/9] Adjust project constraints for newer Hackage --- cabal.project | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index ef740520da..ac82ea496b 100644 --- a/cabal.project +++ b/cabal.project @@ -36,7 +36,9 @@ if os(windows) constraints: time ^>=1.14 allow-newer: *:time -constraints: any.text source +-- Temporary workaround for problem with cabal-doctest +constraints: Cabal <3.14 + -- 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 From 537194a45da308bfeefbe6dc1afc525468867e95 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Fri, 22 Nov 2024 15:21:52 -0700 Subject: [PATCH 3/9] cardano-ledger upgrade: `toPlainDecoder` changes --- cardano-cli/src/Cardano/CLI/Helpers.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cardano-cli/src/Cardano/CLI/Helpers.hs b/cardano-cli/src/Cardano/CLI/Helpers.hs index 9f7eb8deda..a0a3de0cba 100644 --- a/cardano-cli/src/Cardano/CLI/Helpers.hs +++ b/cardano-cli/src/Cardano/CLI/Helpers.hs @@ -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) From 607496265739bb734fe445e88c6922b3e1e26a85 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Wed, 4 Dec 2024 11:37:28 -0700 Subject: [PATCH 4/9] cardano-ledger-upgrade: accommodate the new VRFVerKeyHash type --- cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs | 4 ++-- .../src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs index e819fae1c5..a71ef01145 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs @@ -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) ) <- @@ -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) ) <- diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs index 13993b6f53..9d76ec511a 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs @@ -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) ) <- From ffe9546f1d3da8f9c43c78b833cc45f575984554 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Mon, 9 Dec 2024 22:57:48 -0700 Subject: [PATCH 5/9] cardano-ledger upgrade: NumberOfPools change to Word16 --- .../Cardano/CLI/EraBased/Options/Common.hs | 4 +-- .../cardano-cli-golden/files/golden/help.cli | 28 +++++++++---------- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...gacy_governance_create-update-proposal.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- ...tion_create-protocol-parameters-update.cli | 5 ++-- 16 files changed, 44 insertions(+), 58 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 4864b42784..4d113ffa75 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -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." ] 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 740827f9a1..0e3ec11f59 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] @@ -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] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance_action_create-protocol-parameters-update.cli index 42b3e61e17..9aa89d84f4 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance_action_create-protocol-parameters-update.cli @@ -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] @@ -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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance_action_create-protocol-parameters-update.cli index 6eae90afb6..28f020ac5b 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance_action_create-protocol-parameters-update.cli @@ -8,7 +8,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] @@ -52,8 +52,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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance_action_create-protocol-parameters-update.cli index 5a140a9b5a..a212268b2e 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance_action_create-protocol-parameters-update.cli @@ -8,7 +8,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] @@ -49,8 +49,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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_allegra_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_allegra_governance_action_create-protocol-parameters-update.cli index 88687866c5..125597f9d4 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_allegra_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_allegra_governance_action_create-protocol-parameters-update.cli @@ -8,7 +8,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] @@ -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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_alonzo_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_alonzo_governance_action_create-protocol-parameters-update.cli index e78f0baf6a..329e62c1ea 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_alonzo_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_alonzo_governance_action_create-protocol-parameters-update.cli @@ -8,7 +8,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] @@ -52,8 +52,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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_babbage_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_babbage_governance_action_create-protocol-parameters-update.cli index 68eb821aaa..3ca137367b 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_babbage_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_babbage_governance_action_create-protocol-parameters-update.cli @@ -8,7 +8,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] @@ -49,8 +49,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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_conway_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_conway_governance_action_create-protocol-parameters-update.cli index a1bd2ee7de..c472ac20f7 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_conway_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_conway_governance_action_create-protocol-parameters-update.cli @@ -23,7 +23,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] @@ -108,8 +108,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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_mary_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_mary_governance_action_create-protocol-parameters-update.cli index 3d9d92d209..68ad0e7195 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_mary_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_mary_governance_action_create-protocol-parameters-update.cli @@ -8,7 +8,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] @@ -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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_shelley_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_shelley_governance_action_create-protocol-parameters-update.cli index a0d1a814c8..8f68bd20d9 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_shelley_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/compatible_shelley_governance_action_create-protocol-parameters-update.cli @@ -8,7 +8,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] @@ -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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli index d4a633da3c..838e7d72a9 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli @@ -23,7 +23,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] @@ -108,8 +108,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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-protocol-parameters-update.cli index c7b13712b7..4d14d87b4b 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-protocol-parameters-update.cli @@ -23,7 +23,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] @@ -108,8 +108,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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_create-update-proposal.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_create-update-proposal.cli index 4ecbf10d0d..98e8309cd7 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_create-update-proposal.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_create-update-proposal.cli @@ -17,7 +17,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] @@ -72,8 +72,7 @@ Available options: --min-pool-cost NATURAL The minimum allowed cost parameter for stake pools. --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. --monetary-expansion RATIONAL diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance_action_create-protocol-parameters-update.cli index 58c0cab191..74834fc292 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance_action_create-protocol-parameters-update.cli @@ -8,7 +8,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] @@ -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 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance_action_create-protocol-parameters-update.cli index cad82e01aa..ee18f8432a 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance_action_create-protocol-parameters-update.cli @@ -8,7 +8,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] @@ -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 From ac700a2cfe1bc4e3ad75a0c4867d2ef1da847241 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Thu, 21 Nov 2024 16:00:16 -0700 Subject: [PATCH 6/9] ouroboros-network upgrade: Increase bounds on cardano-ping --- cardano-cli/cardano-cli.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 609cbc2a7a..c7414b014a 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -214,7 +214,7 @@ library cardano-crypto-wrapper ^>=1.5.1, cardano-data >=1.1, cardano-git-rev ^>=0.2.2, - cardano-ping ^>=0.5, + cardano-ping ^>=0.6, cardano-prelude, cardano-slotting ^>=0.2.0.0, cardano-strict-containers ^>=0.1, From 06ce7f712685293c88e095e3fd94b6fc77d41cb4 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 2 Jan 2025 16:22:31 +0100 Subject: [PATCH 7/9] ouroboros-network upgrade: use cardano-ping-0.7 --- cardano-cli/cardano-cli.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index c7414b014a..1fdf02ce9e 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -214,7 +214,7 @@ library cardano-crypto-wrapper ^>=1.5.1, cardano-data >=1.1, cardano-git-rev ^>=0.2.2, - cardano-ping ^>=0.6, + cardano-ping ^>=0.7, cardano-prelude, cardano-slotting ^>=0.2.0.0, cardano-strict-containers ^>=0.1, From 7c147619586183bfd539aaade73f49e16e99cde0 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Fri, 10 Jan 2025 10:31:11 -0700 Subject: [PATCH 8/9] Remove redundant constraints from cabal.project `cabal-doctest` has now been fixed --- cabal.project | 3 --- 1 file changed, 3 deletions(-) diff --git a/cabal.project b/cabal.project index ac82ea496b..af6d67cd16 100644 --- a/cabal.project +++ b/cabal.project @@ -36,9 +36,6 @@ if os(windows) constraints: time ^>=1.14 allow-newer: *:time --- Temporary workaround for problem with cabal-doctest -constraints: Cabal <3.14 - -- 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 From 2b860665dc9da29e09935d8eb6b6eed0ed6d09b1 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Thu, 21 Nov 2024 15:59:44 -0700 Subject: [PATCH 9/9] Upgrade cardano-api-10.6.0.0 --- cabal.project | 3 ++- cardano-cli/cardano-cli.cabal | 2 +- cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs | 3 ++- flake.lock | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cabal.project b/cabal.project index af6d67cd16..8d34ceba70 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2024-12-24T12:56:48Z - , cardano-haskell-packages 2025-01-08T16:35:32Z + , cardano-haskell-packages 2025-01-15T09:59:24Z packages: cardano-cli @@ -59,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. + diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 1fdf02ce9e..6139f4be88 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -207,7 +207,7 @@ library binary, bytestring, canonical-json, - cardano-api ^>=10.5, + cardano-api ^>=10.6, cardano-binary, cardano-crypto, cardano-crypto-class ^>=2.1.2, diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs b/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs index 05854ca6ae..52d169d10a 100644 --- a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs @@ -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 $ diff --git a/flake.lock b/flake.lock index 6dddfe24e1..1a52b082dd 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1736355014, - "narHash": "sha256-2eKlS3k8Up/2oxDSBrw5aoXHFhBq+WV1HwjWwjetom4=", + "lastModified": 1736937016, + "narHash": "sha256-dmLSu2SvSaTDjSE03cU6DwY62J3nWJbVhIn/kKtMwJg=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "b7f0f0885cd6f507cc767263488f4a07ebdd79d1", + "rev": "045875beec586ff57a7333c0563fd5c2b1a308fa", "type": "github" }, "original": {