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
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.17
, plutus-ledger-api ^>=1.45
, plutus-tx ^>=1.45
, plutus-tx-plugin ^>=1.45
, plutus-ledger-api ^>=1.50
, plutus-tx ^>=1.50
, plutus-tx-plugin ^>=1.50

------------------------
-- Non-IOG dependencies
Expand Down
5 changes: 3 additions & 2 deletions bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import Data.Int (Int64)
import Data.Map.Strict as Map (lookup)

import Control.Exception (displayException)

Check warning on line 22 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 Expand Up @@ -71,8 +72,8 @@
doLoad fp = second (second (const $ ResolvedToFallback asFileName)) <$> readPlutusScript (Right fp)
readPlutusScript (Right fp)
= runExceptT $ do
script <- firstExceptT ApiError $
readFileScriptInAnyLang fp
script <-
handleExceptT (\(e :: SomeException) -> ApiError $ displayException e) (readFileScriptInAnyLang fp)
case script of
ScriptInAnyLang (PlutusScriptLanguage _) _ -> pure (script, ResolvedToFileName fp)
ScriptInAnyLang lang _ -> throwE $ TxGenError $ "readPlutusScript: only PlutusScript supported, found: " ++ show lang
Expand Down
5 changes: 2 additions & 3 deletions bench/tx-generator/tx-generator.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ library
, attoparsec-aeson
, base16-bytestring
, bytestring
, cardano-api ^>= 10.17
, cardano-api ^>= 10.18
, cardano-binary
, cardano-cli ^>= 10.11
, cardano-cli ^>= 10.12
, cardano-crypto-class
, cardano-crypto-wrapper
, cardano-data
Expand Down Expand Up @@ -154,7 +154,6 @@ library
, random
, serialise
, streaming
, strict-stm
, cardano-ledger-shelley
, prettyprinter
, stm
Expand Down
49 changes: 47 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-07-01T09:22:51Z
, hackage.haskell.org 2025-09-24T20:00:55Z
, cardano-haskell-packages 2025-09-24T15:29:30Z

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,41 @@ 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: 801b1d7cce99c6d5afbe6af7d7ad1d7a2cde087c
--sha256: sha256-s6SvoDHCFXfMC5bNBFoDgxMDZuMhnE1ZZwx1L15yjL0=
subdir: cardano-cli


source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-api
tag: 7388805c2a56e2f628ca46924c648268cc61bbd2
--sha256: sha256-YdFyulwmlwLDjVd6Bk+8IxQAdBSRCpacL5HzW3aCb7c=
subdir:
cardano-api

source-repository-package
type: git
location: https://github.com/IntersectMBO/ouroboros-consensus
-- latest master
tag: 71b02607c8a39ed4d8c983b281b05452ed8c01ce
--sha256: sha256-/vnZnAPsEuqQMzG5NGHaWk9vyefBWMft7/rKQ+yyYTQ=
subdir:
ouroboros-consensus
ouroboros-consensus-cardano
ouroboros-consensus-diffusion
ouroboros-consensus-protocol
sop-extras
strict-sop-core

source-repository-package
type: git
location: https://github.com/input-output-hk/kes-agent
tag: bf203c4e7f7e6aab947b077e178baac3ecb2541d
--sha256: sha256-cURVbhbTvK6iPKaXVjCovBezyE5UVs46iarmVyWA2Uc=
subdir:
kes-agent
9 changes: 4 additions & 5 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.17
, cardano-node ^>= 10.5
, cardano-prelude
, containers
Expand All @@ -55,8 +55,7 @@ executable cardano-node-chairman
, ouroboros-consensus-cardano
, ouroboros-network-api
, ouroboros-network-protocols
, strict-stm
, si-timers
, io-classes
, text
, time

Expand All @@ -75,7 +74,7 @@ test-suite chairman-tests
, data-default-class
, filepath
, hedgehog
, hedgehog-extras ^>= 0.8
, hedgehog-extras ^>= 0.10
, network
, process
, random
Expand All @@ -90,5 +89,5 @@ test-suite chairman-tests
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"

build-tool-depends: cardano-node:cardano-node
, cardano-cli:cardano-cli ^>= 10.11
, cardano-cli:cardano-cli ^>= 10.12
, cardano-node-chairman:cardano-node-chairman
23 changes: 10 additions & 13 deletions cardano-node/cardano-node.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,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 @@ -142,7 +141,7 @@ library
, async
, base16-bytestring
, bytestring
, cardano-api ^>= 10.17.1
, cardano-api ^>= 10.18
, cardano-crypto-class
, cardano-crypto-wrapper
, cardano-git-rev ^>=0.2.2
Expand Down Expand Up @@ -172,7 +171,7 @@ library
, generic-data
, hashable
, hostname
, io-classes >= 1.5
, io-classes:{io-classes,strict-stm,si-timers} >= 1.5
, iohk-monitoring ^>= 0.2
, microlens
, mmap
Expand All @@ -191,23 +190,22 @@ library
, ouroboros-consensus-cardano ^>= 0.25
, ouroboros-consensus-diffusion ^>= 0.23
, 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
, ouroboros-network-framework
, ouroboros-network-protocols ^>= 0.15
, prettyprinter
, prettyprinter-ansi-terminal
, psqueues
, random
, resource-registry
, safe-exceptions
, scientific
, si-timers
, io-classes
, 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 +216,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 +262,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