Skip to content

Commit a69c0fa

Browse files
palaspalas
authored
Merge pull request #1439 from IntersectMBO/koslambrou/prepare-11.2
Update bounds for 11.2 integration
2 parents cc354e1 + bdaaf8d commit a69c0fa

52 files changed

Lines changed: 648 additions & 309 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changes/20260813_120000_cardano-cli_sebastian.nagel_pool_reg_bls_key.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
description: |
2+
`stake-pool registration-certificate` can now register a stake pool's BLS voting key. The new `--bls-signing-key-file FILEPATH` option is era-gated: it is mandatory from the Dijkstra era onwards and not offered in Conway or earlier, so existing Conway invocations are unaffected. The signing key is read as a text envelope (produce one with `node key-gen-BLS`) and converted to the registered verification key plus proof of possession via `toLedgerBlsKey`.
3+
Genesis pool parameters built by `genesis create-staked` and `genesis create-testnet-data` set the new ledger `sppBlsKey` field to `SNothing`.
4+
kind:
5+
- feature
6+
pr: 1439
7+
project: cardano-cli

‎.changes/20260904_fix_dijkstra_era_commands.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
project: cardano-cli
2+
3+
pr: 1439
4+
5+
kind:
6+
- bugfix
7+
8+
description: |
9+
Fix Dijkstra era commands (BLS key generation, transaction witness/assemble) that were failing with "TODO DijkstraEra" because the era dispatch in runAnyEraCommand was unconditionally calling obtainCommonConstraints, which is not yet implemented for DijkstraEra. Commands that do not require EraCommonConstraints now work correctly for the Dijkstra era.

‎.changes/20260918_084856_cardano-cli_ch1bo_leios_pparam_updates.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
description: |
2+
Add new Leios parameters to create-protocol-parameters-update command line options
3+
kind:
4+
- feature
5+
pr: 1439
6+
project: cardano-cli

‎.changes/20260925_100000_cardano-cli_sebastian.nagel_drop_bls_pop_and_hash_cmds.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
project: cardano-cli
2+
3+
pr: 1439
4+
5+
kind:
6+
- breaking
7+
8+
description: |
9+
Removed the `node issue-pop-BLS` and `node key-hash-BLS` commands. 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. Both commands shipped in 10.16.0.0 but no node release ever made use of their output, so removing them breaks no existing workflow. `node key-gen-BLS` is unaffected, and either command can be reinstated if a concrete use case turns up.

‎.changes/20261006_120000_cardano-cli_jordan.millar_pool_state_bls_epoch.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
project: cardano-cli
2+
3+
pr: 1439
4+
5+
kind:
6+
- compatible
7+
8+
description: |
9+
Adapt to cardano-ledger-core 1.22, where `mkStakePoolState` stamps a pool's BLS voting key with the epoch its registration takes effect in. The pool-state query does not report that epoch yet, so `query pool-state` fills `bksRegisteredIn` with the epoch the parameters take effect in: the current epoch for the active parameters and the next one for the future parameters. The reported value is a placeholder until the ledger exposes the real one (https://github.com/IntersectMBO/cardano-ledger/issues/6147); the feature is not yet used on mainnet.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
.stack-work/
22
.ghc.environment.*
33
.nix-shell-cabal.project
4+
.direnv
5+
.envrc
46
/cabal.project.diff
57
/cabal.project.freeze
68
/cabal.project.local*

‎cabal.project‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state:
16-
, hackage.haskell.org 2026-07-30T07:30:12Z
17-
, cardano-haskell-packages 2026-09-24T00:08:56Z
16+
, hackage.haskell.org 2026-09-02T14:05:07Z
17+
, cardano-haskell-packages 2026-10-06T19:41:19Z
1818

1919
packages:
2020
cardano-cli
@@ -35,16 +35,21 @@ extra-packages: Cabal
3535

3636
if impl(ghc < 9.14)
3737
constraints:
38-
-- hourglass and time-hourglass both in dependency tree break musl build
39-
, time-hourglass < 0
4038
-- haskell.nix patch does not work for 1.6.8
41-
, any.crypton-x509-system < 1.6.8
39+
, any.crypton-x509-system (< 1.6.8 || >= 1.7)
4240

