Propose protocol parameter update with guardrail script

bench/locli/src/Cardano/Analysis/API/Types.hs

@@ -443,8 +443,8 @@ testSlotStats :: Genesis -> SlotStats a -> SlotCond -> Bool
 testSlotStats g SlotStats{..} = \case
   SlotGEq  s -> slSlot >= s
   SlotLEq  s -> slSlot <= s
-  EpochGEq s -> fromIntegral (unEpochNo slEpoch) >= s
-  EpochLEq s -> fromIntegral (unEpochNo slEpoch) <= s
+  EpochGEq s -> slEpoch >= s
+  EpochLEq s -> slEpoch <= s
   SlotHasLeaders -> slCountLeads > 0
   EpochSafeIntGEq i -> slEpochSafeInt >= i
   EpochSafeIntLEq i -> slEpochSafeInt <= i

bench/locli/src/Cardano/Analysis/MachPerf.hs

@@ -74,7 +74,7 @@ timelineFromLogObjects run@Run{genesis} (f, xs') =
    zeroSlotStats =
      SlotStats
      { slSlot = impliedSlot genesis firstRelevantLogObjectTime
-     , slEpoch = 0
+     , slEpoch = EpochNo 0
      , slEpochSlot = 0
      , slEpochSafeInt = 0
      , slStart = SlotStart firstRelevantLogObjectTime

bench/plutus-scripts-bench/plutus-scripts-bench.cabal

@@ -73,10 +73,10 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>= 8.42.0.0
+    , cardano-api             ^>= 8.44
     , plutus-ledger-api       >=1.0.0
     , plutus-tx               >=1.0.0
-    , plutus-tx-plugin        ^>=1.21
+    , plutus-tx-plugin        ^>=1.23
 
   ------------------------
   -- Non-IOG dependencies

bench/tx-generator/src/Cardano/TxGenerator/Fund.hs

@@ -15,7 +15,7 @@ module Cardano.TxGenerator.Fund
     -- $Accessors
     , getFundTxIn
     , getFundKey
-    , getFundLovelace
+    , getFundCoin
     , getFundWitness
     )
     where
@@ -68,9 +68,8 @@ getFundTxIn (Fund (InAnyCardanoEra _ a)) = _fundTxIn a
 getFundKey :: Fund -> Maybe (SigningKey PaymentKey)
 getFundKey (Fund (InAnyCardanoEra _ a)) = _fundSigningKey a
 
--- | Converting a `TxOutValue` to `Lovelace` requires case analysis.
-getFundLovelace :: Fund -> L.Coin
-getFundLovelace (Fund (InAnyCardanoEra _ a)) = case _fundVal a of
+getFundCoin :: Fund -> L.Coin
+getFundCoin (Fund (InAnyCardanoEra _ a)) = case _fundVal a of
   TxOutValueByron l -> l
   TxOutValueShelleyBased era v -> selectLovelace $ Api.fromLedgerValue era v
 

bench/tx-generator/src/Cardano/TxGenerator/PureExample.hs

@@ -164,7 +164,7 @@ generateTxPure TxEnvironment{..} inQueue
         collateralFunds :: (TxInsCollateral BabbageEra, [Fund])
         collateralFunds = (TxInsCollateralNone, [])
 
-    outValues = computeOutputValues $ map getFundLovelace inputs
+    outValues = computeOutputValues $ map getFundCoin inputs
     (outputs, toFunds) = makeToUTxOList (repeat computeUTxO) outValues
 
     computeOutputValues :: [L.Coin] -> [L.Coin]

bench/tx-generator/src/Cardano/TxGenerator/Tx.hs

@@ -66,10 +66,10 @@ sourceToStoreTransaction txGenerator fundSource inToOut mkTxOut fundToStore =
  where
   go inputFunds = do
     let
-      -- 'getFundLovelace' unwraps the 'TxOutValue' in a fund field
+      -- 'getFundCoin' unwraps the 'TxOutValue' in a fund field
       -- so it's all just 'Lovelace' instead of a coproduct
       -- maintaining distinctions.
-      outValues = inToOut $ map getFundLovelace inputFunds
+      outValues = inToOut $ map getFundCoin inputFunds
       (outputs, toFunds) = mkTxOut outValues
     case txGenerator inputFunds outputs of
         Left err -> return $ Left err
@@ -102,7 +102,7 @@ sourceToStoreTransactionNew txGenerator fundSource valueSplitter toStore =
  where
   go inputFunds = do
     let
-      split = valueSplitter $ map getFundLovelace inputFunds
+      split = valueSplitter $ map getFundCoin inputFunds
       (outputs, storeAction) = toStore split
     case txGenerator inputFunds outputs of
         Left err -> return $ Left err
@@ -144,7 +144,7 @@ sourceTransactionPreview txGenerator inputFunds valueSplitter toStore =
   second fst $
     txGenerator inputFunds outputs
  where
-  split         = valueSplitter $ map getFundLovelace inputFunds
+  split         = valueSplitter $ map getFundCoin inputFunds
   (outputs, _)  = toStore split
 
 -- | 'genTx' seems to mostly be a wrapper for

bench/tx-generator/tx-generator.cabal

@@ -100,9 +100,9 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.42.0.0
+                      , cardano-api ^>= 8.44
                       , cardano-binary
-                      , cardano-cli ^>= 8.21.0.0
+                      , cardano-cli ^>= 8.22
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-03-26T06:28:59Z
-  , cardano-haskell-packages 2024-03-25T11:11:00Z
+  , cardano-haskell-packages 2024-03-31T05:00:00Z
 
 packages:
   cardano-node
@@ -31,8 +31,8 @@ packages:
   trace-resources
   trace-forward
 
-program-options
-  ghc-options: -Werror
+-- program-options
+--   ghc-options: -Werror
 
 test-show-details: direct
 
@@ -59,3 +59,38 @@ package plutus-scripts-bench
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
 
 -- `smtp-mail` should depend on `crypton-connection` rather than `connection`!
+
+source-repository-package
+  type: git
+  location: https://github.com/intersectmbo/ouroboros-network
+  tag: 318aee8ca3049e762c1a3990fb4e24db96d3393b
+  --sha256: sha256-jKtGreAivI2UPKYjuXIRVTQt1ovKMSdvdjT0ywwTf/A=
+  subdir:
+    ouroboros-network-protocols
+
+source-repository-package
+  type: git
+  location: https://github.com/intersectmbo/ouroboros-consensus
+  tag: 0a1925206d4532cc7b189bc7ca6719571982b6cc
+  --sha256: sha256-3SG/O2F69Hg30W0Oc6KerVEKmUgDkH582PlAnCBd1Pg=
+  subdir:
+    ouroboros-consensus
+    ouroboros-consensus-cardano
+    ouroboros-consensus-diffusion
+    ouroboros-consensus-protocol
+
+source-repository-package
+  type: git
+  location: https://github.com/intersectmbo/cardano-api
+  tag: 6a59f3b09990a7674a919ba8a05317396a65b550
+  --sha256: sha256-g8zcktWdi0PKe3wz6wk/cSN5m/QVlvZDUdh/ejxgHJk=
+  subdir:
+    cardano-api
+
+source-repository-package
+  type: git
+  location: https://github.com/intersectmbo/cardano-cli
+  tag: 8f8778782157349977491a515020703c2aeb5b06
+  --sha256: sha256-9n4iz7IByvZoNohI6Z5FbSYVgx1i7l0KGB6ertNDA7k=
+  subdir:
+    cardano-cli

cardano-node-chairman/cardano-node-chairman.cabal

@@ -88,5 +88,5 @@ test-suite chairman-tests
   ghc-options:          -threaded -rtsopts "-with-rtsopts=-N -T"
 
   build-tool-depends:   cardano-node:cardano-node
-                      , cardano-cli:cardano-cli ^>= 8.21.0.0
+                      , cardano-cli:cardano-cli ^>= 8.22.0.0
                       , cardano-node-chairman:cardano-node-chairman

cardano-node/cardano-node.cabal

@@ -144,7 +144,7 @@ library
                       , async
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.42.0.0
+                      , cardano-api ^>= 8.44
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>=0.2.2
@@ -158,7 +158,7 @@ library
                       , cardano-ledger-shelley
                       , cardano-prelude
                       , cardano-protocol-tpraos >= 1.0.2
-                      , cardano-slotting >= 0.1.1
+                      , cardano-slotting >= 0.2
                       , cborg ^>= 0.2.4
                       , containers
                       , contra-tracer
@@ -183,9 +183,10 @@ library
                       , network-mux >= 0.4
                       , nothunks
                       , optparse-applicative-fork >= 0.18.1
-                      , ouroboros-consensus ^>= 0.16
-                      , ouroboros-consensus-cardano ^>= 0.14
-                      , ouroboros-consensus-diffusion ^>= 0.12
+                      , ouroboros-consensus ^>= 0.17
+                      , ouroboros-consensus-cardano ^>= 0.15
+                      -- FIXME: bump ouroboros-consensus-diffusion
+                      , ouroboros-consensus-diffusion ^>= 0.13
                       , ouroboros-consensus-protocol
                       , ouroboros-network-api ^>= 0.7.1
                       , ouroboros-network ^>= 0.13

cardano-node/src/Cardano/Node/Protocol/Cardano.hs

@@ -33,6 +33,7 @@ import           Ouroboros.Consensus.Cardano
 import qualified Ouroboros.Consensus.Cardano as Consensus
 import qualified Ouroboros.Consensus.Cardano.CanHardFork as Consensus
 import           Ouroboros.Consensus.Cardano.Condense ()
+import           Ouroboros.Consensus.Config (emptyCheckpointsMap)
 import           Ouroboros.Consensus.HardFork.Combinator.Condense ()
 import qualified Ouroboros.Consensus.Mempool.Capacity as TxLimits
 import qualified Ouroboros.Consensus.Shelley.Node.Praos as Praos
@@ -305,6 +306,7 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
                              (maybe 9 fromIntegral npcTestConwayHardForkAtVersion)
                 Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo
         }
