Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 93 additions & 4 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repository cardano-haskell-packages
-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state:
, hackage.haskell.org 2026-07-30T07:30:12Z
, hackage.haskell.org 2026-09-02T14:05:07Z
, cardano-haskell-packages 2026-09-02T08:49:12Z

packages:
Expand All @@ -35,10 +35,8 @@ extra-packages: Cabal

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

if os(windows)
constraints: time ^>=1.14
Expand Down Expand Up @@ -70,6 +68,23 @@ write-ghc-environment-files: always
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.

-- Allow network-mux 0.11 from SRP (cardano-ping 0.10 on CHaP expects ^>=0.10)
-- Allow grapesy deps with updated bounds (matching cardano-node)
allow-newer:
, cardano-ping:network-mux
, grapesy:aeson
, grapesy:crypton-x509
, grapesy:crypton-x509-store
, grapesy:crypton-x509-system
, grapesy:crypton-x509-validation
, grapesy:http2
, grapesy:http2-tls
, grapesy:network-run
, grapesy:tls
-- kes-agent bounds cardano-crypto-class ^>=2.5 but we have a newer version
, kes-agent:cardano-crypto-class
, kes-agent-crypto:cardano-crypto-class

-- cabal-allow-newer begin
if impl(ghc >= 9.14)
allow-newer:
Expand All @@ -83,6 +98,13 @@ if impl(ghc >= 9.14)
, dictionary-sharing:containers
, diff-containers:base
, fs-sim:QuickCheck
, grapesy:base
, grapesy:containers
, grapesy:tls
, grpc-spec:base
, grpc-spec:containers
, lens-family:containers
, lens-family-core:containers
, lsm-tree:data-elevator
, ordered-containers:containers
, partial-order:containers
Expand All @@ -95,3 +117,70 @@ if impl(ghc >= 9.14)
, time-locale-compat:time
, with-utf8:base
-- cabal-allow-newer end

source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-ledger
tag: 620d2e31ad263bcfab4ad1516a9549c7b53c3ef6
--sha256: sha256-LI0zqi99UaXksj+op2rLFL0aY+Ayt7EmxvQtUlJvHDg=
subdir:
eras/allegra/impl
eras/alonzo/impl
eras/babbage/impl
eras/byron/chain/executable-spec
eras/byron/crypto
eras/byron/ledger/executable-spec
eras/byron/ledger/impl
eras/conway/impl
eras/dijkstra/impl
eras/mary/impl
eras/shelley/impl
eras/shelley/test-suite
libs/cardano-data
libs/cardano-ledger-api
libs/cardano-ledger-binary
libs/cardano-ledger-core
libs/cardano-protocol
libs/cardano-protocol-tpraos
libs/non-integral
libs/plutus-preprocessor
libs/small-steps
libs/vector-map

source-repository-package
type: git
location: https://github.com/intersectmbo/cardano-base.git
--sha256: sha256-WUBluY6UqvBkS5cNsJnKMOaW+1dTfL3mg8iq/kVPV0o=
tag: d92e2e3841eaad354c5e1ef77b458b347f471271
subdir: cardano-crypto-leios

source-repository-package
type: git
location: https://github.com/IntersectMBO/ouroboros-consensus
tag: 4ee752860daff98f218ace65f828b1244a831055
--sha256: sha256-rno71IrjiOfEeOVDqesedJ+3eAWXIBhy/OwtnS44po4=
subdir:
.

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-api
tag: 6f93e4ab99973bd7249ed0208ddd9d5c36421ac8
--sha256: sha256-AUGmRLi62RRl32H4nOnRTCGf7zL+bG5hLgmRiwmQ9ds=
subdir:
cardano-api

source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-addresses
tag: f59608374d955b653624822429685114f41e2db2
--sha256: sha256-HgLfcxlz%2BVC2ENmS5dP4S4dCtF6y9I9sjnd0EbDWo8k%3D

