diff --git a/cabal.project b/cabal.project index 6f485a76ee8..677cedb0267 100644 --- a/cabal.project +++ b/cabal.project @@ -91,8 +91,8 @@ package io-sim-classes source-repository-package type: git location: https://github.com/input-output-hk/cardano-base - tag: 6a6ea9695ee898dd7d4fd7a5d2cc639d7d5764f7 - --sha256: 1hkq5i9fjjr4picx3plq3s09isrmx6jifpqf57c7viqfdrwlhjnj + tag: 4251c0bb6e4f443f00231d28f5f70d42876da055 + --sha256: 02a61ymvx054pcdcgvg5qj9kpybiajg993nr22iqiya196jmgciv subdir: binary binary/test @@ -104,14 +104,14 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-crypto - tag: 2547ad1e80aeabca2899951601079408becbc92c - --sha256: 1p2kg2w02q5w1cvqzhfhqmxviy4xrzada3mmb096j2n6hfr20kri + tag: f73079303f663e028288f9f4a9e08bcca39a923e + --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger-specs - tag: a638b9fa854fced8b8165631885268e3814f2d90 - --sha256: 0jfdiha2xjjvqqi3dy410whzjiyhs3vxyic423ddlpbi1pdr3xdd + tag: cf3b01490a2cc7ebbb5ac6f7a4de79e8b1d5c70f + --sha256: 1v15xqy0qvb7ll4080pplrq2ygqgnf443kaq5i6mj0105941mcjc subdir: byron/chain/executable-spec byron/crypto @@ -159,7 +159,7 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/ouroboros-network - tag: 4fdc309f855792ed30271c30dcd9159232404787 + tag: 8b176d11ccf5946fc3f715623cc779c3c449dc8d --sha256: 1j03pzqw0n10m9af17q37b6l90x2qdajp30xjpv2247rwpgip31i subdir: io-sim diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Orphans.hs b/cardano-cli/src/Cardano/CLI/Shelley/Orphans.hs index 49738167872..94c577a856c 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Orphans.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Orphans.hs @@ -124,7 +124,6 @@ deriving newtype instance ToJSON (Ledger.Stake StandardCrypto) deriving anyclass instance ToJSON (Ledger.GenDelegs StandardCrypto) deriving anyclass instance ToJSON (Ledger.IndividualPoolStake StandardCrypto) -deriving anyclass instance ToJSON (Ledger.BlocksMade StandardCrypto) deriving anyclass instance ToJSON (Ledger.ProposedPPUpdates StandardShelley) deriving anyclass instance ToJSON (Ledger.PPUPState StandardShelley) diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs index aed8b21f340..e57a370f0ab 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs @@ -606,7 +606,7 @@ queryStakeDistributionFromLocalState era connectInfo@LocalNodeConnectInfo{ queryLocalLedgerState :: forall era ledgerera mode block. ShelleyLedgerEra era ~ ledgerera - => Ledger.ShelleyBased ledgerera + => Consensus.ShelleyBasedEra ledgerera => ShelleyBasedEra era -> LocalNodeConnectInfo mode block -> ExceptT ShelleyQueryCmdLocalStateQueryError IO diff --git a/cardano-node/src/Cardano/Node/Configuration/Logging.hs b/cardano-node/src/Cardano/Node/Configuration/Logging.hs index f62709d1268..3aae3977a41 100644 --- a/cardano-node/src/Cardano/Node/Configuration/Logging.hs +++ b/cardano-node/src/Cardano/Node/Configuration/Logging.hs @@ -273,9 +273,6 @@ nodeBasicInfo nc p nodeStartTime' = do Consensus.ProtocolShelley {} -> let DegenLedgerConfig cfgShelley = Consensus.configLedger cfg in getGenesisValues "Shelley" cfgShelley - Consensus.ProtocolMary {} -> - let DegenLedgerConfig cfgMary = Consensus.configLedger cfg - in getGenesisValues "Mary" cfgMary Consensus.ProtocolCardano {} -> let CardanoLedgerConfig cfgByron cfgShelley cfgAllegra cfgMary = Consensus.configLedger cfg in getGenesisValuesByron cfg cfgByron diff --git a/cardano-node/src/Cardano/Node/Protocol/Cardano.hs b/cardano-node/src/Cardano/Node/Protocol/Cardano.hs index eb8c660f4b5..6f4828d2542 100644 --- a/cardano-node/src/Cardano/Node/Protocol/Cardano.hs +++ b/cardano-node/src/Cardano/Node/Protocol/Cardano.hs @@ -21,7 +21,6 @@ module Cardano.Node.Protocol.Cardano ) where import Prelude -import Cardano.Prelude (headMay) import Control.Monad.Trans.Except (ExceptT) import Control.Monad.Trans.Except.Extra (firstExceptT) @@ -168,7 +167,7 @@ mkConsensusProtocolCardano NodeByronProtocolConfiguration { shelleyBasedInitialNonce = Shelley.genesisHashToPraosNonce shelleyGenesisHash, shelleyBasedLeaderCredentials = - headMay shelleyLeaderCredentials + shelleyLeaderCredentials } Consensus.ProtocolParamsShelley { -- This is /not/ the Shelley protocol version. It is the protocol diff --git a/cardano-node/src/Cardano/Node/Query.hs b/cardano-node/src/Cardano/Node/Query.hs index 1dd061714c8..e795d87b1b2 100644 --- a/cardano-node/src/Cardano/Node/Query.hs +++ b/cardano-node/src/Cardano/Node/Query.hs @@ -73,8 +73,6 @@ answerQueryWithLedgerState protocol extLedgerState query = runIdentity $ byronQuery Consensus.ProtocolShelley {} -> shelleyBasedQuery - Consensus.ProtocolMary {} -> - shelleyBasedQuery Consensus.ProtocolCardano {} -> HF.forwardCompatQuery answerQueryHelper diff --git a/cardano-node/src/Cardano/Tracing/Config.hs b/cardano-node/src/Cardano/Tracing/Config.hs index 27fc8922b40..7769b4b752d 100644 --- a/cardano-node/src/Cardano/Tracing/Config.hs +++ b/cardano-node/src/Cardano/Tracing/Config.hs @@ -60,6 +60,7 @@ type TraceMux = ("TraceMux" :: Symbol) type TraceTxInbound = ("TraceTxInbound" :: Symbol) type TraceTxOutbound = ("TraceTxOutbound" :: Symbol) type TraceTxSubmissionProtocol = ("TraceTxSubmissionProtocol" :: Symbol) +type TraceTxSubmission2Protocol = ("TraceTxSubmission2Protocol" :: Symbol) newtype OnOff (name :: Symbol) = OnOff { isOn :: Bool } deriving (Eq, Show) @@ -107,6 +108,7 @@ data TraceSelection , traceTxInbound :: OnOff TraceTxInbound , traceTxOutbound :: OnOff TraceTxOutbound , traceTxSubmissionProtocol :: OnOff TraceTxSubmissionProtocol + , traceTxSubmission2Protocol :: OnOff TraceTxSubmission2Protocol } deriving (Eq, Show) @@ -175,7 +177,9 @@ traceConfigParser v = txOutbound :: OnOff TraceTxOutbound txOutbound = OnOff False txSubmissionProtocol :: OnOff TraceTxSubmissionProtocol - txSubmissionProtocol = OnOff False in + txSubmissionProtocol = OnOff False + txSubmission2Protocol :: OnOff TraceTxSubmission2Protocol + txSubmission2Protocol = OnOff False in TracingOn <$> (TraceSelection <$> v .:? "TracingVerbosity" .!= NormalVerbosity @@ -211,4 +215,5 @@ traceConfigParser v = <*> v .:? getName mux .!= mux <*> v .:? getName txInbound .!= txInbound <*> v .:? getName txOutbound .!= txOutbound - <*> v .:? getName txSubmissionProtocol .!= txSubmissionProtocol) + <*> v .:? getName txSubmissionProtocol .!= txSubmissionProtocol + <*> v .:? getName txSubmission2Protocol .!= txSubmission2Protocol) diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs index 813c586c680..6ed745915da 100644 --- a/cardano-node/src/Cardano/Tracing/Tracers.hs +++ b/cardano-node/src/Cardano/Tracing/Tracers.hs @@ -326,6 +326,7 @@ mkTracers TracingOff _ _ = , NodeToNode.tBlockFetchTracer = nullTracer , NodeToNode.tBlockFetchSerialisedTracer = nullTracer , NodeToNode.tTxSubmissionTracer = nullTracer + , NodeToNode.tTxSubmission2Tracer = nullTracer } , ipSubscriptionTracer = nullTracer , dnsSubscriptionTracer= nullTracer @@ -857,6 +858,7 @@ nodeToNodeTracers' trSel verb tr = , NodeToNode.tBlockFetchTracer = tracerOnOff (traceBlockFetchProtocol trSel) verb "BlockFetchProtocol" tr , NodeToNode.tBlockFetchSerialisedTracer = showOnOff (traceBlockFetchProtocolSerialised trSel) "BlockFetchProtocolSerialised" tr , NodeToNode.tTxSubmissionTracer = tracerOnOff (traceTxSubmissionProtocol trSel) verb "TxSubmissionProtocol" tr + , NodeToNode.tTxSubmission2Tracer = nullTracer -- TODO @coot: tracerOnOff (traceTxSubmission2Protocol trSel) verb "TxSubmission2Protocol" tr } teeTraceBlockFetchDecision