Skip to content

Commit 52446ae

Browse files
carbolymercarbolymer
committed
More fixes, still not compiling yet
1 parent 361e83c commit 52446ae

File tree

13 files changed

+116
-207
lines changed

13 files changed

+116
-207
lines changed

‎cardano-node/cardano-node.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ library
171171
, generic-data
172172
, hashable
173173
, hostname
174-
, io-classes >= 1.5
174+
, io-classes:{io-classes,strict-stm,si-timers} >= 1.5
175175
, iohk-monitoring ^>= 0.2
176176
, microlens
177177
, mmap

‎cardano-node/src/Cardano/Node/Configuration/Logging.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,14 +344,15 @@ nodeBasicInfo nc (SomeConsensusProtocol whichP pForInfo) nodeStartTime' = do
344344
in getGenesisValues "Shelley" cfgShelley
345345
Api.CardanoBlockType ->
346346
let CardanoLedgerConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo
347-
cfgBabbage cfgConway = Consensus.configLedger cfg
347+
cfgBabbage cfgConway cfgDjikstra = Consensus.configLedger cfg
348348
in getGenesisValuesByron cfg cfgByron
349349
++ getGenesisValues "Shelley" cfgShelley
350350
++ getGenesisValues "Allegra" cfgAllegra
351351
++ getGenesisValues "Mary" cfgMary
352352
++ getGenesisValues "Alonzo" cfgAlonzo
353353
++ getGenesisValues "Babbage" cfgBabbage
354354
++ getGenesisValues "Conway" cfgConway
355+
++ getGenesisValues "Djikstra" cfgDjikstra
355356
items = nub $
356357
[ ("protocol", pack . show $ ncProtocol nc)
357358
, ("version", pack . showVersion $ version)

‎cardano-node/src/Cardano/Node/Configuration/POM.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,6 @@ defaultPartialNodeConfiguration =
668668
-- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/cardano-diffusion/Cardano-Network-Diffusion-Configuration.html#v:defaultNumberOfBigLedgerPeers
669669
, pncConsensusMode = Last (Just Ouroboros.defaultConsensusMode)
670670
-- https://ouroboros-network.cardano.intersectmbo.org/ouroboros-network/Ouroboros-Network-Diffusion-Configuration.html#v:defaultConsensusMode
671-
, pncEnableP2P = Last (Just EnabledP2PMode)
672671
, pncPeerSharing = mempty
673672
-- the default is defined in `makeNodeConfiguration`
674673
, pncGenesisConfigFlags = Last (Just defaultGenesisConfigFlags)

‎cardano-node/src/Cardano/Node/Queries.hs‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ import qualified Cardano.Crypto.Hash as Crypto
4242
import qualified Cardano.Crypto.Hashing as Byron.Crypto
4343
import Cardano.Crypto.KES.Class (Period)
4444
import Cardano.Ledger.BaseTypes (StrictMaybe (..), fromSMaybe)
45+
import qualified Cardano.Ledger.Conway.State as Conway
4546
import qualified Cardano.Ledger.Hashes as Ledger
4647
import qualified Cardano.Ledger.Shelley.LedgerState as Shelley
48+
import qualified Cardano.Ledger.State as Ledger
4749
import qualified Cardano.Ledger.TxIn as Ledger
4850
import qualified Cardano.Ledger.UMap as UM
4951
import Cardano.Protocol.TPraos.OCert (KESPeriod (..))
@@ -241,7 +243,8 @@ instance LedgerQueries Byron.ByronBlock where
241243
ledgerDRepCount _ = 0
242244
ledgerDRepMapSize _ = 0
243245

244-
instance Shelley.EraCertState era => LedgerQueries (Shelley.ShelleyBlock protocol era) where
246+
-- TODO should this be ConwayEraCertState constraint? Wouldn't this break queries for older eras?
247+
instance Conway.ConwayEraCertState era => LedgerQueries (Shelley.ShelleyBlock protocol era) where
245248
ledgerUtxoSize =
246249
(\(Shelley.UTxO xs)-> Map.size xs)
247250
. Shelley.utxosUtxo
@@ -252,24 +255,27 @@ instance Shelley.EraCertState era => LedgerQueries (Shelley.ShelleyBlock protoco
252255
ledgerDelegMapSize =
253256
UM.size
254257
. UM.SPoolUView
255-
. Shelley.dsUnified
258+
. undefined -- TODO what should be here?
259+
. (^. Conway.accountsMapL)
260+
. Ledger.dsAccounts
256261
. (^. Shelley.certDStateL)
257262
. Shelley.lsCertState
258263
. Shelley.esLState
259264
. Shelley.nesEs
260265
. Shelley.shelleyLedgerState
261266
ledgerDRepCount =
262267
Map.size
263-
. Shelley.vsDReps
264-
. (^. Shelley.certVStateL)
268+
. Conway.vsDReps
269+
. (^. Conway.certVStateL)
265270
. Shelley.lsCertState
266271
. Shelley.esLState
267272
. Shelley.nesEs
268273
. Shelley.shelleyLedgerState
269274
ledgerDRepMapSize =
270275
UM.size
271276
. UM.DRepUView
272-
. Shelley.dsUnified
277+
. undefined -- TODO what should be here?
278+
. Ledger.dsAccounts
273279
. (^. Shelley.certDStateL)
274280
. Shelley.lsCertState
275281
. Shelley.esLState
@@ -283,38 +289,40 @@ instance (LedgerQueries x, NoHardForks x)
283289
ledgerDRepCount = ledgerDRepCount . unFlip . project . Flip
284290
ledgerDRepMapSize = ledgerDRepMapSize . unFlip . project . Flip
285291

292+
-- TODO those states make no sense, since required lenses got moved to Conway
293+
-- TODO non-exhaustive pattern matches
286294
instance LedgerQueries (Cardano.CardanoBlock c) where
287295
ledgerUtxoSize = \case
288-
Cardano.LedgerStateByron ledgerByron -> ledgerUtxoSize ledgerByron
289-
Cardano.LedgerStateShelley ledgerShelley -> ledgerUtxoSize ledgerShelley
290-
Cardano.LedgerStateAllegra ledgerAllegra -> ledgerUtxoSize ledgerAllegra
291-
Cardano.LedgerStateMary ledgerMary -> ledgerUtxoSize ledgerMary
292-
Cardano.LedgerStateAlonzo ledgerAlonzo -> ledgerUtxoSize ledgerAlonzo
293-
Cardano.LedgerStateBabbage ledgerBabbage -> ledgerUtxoSize ledgerBabbage
296+
-- Cardano.LedgerStateByron ledgerByron -> ledgerUtxoSize ledgerByron
297+
-- Cardano.LedgerStateShelley ledgerShelley -> ledgerUtxoSize ledgerShelley
298+
-- Cardano.LedgerStateAllegra ledgerAllegra -> ledgerUtxoSize ledgerAllegra
299+
-- Cardano.LedgerStateMary ledgerMary -> ledgerUtxoSize ledgerMary
300+
-- Cardano.LedgerStateAlonzo ledgerAlonzo -> ledgerUtxoSize ledgerAlonzo
301+
-- Cardano.LedgerStateBabbage ledgerBabbage -> ledgerUtxoSize ledgerBabbage
294302
Cardano.LedgerStateConway ledgerConway -> ledgerUtxoSize ledgerConway
295303
ledgerDelegMapSize = \case
296-
Cardano.LedgerStateByron ledgerByron -> ledgerDelegMapSize ledgerByron
297-
Cardano.LedgerStateShelley ledgerShelley -> ledgerDelegMapSize ledgerShelley
298-
Cardano.LedgerStateAllegra ledgerAllegra -> ledgerDelegMapSize ledgerAllegra
299-
Cardano.LedgerStateMary ledgerMary -> ledgerDelegMapSize ledgerMary
300-
Cardano.LedgerStateAlonzo ledgerAlonzo -> ledgerDelegMapSize ledgerAlonzo
301-
Cardano.LedgerStateBabbage ledgerBabbage -> ledgerDelegMapSize ledgerBabbage
304+
-- Cardano.LedgerStateByron ledgerByron -> ledgerDelegMapSize ledgerByron
305+
-- Cardano.LedgerStateShelley ledgerShelley -> ledgerDelegMapSize ledgerShelley
306+
-- Cardano.LedgerStateAllegra ledgerAllegra -> ledgerDelegMapSize ledgerAllegra
307+
-- Cardano.LedgerStateMary ledgerMary -> ledgerDelegMapSize ledgerMary
308+
-- Cardano.LedgerStateAlonzo ledgerAlonzo -> ledgerDelegMapSize ledgerAlonzo
309+
-- Cardano.LedgerStateBabbage ledgerBabbage -> ledgerDelegMapSize ledgerBabbage
302310
Cardano.LedgerStateConway ledgerConway -> ledgerDelegMapSize ledgerConway
303311
ledgerDRepCount = \case
304-
Cardano.LedgerStateByron ledgerByron -> ledgerDRepCount ledgerByron
305-
Cardano.LedgerStateShelley ledgerShelley -> ledgerDRepCount ledgerShelley
306-
Cardano.LedgerStateAllegra ledgerAllegra -> ledgerDRepCount ledgerAllegra
307-
Cardano.LedgerStateMary ledgerMary -> ledgerDRepCount ledgerMary
308-
Cardano.LedgerStateAlonzo ledgerAlonzo -> ledgerDRepCount ledgerAlonzo
309-
Cardano.LedgerStateBabbage ledgerBabbage -> ledgerDRepCount ledgerBabbage
312+
-- Cardano.LedgerStateByron ledgerByron -> ledgerDRepCount ledgerByron
313+
-- Cardano.LedgerStateShelley ledgerShelley -> ledgerDRepCount ledgerShelley
314+
-- Cardano.LedgerStateAllegra ledgerAllegra -> ledgerDRepCount ledgerAllegra
315+
-- Cardano.LedgerStateMary ledgerMary -> ledgerDRepCount ledgerMary
316+
-- Cardano.LedgerStateAlonzo ledgerAlonzo -> ledgerDRepCount ledgerAlonzo
317+
-- Cardano.LedgerStateBabbage ledgerBabbage -> ledgerDRepCount ledgerBabbage
310318
Cardano.LedgerStateConway ledgerConway -> ledgerDRepCount ledgerConway
311319
ledgerDRepMapSize = \case
312-
Cardano.LedgerStateByron ledgerByron -> ledgerDRepMapSize ledgerByron
313-
Cardano.LedgerStateShelley ledgerShelley -> ledgerDRepMapSize ledgerShelley
314-
Cardano.LedgerStateAllegra ledgerAllegra -> ledgerDRepMapSize ledgerAllegra
315-
Cardano.LedgerStateMary ledgerMary -> ledgerDRepMapSize ledgerMary
316-
Cardano.LedgerStateAlonzo ledgerAlonzo -> ledgerDRepMapSize ledgerAlonzo
317-
Cardano.LedgerStateBabbage ledgerBabbage -> ledgerDRepMapSize ledgerBabbage
320+
-- Cardano.LedgerStateByron ledgerByron -> ledgerDRepMapSize ledgerByron
321+
-- Cardano.LedgerStateShelley ledgerShelley -> ledgerDRepMapSize ledgerShelley
322+
-- Cardano.LedgerStateAllegra ledgerAllegra -> ledgerDRepMapSize ledgerAllegra
323+
-- Cardano.LedgerStateMary ledgerMary -> ledgerDRepMapSize ledgerMary
324+
-- Cardano.LedgerStateAlonzo ledgerAlonzo -> ledgerDRepMapSize ledgerAlonzo
325+
-- Cardano.LedgerStateBabbage ledgerBabbage -> ledgerDRepMapSize ledgerBabbage
318326
Cardano.LedgerStateConway ledgerConway -> ledgerDRepMapSize ledgerConway
319327

320328
--

‎cardano-node/src/Cardano/Node/Tracing/Era/Byron.hs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import Ouroboros.Consensus.Byron.Ledger (ByronBlock (..),
2929
import Ouroboros.Consensus.Byron.Ledger.Inspect (ByronLedgerUpdate (..),
3030
ProtocolUpdate (..), UpdateState (..))
3131
import Ouroboros.Consensus.Ledger.SupportsMempool (GenTx, txId)
32-
import Ouroboros.Consensus.Protocol.PBFT (PBftSelectView (..))
3332
import Ouroboros.Consensus.Util.Condense (condense)
3433
import Ouroboros.Network.Block (blockHash, blockNo, blockSlot)
3534

@@ -212,11 +211,3 @@ instance LogFormatting ByronOtherHeaderEnvelopeError where
212211
[ "kind" .= String "UnexpectedEBBInSlot"
213212
, "slot" .= slot
214213
]
215-
216-
instance LogFormatting PBftSelectView where
217-
forMachine _dtal (PBftSelectView blkNo isEBB) =
218-
mconcat
219-
[ "kind" .= String "PBftSelectView"
220-
, "blockNo" .= blkNo
221-
, "isEBB" .= fromIsEBB isEBB
222-
]

‎cardano-node/src/Cardano/Node/Tracing/Era/HardFork.hs‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import Ouroboros.Consensus.HardFork.Combinator
2626
import Ouroboros.Consensus.HardFork.Combinator.AcrossEras (EraMismatch (..),
2727
OneEraCannotForge (..), OneEraEnvelopeErr (..), OneEraForgeStateInfo (..),
2828
OneEraForgeStateUpdateError (..), OneEraLedgerError (..),
29-
OneEraLedgerUpdate (..), OneEraLedgerWarning (..), OneEraSelectView (..),
29+
OneEraLedgerUpdate (..), OneEraLedgerWarning (..),
3030
OneEraValidationErr (..), mkEraMismatch)
3131
import Ouroboros.Consensus.HardFork.Combinator.Condense ()
3232
import Ouroboros.Consensus.HardFork.History
@@ -36,7 +36,7 @@ import Ouroboros.Consensus.HeaderValidation (OtherHeaderEnvelopeError)
3636
import Ouroboros.Consensus.Ledger.Abstract (LedgerError)
3737
import Ouroboros.Consensus.Ledger.Inspect (LedgerUpdate, LedgerWarning)
3838
import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr)
39-
import Ouroboros.Consensus.Protocol.Abstract (SelectView, ValidationErr)
39+
import Ouroboros.Consensus.Protocol.Abstract (ValidationErr)
4040
import Ouroboros.Consensus.TypeFamilyWrappers
4141
import Ouroboros.Consensus.Util.Condense (Condense (..))
4242

@@ -345,23 +345,3 @@ instance All (LogFormatting `Compose` WrapForgeStateUpdateError) xs => LogFormat
345345
instance LogFormatting (ForgeStateUpdateError blk) => LogFormatting (WrapForgeStateUpdateError blk) where
346346
forMachine dtal = forMachine dtal . unwrapForgeStateUpdateError
347347

348-
--
349-
-- instances for HardForkSelectView
350-
--
351-
352-
instance All (LogFormatting `Compose` WrapSelectView) xs => LogFormatting (HardForkSelectView xs) where
353-
-- elide BlockNo as it is already contained in every per-era SelectView
354-
-- TODO: use level DMinimal for a textual representation without the block number,
355-
-- like this: `forMachine DMinimal . getHardForkSelectView`, and update the different SelectView instances
356-
-- to not print the blockNr
357-
forMachine dtal = forMachine dtal . dropBlockNo . getHardForkSelectView
358-
359-
instance All (LogFormatting `Compose` WrapSelectView) xs => LogFormatting (OneEraSelectView xs) where
360-
forMachine dtal =
361-
hcollapse
362-
. hcmap (Proxy @(LogFormatting `Compose` WrapSelectView))
363-
(K . forMachine dtal)
364-
. getOneEraSelectView
365-
366-
instance LogFormatting (SelectView (BlockProtocol blk)) => LogFormatting (WrapSelectView blk) where
367-
forMachine dtal = forMachine dtal . unwrapSelectView

‎cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs‎

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import qualified Cardano.Api as Api
2222
import Cardano.Api.Ledger (fromVRFVerKeyHash)
2323

2424
import qualified Cardano.Crypto.Hash.Class as Crypto
25-
import qualified Cardano.Crypto.VRF.Class as Crypto
2625
import Cardano.Ledger.Allegra.Rules (AllegraUtxoPredFailure)
2726
import qualified Cardano.Ledger.Allegra.Rules as Allegra
2827
import qualified Cardano.Ledger.Allegra.Scripts as Allegra
@@ -59,7 +58,6 @@ import Cardano.Tracing.OrphanInstances.Shelley ()
5958
import Ouroboros.Consensus.Ledger.SupportsMempool (txId)
6059
import qualified Ouroboros.Consensus.Ledger.SupportsMempool as SupportsMempool
6160
import qualified Ouroboros.Consensus.Protocol.Praos as Praos
62-
import Ouroboros.Consensus.Protocol.Praos.Common (PraosChainSelectView (..))
6361
import Ouroboros.Consensus.Protocol.TPraos (TPraosCannotForge (..))
6462
import Ouroboros.Consensus.Shelley.Ledger hiding (TxId)
6563
import qualified Ouroboros.Consensus.Shelley.Ledger as Consensus
@@ -70,12 +68,10 @@ import Ouroboros.Network.Block (SlotNo (..), blockHash, blockNo, block
7068
import Ouroboros.Network.Point (WithOrigin, withOriginToMaybe)
7169

7270
import Data.Aeson (ToJSON (..), Value (..), (.=))
73-
import qualified Data.ByteString.Base16 as B16
7471
import qualified Data.List.NonEmpty as NonEmpty
7572
import Data.Set (Set)
7673
import qualified Data.Set as Set
7774
import Data.Text (Text)
78-
import qualified Data.Text.Encoding as Text
7975

8076
{- HLINT ignore "Use :" -}
8177

@@ -361,10 +357,6 @@ instance
361357
, "fromTxBody" .= renderScriptIntegrityHash (strictMaybeToMaybe mismatchSupplied)
362358
, "fromPParams" .= renderScriptIntegrityHash (strictMaybeToMaybe mismatchExpected)
363359
]
364-
forMachine _ (MissingRequiredSigners missingKeyWitnesses) =
365-
mconcat [ "kind" .= String "MissingRequiredSigners"
366-
, "witnesses" .= Set.toList missingKeyWitnesses
367-
]
368360
forMachine _ (UnspendableUTxONoDatumHash txins) =
369361
mconcat [ "kind" .= String "MissingRequiredSigners"
370362
, "txins" .= Set.toList txins
@@ -596,7 +588,7 @@ instance
596588
]
597589
forMachine _dtal (WithdrawalsNotInRewardsDELEGS incorrectWithdrawals) =
598590
mconcat [ "kind" .= String "WithdrawalsNotInRewardsCERTS"
599-
, "incorrectWithdrawals" .= incorrectWithdrawals
591+
, "incorrectWithdrawals" .= unWithdrawals incorrectWithdrawals
600592
]
601593
forMachine dtal (DelplFailure f) = forMachine dtal f
602594

@@ -740,9 +732,6 @@ instance
740732
) => LogFormatting (ShelleyNewEpochPredFailure era) where
741733
forMachine dtal (EpochFailure f) = forMachine dtal f
742734
forMachine dtal (MirFailure f) = forMachine dtal f
743-
forMachine _dtal (CorruptRewardUpdate update) =
744-
mconcat [ "kind" .= String "CorruptRewardUpdate"
745-
, "update" .= String (textShow update) ]
746735

747736

748737
instance
@@ -1187,13 +1176,18 @@ instance
11871176
, "invalidAccounts" .= accounts
11881177
]
11891178

1179+
forMachine _ (Conway.UnelectedCommitteeVoters voters) =
1180+
mconcat [ "kind" .= String "UnelectedCommitteeVoters"
1181+
, "unelectedCommitteeVoters" .= voters
1182+
]
1183+
11901184
instance
11911185
( Consensus.ShelleyBasedEra era
11921186
, LogFormatting (PredicateFailure (Ledger.EraRule "CERT" era))
11931187
) => LogFormatting (Conway.ConwayCertsPredFailure era) where
11941188
forMachine _ (Conway.WithdrawalsNotInRewardsCERTS rs) =
11951189
mconcat [ "kind" .= String "WithdrawalsNotInRewardsCERTS"
1196-
, "rewardAccounts" .= rs
1190+
, "rewardAccounts" .= unWithdrawals rs
11971191
]
11981192
forMachine dtal (Conway.CertFailure certFailure) =
11991193
forMachine dtal certFailure
@@ -1292,24 +1286,6 @@ instance LogFormatting Praos.PraosEnvelopeError where
12921286
, "blockSize" .= blockSize
12931287
]
12941288

1295-
instance Ledger.Crypto c => LogFormatting (PraosChainSelectView c) where
1296-
forMachine _ PraosChainSelectView {
1297-
csvChainLength
1298-
, csvSlotNo
1299-
, csvIssuer
1300-
, csvIssueNo
1301-
, csvTieBreakVRF
1302-
} =
1303-
mconcat [ "kind" .= String "PraosChainSelectView"
1304-
, "chainLength" .= csvChainLength
1305-
, "slotNo" .= csvSlotNo
1306-
, "issuerHash" .= hashKey csvIssuer
1307-
, "issueNo" .= csvIssueNo
1308-
, "tieBreakVRF" .= renderVRF csvTieBreakVRF
1309-
]
1310-
where
1311-
renderVRF = Text.decodeUtf8 . B16.encode . Crypto.getOutputVRFBytes
1312-
13131289
instance
13141290
( ToJSON (Alonzo.CollectError ledgerera)
13151291
) => LogFormatting (Conway.ConwayUtxosPredFailure ledgerera) where

