Skip to content

Defensive mempool #1327

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

Jump to bottom
Open
palas wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Defensive mempool #1327

palas wants to merge 6 commits into from
+70 −52

Conversation

@palas
Copy link
Contributor

@palas palas commented Jan 23, 2026 •
edited
Loading

Stanzas must be removed before merging!

Changelog

- description: |
    Bumped `ouroboros-consensus` to include mempool timeouts patch
  type:
    - breaking       # the API has changed in a breaking way

Context

This PR updates cardano-api to use the latest version of ouroboros-consensus that includes this patch: IntersectMBO/ouroboros-consensus#1836

Related PRs:

How to trust this PR

Changes are small, but worth checking they make sense if you have good context about them.

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. See Running tests for more details
  • Self-reviewed the diff

@palas palas self-assigned this Jan 23, 2026
@palas palas mentioned this pull request Jan 23, 2026
Open
3 tasks
@palas palas mentioned this pull request Jan 24, 2026
Open
9 tasks
carbolymer
carbolymer reviewed Jan 26, 2026
View reviewed changes
cardano-cli/src/Cardano/CLI/Type/Error/DebugCmdError.hs
DebugNodeConfigNoConwayFileCmdError fp ->
"Conway genesis file not specified in "
<> pretty fp
<> ". Please add a \"ConwayGenesisFile\" key to the file at "
Copy link
Contributor

@carbolymer carbolymer Jan 26, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

DebugNodeConfigNoConwayHashCmdError is not needed anymore. Also, I've bumped cardano-cli to latest api's master here: https://github.com/IntersectMBO/cardano-cli/pull/1326/files

carbolymer
carbolymer reviewed Jan 26, 2026
View reviewed changes
cardano-cli/src/Cardano/CLI/EraIndependent/Debug/CheckNodeConfiguration/Run.hs
checkHashIfPresent shelleyGenFile actualShelleyHash mExpectedShelleyHash
checkHashIfPresent conwayGenFile actualConwayHash mExpectedConwayHash
where
ifJustAndDifferent :: Eq a => a -> (a -> CIO e ()) -> Maybe a -> CIO e ()
Copy link
Contributor

@carbolymer carbolymer Jan 26, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

This function is too complicated tbh. It would be better to just use for_ instead of it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@carbolymer carbolymer carbolymer left review comments

@Jimbo4350 Jimbo4350 Awaiting requested review from Jimbo4350 Jimbo4350 is a code owner

@newhoggy newhoggy Awaiting requested review from newhoggy newhoggy is a code owner

@kevinhammond kevinhammond Awaiting requested review from kevinhammond kevinhammond is a code owner

@disassembler disassembler Awaiting requested review from disassembler disassembler is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

@palas palas

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@palas @carbolymer