From 83f48daab3a5b37b66bde5a17090c19996072366 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Tue, 25 Aug 2026 16:45:37 +0200 Subject: [PATCH] Update cardano-api-11.6 --- ...-cli_mateusz.galazyn_bump_cardano_api_11_6_0_0.yml | 6 ++++++ cabal.project | 2 +- cardano-cli/cardano-cli.cabal | 2 +- .../src/Cardano/CLI/Compatible/Transaction/TxOut.hs | 11 +++++++++++ .../test/cardano-cli-golden/files/golden/help.cli | 1 + .../files/golden/help/legacy_genesis_create.cli | 2 ++ flake.lock | 6 +++--- 7 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 .changes/20260825_164537_cardano-cli_mateusz.galazyn_bump_cardano_api_11_6_0_0.yml diff --git a/.changes/20260825_164537_cardano-cli_mateusz.galazyn_bump_cardano_api_11_6_0_0.yml b/.changes/20260825_164537_cardano-cli_mateusz.galazyn_bump_cardano_api_11_6_0_0.yml new file mode 100644 index 0000000000..840bf6130b --- /dev/null +++ b/.changes/20260825_164537_cardano-cli_mateusz.galazyn_bump_cardano_api_11_6_0_0.yml @@ -0,0 +1,6 @@ +project: cardano-cli +pr: 1424 +kind: + - compatible +description: | + Bump cardano-api to 11.6.0.0. diff --git a/cabal.project b/cabal.project index 07e6f256ba..acfa0fdf2a 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 2026-07-30T07:30:12Z - , cardano-haskell-packages 2026-08-17T09:19:44Z + , cardano-haskell-packages 2026-08-25T14:04:50Z packages: cardano-cli diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 5a60d91d18..2f06c443eb 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -246,7 +246,7 @@ library binary, bytestring, canonical-json, - cardano-api ^>=11.5, + cardano-api ^>=11.6, cardano-binary, cardano-crypto, cardano-crypto-class ^>=2.5, diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Transaction/TxOut.hs b/cardano-cli/src/Cardano/CLI/Compatible/Transaction/TxOut.hs index f3dfe9220f..18eaacbe71 100644 --- a/cardano-cli/src/Cardano/CLI/Compatible/Transaction/TxOut.hs +++ b/cardano-cli/src/Cardano/CLI/Compatible/Transaction/TxOut.hs @@ -78,6 +78,17 @@ mkTxOut sbe addr val' mDatumAnyEra refScriptFp = do ) , suppl ) + ShelleyBasedEraDijkstra -> do + (dat, suppl) <- babbageDatumFields mDatumAnyEra + refScript <- readRefScript sbe refScriptFp + pure + ( Exp.TxOut + ( L.mkBasicTxOut ledgerAddr ledgerVal + & L.datumTxOutL .~ dat + & L.referenceScriptTxOutL .~ refScript + ) + , suppl + ) alonzoDatumFields :: L.Era ledgerera 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 849c548490..40f144eb1e 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -669,6 +669,7 @@ Usage: cardano-cli legacy genesis create | --alonzo | --babbage | --conway + | --dijkstra ) [ --key-output-bech32 | --key-output-text-envelope diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_genesis_create.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_genesis_create.cli index 26a89c7499..026213cfd1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_genesis_create.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_genesis_create.cli @@ -5,6 +5,7 @@ Usage: cardano-cli legacy genesis create | --alonzo | --babbage | --conway + | --dijkstra ) [ --key-output-bech32 | --key-output-text-envelope @@ -28,6 +29,7 @@ Available options: --alonzo Specify the Alonzo era --babbage Specify the Babbage era --conway Specify the Conway era + --dijkstra Specify the Dijkstra era --key-output-bech32 Format key output to BECH32. --key-output-text-envelope Format key output to TEXT_ENVELOPE (default). diff --git a/flake.lock b/flake.lock index 8c91844c85..1fc64040d5 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1786963065, - "narHash": "sha256-vrwQwlikGCvKfWaGCle7SQuL79m1FU7rScpTW4m8N2U=", + "lastModified": 1787668218, + "narHash": "sha256-cbK37n9b3BJYvQLkYhA5UBrxkvvI0EIjfYdr104fKwQ=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "99e136ba50cb95e1f552a9ad7ea06bee0deb3983", + "rev": "7cbe1ae014c0eafb0da35d9b4294c1cab0af7d1d", "type": "github" }, "original": {