diff --git a/cabal.project b/cabal.project index c2e0f2e63b..8775c7acba 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-05-02T11:03:23Z - , cardano-haskell-packages 2024-05-03T12:56:13Z + , cardano-haskell-packages 2024-05-14T04:43:46Z packages: cardano-cli @@ -40,4 +40,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. \ No newline at end of file +-- temporary! Please read the section in CONTRIBUTING about updating dependencies. diff --git a/cardano-cli/CHANGELOG.md b/cardano-cli/CHANGELOG.md index 0ee5fa25d7..c834db7c23 100644 --- a/cardano-cli/CHANGELOG.md +++ b/cardano-cli/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog for cardano-cli +## 8.23.1.0 + +- Make `--prev-governance-action-tx-id` and `--prev-governance-action-tx-id` optional for `create-no-confidence` command + (feature, compatible) + [PR 753](https://github.com/IntersectMBO/cardano-cli/pull/753) + ## 8.23.0.0 - Introduces the `governance action create-hardfork` cmd. diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 6578014252..487dd75fd4 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -1,7 +1,7 @@ cabal-version: 3.4 name: cardano-cli -version: 8.23.0.0 +version: 8.23.1.0 synopsis: The Cardano command-line interface description: The Cardano command-line interface. copyright: 2020-2023 Input Output Global Inc (IOG). @@ -196,7 +196,7 @@ library , binary , bytestring , canonical-json - , cardano-api ^>= 8.45.2.0 + , cardano-api ^>= 8.46.0.0 , cardano-binary , cardano-crypto , cardano-crypto-class ^>= 2.1.2 @@ -226,7 +226,7 @@ library , ouroboros-consensus >= 0.17 -- TODO: bump consensus back , ouroboros-consensus-cardano >= 0.15 - , ouroboros-consensus-protocol >= 0.8 + , ouroboros-consensus-protocol >= 0.9 , ouroboros-network-api , ouroboros-network-protocols ^>=0.8 , parsec diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs index 3da653f764..198864e895 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs @@ -224,7 +224,7 @@ pMinFeeRefScriptCostPerByte = Opt.option (toNonNegativeIntervalOrErr <$> readRational) $ mconcat [ Opt.long "ref-script-cost-per-byte" , Opt.metavar "RATIONAL" - , Opt.help "Reference script cost per byte for free calculation" + , Opt.help "Reference script cost per byte for the minimum fee calculation." ] convertToLedger :: (a -> b) -> Parser (Maybe a) -> Parser (L.StrictMaybe b) 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 abeb2f0a74..b5a9187cb1 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 @@ -198,7 +198,8 @@ Available options: --drep-deposit LOVELACE DRep deposit amount. --drep-activity WORD32 DRep activity period, in epochs. --ref-script-cost-per-byte RATIONAL - Reference script cost per byte for free calculation + Reference script cost per byte for the minimum fee + calculation. --cost-model-file FILE Filepath of the JSON formatted cost model --out-file FILE The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/input/conway/genesis.conway.spec.json b/cardano-cli/test/cardano-cli-golden/files/input/conway/genesis.conway.spec.json index 76c0dd55ae..cb36a9387f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/input/conway/genesis.conway.spec.json +++ b/cardano-cli/test/cardano-cli-golden/files/input/conway/genesis.conway.spec.json @@ -25,6 +25,7 @@ "dRepDeposit": 0, "dRepActivity": 0, "minFeeRefScriptCostPerByte": 0, + "plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], "constitution": { "anchor": { "url": "", diff --git a/flake.lock b/flake.lock index 6a8dc2d4ca..30b33a5678 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1714749809, - "narHash": "sha256-lIIwnXo+h0z5omBWTCe/FWsEcjpC50VfqO4TOwUFO00=", + "lastModified": 1715664347, + "narHash": "sha256-VAagQ+wtru+ryYeleT9r3D2RpnUTXAdF3D3TzmOjn0Y=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "25684d60a9c139abc1c03b6938125f48f5996769", + "rev": "e276bb212b6065ebdb642e93ebfb623da44b4032", "type": "github" }, "original": {