cardano-node-8.9.0, cardano-api-8.39.2

.github/workflows/ci-linux.yaml

@@ -26,7 +26,7 @@ jobs:
       - uses: haskell-actions/setup@v2
         id: cabal-setup
         with:
-          ghc-version: '9.6.4'
+          ghc-version: '9.8.1'
           cabal-version: '3.10.1.0'
 
       - uses: actions/checkout@v4

README.md

@@ -16,9 +16,9 @@ The `main` branch uses the following versions of its major dependencies:
 
 |Name|Version|
 |--|--|
-|`cardano-node`|[8.8.0-pre](https://github.com/IntersectMBO/cardano-node/releases/tag/8.8.0-pre)|
-|`cardano-api`|[8.38.0.0](https://github.com/IntersectMBO/cardano-api/releases/tag/cardano-api-8.38.0.0)|
-|`ghc`|9.6.4|
+|`cardano-node`|[8.9.0](https://chap.intersectmbo.org/package/cardano-node-8.9.0/)|
+|`cardano-api`|[8.39.2.0](https://chap.intersectmbo.org/package/cardano-api-8.39.2.0/)|
+|`ghc`|9.8.1|
 |`cabal`|3.10.1.0|
 
 Support for `ghc-8.10.7` and `cardano-node-1.35.4` will be maintained for a little while in the [`node-1.35.4`](https://github.com/j-mueller/sc-tools/tree/node-1.35.4) branch.

cabal.project

@@ -14,30 +14,11 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2024-02-18T12:44:28Z
-  , cardano-haskell-packages 2024-02-15T15:59:55Z
+  , hackage.haskell.org 2024-03-01T12:44:28Z
+  , cardano-haskell-packages 2024-02-29T15:45:10Z
 
 with-compiler: ghc-9.6.4
 
--- NOTE (j-mueller, 2024-02-19): This is cardano-node-8.8.0-pre, which is not on CHaP yet.
--- We are importing it from source directly because it uses @cardano-api ^>= 8.38@, which
--- is what we have in @sc-tools@.
--- TODO: Remove this source-repository-package as soon as cardano-node-8.8 is on CHaP.
-source-repository-package
-  type: git
-  location: https://github.com/IntersectMBO/cardano-node
-  tag: 4bb2048db77d623ee6e3678618c2d8b6c4676333
-  subdir:
-    cardano-node
-    cardano-node-capi
-    cardano-node-chairman
-    cardano-submit-api
-    cardano-testnet
-    cardano-tracer
-    trace-dispatcher
-    trace-forward
-    trace-resources
-
 -- NOTE (j-mueller, 2024-02-19): Change back to Plutonomicon/plutarch-plutus:master
 -- when plutus-1.21.0.0 is supported. Currently upstream is on 1.20.0.0
 source-repository-package

changelog.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changes
 
-* Bump `cardano-api`
+* Bump `cardano-api`, `cardano-node`
 * Updated the [conway genesis configuration file](node-config/mainnet/mainnet-conway-genesis.json) for mainnet
 * When selecting public-key UTxOs during coin selection, outputs that are incompatible with PlutusV1 scripts are excluded.
 * Fixed a bug in coin selection where the wallet's mixed inputs were not considered for a `TxBodyContent` with zero inputs

src/coin-selection/lib/Convex/CoinSelection.hs

@@ -43,7 +43,6 @@ module Convex.CoinSelection(
   ) where
 
 import qualified Cardano.Api               as Cardano.Api
-import           Cardano.Api.Pretty        (docToString)
 import           Cardano.Api.Shelley       (BabbageEra, BuildTx, EraHistory,
                                             PoolId, TxBodyContent, TxOut,
                                             UTxO (..))
@@ -135,7 +134,7 @@ data CoinSelectionError =
   deriving anyclass (ToJSON, FromJSON)
 
 bodyError :: C.TxBodyError -> CoinSelectionError
-bodyError = BodyError . Text.pack . docToString . C.prettyError
+bodyError = BodyError . Text.pack . C.docToString . C.prettyError
 
 data BalancingError =
   BalancingError Text
@@ -146,7 +145,7 @@ data BalancingError =
   deriving anyclass (ToJSON, FromJSON)
 
 balancingError :: MonadError BalancingError m => Either (C.TxBodyErrorAutoBalance C.BabbageEra) a -> m a
-balancingError = either (throwError . BalancingError . Text.pack . docToString . C.prettyError) pure
+balancingError = either (throwError . BalancingError . Text.pack . C.docToString . C.prettyError) pure
 
 -- | Messages that are produced during coin selection and balancing
 data TxBalancingMessage =
@@ -184,7 +183,7 @@ balanceTransactionBody tracer systemStart eraHistory protocolParams stakePools C
                 csiUtxo
                 txbody0
 
-  traceWith tracer $ ExUnitsMap $ fmap (second (first (docToString . C.prettyError))) $ Map.toList exUnitsMap
+  traceWith tracer $ ExUnitsMap $ fmap (second (first (C.docToString . C.prettyError))) $ Map.toList exUnitsMap
 
   exUnitsMap' <- balancingError $
     case Map.mapEither id exUnitsMap of

src/node-client/lib/Convex/NodeClient/Fold.hs

@@ -153,7 +153,7 @@ foldClient' initialState env applyRollback applyBlock = PipelinedLedgerStateClie
       = case pipelineDecisionMax pipelineSize n clientTip_ serverTip_  of
           Collect -> case n of
             Succ predN -> CSP.CollectResponse Nothing (clientNextN predN history)
-          _ -> CSP.SendMsgRequestNextPipelined (clientIdle_RequestMoreN clientTip_ serverTip_ (Succ n) history)
+          _ -> CSP.SendMsgRequestNextPipelined (pure ()) (clientIdle_RequestMoreN clientTip_ serverTip_ (Succ n) history)
 
     clientNextN
       :: Nat n

src/node-client/lib/Convex/NodeClient/Progress.hs

@@ -44,7 +44,7 @@ progressClient = PipelinedLedgerStateClient $ CSP.ChainSyncClientPipelined $ do
       = case pipelineDecisionMax pipelineSize n clientTip serverTip  of
           Collect -> case n of
             Succ predN -> CSP.CollectResponse Nothing (clientNextN predN)
-          _ -> CSP.SendMsgRequestNextPipelined (clientIdle_RequestMoreN clientTip serverTip (Succ n))
+          _ -> CSP.SendMsgRequestNextPipelined (pure ()) (clientIdle_RequestMoreN clientTip serverTip (Succ n))
 
     clientNextN :: Nat n -> ClientStNext n BlockInMode ChainPoint ChainTip IO ()
     clientNextN n =