‎cardano-node/src/Cardano/Tracing/OrphanInstances/Byron.hs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ import Cardano.Tracing.OrphanInstances.Common
2121
import Cardano.Tracing.OrphanInstances.Consensus ()
2222
import Cardano.Tracing.Render (renderTxId)
2323
import Ouroboros.Consensus.Block (Header)
24-
import Ouroboros.Consensus.Block.EBB (fromIsEBB)
2524
import Ouroboros.Consensus.Byron.Ledger (ByronBlock (..), ByronNodeToClientVersion (..),
2625
ByronNodeToNodeVersion (..), ByronOtherHeaderEnvelopeError (..), TxId (..),
2726
byronHeaderRaw)
2827
import Ouroboros.Consensus.Byron.Ledger.Inspect (ByronLedgerUpdate (..),
2928
ProtocolUpdate (..), UpdateState (..))
3029
import Ouroboros.Consensus.Ledger.SupportsMempool (GenTx, txId)
31-
import Ouroboros.Consensus.Protocol.PBFT (PBftSelectView (..))
3230
import Ouroboros.Consensus.Util.Condense (condense)
3331
import Ouroboros.Network.Block (blockHash, blockNo, blockSlot)
3432

@@ -220,11 +218,3 @@ instance ToJSON ByronNodeToClientVersion where
220218
instance ToJSON ByronNodeToNodeVersion where
221219
toJSON ByronNodeToNodeVersion1 = String "ByronNodeToNodeVersion1"
222220
toJSON ByronNodeToNodeVersion2 = String "ByronNodeToNodeVersion2"
223-
224-
instance ToObject PBftSelectView where
225-
toObject _verb (PBftSelectView blkNo isEBB) =
226-
mconcat
227-
[ "kind" .= String "PBftSelectView"
228-
, "blockNo" .= blkNo
229-
, "isEBB" .= fromIsEBB isEBB
230-
]

0 commit comments

Comments
 (0)