Skip to content

Update bounds for 11.2 integration - #1439

Merged
palas merged 11 commits into
masterfrom
koslambrou/prepare-11.2
Oct 7, 2026
Merged

palas merged 11 commits into
masterfrom
koslambrou/prepare-11.2

Conversation

@koslambrou

Copy link
Copy Markdown
Contributor
  • Fix StakePoolParams construction: add sppBlsKey = SNothing for ledger 1.2

  • Replace deprecated rawDeserialiseVerKeyDSIGN with rawDecodeFixedSized

Context

Additional context for the PR goes here. If the PR fixes a particular issue please provide a link to the issue.

How to trust this PR

Highlight important bits of the PR that will make the review faster. If there are commands the reviewer can run to observe the new behavior, describe 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
  • Changelog fragment added in .changes/

@koslambrou
koslambrou force-pushed the koslambrou/prepare-11.2 branch 7 times, most recently from 4f23a71 to efc7514 Compare September 11, 2026 18:06
@koslambrou
koslambrou force-pushed the koslambrou/prepare-11.2 branch 4 times, most recently from 49f5e72 to 1d910bf Compare October 7, 2026 11:50
@palas
palas marked this pull request as ready for review October 7, 2026 13:30
Copilot AI balanced review requested due to automatic review settings October 7, 2026 13:30

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot review overview

🟡 Changes recommended

Future BLS parameters receive the wrong effective epoch, and key Dijkstra behavior lacks adequate regression coverage.

Review effort: Balanced
Findings: 3 Medium severity · 2 Low severity

Open (5)
What changed in this PR

Updates cardano-cli for cardano-api 11.8 and newer ledger dependencies, including Dijkstra/Leios support and cross-platform build fixes.

Changes:

  • Adds Dijkstra BLS stake-pool registration, Leios parameters, and pool-state adaptation.
  • Updates dependency bounds and Nix cross-compilation patches.
  • Removes obsolete BLS commands and updates golden tests/help.
File Description
.changes/​20260813_120000_cardano-cli_sebastian.nagel_pool_reg_bls_key.yml Documents BLS pool registration.
.changes/​20260904_fix_dijkstra_era_commands.yml Documents Dijkstra command dispatch.
.changes/​20260918_084856_cardano-cli_ch1bo_leios_pparam_updates.yml Documents Leios parameters.
.changes/​20260925_100000_cardano-cli_sebastian.nagel_drop_bls_pop_and_hash_cmds.yml Documents removed BLS commands.
.changes/​20261006_120000_cardano-cli_jordan.millar_pool_state_bls_epoch.yml Documents pool-state epoch handling.
.gitignore Ignores direnv files.
cabal.project Updates indexes and dependency constraints.
cardano-cli/​CHANGELOG.md Normalizes whitespace.
cardano-cli/​cardano-cli.cabal Raises bounds and updates test modules.
cardano-cli/​src/​Cardano/​CLI/​Compatible/​StakePool/​Run.hs Initializes absent BLS keys.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​Genesis/​CreateTestnetData/​Run.hs Adapts genesis pool parameters.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​Genesis/​Run.hs Adds era-qualified pool parameters.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​Governance/​Actions/​Option.hs Adds Leios parameter options.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​Option.hs Removes obsolete import.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​Query/​Option.hs Documents placeholder BLS epochs.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​Query/​Run.hs Threads current epoch into output.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​Run.hs Changes era command dispatch.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​StakePool/​Command.hs Adds BLS signing-key argument.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​StakePool/​Option.hs Era-gates the BLS option.
cardano-cli/​src/​Cardano/​CLI/​EraBased/​StakePool/​Run.hs Derives registered BLS data.
cardano-cli/​src/​Cardano/​CLI/​EraIndependent/​Key/​Run.hs Qualifies fixed-size decoding.
cardano-cli/​src/​Cardano/​CLI/​EraIndependent/​Node/​Command.hs Removes obsolete BLS commands.
cardano-cli/​src/​Cardano/​CLI/​EraIndependent/​Node/​Option.hs Removes their parsers.
cardano-cli/​src/​Cardano/​CLI/​EraIndependent/​Node/​Run.hs Removes their execution paths.
cardano-cli/​src/​Cardano/​CLI/​Type/​Common.hs Reconstructs pool states with epochs.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Dijkstra/​StakePool/​RegistrationCertificate.hs Tests BLS registration behavior.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Dijkstra/​Transaction/​Assemble.hs Uses a prebuilt transaction body.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​Node/​IssuePopBls.hs Removes PoP tests.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​Node/​KeyHashBls.hs Removes BLS hash tests.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​TextEnvelope/​Certificates/​Operational.hs Updates API imports.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​TextEnvelope/​Keys/​ExtendedPaymentKeys.hs Updates API imports.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​TextEnvelope/​Keys/​GenesisDelegateKeys.hs Updates API imports.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​TextEnvelope/​Keys/​GenesisKeys.hs Updates API imports.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​TextEnvelope/​Keys/​GenesisUTxOKeys.hs Updates API imports.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​TextEnvelope/​Keys/​KESKeys.hs Updates API imports.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​TextEnvelope/​Keys/​PaymentKeys.hs Updates API imports.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​TextEnvelope/​Keys/​StakeKeys.hs Updates API imports.
cardano-cli/​test/​cardano-cli-golden/​Test/​Golden/​Shelley/​TextEnvelope/​Keys/​VRFKeys.hs Updates API imports.
cardano-cli/​test/​cardano-cli-golden/​files/​golden/​dijkstra/​stake_pool/​registration_certificate.json Adds registration certificate golden.
cardano-cli/​test/​cardano-cli-golden/​files/​golden/​help.cli Updates aggregate help output.
cardano-cli/​test/​cardano-cli-golden/​files/​golden/​help/​dijkstra_governance_action_create-protocol-parameters-update.cli Adds Leios option help.
cardano-cli/​test/​cardano-cli-golden/​files/​golden/​help/​dijkstra_node.cli Removes obsolete commands.
cardano-cli/​test/​cardano-cli-golden/​files/​golden/​help/​dijkstra_node_issue-pop-BLS.cli Removes obsolete help golden.
cardano-cli/​test/​cardano-cli-golden/​files/​golden/​help/​dijkstra_node_key-hash-BLS.cli Removes obsolete help golden.
cardano-cli/​test/​cardano-cli-golden/​files/​golden/​help/​dijkstra_query.cli Documents pool-state limitation.
cardano-cli/​test/​cardano-cli-golden/​files/​golden/​help/​dijkstra_query_pool-state.cli Updates pool-state help.
cardano-cli/​test/​cardano-cli-golden/​files/​golden/​help/​dijkstra_stake-pool_registration-certificate.cli Adds mandatory BLS option.
cardano-cli/​test/​cardano-cli-golden/​files/​input/​dijkstra/​transaction/​tx_body Adds transaction fixture.
cardano-cli/​test/​cardano-cli-golden/​files/​input/​shelley/​keys/​bls_keys/​signing_key.pop Removes obsolete PoP fixture.
cardano-cli/​test/​cardano-cli-golden/​files/​input/​shelley/​keys/​bls_keys/​verification_key.key-hash Removes obsolete hash fixture.
flake.lock Updates CHaP and Hackage inputs.
flake.nix Adds cross-build dependency patches.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@koslambrou
koslambrou force-pushed the koslambrou/prepare-11.2 branch 3 times, most recently from 5130a01 to 6b196a4 Compare October 7, 2026 15:53
koslambrou and others added 3 commits October 7, 2026 11:53
* Fix StakePoolParams construction: add sppBlsKey = SNothing for ledger 1.2

