Skip to content

Defensive mempool#1327

Merged
palas merged 2 commits intomasterfrom
defensive-mempool
Jan 30, 2026
Merged

Defensive mempool#1327
palas merged 2 commits intomasterfrom
defensive-mempool

Conversation

@palas
Copy link
Contributor

@palas palas commented Jan 23, 2026

Changelog

- description: |
    Bumped `cardano-api-10.23.0.0`
  type:
    - maintenance

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

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

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

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I saw your PR just after writing this, and I think your solution is much nicer. I will cherry-pick it and/or rebase on top of it when your PR is merged

@palas
Copy link
Contributor Author

palas commented Jan 29, 2026

@palas palas closed this Jan 29, 2026
@palas palas force-pushed the defensive-mempool branch from 89b1a5d to dd03c5a Compare January 29, 2026 03:01
@palas palas reopened this Jan 29, 2026
@palas palas force-pushed the defensive-mempool branch from c13540f to 966e34c Compare January 29, 2026 17:23
@palas palas force-pushed the defensive-mempool branch from 734f6f8 to f30522e Compare January 29, 2026 23:54
@palas palas enabled auto-merge January 30, 2026 00:44
Copy link
Contributor

@erikd erikd left a comment

Choose a reason for hiding this comment

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

LGTM!

@palas palas added this pull request to the merge queue Jan 30, 2026
Merged via the queue into master with commit 5f43075 Jan 30, 2026
26 checks passed
@palas palas deleted the defensive-mempool branch January 30, 2026 01:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants