Skip to content

Update ouroboros-consensus, cardano-api, cardano-cli and cardano-rpc for 11.2 release. - #6677

Merged
johnalotoski merged 45 commits into
masterfrom
koslambrou/prepare-11.2
Oct 27, 2026
Merged

Update ouroboros-consensus, cardano-api, cardano-cli and cardano-rpc for 11.2 release.#6677
johnalotoski merged 45 commits into
masterfrom
koslambrou/prepare-11.2

Conversation

@koslambrou

@koslambrou koslambrou commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

Description

Add your description here, if it fixes a particular issue please provide a
link
to the issue.

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. These may include:
    • golden tests
    • property tests
    • roundtrip tests
    • integration tests
      See Running tests for more details
  • Any changes are noted in the CHANGELOG.md for affected package
    • cardano-node-chairman, cardano-submit-api and cardano-testnet instead need a
      changelog fragment in <package>/.changes/, because their CHANGELOG.md is generated
      from fragments at release time. Copy _TEMPLATE.yml from that directory, or run
      nix run github:input-output-hk/cardano-dev#herald -- new
  • The version bounds in .cabal files are updated
  • CI passes. See note on CI. The following CI checks are required:
    • Code is linted with hlint. See .github/workflows/check-hlint.yml to get the hlint version
    • Code is formatted with stylish-haskell. See .github/workflows/stylish-haskell.yml to get the stylish-haskell version
    • Code builds on Linux, MacOS and Windows for ghc-9.6 and ghc-9.12
  • Self-reviewed the diff

Note on CI

If your PR is from a fork, the necessary CI jobs won't trigger automatically for security reasons.
You will need to get someone with write privileges. Please contact IOG node developers to do this
for you.

@koslambrou koslambrou mentioned this pull request Sep 3, 2026
Open
@koslambrou
koslambrou force-pushed the koslambrou/prepare-11.2 branch 4 times, most recently from df2ac99 to 3b679a6 Compare September 4, 2026 13:55
@koslambrou
koslambrou force-pushed the koslambrou/prepare-11.2 branch 4 times, most recently from f006ac2 to 3d77a7d Compare September 11, 2026 17:55
@koslambrou koslambrou changed the title Prepare release 11.2 Update ouroboros-consensus, cardano-api, cardano-cli and cardano-rpc for 11.2 release. Sep 11, 2026
@koslambrou
koslambrou force-pushed the koslambrou/prepare-11.2 branch from a384d4a to 8ff994d Compare September 14, 2026 22:13
jasagredo added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Sep 16, 2026
@jasagredo
Follow the ledger's account-registration rename
232e47e 
cardano-ledger replaced two predicate-failure constructors and removed a third:

  conway: StakeKeyRegisteredDELEG        -> DelegAccountAlreadyRegistered,
          wrapping the new AccountAlreadyRegistered rather than a
          Credential Staking directly
  conway: WithdrawalsNotInRewardsCERTS   removed from ConwayCertsPredFailure
  shelley: StakeKeyAlreadyRegisteredDELEG -> DelegAccountAlreadyRegistered

The payload is unchanged in both renames -- AccountAlreadyRegistered is a
newtype over the same Credential Staking -- so only the pattern and the "kind"
string move. The removed constructor's case goes rather than being renamed;
CertFailure is the only one left, and the match stays exhaustive.

This matches how cardano-node handles the same three sites in
IntersectMBO/cardano-node#6677, so the two do not diverge while that is open.
Note the "kind" values change with the constructors, from
StakeKeyRegisteredDELEG and StakeKeyAlreadyRegisteredDELEG to
DelegAccountAlreadyRegistered.
jasagredo added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Sep 16, 2026
@jasagredo
Follow the ledger's account-registration rename
f86d8dc 
cardano-ledger replaced two predicate-failure constructors and removed a third:

  conway: StakeKeyRegisteredDELEG        -> DelegAccountAlreadyRegistered,
          wrapping the new AccountAlreadyRegistered rather than a
          Credential Staking directly
  conway: WithdrawalsNotInRewardsCERTS   removed from ConwayCertsPredFailure
  shelley: StakeKeyAlreadyRegisteredDELEG -> DelegAccountAlreadyRegistered