+      , checkpoints = emptyCheckpointsMap
       }
 
         ----------------------------------------------------------------------

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

@@ -136,6 +136,13 @@ instance LogFormatting (Conway.ConwayGovCertPredFailure era) where
       , "credential" .= String (textShow kHash)
       , "error" .= String "Committee has resigned"
       ]
+    Conway.ConwayDRepIncorrectRefund givenRefund expectedRefund  ->
+      [ "kind" .= String "ConwayDRepIncorrectRefund"
+      , "givenRefund" .= givenRefund
+      , "expectedRefund" .= expectedRefund
+      , "error" .= String "Refunds mismatch"
+      ]
+
 
 
 instance LogFormatting (Conway.ConwayDelegPredFailure era) where
@@ -184,7 +191,7 @@ instance
   , LogFormatting (PredicateFailure (Ledger.EraRule "LEDGER" era))
   ) => LogFormatting (ApplyTxError era) where
   forMachine dtal (ApplyTxError predicateFailures) =
-    mconcat $ map (forMachine dtal) predicateFailures
+    mconcat $ NonEmpty.toList $ fmap (forMachine dtal) predicateFailures
 
 instance
   ( Ledger.Crypto era
@@ -211,7 +218,7 @@ instance
   ) => LogFormatting (ShelleyLedgerError era) where
   forMachine dtal (BBodyError (BlockTransitionError fs)) =
     mconcat [ "kind" .= String "BBodyError"
-             , "failures" .= map (forMachine dtal) fs
+             , "failures" .= fmap (forMachine dtal) fs
              ]
 
 instance
