Skip to content

Commit e0a1490

Browse files
authored
Merge pull request #1370 from IntersectMBO/jordan/cardano-api-11.0.0.0
Bump cardano-api to 11.0.0.0
2 parents 63a2e30 + deaab73 commit e0a1490

7 files changed

Lines changed: 17 additions & 7 deletions

File tree

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
1414
-- you need to run if you change them
1515
index-state:
1616
, hackage.haskell.org 2026-04-16T00:15:23Z
17-
, cardano-haskell-packages 2026-04-15T11:20:53Z
17+
, cardano-haskell-packages 2026-04-30T13:08:25Z
1818

1919
active-repositories:
2020
, :rest

cardano-cli/cardano-cli.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ library
242242
binary,
243243
bytestring,
244244
canonical-json,
245-
cardano-api ^>=10.26,
245+
cardano-api ^>=11.0,
246246
cardano-binary,
247247
cardano-crypto,
248248
cardano-crypto-class ^>=2.3,

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,10 @@ runTransactionBuildEstimateCmd -- TODO change type
542542
(anyAddressInShelleyBasedEra sbe changeAddr)
543543
(obtainCommonConstraints currentEra $ toLedgerValue (convert currentEra) totalUTxOValue)
544544

545-
let unsignedTx = Exp.makeUnsignedTx currentEra balancedTxBody
545+
unsignedTx <-
546+
fromEitherCli $
547+
first TxCmdMakeUnsignedTxError $
548+
Exp.makeUnsignedTx currentEra balancedTxBody
546549
fromEitherIOCli
547550
$ ( if isCborOutCanonical == TxCborCanonical
548551
then writeTxFileTextEnvelopeCanonical
@@ -808,7 +811,7 @@ runTxBuildRaw
808811
mTreasuryDonation
809812
suppDatums
810813

811-
return $ Exp.makeUnsignedTx Exp.useEra txBodyContent
814+
first TxCmdMakeUnsignedTxError $ Exp.makeUnsignedTx Exp.useEra txBodyContent
812815

813816
constructTxBodyContent
814817
:: forall era

cardano-cli/src/Cardano/CLI/Type/Error/TxCmdError.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ data TxCmdError
7171
| -- Validation errors
7272
forall era. TxCmdVotingError (TxVotingError era)
7373
| forall era. TxCmdFeeEstimationError (Exp.TxFeeEstimationError era)
74+
| TxCmdMakeUnsignedTxError !Exp.MakeUnsignedTxError
7475
| TxCmdPoolMetadataHashError Exp.AnchorDataFromCertificateError
7576
| TxCmdHashCheckError L.Url HashCheckError
7677
| TxCmdUnregisteredStakeAddress !(Set StakeCredential)
@@ -170,6 +171,8 @@ renderTxCmdError = \case
170171
prettyError e
171172
TxCmdFeeEstimationError e ->
172173
prettyError e
174+
TxCmdMakeUnsignedTxError e ->
175+
prettyError e
173176
TxCmdPoolMetadataHashError e ->
174177
"Hash of the pool metadata hash is not valid:" <+> prettyError e
175178
TxCmdHashCheckError url e ->

cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ hprop_golden_view_babbage_yaml =
159159
, inputDir </> "alonzo/scripts/mint.all"
160160
, "--mint-script-file"
161161
, inputDir </> "alonzo/scripts/mint.sig"
162+
, "--protocol-params-file"
163+
, "test/cardano-cli-golden/files/input/transaction/calculate-min-fee/protocol-params-preview.json"
162164
, "--out-file"
163165
, transactionBodyFile
164166
]

cardano-cli/test/cardano-cli-test/Test/Cli/Transaction/Build.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ hprop_conway_calculate_plutus_script_cost_offline =
143143
, "addr_test1wqvxuvh64q9zdqgrjt76d42eclk5wgdxtnsun4808cwg0dqxy2mj0+1000000"
144144
, "--fee"
145145
, "200000"
146+
, "--protocol-params-file"
147+
, "test/cardano-cli-test/files/input/calculate-min-fee/offline-protocol-params-preview.json"
146148
, "--out-file"
147149
, unsignedTx
148150
]

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)