* Replace deprecated rawDeserialiseVerKeyDSIGN with rawDecodeFixedSized
palas and others added 6 commits October 7, 2026 11:53
All these parameters are available now in ledger and cardano-api
Stake pools can now register a BLS voting key via a new
'--bls-signing-key-file' option on 'stake-pool
registration-certificate'. The option is era-gated: mandatory from
Dijkstra onwards and absent in Conway and earlier, so existing
invocations are unaffected. The signing key is read as a text envelope
and converted to a registered verification key plus proof of possession
via 'toLedgerBlsKey'. The compatible pre-Dijkstra path sets
'stakePoolBlsKey = Nothing'.

Co-Authored-By: kolam <kolam@posteo.me>
Take an `Exp.Era era` argument and pattern match on it, matching how
other era-gated field parsers such as pCostModelsFile are written,
instead of summoning the witness via `useEra @era` inside the helper.
This lets us drop the AllowAmbiguousTypes and TypeApplications pragmas.

Adapt mkPoolStates to the new mkStakePoolState signature
A pool's BLS proof of possession is now built straight into the
registration certificate from the signing key given to `stake-pool
registration-certificate --bls-signing-key-file`, so there is no need to
issue one as a standalone artifact; a standalone BLS key hash was never
needed at all.
QueryPoolStateResult does not carry the epoch a pool's BLS voting key
was registered in, so mkPoolStates stamps the key with the current
epoch. That value is emitted as bksRegisteredIn in the query output, so
say so in the Dijkstra help text for the command and in the changelog,
and leave a TODO pointing at the ledger issue that will expose the real
epoch (IntersectMBO/cardano-ledger#6147). BLS keys only exist from
Dijkstra onwards, so the Conway help text is unchanged.
@koslambrou
koslambrou force-pushed the koslambrou/prepare-11.2 branch from 6b196a4 to 9886c24 Compare October 7, 2026 15:53
…arams

The ledger's ShelleyGenesisStaking fixes sgsPools to StakePoolParams
ShelleyEra, so every genesis code path that builds pool params is pinned to
that era regardless of the era the chain starts in. Give the type a name in
Genesis.Internal.Common and document why the pin is safe: the era index on
StakePoolParams is phantom and mkStakePoolState discards it.
The case split on the Era GADT introduced in d7836f1 duplicates what
obtainCommonConstraints already does in cardano-api. EraCommonConstraints
still includes IsEra era in cardano-api 11.8, so the original call
discharges the constraint runCmds needs without inlining the era match.
@Jimbo4350
Jimbo4350 force-pushed the koslambrou/prepare-11.2 branch from 57bd1da to bdaaf8d Compare October 7, 2026 18:27
@Jimbo4350
Jimbo4350 enabled auto-merge October 7, 2026 18:27
@Jimbo4350
Jimbo4350 added this pull request to the merge queue Oct 7, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to no response for status checks Oct 7, 2026
@palas
palas added this pull request to the merge queue Oct 7, 2026
Merged via the queue into master with commit a69c0fa Oct 7, 2026
25 checks passed
@palas
palas deleted the koslambrou/prepare-11.2 branch October 7, 2026 21:31
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.

6 participants