@@ -254,7 +261,7 @@ instance
   ) => LogFormatting (ChainTransitionError crypto) where
   forMachine dtal (ChainTransitionError fs) =
     mconcat [ "kind" .= String "ChainTransitionError"
-             , "failures" .= map (forMachine dtal) fs
+             , "failures" .= fmap (forMachine dtal) fs
              ]
 
 instance LogFormatting ChainPredicateFailure where
@@ -345,7 +352,7 @@ instance
   , Api.IsShelleyBasedEra era
   , Consensus.ShelleyBasedEra ledgerera
   , Ledger.EraCrypto ledgerera ~ StandardCrypto
-  , LogFormatting (PPUPPredFailure ledgerera)
+  , LogFormatting (Ledger.EraRuleFailure "PPUP" ledgerera)
   , LogFormatting (PredicateFailure (Ledger.EraRule "UTXO" ledgerera))
   ) => LogFormatting (AlonzoUtxowPredFailure ledgerera) where
   forMachine dtal (ShelleyInAlonzoUtxowPredFailure utxoPredFail) =
@@ -441,7 +448,7 @@ instance
 
 instance
   ( Consensus.ShelleyBasedEra era
-  , LogFormatting (PPUPPredFailure era)
+  , LogFormatting (Ledger.EraRuleFailure "PPUP" era)
   ) => LogFormatting (ShelleyUtxoPredFailure era) where
   forMachine _dtal (BadInputsUTxO badInputs) =
     mconcat [ "kind" .= String "BadInputsUTxO"
@@ -500,7 +507,7 @@ instance
 instance
   ( Consensus.ShelleyBasedEra era
   , ToJSON Allegra.ValidityInterval
-  , LogFormatting (PPUPPredFailure era)
+  , LogFormatting (Ledger.EraRuleFailure "PPUP" era)
   ) => LogFormatting (AllegraUtxoPredFailure era) where
   forMachine _dtal (Allegra.BadInputsUTxO badInputs) =
     mconcat [ "kind" .= String "BadInputsUTxO"
@@ -1013,7 +1020,7 @@ instance
 
 instance
   ( ToJSON (Alonzo.CollectError ledgerera)
-  , LogFormatting (PPUPPredFailure ledgerera)
+  , LogFormatting (Ledger.EraRuleFailure "PPUP" ledgerera)
   ) => LogFormatting (AlonzoUtxosPredFailure ledgerera) where
   forMachine _ (Alonzo.ValidationTagMismatch isValidating reason) =
     mconcat [ "kind" .= String "ValidationTagMismatch"
@@ -1060,13 +1067,18 @@ instance
                 , "outputs" .= outputs
                 ]
 
+      Babbage.BabbageNonDisjointRefInputs nonDisjointInputs ->
+        mconcat [ "kind" .= String "BabbageNonDisjointRefInputs"
+                , "outputs" .= nonDisjointInputs
+                ]
+
 instance
   ( Api.ShelleyLedgerEra era ~ ledgerera
   , Api.IsShelleyBasedEra era
   , Ledger.Era ledgerera
   , Ledger.EraCrypto ledgerera ~ StandardCrypto
   , ShelleyBasedEra ledgerera
-  , LogFormatting (PPUPPredFailure ledgerera)
+  , LogFormatting (Ledger.EraRuleFailure "PPUP" ledgerera)
   , LogFormatting (ShelleyUtxowPredFailure ledgerera)
   , LogFormatting (PredicateFailure (Ledger.EraRule "UTXO" ledgerera))
   ) => LogFormatting (BabbageUtxowPredFailure ledgerera) where
@@ -1290,6 +1302,25 @@ instance Ledger.Crypto c => LogFormatting (PraosChainSelectView c) where
     where
       renderVRF = Text.decodeUtf8 . B16.encode . Crypto.getOutputVRFBytes
 
+instance
+  ( ToJSON (Alonzo.CollectError ledgerera)
+  ) => LogFormatting (Conway.ConwayUtxosPredFailure ledgerera) where
+  forMachine _ (Conway.ValidationTagMismatch isValidating reason) =
+    mconcat [ "kind" .= String "ValidationTagMismatch"
+             , "isvalidating" .= isValidating
+             , "reason" .= reason
+             ]
+  forMachine _ (Conway.CollectErrors errors) =
+    mconcat [ "kind" .= String "CollectErrors"
+             , "errors" .= errors
+             ]
+
+-- We define this bogus instance as it is required by some of the
+-- 'LogFormatting' instances in this module
+instance LogFormatting (Ledger.VoidEraRule rule era) where
+  -- NOTE: There are no values of type 'Ledger.VoidEraRule rule era'
+  forMachine _ = \case
+
 --------------------------------------------------------------------------------
 -- Helper functions
 --------------------------------------------------------------------------------

cardano-node/src/Cardano/Node/Tracing/StateRep.hs

@@ -227,7 +227,7 @@ traceNodeStateChainDB _scp tr ev =
       case ev' of
         ChainDB.StartedInitChainSelection ->
           traceWith tr $ NodeInitChainSelection InitChainStartedSelection
-        ChainDB.InitalChainSelected ->
+        ChainDB.InitialChainSelected ->
           traceWith tr $ NodeInitChainSelection InitChainSelected
         _ -> return ()
     ChainDB.TraceAddBlockEvent ev' ->