The payload is unchanged in both renames -- AccountAlreadyRegistered is a
newtype over the same Credential Staking -- so only the pattern and the "kind"
string move. The removed constructor's case goes rather than being renamed;
CertFailure is the only one left, and the match stays exhaustive.

This matches how cardano-node handles the same three sites in
IntersectMBO/cardano-node#6677, so the two do not diverge while that is open.
Note the "kind" values change with the constructors, from
StakeKeyRegisteredDELEG and StakeKeyAlreadyRegisteredDELEG to
DelegAccountAlreadyRegistered.
@koslambrou
koslambrou force-pushed the koslambrou/prepare-11.2 branch 17 times, most recently from 544a735 to 474f851 Compare October 10, 2026 00:24
johnalotoski and others added 13 commits October 27, 2026 08:00
@johnalotoski @koslambrou
nixosModule: add configFormat to select the generated config dialect
5f4426b 
The published configs and release artifacts moved to the cardano-config
envelope, but the service still writes a flat config. Add configFormat,
"legacy" or "enveloped", so consumers can move a host at a time.

Enveloping happens last, on the assembled instance config, so nodeConfig,
extraNodeConfig and extraNodeInstanceConfig stay flat and keep today's key
names. mkEnvelope applies the renames and sections each key. A key it does
not recognise is kept outside any section, where the node will not resolve
it, so opting a host in is worth checking against its warnings.

Ignored when nodeConfigFile is set, so workbench is unaffected. The default
stays legacy.
@johnalotoski @koslambrou
nixosModule: warn about config keys enveloping would strand
5022604 
Added warnings, raised at eval time when configFormat is "enveloped", for
keys cardano-config will not resolve.

Lifted the config assembly out of mkScript to module level so the warnings
check the same document that gets written, rather than a second assembly
of it.

Needs the cardanoLib exports added in iohk-nix: removedKeys, renamedKeys
and unrecognisedKeys.
@johnalotoski @koslambrou
nixosModule: emit the peer target names the selected dialect reads
dcf625a 
POM reads these only as TargetNumberOf*, cardano-config only as
DeadlineTargetNumberOf*. The module emitted the former unconditionally,
which mkEnvelope renamed, so an enveloped host warned that four keys were
stale when nothing the operator set could change them.
@johnalotoski @koslambrou
nixosTests/cardanoNodeDbtools: raise the global timeout to 300s
43fe2d2 
globalTimeout bounds the whole test, so 45s had to cover the vm boot plus
create-env, synthesis, both analyser passes, truncation and the asserted
synthesis. It was raised from 30 to 45 in c310c0d and is still tight
enough that runner variance can reach it.

300s keeps the override useful for surfacing a hang while leaving room
under the one hour framework default.
@johnalotoski @koslambrou
nixosTests/cardanoOciReadonly: cover graceful shutdown
ac8c20e 
Added SIGTERM and SIGINT cases for both ways into the image, scripts mode
and custom mode, asserting docker did not have to SIGKILL after the grace
period.

These were the first four items of the Manual Testing section in
nix/docker/README.md, which nobody ran and which predated merge mode, the
/tmp runtime dir, read-only root and non-root UIDs. Its fifth item, cli
access, is already covered three times here. Dropped the section.

Use util-linux rather than the utillinux alias to resolve eval warn.
@johnalotoski @koslambrou
nixosTests: add submit-api startup coverage, rename to cardanoOci
ac3e39d 
Added a submit-api subtest covering scripts mode startup and a metrics
scrape.

Renamed cardanoOciReadonly to cardanoOci. The test has covered more than
read-only roots since its second commit and the name described only the
first.

Grouped the stages into subtests so a failure names its concern rather than
a line number. Kept as one test: the shared cost is the vm, the docker
daemon and four image loads, which a split would pay per test.

All eleven subtests pass in ~120s.
@johnalotoski @koslambrou
nixosTests: cover an enveloped host config
e038dcc 
Boot a preview node on `configFormat = "enveloped"` with `withUtxoHdLsmt`
and an envelope-shaped `extraNodeConfig`, and assert the node took the
cardano-config path, that it reported nothing to migrate or ignore, that the
LSM backend resolved with its path, that the envelope-shaped key reached the
resolved configuration, and that `config resolve` on the generated file says
nothing on stderr.

