Bump Hackage and CHaP index states

Author: geo2a

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 2025-12-02T22:23:29Z
-  , cardano-haskell-packages 2026-01-30T03:40:53Z
+  , hackage.haskell.org 2026-01-12T19:29:50Z
+  , cardano-haskell-packages 2026-01-27T13:37:12Z
 
 packages:
   cardano-cli
@@ -67,65 +67,12 @@ if impl (ghc >= 9.12)
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
 
-
-
-source-repository-package
-  type: git
-  location: https://github.com/IntersectMBO/cardano-ledger
-  tag: 324efe565237061615ec10e7f47e08699cace660
-  --sha256: sha256-Tu5TlPwJgVpEfTui+zbaUJIOMoexCwFTQ5M/n2DP2/I=
-  subdir:
-    eras/allegra/impl
-    eras/alonzo/impl
-    eras/alonzo/test-suite
-    eras/babbage/impl
-    eras/byron/chain/executable-spec
-    eras/byron/crypto
-    eras/byron/ledger/executable-spec
-    eras/byron/ledger/impl
-    eras/conway/impl
-    eras/dijkstra/impl
-    eras/mary/impl
-    eras/shelley-ma/test-suite
-    eras/shelley/impl
-    eras/shelley/test-suite
-    libs/cardano-data
-    libs/cardano-ledger-api
-    libs/cardano-ledger-binary
-    libs/cardano-ledger-core
-    libs/cardano-protocol-tpraos
-    libs/non-integral
-    libs/plutus-preprocessor
-    libs/small-steps
-    libs/vector-map
-
-source-repository-package
-  type: git
-  location: https://github.com/IntersectMBO/ouroboros-consensus
-  tag: 0106df607184099af6770d0f49557e8f8ae93de4
-  --sha256: sha256-NpyTScEwSUz2zr1DtxUVJSGT2LaDBD8wtRj6NObBOuc=
-  subdir:
-    ouroboros-consensus
-    ouroboros-consensus-cardano
-    ouroboros-consensus-diffusion
-    ouroboros-consensus-protocol
-    strict-sop-core
-    sop-extras
-
-source-repository-package
-   type: git
-   location: https://github.com/IntersectMBO/ouroboros-network
-   tag: 228bb2045784a9c180651dedeea9af9396140f47
-   --sha256: sha256-q/93M6+TtnqWiguOiwuUSJljA7nrICOsu+5SLl6jiCc=
-   subdir:
-     ouroboros-network
-     cardano-diffusion
-     network-mux
-
 source-repository-package
    type: git
    location: https://github.com/IntersectMBO/cardano-api
-   tag: 88149e968d0536ac2110abe32a69f221d4b1ea8c
-   --sha256: sha256-/0oaPmSjsN0H3O/bCLSpimIzT7+Kloof1LBcDOahu5Y=
+   tag: 7f0d7a8e22f5fe921e80f75ce868554f898c1d07
+   --sha256: sha256-8Lq88OX0+P+yTo2OX3oYgw3LHFSASASsnd/OoC4wMvo=
    subdir:
-     cardano-api
+     cardano-api
+
+allow-older: plutus-ledger-api, plutus-core

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

@@ -1046,12 +1046,12 @@ runTxBuild
           )
           & onLeft (left . TxCmdQueryConvenienceError . AcqFailure)
           & onLeft (left . TxCmdQueryConvenienceError)
-
+      let ledgerPParams = fromShelleyLedgerPParamsShim Exp.useEra $ unLedgerProtocolParameters pparams
       txBodyContent <-
         hoistEither $
           constructTxBodyContent
             mScriptValidity
-            (Just $ fromShelleyLedgerPParamsShim Exp.useEra $ unLedgerProtocolParameters pparams)
+            (Just ledgerPParams)
             inputsAndMaybeScriptWits
             readOnlyRefIns
             txinsc
@@ -1081,7 +1081,14 @@ runTxBuild
       cAddr <-
         pure (anyAddressInEra era changeAddr)
           & onLeft (error $ "runTxBuild: Byron address used: " <> show changeAddr) -- should this throw instead?
-      r@(unsignedTx, _) <-
+      let unbalancedTx = Exp.makeUnsignedTx (Exp.useEra @era) txBodyContent
+
+      unsignedTx :: Exp.UnsignedTx (Exp.LedgerEra era) <-
+        firstExceptT TxCmdRecursiveTxFeeError $
+          hoistEither $
+            obtainCommonConstraints (Exp.useEra @era) $
+              Exp.calcMinFeeRecursive unbalancedTx ledgerUTxO ledgerPParams 0
+      (_, updatedTxBodyContent) <-
         firstExceptT (TxCmdBalanceTxBody . AnyTxBodyErrorAutoBalance)
           . hoistEither
           $ Exp.makeTransactionBodyAutoBalance
@@ -1102,7 +1109,7 @@ runTxBuild
             Exp.extractAllIndexedPlutusScriptWitnesses Exp.useEra txBodyContent
       scriptWitnessesAfterBalance <-
         hoistEither . first TxCmdCBORDecodeError $
-          Exp.extractAllIndexedPlutusScriptWitnesses Exp.useEra (snd r)
+          Exp.extractAllIndexedPlutusScriptWitnesses Exp.useEra updatedTxBodyContent
       when
         ( length scriptWitnessesBeforeBalance
             /= length scriptWitnessesAfterBalance
@@ -1113,7 +1120,7 @@ runTxBuild
       liftIO . putStrLn . docToString $
         "Estimated transaction fee:" <+> pretty (Exp.getUnsignedTxFee unsignedTx)
 
-      return r
+      return (unsignedTx, updatedTxBodyContent)
 
 -- ----------------------------------------------------------------------------
 -- Transaction body validation and conversion

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

@@ -79,6 +79,7 @@ data TxCmdError
   | TxCmdUtxoJsonError String
   | forall era. TxCmdDeprecatedEra (Exp.DeprecatedEra era)
   | TxCmdGenesisDataError GenesisDataError
+  | TxCmdRecursiveTxFeeError Exp.RecursiveFeeCalculationError
 
 instance Show TxCmdError where
   show = show . renderTxCmdError
@@ -198,6 +199,8 @@ renderTxCmdError = \case
       ]
   TxCmdDatumDecodingError err ->
     "Error decoding datum: " <> pshow err
+  TxCmdRecursiveTxFeeError err ->
+    "Error during recursive fee calculation: " <> prettyError err
 
 prettyPolicyIdList :: [PolicyId] -> Doc ann
 prettyPolicyIdList =