4341
if os(windows)
4442
constraints: time ^>=1.14
4543
allow-newer: *:time
4644
-- Needed for running tests with WINE (see https://github.com/haskell/network/issues/604)
4745
constraints: network <3.2.8.0
46+
-- cardano-config and kes-agent (pulled in by ouroboros-consensus 5.0 and
47+
-- cardano-api) require network ^>=3.2.8, but they only need APIs that are
48+
-- already in 3.2.7, so let them accept the WINE-compatible network pinned
49+
-- above.
50+
allow-older:
51+
, cardano-config:network
52+
, kes-agent:network
4853

4954
-- cardano-ledger-binary 1.9.0.0 reversed the byte order of relay IPv4 addresses (cardano-cli#1442)
5055
constraints: cardano-ledger-binary >=1.9.1
@@ -73,6 +78,23 @@ write-ghc-environment-files: always
7378
-- Do NOT add more source-repository-package stanzas here unless they are strictly
7479
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
7580

81+
-- Allow network-mux 0.11 from SRP (cardano-ping 0.10 on CHaP expects ^>=0.10)
82+
-- Allow grapesy deps with updated bounds (matching cardano-node)
83+
allow-newer:
84+
, cardano-ping:network-mux
85+
, grapesy:aeson
86+
, grapesy:crypton-x509
87+
, grapesy:crypton-x509-store
88+
, grapesy:crypton-x509-system
89+
, grapesy:crypton-x509-validation
90+
, grapesy:http2
91+
, grapesy:http2-tls
92+
, grapesy:network-run
93+
, grapesy:tls
94+
-- kes-agent bounds cardano-crypto-class ^>=2.5 but we have a newer version
95+
, kes-agent:cardano-crypto-class
96+
, kes-agent-crypto:cardano-crypto-class
97+
7698
-- cabal-allow-newer begin
7799
if impl(ghc >= 9.14)
78100
allow-newer:
@@ -86,6 +108,13 @@ if impl(ghc >= 9.14)
86108
, dictionary-sharing:containers
87109
, diff-containers:base
88110
, fs-sim:QuickCheck
111+
, grapesy:base
112+
, grapesy:containers
113+
, grapesy:tls
114+
, grpc-spec:base
115+
, grpc-spec:containers
116+
, lens-family:containers
117+
, lens-family-core:containers
89118
, lsm-tree:data-elevator
90119
, ordered-containers:containers
91120
, partial-order:containers

‎cardano-cli/CHANGELOG.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,58 +63,58 @@
6363
[PR 1396](https://github.com/intersectmbo/cardano-cli/pull/1396)
6464

6565
- new `cardano-cli ping` api
66-
66+
6767
`cardano-cli ping` allows now to ping multiple servers, does domain name
6868
resolution and supports SRV records (as specified in
6969
https://cips.cardano.org/cip/CIP-0155)
70-
70+
7171
Some examples:
72-
72+
7373
Run a ping against two ip addresses, ipv4 & ipv6
7474
```bash
7575
cardano-cli ping 127.0.0.1:3001 [::1]:3001
7676
```
77-
77+
7878
Run a ping against a domain name:
7979
```bash
8080
cardano-cli ping my.domain.com:3001
8181
```
82-
82+
8383
Run a ping against an SRV domain.
8484
According to CIP#0155 the SRV record needs to be registered at
8585
`_cardano._tcp.srv.domain.com`
8686
```bash
8787
cardano-cli ping srv.domain.com
8888
```
89-
89+
9090
Run a ping against unix socket
9191
```bash
9292
cardano-cli ping /var/run/cardano-node.socket
9393
```
94-
94+
9595
`cardano-cli` ping has three modes of operation:
96-
96+
9797
* ping mode: `--mode ping` (the default)
9898
* tip mode `--mode tip`
9999
* query handshake parameters: `--mode query`
100100
(breaking, feature)
101101
[PR 1384](https://github.com/intersectmbo/cardano-cli/pull/1384)
102102

103103
- The interface for `cardano-cli ping` has been reshuffled:
104-
104+
105105
Removed:
106-
106+
107107
* `-h`/`--host`, `-u`/`--unixsock` and `-p`/`--port`. The target is now given as a
108108
positional argument instead (see below).
109109
* `-Q`/`--query-versions`, replaced by `--mode query`.
110110
* `-t`/`--tip`, replaced by `--mode tip`.
111-
111+
112112
Renamed:
113-
113+
114114
* `-m`/`--magic` is now `-m`/`--network-magic`.
115-
115+
116116
Added:
117-
117+
118118
* A positional `ADDRS` argument, which accepts one or more targets: an IP/DNS address
119119
with a port (`127.0.0.1:3001`, `[::1]:3001`, `example.org:3001`), an SRV name, or a
120120
UNIX socket path.
@@ -124,7 +124,7 @@
124124
(default `_cardano._tcp`).
125125
* `--color COLOR`, one of `auto`, `never` or `always`.
126126
* `--short-hash`, to show an abbreviated tip hash.
127-
127+
128128
Note that `-h` is now only a short form of `--help`; it no longer means `--host`.
129129
(breaking, feature)
130130
[PR 1384](https://github.com/intersectmbo/cardano-cli/pull/1384)

‎cardano-cli/cardano-cli.cabal‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,13 @@ library
246246
binary,
247247
bytestring,
248248
canonical-json,
249-
cardano-api ^>=11.7,
249+
cardano-api ^>=11.8,
250250
cardano-binary,
251251
cardano-crypto,
252-
cardano-crypto-class ^>=2.5,
253-
cardano-crypto-wrapper ^>=1.7,
252+
cardano-crypto-class ^>=2.6,
253+
cardano-crypto-wrapper ^>=1.8,
254254
cardano-data >=1.1,
255-
cardano-diffusion:ping ^>=1.1.1,
255+
cardano-diffusion:ping ^>=1.3,
256256
cardano-git-rev ^>=0.2.2,
257257
cardano-ledger-api,
258258
cardano-ledger-conway,
@@ -483,6 +483,7 @@ test-suite cardano-cli-golden
483483
Test.Golden.CreateStaked
484484
Test.Golden.CreateTestnetData
485485
Test.Golden.Debug.TransactionView
486+
Test.Golden.Dijkstra.StakePool.RegistrationCertificate
486487
Test.Golden.Dijkstra.Transaction.Assemble
487488
Test.Golden.ErrorsSpec
488489
Test.Golden.Genesis.Common
@@ -509,12 +510,10 @@ test-suite cardano-cli-golden
509510
Test.Golden.Shelley.Metadata.StakePoolMetadata
510511
Test.Golden.Shelley.MultiSig.Address
511512
Test.Golden.Shelley.Node.IssueOpCert
512-
Test.Golden.Shelley.Node.IssuePopBls
513513
Test.Golden.Shelley.Node.KeyGen
514514
Test.Golden.Shelley.Node.KeyGenBls
515515
Test.Golden.Shelley.Node.KeyGenKes
516516
Test.Golden.Shelley.Node.KeyGenVrf
517-
Test.Golden.Shelley.Node.KeyHashBls
518517
Test.Golden.Shelley.StakeAddress.Build
519518
Test.Golden.Shelley.StakeAddress.DeregistrationCertificate
520519
Test.Golden.Shelley.StakeAddress.KeyGen

‎cardano-cli/src/Cardano/CLI/Compatible/StakePool/Run.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ runStakePoolRegistrationCertificateCmd
8484
StakePoolParameters
8585
{ stakePoolId = stakePoolId'
8686
, stakePoolVRF = vrfKeyHash'
87+
, stakePoolBlsKey = Nothing
8788
, stakePoolCost = poolCost
8889
, stakePoolMargin = poolMargin
8990
, stakePoolRewardAccount = rewardAccountAddr

0 commit comments

Comments
 (0)