Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

5 changes: 5 additions & 0 deletions .changes/20261026_cardano_cli_11_6_0_0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
description: Release cardano-cli 11.6.0.0
kind:
- release
pr: 1486
project: cardano-cli
4 changes: 2 additions & 2 deletions cabal.project
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 2026-09-02T14:05:07Z
, cardano-haskell-packages 2026-10-21T13:12:35Z
, hackage.haskell.org 2026-09-29T11:48:37Z
, cardano-haskell-packages 2026-10-26T14:00:38Z

packages:
cardano-cli
Expand Down
6 changes: 6 additions & 0 deletions cardano-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog for cardano-cli

## 11.6.0.0 -- 2026-10-26

- Update to cardano-api 11.11 and adapt Dijkstra sub-transaction construction to validated, insertion-ordered TxGuards while preserving existing guard witness handling. Add TxCmdGuardsError to the exposed TxCmdError type to report API guard-validation failures.
(compatible)
[PR 1486](https://github.com/intersectmbo/cardano-cli/pull/1486)

## 11.5.0.0 -- 2026-10-23

- `debug check-node-configuration` now reads the configuration with cardano-config. It accepts both the old flat format and the new cardano-config format.
Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/cardano-cli.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.8
name: cardano-cli
version: 11.5.0.0
version: 11.6.0.0
synopsis: The Cardano command-line interface
description: The Cardano command-line interface.
copyright: 2020-2023 Input Output Global Inc (IOG).
Expand Down Expand Up @@ -250,7 +250,7 @@ library
binary,
bytestring,
canonical-json,
cardano-api ^>=11.10,
cardano-api ^>=11.11,
cardano-binary,
cardano-config ^>=2.2.2,
cardano-crypto,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ validateGuardRedeemer credential script hasRedeemer
| otherwise =
unless hasRedeemer $ Left $ TxCmdPlutusGuardMissingRedeemer credential

-- | The API currently collects witnesses for the six pre-Dijkstra purposes.
-- Add guarding witnesses before canonicalisation/signing and update the script
-- | Guard credentials are passed to the API without witnesses below.
-- Add their witnesses before canonicalisation/signing and update the script
-- integrity hash to cover the complete redeemer set. Guard indices include key
-- and native-script guards, and preserve the body's OSet order.
addGuardWitnesses
Expand Down Expand Up @@ -423,6 +423,10 @@ constructSubTx
TxMetadataInEra _ mDat -> mDat

validatedDirectDeposits <- convertDirectDeposits directDeposits
validatedGuards <-
first TxCmdGuardsError $
obtainCommonConstraints (Exp.useEra @era) $
Exp.mkTxGuards [(credential, Nothing) | credential <- Foldable.toList guards]
validatedMintValue <- createTxMintValue valuesWithScriptWits
validatedVotingProcedures <-
first (TxCmdVotingError . TxVotingError) $
Expand All @@ -448,7 +452,7 @@ constructSubTx
& maybe id (Exp.setTxCurrentTreasuryValue . unTxCurrentTreasuryValue) mCurrentTreasury
& maybe id (Exp.setTxTreasuryDonation . unTxTreasuryDonation) mTreasuryDonation
& Exp.setTxSupplementalDatums suppDatums
& Exp.setTxGuards guards
& Exp.setTxGuards validatedGuards
& Exp.setTxRequiredTopLevelGuards requiredTopLevelGuards
)

Expand Down
2 changes: 2 additions & 0 deletions cardano-cli/src/Cardano/CLI/Type/Error/TxCmdError.hs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ data TxCmdError
| TxCmdSubTxByronWitnessUnsupported
| TxCmdDuplicateDirectDeposits ![StakeAddress]
| TxCmdDuplicateGuards ![L.Credential L.Guard]
| TxCmdGuardsError !Exp.TxGuardsError
| TxCmdPlutusGuardMissingRedeemer !(L.Credential L.Guard)
| TxCmdNativeGuardWithRedeemer !(L.Credential L.Guard)
| TxCmdTopLevelGuardMissingDatum !FilePath
Expand Down Expand Up @@ -225,6 +226,7 @@ renderTxCmdError = \case
<> hsep (map (pretty . serialiseAddress) addresses)
TxCmdDuplicateGuards credentials ->
"Duplicate guards: " <> hsep (map (pretty . L.credToText) credentials)
TxCmdGuardsError err -> prettyError err
TxCmdPlutusGuardMissingRedeemer credential ->
"Plutus guard "
<> pretty (L.credToText credential)
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading