Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
dc0b68b
Bump `cardano-cli` to `10.12.0.0` and `cardano-api` to `10.18`
palas Sep 17, 2025
653ce0c
Fix compilation errors
palas Sep 17, 2025
bb2c3b1
WIP: bump upper bounds
ana-pantilie Sep 23, 2025
14be36d
WIP: fix dependencies
ana-pantilie Sep 24, 2025
015b955
Depend on new ekg-forward
ana-pantilie Sep 24, 2025
b47ed9a
Fix all dependency issues
ana-pantilie Sep 24, 2025
c38a12e
Propagate changes from cardano-cli
Jimbo4350 Jul 24, 2025
f6a5b99
REMOVE ME: Srps
Jimbo4350 Jul 24, 2025
b7b0f15
WIP: 10.6 dependency bump
Aug 9, 2025
1768396
Update deps
carbolymer Aug 14, 2025
0323395
Try update ekg-forward
carbolymer Aug 18, 2025
2c8dae5
Integrated ouroboros-network:cardano-diffusion package
coot Jun 12, 2025
81422ce
Fixed failing tests
coot Jun 16, 2025
c0d305b
Removed a stale TODO comment
coot Jun 16, 2025
92081aa
More fixes, still not compiling yet
carbolymer Aug 19, 2025
6c289f3
Update SRPs and flake.lock
carbolymer Aug 20, 2025
b8a9e20
nix build fix
carbolymer Aug 20, 2025
4f23de1
Fix non-exhaustive pattern-matching in LedgerQueries
geo2a Aug 25, 2025
b2c1170
Consensus traces: update ChainDB.PoppedBlockFromQueue trace
geo2a Aug 25, 2025
66cd58a
Consensus traces: update Mempool traces
geo2a Aug 25, 2025
34552bc
Consensus traces: update Genesis State Machine traces
geo2a Aug 25, 2025
782dc0a
Consensus traces: update LedgerDB.V2.FlavorImplSpecificTrace
geo2a Aug 25, 2025
bd5c990
Consensus traces: update LedgerDB.TraceForkerEvent trace
geo2a Aug 25, 2025
82d3a80
Consensus traces: update SelectView traces
geo2a Aug 25, 2025
e6e2465
Bump cardano-api & cardano-cli
carbolymer Sep 24, 2025
fd237cd
Update project and flake
ana-pantilie Sep 25, 2025
5ef0788
Bump `cardano-cli` to `10.12.0.0` and `cardano-api` to `10.18`
palas Sep 17, 2025
4708003
Fix compilation errors
palas Sep 17, 2025
8c9a9e7
WIP: bump upper bounds
ana-pantilie Sep 23, 2025
0db70eb
WIP: fix dependencies
ana-pantilie Sep 24, 2025
1057b4f
Depend on new ekg-forward
ana-pantilie Sep 24, 2025
c8f62aa
Merge branch 'ana/10.6-final-integration' into ana/10.6-final-integra…
ana-pantilie Sep 25, 2025
57dd6c8
Regenerate flake.lock
ana-pantilie Sep 25, 2025
57da667
WIP: fix compilation errors in cardano-node package
ana-pantilie Sep 25, 2025
8abde9f
WIP: partial fixes for ledger stuff
crocodile-dentist Oct 2, 2025
e493327
WIP: fix ledger stuff
ana-pantilie Sep 25, 2025
bcb34b7
New Dijkstra configuration
jasagredo Sep 26, 2025
2ea395e
Fix Alonzo genesis parsing
jasagredo Sep 26, 2025
438dce9
Provide initial Shelley credentials (unsound credentials)
jasagredo Sep 26, 2025
5be8cca
Fix ledger queries to be usable in all eras
jasagredo Sep 26, 2025
eb1e774
Add tracing instances for `PraosTiebreakerView`
jasagredo Sep 26, 2025
f029899
Add cases for tracing new NT* constructors
jasagredo Sep 26, 2025
f2009c9
Add tracing instances for `KESAgentClientTrace`
jasagredo Sep 26, 2025
e82ef32
Fill in tracing instances for some GSM constructors
jasagredo Sep 26, 2025
54d3912
Use new constructor `IgnoreBlockOlderThanImmTip`
jasagredo Sep 26, 2025
3442e73
Update Consensus and remove KES-agent SRP
jasagredo Sep 26, 2025
647c904
Add missing qualifiers
ana-pantilie Sep 26, 2025
6cbfab9
Ledger changes; fix parsing errors
ana-pantilie Sep 30, 2025
03fe6b1
integrate o-n 0.22.3
crocodile-dentist Oct 2, 2025
34612cc
Configure deadline peer selection targets
crocodile-dentist Oct 2, 2025
c6f48e8
TODO fix
crocodile-dentist Oct 2, 2025
e87b984
WIP cardano-tracer: integrate o-n 0.22 see commit msg
crocodile-dentist Oct 4, 2025
5d04140
Merge remote-tracking branch 'origin/master' into ana/10.6-final-inte…
ana-pantilie Oct 7, 2025
59b41d3
Bump consensus version
jasagredo Oct 2, 2025
eeb0a0d
Make Dijkstra genesis parsing dependent on ExperimentalHardForksEnabled
jasagredo Oct 2, 2025
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
4 changes: 2 additions & 2 deletions bench/locli/locli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ library
, hashable
, optparse-applicative-fork >= 0.18.1
, ouroboros-consensus
, ouroboros-network-api ^>= 0.14
, ouroboros-network-api ^>= 0.16
, sop-core
, split
, sqlite-easy >= 1.1.0.1
Expand Down Expand Up @@ -212,7 +212,7 @@ test-suite test-locli
build-depends: cardano-prelude
, containers
, hedgehog
, hedgehog-extras ^>= 0.8
, hedgehog-extras ^>= 0.10
, locli
, text

Expand Down
6 changes: 3 additions & 3 deletions bench/plutus-scripts-bench/plutus-scripts-bench.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ library
--------------------------
build-depends:
, cardano-api ^>=10.18
, plutus-ledger-api ^>=1.45
, plutus-tx ^>=1.45
, plutus-tx-plugin ^>=1.45
, plutus-ledger-api ^>=1.53
, plutus-tx ^>=1.53
, plutus-tx-plugin ^>=1.53

------------------------
-- Non-IOG dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import Data.Int (Int64)
import Data.Map.Strict as Map (lookup)

import Control.Exception (displayException)

Check warning on line 23 in bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs

View workflow job for this annotation

GitHub Actions / build

Warning in module Cardano.TxGenerator.Setup.Plutus: Use fewer imports ▫︎ Found: "import Control.Exception ( displayException )\nimport Control.Exception ( SomeException(..), try )\n" ▫︎ Perhaps: "import Control.Exception\n ( displayException, SomeException(..), try )\n"
import Control.Monad.Trans.Except
import Control.Monad.Trans.Except.Extra
import Control.Monad.Writer (runWriter)
Expand Down
1 change: 0 additions & 1 deletion bench/tx-generator/tx-generator.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ library
, random
, serialise
, streaming
, strict-stm
, cardano-ledger-shelley
, prettyprinter
, stm
Expand Down
27 changes: 25 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ 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 2025-06-24T21:06:59Z
, cardano-haskell-packages 2025-09-18T12:21:32Z
, hackage.haskell.org 2025-09-24T20:00:55Z
, cardano-haskell-packages 2025-09-30T09:59:24Z

packages:
cardano-node
Expand Down Expand Up @@ -61,6 +61,13 @@ package plutus-scripts-bench
allow-newer:
, katip:Win32

allow-newer:
, cardano-ledger-byron
-- https://github.com/phadej/vec/issues/121
, ral:QuickCheck
, fin:QuickCheck
, bin:QuickCheck

if impl (ghc >= 9.12)
allow-newer:
-- https://github.com/kapralVV/Unique/issues/11
Expand All @@ -72,3 +79,19 @@ if impl (ghc >= 9.12)
-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.

source-repository-package
type: git
location: https://github.com/intersectmbo/cardano-cli.git
tag: 9205bba98c35c3a158081104a202a59864472445
--sha256: sha256-JViaos6axYtRntdRP7GV34wY3LO2NCjyofZ+cEQG8ug=
subdir:
cardano-cli

source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-api
tag: cee9b20505a407b55f3b7b335e857d61d71ae196
--sha256: sha256-ijMOji6MNupx6eewRJcWpuoxitp4rw8nnccr/Ay+tTo=
subdir:
cardano-api
6 changes: 2 additions & 4 deletions cardano-node-chairman/cardano-node-chairman.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ executable cardano-node-chairman
build-depends: cardano-api
, cardano-crypto-class
, cardano-git-rev ^>= 0.2.2
, cardano-ledger-core ^>= 1.17
, cardano-ledger-core ^>= 1.18
, cardano-node ^>= 10.5
, cardano-prelude
, containers
Expand All @@ -55,8 +55,6 @@ executable cardano-node-chairman
, ouroboros-consensus-cardano
, ouroboros-network-api
, ouroboros-network-protocols
, strict-stm
, si-timers
, text
, time

Expand All @@ -75,7 +73,7 @@ test-suite chairman-tests
, data-default-class
, filepath
, hedgehog
, hedgehog-extras ^>= 0.8
, hedgehog-extras ^>= 0.10
, network
, process
, random
Expand Down
29 changes: 14 additions & 15 deletions cardano-node/cardano-node.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ library
Cardano.Node.Protocol.Cardano
Cardano.Node.Protocol.Checkpoints
Cardano.Node.Protocol.Conway
Cardano.Node.Protocol.Dijkstra
Cardano.Node.Protocol.Shelley
Cardano.Node.Protocol.Types
Cardano.Node.Queries
Expand Down Expand Up @@ -112,7 +113,6 @@ library
Cardano.Node.Tracing.Tracers.NodeToClient
Cardano.Node.Tracing.Tracers.NodeToNode
Cardano.Node.Tracing.Tracers.NodeVersion
Cardano.Node.Tracing.Tracers.NonP2P
Cardano.Node.Tracing.Tracers.P2P
Cardano.Node.Tracing.Tracers.Peer
Cardano.Node.Tracing.Tracers.Resources
Expand Down Expand Up @@ -154,6 +154,7 @@ library
, cardano-ledger-byron
, cardano-ledger-conway
, cardano-ledger-core
, cardano-ledger-dijkstra
, cardano-ledger-shelley
, cardano-prelude
, cardano-protocol-tpraos >= 1.4
Expand All @@ -172,8 +173,9 @@ library
, generic-data
, hashable
, hostname
, io-classes >= 1.5
, io-classes:{io-classes,strict-stm,si-timers} >= 1.5
, iohk-monitoring ^>= 0.2
, kes-agent ^>=0.2
, microlens
, mmap
, network-mux
Expand All @@ -187,27 +189,25 @@ library
, network-mux >= 0.8
, nothunks
, optparse-applicative-fork >= 0.18.1
, ouroboros-consensus ^>= 0.27
, ouroboros-consensus-cardano ^>= 0.25
, ouroboros-consensus-diffusion ^>= 0.23
, ouroboros-consensus ^>= 0.28
, ouroboros-consensus-cardano ^>= 0.26
, ouroboros-consensus-diffusion ^>= 0.24
, ouroboros-consensus-protocol
, ouroboros-network-api ^>= 0.14
, ouroboros-network ^>= 0.21.2
, ouroboros-network-framework ^>= 0.18.0.1
, ouroboros-network-protocols ^>= 0.14
, ouroboros-network-api ^>= 0.16
, ouroboros-network:{ouroboros-network, cardano-diffusion, orphan-instances} ^>= 0.22.3
, ouroboros-network-framework ^>= 0.19.1
, ouroboros-network-protocols ^>= 0.15
, prettyprinter
, prettyprinter-ansi-terminal
, psqueues
, random
, resource-registry
, safe-exceptions
, scientific
, si-timers
, sop-core
-- avoid stm-2.5.2 https://github.com/haskell/stm/issues/76
, stm <2.5.2 || >=2.5.3
, strict-sop-core
, strict-stm
, sop-core
, sop-extras
, text >= 2.0
Expand All @@ -218,8 +218,7 @@ library
, tracer-transformers
, transformers
, transformers-except
, typed-protocols >= 0.3
, typed-protocols-stateful >= 0.3
, typed-protocols:{typed-protocols, stateful} >= 1.0
, yaml

