Skip to content
Open
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
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
## Changelog

### Unreleased Dijkstra integration (node 11.1.1.1 proposal)

* Use complete API defaults for fallback Dijkstra genesis, including the V4 cost model.
* Render the Receiving script purpose in node traces.
* Align normal-project benchmark dependency bounds with API 11.9, CLI 11.3,
network/diffusion 1.3 and Plutus 1.71 (locli 2.4.0.1, tx-generator 2.18.0.1
and plutus-scripts-bench 1.0.5.1 proposals).
* Refresh the package-index dates and verified CHaP Nix input to include the
published DMQ 0.7.2.0 consensus-5.1 metadata revision.
* Align Dijkstra testnet configuration with genesis protocol major 12, the local
protected-address activation proposal. Enable `ExperimentalHardForksEnabled`
only for requested Dijkstra testnets; earlier-era configurations remain unchanged.
Upstream agreement remains separate.

Changelogs for components can be found as follows:

- [cardano-testnet](https://github.com/IntersectMBO/cardano-node/blob/master/cardano-testnet/CHANGELOG.md)
Expand Down
4 changes: 4 additions & 0 deletions bench/locli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased 2.4.0.1

- Update the explicit network API bound to 1.3 for the Dijkstra feature dependency graph.

# Revision history for locli

## 2.4 -- Jul 2026
Expand Down
4 changes: 2 additions & 2 deletions bench/locli/locli.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 3.0

name: locli
version: 2.4
version: 2.4.0.1
synopsis: Cardano log analysis CLI
description: Cardano log analysis CLI.
category: Cardano,
Expand Down Expand Up @@ -128,7 +128,7 @@ library
, hashable
, optparse-applicative
, ouroboros-consensus:ouroboros-consensus
, ouroboros-network:api ^>= 1.2
, ouroboros-network:api ^>= 1.3
, sop-core
, split
, sqlite-easy >= 1.1.0.1
Expand Down
10 changes: 5 additions & 5 deletions bench/plutus-scripts-bench/plutus-scripts-bench.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: plutus-scripts-bench
version: 1.0.5.0
version: 1.0.5.1
synopsis: Plutus scripts used for benchmarking
description: Plutus scripts used for benchmarking.
category: Cardano,
Expand Down Expand Up @@ -86,10 +86,10 @@ library
-- IOG dependencies
--------------------------
build-depends:
, cardano-api ^>=11.7
, plutus-ledger-api ^>=1.65
, plutus-tx ^>=1.65
, plutus-tx-plugin ^>=1.65
, cardano-api ^>=11.9
, plutus-ledger-api ^>=1.71
, plutus-tx ^>=1.71
, plutus-tx-plugin ^>=1.71

------------------------
-- Non-IOG dependencies
Expand Down
4 changes: 4 additions & 0 deletions bench/tx-generator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased 2.18.0.1

- Update API, CLI and diffusion bounds for the Dijkstra Receiving source proposals. Use the current public era-dispatch API for node era queries.

# ChangeLog

## 2.18 -- Sep 2026
Expand Down
4 changes: 2 additions & 2 deletions bench/tx-generator/src/Cardano/Benchmarking/Script/Core.hs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import qualified Data.ByteString as BS (hPut)
import Data.ByteString.Lazy.Char8 as BSL (writeFile)
import Data.Ratio ((%))
import qualified Data.Text as Text (unpack)
import System.IO (IOMode(..), withFile)
import System.IO (IOMode (..), withFile)

import Streaming
import qualified Streaming.Prelude as Streaming
Expand Down Expand Up @@ -172,7 +172,7 @@ queryEra = do
AnyCardanoEra era <- mapExceptT liftIO .
modifyError (Env.TxGenError . TxGenError . show) $
queryNodeLocalState localNodeConnectInfo (SpecificPoint $ chainTipToChainPoint chainTip) QueryCurrentEra
caseByronOrShelleyBasedEra
inEonForEra
(liftTxGenError $ TxGenError "queryEra Byron not supported")
(return . AnyShelleyBasedEra)
era
Expand Down
8 changes: 4 additions & 4 deletions bench/tx-generator/tx-generator.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 3.0

name: tx-generator
version: 2.18
version: 2.18.0.1
synopsis: A transaction workload generator for Cardano clusters
description: A transaction workload generator for Cardano clusters.
category: Cardano,
Expand Down Expand Up @@ -116,13 +116,13 @@ library
, attoparsec-aeson
, base16-bytestring
, bytestring
, cardano-api ^>= 11.7
, cardano-api ^>= 11.9
, cardano-binary
, cardano-cli ^>= 11.2.2
, cardano-cli ^>= 11.3
, cardano-crypto-class
, cardano-crypto-wrapper
, cardano-data
, cardano-diffusion ^>= 1.1.1
, cardano-diffusion ^>= 1.3
, cardano-git-rev ^>= 0.2.2
, cardano-ledger-alonzo
, cardano-ledger-api
Expand Down
105 changes: 103 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ 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-08-14T13:38:07Z
, cardano-haskell-packages 2026-09-22T20:39:47Z
, hackage.haskell.org 2026-09-02T14:05:07Z
, cardano-haskell-packages 2026-10-06T16:46:26Z

constraints:
-- Both time providers export the same C clock symbol in static musl builds.
-- DNS 4.2.0.1 uses the modern provider required by TLS.
, hourglass < 0
, dns ^>= 4.2.0.1
-- haskell.nix patch does not work for 1.6.8
-- grapesy currently depends on crypton-x509-system (>=1.6 && <1.7)
, any.crypton-x509-system < 1.6.8 || >= 1.7
Expand Down Expand Up @@ -166,3 +170,100 @@ if impl(ghc >= 9.14)
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.


-- Temporary public source prerequisites for the coordinated CIP-160 proposals.
-- Proposed package versions are unreleased; remove after official package delivery.
-- Remove these overrides after the reviewed package versions reach CHaP.
source-repository-package
type: git
location: https://github.com/colll78/cardano-ledger.git
tag: 4b06e253c2fee5436d57cf56669c4e8a9358717b
--sha256: sha256-PzoJjGuFq23OHvnDDwXnsCkxfywF41typfb7oCKefNw=
subdir:
eras/allegra/impl
eras/alonzo/impl
eras/babbage/impl
eras/byron/crypto
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/small-steps
libs/vector-map

source-repository-package
type: git
location: https://github.com/colll78/plutus.git
tag: dcbb7e3232c3322557410fe341ec84f3cd78dc04
--sha256: sha256-6n+edByIhXRu9+ZfeMhIKLlfkcj/7aRJ1mrH29mn4nE=
subdir: plutus-ledger-api

-- Exact public source prerequisites; proposed versions are unreleased.

source-repository-package
type: git
location: https://github.com/colll78/cardano-addresses.git
tag: 83cf033c671d8a03d95de52c1451195f331d538e
--sha256: sha256-L0Bt4ynhocsSopD2xsY+JqajASjSAggrBP46Szbzygg=

source-repository-package
type: git
location: https://github.com/colll78/cardano-keys.git
tag: b63987bd43d99b82b91d29020ceab089fb61b123
--sha256: sha256-7oRxoZjCv/RhnnRWQ8LvI4sknlEGqy81j8uFxuJzOc0=
subdir: cardano-keys

source-repository-package
type: git
location: https://github.com/colll78/cardano-config.git
tag: e7a6f979964d2f613671832af001d06f99a67a86
--sha256: sha256-D+PbL2GcvEwCpazxy8cYncl8EUjwuR4H5Wj2HWO3UX0=

source-repository-package
type: git
location: https://github.com/colll78/ouroboros-consensus.git
tag: bb55e647b1c1142948562c3702fe96ab2ee160f4
--sha256: sha256-pqHyVyZfmTmU0UCgHZKjrpGvipR/3Mre7JohH8dilXk=


-- Published feature sources retain the complete normal component graph.
source-repository-package
type: git
location: https://github.com/colll78/cardano-cli.git
tag: 9fa3747627cfadeb4fae15d1e09adee70ad63bea
--sha256: sha256-hQUYoPCkLRO6Ym34Wk5SWuZd/ZzUys6ZPt4mrWnVhoQ=
subdir: cardano-cli

source-repository-package
type: git
location: https://github.com/colll78/cardano-api.git
tag: 70415a82d7fbbc786aa646199c0cafe4063194fe
--sha256: sha256-+F+j2njiPyKY1suO11uAL/fkxpB8/INDt/ifUzxBCvA=
subdir:
cardano-api
cardano-api-gen
cardano-rpc
cardano-wasm

source-repository-package
type: git
location: https://github.com/colll78/ekg-forward.git
tag: 420e68445d1f853274724ccd18c1bd2222843f3a
--sha256: sha256-OWGyRyqprIoQi+zzCw5aHk9/bA778dDaVn9pJfspLhE=

-- Temporary upstream DNS prerequisite: https://github.com/kazu-yamamoto/dns/pull/177
-- Share the modern time provider required by TLS; remove after upstream delivery.
source-repository-package
type: git
location: https://github.com/colll78/dns.git
tag: df28303f5d07058388e40b3b9fa59509a11abdbb
--sha256: sha256-2w9tP3bY7jOo+oyI4ozhyH/co+E1VEUpBqwKHpOY57Y=
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 1
kind:
- maintenance
description: |
Update crypto-class and protocol dependency bounds for the selected Receiving-aware node integration.
6 changes: 3 additions & 3 deletions cardano-node-chairman/cardano-node-chairman.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 3.0

name: cardano-node-chairman
version: 11.1.1
version: 11.1.1.1
synopsis: The cardano full node
description: The cardano full node.
category: Cardano,
Expand Down Expand Up @@ -67,7 +67,7 @@ test-suite chairman-tests

build-depends: , cardano-api
, cardano-testnet
, cardano-crypto-class ^>=2.5
, cardano-crypto-class ^>=2.6
, data-default-class
, filepath
, hedgehog
Expand All @@ -86,5 +86,5 @@ test-suite chairman-tests
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"

build-tool-depends: cardano-node:cardano-node
, cardano-cli:cardano-cli ^>= 11.2.2
, cardano-cli:cardano-cli ^>= 11.3
, cardano-node-chairman:cardano-node-chairman
11 changes: 11 additions & 0 deletions cardano-node/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

## Next version

- Update ledger/consensus and credential-envelope adapters for the selected
dependencies, preserving the LSM cache default and credential envelope type.
Render current account/withdrawal/pool and Peras failures, snapshot-policy
configuration and mempool-capacity changes. Expose ReadMempool/WatchMempool
RPC span namespaces, documentation and request counters. Use the supported
randomized responder salt API and display the supported client protocol version.

- Render Receiving purposes by original output index. Missing-redeemer logs
preserve every purpose sharing a script hash: singleton values keep their
existing JSON shape, while multiple values form an array in source order.

- Fix `BlockFetch.Decision` trace namespace drift: documentation and the
configuration consistency check now use the runtime `TraceDecisionEvent`
type, so the documented message namespaces are
Expand Down
23 changes: 14 additions & 9 deletions cardano-node/cardano-node.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 3.8

name: cardano-node
version: 11.1.1
version: 11.1.1.1
synopsis: The cardano full node
description: The cardano full node.
category: Cardano,
Expand Down Expand Up @@ -133,9 +133,9 @@ library
, async
, base16-bytestring
, bytestring
, cardano-api ^>= 11.7
, cardano-api ^>= 11.9
, cardano-data
, cardano-crypto-class ^>=2.5
, cardano-crypto-class ^>=2.6
, cardano-crypto-wrapper
, cardano-git-rev ^>=0.2.2
, cardano-ledger-alonzo
Expand All @@ -149,7 +149,7 @@ library
, cardano-ledger-dijkstra
, cardano-ledger-shelley
, cardano-prelude
, cardano-protocol ^>= 0.1
, cardano-protocol ^>= 0.3
, cardano-protocol-tpraos >= 1.4
, cardano-slotting >= 0.2
, cardano-rpc ^>= 11.4
Expand All @@ -167,7 +167,7 @@ library
, hashable
, hostname
, io-classes:{io-classes,strict-stm,si-timers} ^>= 1.8 || ^>= 1.9
, kes-agent ^>=1.3
, kes-agent ^>=1.4
, microlens
, mmap
, network-mux
Expand All @@ -176,9 +176,9 @@ library
, network-mux >= 0.8
, nothunks
, optparse-applicative
, ouroboros-consensus:{ouroboros-consensus, lsm, cardano, diffusion, protocol} ^>= 4.2.0.1
, ouroboros-network:{api, ouroboros-network, orphan-instances, framework, protocols, tracing} ^>= 1.2
, cardano-diffusion:{api, cardano-diffusion, tracing, orphan-instances} ^>=1.1.1
, ouroboros-consensus:{ouroboros-consensus, lsm, cardano, diffusion, protocol} ^>= 5.1
, ouroboros-network:{api, ouroboros-network, orphan-instances, framework, protocols, tracing} ^>= 1.3
, cardano-diffusion:{api, cardano-diffusion, tracing, orphan-instances} ^>=1.3
, prettyprinter
, prettyprinter-ansi-terminal
, psqueues
Expand Down Expand Up @@ -236,6 +236,9 @@ test-suite cardano-node-test
, cardano-crypto-class
, cardano-crypto-wrapper
, cardano-api
, cardano-ledger-alonzo
, cardano-ledger-core
, cardano-ledger-dijkstra
, cardano-rpc
, cardano-diffusion:{api, cardano-diffusion, orphan-instances}
, cardano-node
Expand All @@ -258,12 +261,14 @@ test-suite cardano-node-test
, vector
, yaml

other-modules: Test.Cardano.Config.Mainnet
other-modules: Test.Cardano.Config.Dijkstra
Test.Cardano.Config.Mainnet
Test.Cardano.Node.FilePermissions
Test.Cardano.Node.Gen
Test.Cardano.Node.Json
Test.Cardano.Node.POM
Test.Cardano.Node.TopLevel
Test.Cardano.Tracing.NewTracing.Consistency
Test.Cardano.Tracing.Receiving

ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
1 change: 1 addition & 0 deletions cardano-node/src/Cardano/Node/Configuration/LedgerDB.hs
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,4 @@ selectorToArgs (V2LSM fp fpExport) fastStoragePath =
(fromMaybe "lsm" fp)
fpExport
fastStoragePath
LSM.DiskCacheAll
Loading
Loading