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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This is an approximate diagram of the dependencies among the different component
```mermaid
stateDiagram-v2
cn: cardano-node
tr: trace-dispatcher/iohk-monitoring-framework
tr: trace-dispatcher
ca: cardano-api
co: ouroboros-consensus
on: ouroboros-network
Expand Down
18 changes: 9 additions & 9 deletions bench/cardano-profile/data/all-profiles-coay.json
Original file line number Diff line number Diff line change
Expand Up @@ -7304,7 +7304,7 @@
"shutdown_on_slot_synced": 38901589,
"ssd_directory": null,
"tracer": false,
"tracing_backend": "iohk-monitoring",
"tracing_backend": "trace-dispatcher",
"utxo_lmdb": false,
"utxo_lsmt": false,
"verbatim": {
Expand Down Expand Up @@ -8483,7 +8483,7 @@
"shutdown_on_slot_synced": 237599,
"ssd_directory": null,
"tracer": false,
"tracing_backend": "iohk-monitoring",
"tracing_backend": "trace-dispatcher",
"utxo_lmdb": false,
"utxo_lsmt": false,
"verbatim": {
Expand Down Expand Up @@ -11275,7 +11275,7 @@
"shutdown_on_slot_synced": null,
"ssd_directory": null,
"tracer": false,
"tracing_backend": "iohk-monitoring",
"tracing_backend": "trace-dispatcher",
"utxo_lmdb": false,
"utxo_lsmt": false,
"verbatim": {
Expand Down Expand Up @@ -19089,7 +19089,7 @@
"shutdown_on_slot_synced": null,
"ssd_directory": null,
"tracer": true,
"tracing_backend": "iohk-monitoring",
"tracing_backend": "trace-dispatcher",
"utxo_lmdb": false,
"utxo_lsmt": false,
"verbatim": {
Expand Down Expand Up @@ -25425,7 +25425,7 @@
"shutdown_on_slot_synced": null,
"ssd_directory": null,
"tracer": true,
"tracing_backend": "iohk-monitoring",
"tracing_backend": "trace-dispatcher",
"utxo_lmdb": false,
"utxo_lsmt": false,
"verbatim": {
Expand Down Expand Up @@ -46190,7 +46190,7 @@
"shutdown_on_slot_synced": null,
"ssd_directory": null,
"tracer": true,
"tracing_backend": "iohk-monitoring",
"tracing_backend": "trace-dispatcher",
"utxo_lmdb": false,
"utxo_lsmt": false,
"verbatim": {
Expand Down Expand Up @@ -46614,7 +46614,7 @@
"shutdown_on_slot_synced": null,
"ssd_directory": null,
"tracer": true,
"tracing_backend": "iohk-monitoring",
"tracing_backend": "trace-dispatcher",
"utxo_lmdb": false,
"utxo_lsmt": false,
"verbatim": {
Expand Down Expand Up @@ -75372,7 +75372,7 @@
"shutdown_on_slot_synced": null,
"ssd_directory": null,
"tracer": true,
"tracing_backend": "iohk-monitoring",
"tracing_backend": "trace-dispatcher",
"utxo_lmdb": false,
"utxo_lsmt": false,
"verbatim": {
Expand Down Expand Up @@ -82455,7 +82455,7 @@
"shutdown_on_slot_synced": 64000,
"ssd_directory": null,
"tracer": true,
"tracing_backend": "iohk-monitoring",
"tracing_backend": "trace-dispatcher",
"utxo_lmdb": false,
"utxo_lsmt": false,
"verbatim": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ oldTracing = node
(\n ->
if Types.tracing_backend n /= ""
then error "oldTracing: `tracing_backend` already set (not empty)."
else n {Types.tracing_backend = "iohk-monitoring"}
else n {Types.tracing_backend = "trace-dispatcher"}
)

-- "--shutdown-on-*".
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,7 @@ data AfterSlot =
| After SlotNo
deriving (Eq, Show)

-- `FromJSON`/`ToJSON` from "Cardano.Tracing.OrphanInstances.Network".

-- https://github.com/IntersectMBO/cardano-node/blob/52b708f37cd3dc92a188717deae2a6a60117f696/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs#L2784
-- `FromJSON`/`ToJSON`.

instance Aeson.FromJSON UseLedgerPeers where
parseJSON (Aeson.Number slot) = return $
Expand All @@ -372,8 +370,6 @@ instance Aeson.FromJSON UseLedgerPeers where
parseJSON invalid = fail $ "Parsing of slot number failed due to type mismatch. "
<> "Encountered: " <> show invalid

-- https://github.com/IntersectMBO/cardano-node/blob/52b708f37cd3dc92a188717deae2a6a60117f696/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs#L2811

instance Aeson.ToJSON UseLedgerPeers where
toJSON DontUseLedgerPeers = Aeson.Number (-1)
toJSON (UseLedgerPeers Always) = Aeson.Number 0
Expand Down Expand Up @@ -409,11 +405,9 @@ newtype HotValency = HotValency { getHotValency :: Int }
newtype WarmValency = WarmValency { getWarmValency :: Int }
deriving (Show, Eq, Ord)

-- `FromJSON`/`ToJSON` from "Cardano.Tracing.OrphanInstances.Network".
-- `FromJSON`/`ToJSON`.

-- Replaced `HotValency` and `WarmValency` with `Valency`.
-- https://github.com/IntersectMBO/cardano-node/blob/52b708f37cd3dc92a188717deae2a6a60117f696/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs#L1638

instance Aeson.ToJSON Valency where
toJSON (Valency v) = Aeson.toJSON v

Expand Down Expand Up @@ -449,9 +443,7 @@ data PeerTrustable =
| IsNotTrustable
deriving (Eq, Show, Ord, Generic)

-- `FromJSON`/`ToJSON` from "Cardano.Tracing.OrphanInstances.Network".

-- https://github.com/IntersectMBO/cardano-node/blob/52b708f37cd3dc92a188717deae2a6a60117f696/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs#L2824
-- `FromJSON`/`ToJSON`.

instance Aeson.FromJSON PeerTrustable where
parseJSON = Aeson.withBool "PeerTrustable" $ \b ->
Expand All @@ -473,9 +465,7 @@ data UseBootstrapPeers =
| UseBootstrapPeers [RelayAccessPoint]
deriving (Eq, Show, Ord, Generic)

-- `FromJSON`/`ToJSON` from "Cardano.Tracing.OrphanInstances.Network".

-- https://github.com/IntersectMBO/cardano-node/blob/52b708f37cd3dc92a188717deae2a6a60117f696/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs#L2816
-- `FromJSON`/`ToJSON`.

instance Aeson.ToJSON UseBootstrapPeers where
toJSON DontUseBootstrapPeers = Aeson.Null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ import qualified Streaming.Prelude as Streaming
import Data.Time.Clock (NominalDiffTime, UTCTime)
import qualified Data.Time.Clock as Clock

import Cardano.Tracing.OrphanInstances.Byron ()
import Cardano.Tracing.OrphanInstances.Common ()
import Cardano.Tracing.OrphanInstances.Consensus ()
import Cardano.Tracing.OrphanInstances.Network ()
import Cardano.Tracing.OrphanInstances.Shelley ()

import Ouroboros.Network.Protocol.TxSubmission2.Type (SingBlockingStyle (..))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ import Cardano.Benchmarking.Types
import qualified Cardano.Ledger.Core as Ledger
import Cardano.Logging
import Cardano.Prelude hiding (ByteString, atomically, retry, state, threadDelay)
import Cardano.Tracing.OrphanInstances.Byron ()
import Cardano.Tracing.OrphanInstances.Common ()
import Cardano.Tracing.OrphanInstances.Consensus ()
import Cardano.Tracing.OrphanInstances.Network ()
import Cardano.Tracing.OrphanInstances.Shelley ()
import qualified Ouroboros.Consensus.Cardano as Consensus (CardanoBlock)
import qualified Ouroboros.Consensus.Cardano.Block as Block
(TxId (GenTxIdAllegra, GenTxIdAlonzo, GenTxIdBabbage, GenTxIdConway, GenTxIdMary, GenTxIdShelley))
Expand Down
5 changes: 0 additions & 5 deletions bench/tx-generator/src/Cardano/Benchmarking/LogTypes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ import Cardano.Benchmarking.Types
import Cardano.Benchmarking.Version as Version
import Cardano.Logging
import Cardano.Network.NodeToNode (NodeToNodeVersion, RemoteConnectionId)
import Cardano.Tracing.OrphanInstances.Byron ()
import Cardano.Tracing.OrphanInstances.Common ()
import Cardano.Tracing.OrphanInstances.Consensus ()
import Cardano.Tracing.OrphanInstances.Network ()
import Cardano.Tracing.OrphanInstances.Shelley ()
import Cardano.TxGenerator.PlutusContext (PlutusBudgetSummary)
import Cardano.TxGenerator.Setup.NixService (NixServiceOptions (..))
import Cardano.TxGenerator.Types (TPSRate)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module Cardano.Benchmarking.OuroborosImports
(
CardanoBlock
, LocalSubmitTx
, LoggingLayer
, PaymentKey
, ShelleyGenesis
, SigningKey
Expand All @@ -27,7 +26,6 @@ import Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlo

import Cardano.CLI.Type.Common (SigningKeyFile)
import Cardano.Ledger.Shelley.Genesis (ShelleyGenesis)
import Cardano.Node.Configuration.Logging (LoggingLayer)
import Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
import Ouroboros.Consensus.Block.Abstract
import qualified Ouroboros.Consensus.Cardano as Consensus
Expand Down
4 changes: 0 additions & 4 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ package bitvec
package plutus-scripts-bench
haddock-options: "--optghc=-fplugin-opt PlutusTx.Plugin:defer-errors"

allow-newer:
, katip:Win32

-- There is a suspected bug in `cabal` (https://github.com/haskell/cabal/issues/11663)
-- that can be worked around with the following allow-newer stanzas
allow-newer:
Expand All @@ -90,4 +87,3 @@ allow-newer:
-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.

37 changes: 5 additions & 32 deletions cardano-node/cardano-node.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,11 @@ library

if os(linux) && flag(systemd)
cpp-options: -DSYSTEMD
build-depends: lobemo-scribe-systemd
, systemd >= 2.3.0
build-depends: systemd >= 2.3.0

hs-source-dirs: src

exposed-modules: Cardano.Node.Configuration.Logging
Cardano.Node.Configuration.NodeAddress
exposed-modules: Cardano.Node.Configuration.NodeAddress
Cardano.Node.Configuration.POM
Cardano.Node.Configuration.LedgerDB
Cardano.Node.Configuration.Socket
Expand All @@ -88,7 +86,6 @@ library
Cardano.Node.TraceConstraints
Cardano.Node.Tracing
Cardano.Node.Tracing.API
Cardano.Node.Tracing.Compat
Cardano.Node.Tracing.Consistency
Cardano.Node.Tracing.DefaultTraceConfig
Cardano.Node.Tracing.Documentation
Expand All @@ -114,21 +111,9 @@ library
Cardano.Node.Tracing.Tracers.Resources
Cardano.Node.Tracing.Tracers.Rpc
Cardano.Node.Tracing.Tracers.Shutdown
Cardano.Node.Tracing.Tracers.HasIssuer
Cardano.Node.Tracing.Tracers.Startup
Cardano.Node.Types
Cardano.Tracing.Config
Cardano.Tracing.HasIssuer
Cardano.Tracing.Metrics
Cardano.Tracing.OrphanInstances.Byron
Cardano.Tracing.OrphanInstances.Common
Cardano.Tracing.OrphanInstances.Consensus
Cardano.Tracing.OrphanInstances.HardFork
Cardano.Tracing.OrphanInstances.Network
Cardano.Tracing.OrphanInstances.Shelley
Cardano.Tracing.Render
Cardano.Tracing.Shutdown
Cardano.Tracing.Startup
Cardano.Tracing.Tracers

other-modules: Paths_cardano_node
autogen-modules: Paths_cardano_node
Expand Down Expand Up @@ -164,38 +149,30 @@ library
, deepseq
, directory
, dns
, ekg-wai
, ekg-core
, filepath
, generic-data
, hashable
, hostname
, io-classes:{io-classes,strict-stm,si-timers} ^>= 1.8
, iohk-monitoring ^>= 0.2
, kes-agent ^>=1.2
, microlens
, mmap
, network-mux
, iproute
, lobemo-backend-aggregation
, lobemo-backend-ekg ^>= 0.2
, lobemo-backend-monitoring
, lobemo-backend-trace-forwarder
, mtl
, network
, network-mux >= 0.8
, nothunks
, optparse-applicative
, ouroboros-consensus:{ouroboros-consensus, lmdb, lsm, cardano, diffusion, protocol} ^>= 3.0.1
, ouroboros-network:{api, ouroboros-network, orphan-instances, framework, protocols, framework-tracing, tracing} ^>= 1.1
, cardano-diffusion:{api, cardano-diffusion, orphan-instances, tracing} ^>=1.0
, cardano-diffusion:{api, cardano-diffusion, tracing} ^>=1.0
, prettyprinter
, prettyprinter-ansi-terminal
, psqueues
, random
, resource-registry
, safe-exceptions
, scientific
, sop-core
-- avoid stm-2.5.2 https://github.com/haskell/stm/issues/76
, stm <2.5.2 || >=2.5.3
Expand All @@ -207,7 +184,6 @@ library
, trace-dispatcher ^>= 2.12.0
, trace-forward ^>= 2.4.0
, trace-resources ^>= 0.2.4
, tracer-transformers
, transformers
, transformers-except
, typed-protocols:{typed-protocols, stateful} >= 1.2
Expand Down Expand Up @@ -250,7 +226,6 @@ test-suite cardano-node-test
, cardano-api
, cardano-rpc
, cardano-diffusion:{api, cardano-diffusion, orphan-instances}
, cardano-protocol-tpraos
, cardano-node
, cardano-slotting
, contra-tracer
Expand All @@ -261,9 +236,8 @@ test-suite cardano-node-test
, hedgehog-extras ^>= 0.10
, iproute
, mtl
, ouroboros-consensus:{ouroboros-consensus, cardano, diffusion}
, ouroboros-consensus:{ouroboros-consensus, diffusion}
, ouroboros-network:{api, framework, ouroboros-network}
, strict-sop-core
, text
, trace-dispatcher
, transformers
Expand All @@ -276,6 +250,5 @@ test-suite cardano-node-test
Test.Cardano.Node.Json
Test.Cardano.Node.POM
Test.Cardano.Tracing.NewTracing.Consistency
Test.Cardano.Tracing.OrphanInstances.HardFork

ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
Loading
Loading