executable cardano-node
Expand Down Expand Up @@ -265,13 +264,13 @@ test-suite cardano-node-test
, filepath
, hedgehog
, hedgehog-corpus
, hedgehog-extras ^>= 0.8
, hedgehog-extras ^>= 0.10
, iproute
, mtl
, ouroboros-consensus
, ouroboros-consensus-cardano
, ouroboros-consensus-diffusion
, ouroboros-network
, ouroboros-network:{ouroboros-network, cardano-diffusion}
, ouroboros-network-api
, strict-sop-core
, text
Expand Down
3 changes: 2 additions & 1 deletion cardano-node/src/Cardano/Node/Configuration/Logging.hs
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,15 @@ nodeBasicInfo nc (SomeConsensusProtocol whichP pForInfo) nodeStartTime' = do
in getGenesisValues "Shelley" cfgShelley
Api.CardanoBlockType ->
let CardanoLedgerConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo
cfgBabbage cfgConway = Consensus.configLedger cfg
cfgBabbage cfgConway cfgDjikstra = Consensus.configLedger cfg
in getGenesisValuesByron cfg cfgByron
++ getGenesisValues "Shelley" cfgShelley
++ getGenesisValues "Allegra" cfgAllegra
++ getGenesisValues "Mary" cfgMary
++ getGenesisValues "Alonzo" cfgAlonzo
++ getGenesisValues "Babbage" cfgBabbage
++ getGenesisValues "Conway" cfgConway
++ getGenesisValues "Djikstra" cfgDjikstra
items = nub $
[ ("protocol", pack . show $ ncProtocol nc)
, ("version", pack . showVersion $ version)
Expand Down
10 changes: 5 additions & 5 deletions cardano-node/src/Cardano/Node/Configuration/NodeAddress.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module Cardano.Node.Configuration.NodeAddress
, NodeDnsAddress
, nodeIPv4ToIPAddress
, nodeIPv6ToIPAddress
, nodeDnsAddressToDomainAddress
, nodeDnsAddressToRelayAccessPoint
, NodeHostIPAddress (..)
, nodeHostIPAddressToSockAddr
, NodeHostIPv4Address (..)
Expand All @@ -32,7 +32,7 @@ module Cardano.Node.Configuration.NodeAddress

import Cardano.Api

import Ouroboros.Network.PeerSelection.RelayAccessPoint (DomainAccessPoint (..))
import Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..))

import Data.Aeson (Value (..), object, withObject, (.:), (.=))
import Data.IP (IP (..), IPv4, IPv6)
Expand Down Expand Up @@ -76,9 +76,9 @@ nodeIPv4ToIPAddress = fmap nodeHostIPv4AddressToIPAddress
nodeIPv6ToIPAddress :: NodeIPv6Address -> NodeIPAddress
nodeIPv6ToIPAddress = fmap nodeHostIPv6AddressToIPAddress

nodeDnsAddressToDomainAddress :: NodeDnsAddress -> DomainAccessPoint
nodeDnsAddressToDomainAddress NodeAddress { naHostAddress = NodeHostDnsAddress dns, naPort }
= DomainAccessPoint (Text.encodeUtf8 dns) naPort
nodeDnsAddressToRelayAccessPoint :: NodeDnsAddress -> RelayAccessPoint
nodeDnsAddressToRelayAccessPoint NodeAddress { naHostAddress = NodeHostDnsAddress dns, naPort }
= RelayAccessDomain (Text.encodeUtf8 dns) naPort

nodeAddressToSockAddr :: NodeIPAddress -> SockAddr
nodeAddressToSockAddr (NodeAddress addr port) =
Expand Down
Loading
Loading