The service assembles the config it envelopes, so this is the only check
that sees one as a host writes it: iohk-nix lints and envelopes environment
configs, which carry neither the flat `V2LSM` pair the service adds nor
anything a caller supplies.

Reading two settings back out of the resolved `NodeConfiguration` is the
part the iohk-nix checks cannot do at all. Those compare against
cardano-config's own output, so a key its adapter never maps is lost
identically on both sides and agrees.
@johnalotoski @koslambrou
nixosModule: record why the LedgerDB keys stay flat
3da5c38 
The service writes `Backend = "V2LSM"` with a sibling `LSMDatabasePath`,
which is the legacy spelling of the tagged `Backend.LSM` form. POM reads
`Backend` as a string, so the nested form fails to parse on a legacy config,
and mkEnvelope folds the flat one anyway, which it must do regardless for a
caller supplying the same keys through extraNodeConfig.

Writing the nested form here is therefore gated on no consumer still setting
`configFormat = "legacy"`, and is a single flip at that point rather than a
branch on the dialect. The envelope.nix header lists this as the last of the
four conditions for retiring the translation; this is where the mechanics
live.
@johnalotoski @koslambrou
nixosModule: add lsmExportPath
4e4ff55 
The LSM backend can export a standalone copy of each snapshot, which is what
Mithril signing consumes, but the service had no way to ask for one: it set
`LSMDatabasePath` and nothing else.

Emitted only when set, and only under `withUtxoHdLsmt`.
@johnalotoski @koslambrou
nixosScripts: generate the config in the environment's dialect
ed97345
@johnalotoski @koslambrou
nixosTests/cardanoNodeArtifact: give the machine a nameserver
b29860d 
The node resolves relay names from the peer snapshot. With no nameserver the
dns resolver is built from an empty list and throws BadConfiguration, which on
the aarch64 builder escaped diffusion's retry path and took the node down
instead of being retried as it is on x86_64.
@johnalotoski @koslambrou
testnet: drop the removed Net.ErrorPolicy namespace from the golden
0100a5b
@palas @koslambrou
Fail instead of dropping tracing settings when enabling trace forwarding
632883f
@koslambrou
koslambrou force-pushed the koslambrou/prepare-11.2 branch from 2691236 to 632883f Compare October 27, 2026 12:01
@johnalotoski
johnalotoski force-pushed the koslambrou/prepare-11.2 branch 3 times, most recently from 741b75f to f61f91e Compare October 27, 2026 15:49
@johnalotoski
nixosTests: read the hashes create-env writes in cardanoNodeDbtools
e625d75 
cardano-testnet create-env now refreshes the genesis hashes when it writes
the node configuration, so the db tools find them already in place.

Drop the add-genesis-hashes wrapper, which had become a no-op twice over:
the hashes it computed were already correct in the file, and it added them
as top-level keys, where splitEnvelope discards everything outside
Configuration.
@johnalotoski
bump: mithril flake input to release v2642.0 for signer 1.2.5
e4e2d90
@johnalotoski
bump: iohkNix for merged iohk-nix 11.2 pr
5646832
@johnalotoski
update: cabal versions and changelogs from herald fragments
afb6c20
@johnalotoski
johnalotoski force-pushed the koslambrou/prepare-11.2 branch from f61f91e to afb6c20 Compare October 27, 2026 17:06
@koslambrou
koslambrou enabled auto-merge October 27, 2026 17:41
@koslambrou
koslambrou added this pull request to the merge queue Oct 27, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to no response for status checks Oct 27, 2026
@johnalotoski
johnalotoski added this pull request to the merge queue Oct 27, 2026
Merged via the queue into master with commit dac0d7a Oct 27, 2026
31 checks passed
@johnalotoski
johnalotoski deleted the koslambrou/prepare-11.2 branch October 27, 2026 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jasagredo jasagredo jasagredo left review comments
@carbolymer carbolymer carbolymer approved these changes
@jutaro jutaro jutaro approved these changes
@mgmeier mgmeier mgmeier approved these changes
@Jimbo4350 Jimbo4350 Jimbo4350 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@koslambrou @carbolymer @jutaro @mgmeier @Jimbo4350 @jasagredo @johnalotoski @fmaste @palas