Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump consensus version bounds #487

Closed
wants to merge 2 commits into from
Closed

Bump consensus version bounds #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7f3e78
Release 8.39.2
bolt12 Jan 30, 2024
75b2c37
Release cardano-api 8.39.3
bolt12 Mar 18, 2024
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
4 changes: 2 additions & 2 deletions cabal.project
View file
Open in desktop
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 2024-02-15T11:36:53Z
, cardano-haskell-packages 2024-02-14T10:17:08Z
, hackage.haskell.org 2024-03-18T10:10:55Z
, cardano-haskell-packages 2024-03-15T18:07:40Z

packages:
cardano-api
Expand Down
9 changes: 9 additions & 0 deletions cardano-api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog for cardano-api

## 8.39.3.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why two version bumps?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's how Github shows the diff. Because this PR is based on 8.39.2. So it shows a weird diff.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if this should be merged because the up to date version is 8.41... so I made an off branch CHaP release since it didn't have any major changes


- Bump dependencies version bounds
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you specify what was bumped here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ouroboros-consensus-diffusion ^>= 0.12


## 8.39.2.0

- Bump dependencies version bounds
Integrate changes

## 8.39.1.0

- Enable deposit return script addresses
Expand Down
10 changes: 5 additions & 5 deletions cardano-api/cardano-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 3.4

name: cardano-api
version: 8.39.1.0
version: 8.39.3.0
synopsis: The cardano api
description: The cardano api.
category: Cardano,
Expand Down Expand Up @@ -191,12 +191,12 @@ library internal
, mtl
, network
, optparse-applicative-fork
, ouroboros-consensus ^>= 0.15
, ouroboros-consensus-cardano ^>= 0.13
, ouroboros-consensus-diffusion ^>= 0.10
, ouroboros-consensus ^>= 0.16
, ouroboros-consensus-cardano ^>= 0.14
, ouroboros-consensus-diffusion ^>= 0.12
, ouroboros-consensus-protocol ^>= 0.7
, ouroboros-network
, ouroboros-network-api ^>= 0.6.2
, ouroboros-network-api ^>= 0.7
, ouroboros-network-framework
, ouroboros-network-protocols
, parsec
Expand Down
2 changes: 1 addition & 1 deletion cardano-api/internal/Cardano/Api/IPC.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ chainSyncGetCurrentTip tipVar =
where
clientStIdle :: Net.Sync.ClientStIdle BlockInMode ChainPoint ChainTip IO ()
clientStIdle =
Net.Sync.SendMsgRequestNext clientStNext (pure clientStNext)
Net.Sync.SendMsgRequestNext (pure ()) clientStNext

clientStNext :: Net.Sync.ClientStNext BlockInMode ChainPoint ChainTip IO ()
clientStNext = Net.Sync.ClientStNext
Expand Down
10 changes: 5 additions & 5 deletions cardano-api/internal/Cardano/Api/LedgerState.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ foldBlocks nodeConfigFilePath socketPath validationMode state0 accumulate = hand
= case pipelineDecisionMax pipelineSize n clientTip serverTip of
Collect -> case n of
Succ predN -> CSP.CollectResponse Nothing (clientNextN predN knownLedgerStates)
_ -> CSP.SendMsgRequestNextPipelined (clientIdle_RequestMoreN clientTip serverTip (Succ n) knownLedgerStates)
_ -> CSP.SendMsgRequestNextPipelined (pure ()) (clientIdle_RequestMoreN clientTip serverTip (Succ n) knownLedgerStates)

clientNextN
:: Nat n -- Number of requests inflight.
Expand Down Expand Up @@ -667,7 +667,7 @@ chainSyncClientWithLedgerState env ledgerState0 validationMode (CS.ChainSyncClie
-> CS.ClientStIdle (BlockInMode, Either LedgerStateError (LedgerState, [LedgerEvent])) ChainPoint ChainTip m a
-> CS.ClientStIdle BlockInMode ChainPoint ChainTip m a
goClientStIdle history client = case client of
CS.SendMsgRequestNext a b -> CS.SendMsgRequestNext (goClientStNext history a) (goClientStNext history <$> b)
CS.SendMsgRequestNext a b -> CS.SendMsgRequestNext a (goClientStNext history b)
CS.SendMsgFindIntersect ps a -> CS.SendMsgFindIntersect ps (goClientStIntersect history a)
CS.SendMsgDone a -> CS.SendMsgDone a

Expand Down Expand Up @@ -751,8 +751,8 @@ chainSyncClientPipelinedWithLedgerState env ledgerState0 validationMode (CSP.Cha
-> CSP.ClientPipelinedStIdle n (BlockInMode, Either LedgerStateError (LedgerState, [LedgerEvent])) ChainPoint ChainTip m a
-> CSP.ClientPipelinedStIdle n BlockInMode ChainPoint ChainTip m a
goClientPipelinedStIdle history n client = case client of
CSP.SendMsgRequestNext a b -> CSP.SendMsgRequestNext (goClientStNext history n a) (goClientStNext history n <$> b)
CSP.SendMsgRequestNextPipelined a -> CSP.SendMsgRequestNextPipelined (goClientPipelinedStIdle history (Succ n) a)
CSP.SendMsgRequestNext a b -> CSP.SendMsgRequestNext a (goClientStNext history n b)
CSP.SendMsgRequestNextPipelined m a -> CSP.SendMsgRequestNextPipelined m (goClientPipelinedStIdle history (Succ n) a)
CSP.SendMsgFindIntersect ps a -> CSP.SendMsgFindIntersect ps (goClientPipelinedStIntersect history n a)
CSP.CollectResponse a b -> case n of
Succ nPrev -> CSP.CollectResponse ((fmap . fmap) (goClientPipelinedStIdle history n) a) (goClientStNext history nPrev b)
Expand Down Expand Up @@ -1982,7 +1982,7 @@ foldEpochState nodeConfigFilePath socketPath validationMode terminationEpoch ini
= case pipelineDecisionMax pipelineSize n clientTip serverTip of
Collect -> case n of
Succ predN -> CSP.CollectResponse Nothing (clientNextN predN knownLedgerStates)
_ -> CSP.SendMsgRequestNextPipelined (clientIdle_RequestMoreN clientTip serverTip (Succ n) knownLedgerStates)
_ -> CSP.SendMsgRequestNextPipelined (pure ()) (clientIdle_RequestMoreN clientTip serverTip (Succ n) knownLedgerStates)

clientNextN
:: Nat n -- Number of requests inflight.
Expand Down
24 changes: 12 additions & 12 deletions flake.lock
View file
Open in desktop

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