source-repository-package
type: git
location: https://github.com/well-typed/grapesy
tag: bd6af64f69ff89e3a8fc02e2c81262e648f4715d
--sha256: sha256-4F+bUoytvrgOcQ8aIWbOY9uYsPoTZwQOlmh7ckgyK9M=
subdir:
grapesy
grpc-spec
30 changes: 15 additions & 15 deletions cardano-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,58 +57,58 @@
[PR 1396](https://github.com/intersectmbo/cardano-cli/pull/1396)

- new `cardano-cli ping` api

`cardano-cli ping` allows now to ping multiple servers, does domain name
resolution and supports SRV records (as specified in
https://cips.cardano.org/cip/CIP-0155)

Some examples:

Run a ping against two ip addresses, ipv4 & ipv6
```bash
cardano-cli ping 127.0.0.1:3001 [::1]:3001
```

Run a ping against a domain name:
```bash
cardano-cli ping my.domain.com:3001
```

Run a ping against an SRV domain.
According to CIP#0155 the SRV record needs to be registered at
`_cardano._tcp.srv.domain.com`
```bash
cardano-cli ping srv.domain.com
```

Run a ping against unix socket
```bash
cardano-cli ping /var/run/cardano-node.socket
```

`cardano-cli` ping has three modes of operation:

* ping mode: `--mode ping` (the default)
* tip mode `--mode tip`
* query handshake parameters: `--mode query`
(breaking, feature)
[PR 1384](https://github.com/intersectmbo/cardano-cli/pull/1384)

- The interface for `cardano-cli ping` has been reshuffled:

Removed:

* `-h`/`--host`, `-u`/`--unixsock` and `-p`/`--port`. The target is now given as a
positional argument instead (see below).
* `-Q`/`--query-versions`, replaced by `--mode query`.
* `-t`/`--tip`, replaced by `--mode tip`.

Renamed:

* `-m`/`--magic` is now `-m`/`--network-magic`.

Added:

* A positional `ADDRS` argument, which accepts one or more targets: an IP/DNS address
with a port (`127.0.0.1:3001`, `[::1]:3001`, `example.org:3001`), an SRV name, or a
UNIX socket path.
Expand All @@ -118,7 +118,7 @@
(default `_cardano._tcp`).
* `--color COLOR`, one of `auto`, `never` or `always`.
* `--short-hash`, to show an abbreviated tip hash.

Note that `-h` is now only a short form of `--help`; it no longer means `--host`.
(breaking, feature)
[PR 1384](https://github.com/intersectmbo/cardano-cli/pull/1384)
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/cardano-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ library
cardano-api ^>=11.6,
cardano-binary,
cardano-crypto,
cardano-crypto-class ^>=2.5,
cardano-crypto-class ^>=2.6,
cardano-crypto-wrapper ^>=1.7,
cardano-data >=1.1,
cardano-diffusion:ping ^>=1.1.1,
Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/Compatible/Transaction/Run.hs
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ mkTxCertificatesSbe era certs = Exp.TxCertificates . OMap.fromList $ map getStak
getStakeCred
:: (Exp.Certificate (ShelleyLedgerEra era), Exp.AnyWitness (ShelleyLedgerEra era))
-> ( Exp.Certificate (ShelleyLedgerEra era)
, Maybe (StakeCredential, Exp.AnyWitness (ShelleyLedgerEra era))
, Maybe (Exp.AnyWitness (ShelleyLedgerEra era))
)
getStakeCred (c@(Exp.Certificate cert), wit) =
(c, (,wit) <$> Compatible.getTxCertWitness (convert era) cert)
(c, wit <$ Compatible.getTxCertWitness (convert era) cert)

readUpdateProposalFile
:: Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,7 @@ buildPoolParams nw dir index specifiedRelays = do
, L.sppMargin = minBound
, L.sppAccountAddress =
toShelleyStakeAddr $ makeStakeAddress nw $ StakeCredentialByKey (verificationKeyHash rewardsSVK)
, L.sppBlsKey = L.SNothing
, L.sppOwners = mempty
, L.sppRelays = lookupPoolRelay specifiedRelays
, L.sppMetadata = L.SNothing
Expand Down
1 change: 1 addition & 0 deletions cardano-cli/src/Cardano/CLI/EraBased/Genesis/Run.hs
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,7 @@ buildPoolParams nw dir index specifiedRelays = do
, L.sppMargin = minBound
, L.sppAccountAddress =
toShelleyStakeAddr $ makeStakeAddress nw $ StakeCredentialByKey (verificationKeyHash rewardsSVK)
, L.sppBlsKey = L.SNothing
, L.sppOwners = mempty
, L.sppRelays = lookupPoolRelay specifiedRelays
, L.sppMetadata = L.SNothing
Expand Down
6 changes: 3 additions & 3 deletions cardano-cli/src/Cardano/CLI/EraIndependent/Key/Run.hs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import Cardano.Api.Byron qualified as ByronApi
import Cardano.Api.Crypto.Ed25519Bip32 (xPrvFromBytes)
import Cardano.Api.Ledger qualified as L

import Cardano.Binary.FixedSizeCodec (rawDecodeFixedSized)
import Cardano.Binary.FixedSizeCodec qualified as FixedSized
import Cardano.CLI.Byron.Key qualified as Byron
import Cardano.CLI.Compatible.Exception
import Cardano.CLI.EraIndependent.Key.Command qualified as Cmd
Expand Down Expand Up @@ -498,15 +498,15 @@ runConvertITNBip32KeyCmd
convertITNVerificationKey :: Text -> Either ItnKeyConversionError (VerificationKey StakeKey)
convertITNVerificationKey pubKey = do
(_, _, keyBS) <- first ItnKeyBech32DecodeError (decodeBech32 pubKey)
case rawDecodeFixedSized keyBS of
case FixedSized.rawDecodeFixedSized keyBS of
Just verKey -> Right . StakeVerificationKey $ L.VKey verKey
Nothing -> Left $ ItnVerificationKeyDeserialisationError keyBS

-- | Convert private ed22519 key to a Shelley signing key.
convertITNSigningKey :: Text -> Either ItnKeyConversionError (SigningKey StakeKey)
convertITNSigningKey privKey = do
(_, _, keyBS) <- first ItnKeyBech32DecodeError (decodeBech32 privKey)
case rawDecodeFixedSized keyBS of
case FixedSized.rawDecodeFixedSized keyBS of
Just signKey -> Right $ StakeSigningKey signKey
Nothing -> Left $ ItnSigningKeyDeserialisationError keyBS

Expand Down
Loading
Loading