Wrap validated Peras certificates with arrival time

agustinmista · agustinmista · commit 437f9725e705 · 2025-11-10T10:40:04.000+01:00
Conflicts:
  ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ObjectDiffusion/ObjectPool/PerasCert.hs
  ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/API.hs
  ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/PerasCertDB/API.hs
  ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/PerasCertDB/Model.hs
diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs
@@ -269,6 +269,7 @@ mkHandlers
     , keepAliveRng
     , miniProtocolParameters
     , getDiffusionPipeliningSupport
+    , systemTime
     }
   NodeKernel
     { getChainDB
@@ -328,7 +329,7 @@ mkHandlers
             , 10 -- TODO: see https://github.com/tweag/cardano-peras/issues/97
             , 10 -- TODO: see https://github.com/tweag/cardano-peras/issues/97
             )
-            (makePerasCertPoolWriterFromChainDB $ getChainDB)
+            (makePerasCertPoolWriterFromChainDB systemTime getChainDB)
             version
             controlMessageSTM
             state
diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs
@@ -580,6 +580,7 @@ runWith RunNodeArgs{..} encAddrNtN decAddrNtN LowLevelRunNodeArgs{..} =
                   llrnFeatureFlags
                   rnTraceConsensus
                   btime
+                  systemTime
                   (InFutureCheck.realHeaderInFutureCheck llrnMaxClockSkew systemTime)
                   historicityCheck
                   chainDB
@@ -858,6 +859,7 @@ mkNodeKernelArgs ::
   Set CardanoFeatureFlag ->
   Tracers m (ConnectionId addrNTN) (ConnectionId addrNTC) blk ->
   BlockchainTime m ->
+  SystemTime m ->
   InFutureCheck.SomeHeaderInFutureCheck m blk ->
   (m GSM.GsmState -> HistoricityCheck m blk) ->
   ChainDB m blk ->
@@ -878,6 +880,7 @@ mkNodeKernelArgs
   featureFlags
   tracers
   btime
+  systemTime
   chainSyncFutureCheck
   chainSyncHistoricityCheck
   chainDB
@@ -897,6 +900,7 @@ mkNodeKernelArgs
           , cfg
           , featureFlags
           , btime
+          , systemTime
           , chainDB
           , initChainDB = nodeInitChainDB
           , chainSyncFutureCheck
diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/NodeKernel.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/NodeKernel.hs
@@ -210,6 +210,7 @@ data NodeKernelArgs m addrNTN addrNTC blk = NodeKernelArgs
   , cfg :: TopLevelConfig blk
   , featureFlags :: Set CardanoFeatureFlag
   , btime :: BlockchainTime m
+  , systemTime :: SystemTime m
   , chainDB :: ChainDB m blk
   , initChainDB :: StorageConfig blk -> InitChainDB m blk -> m ()
   , chainSyncFutureCheck :: SomeHeaderInFutureCheck m blk
diff --git a/ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs b/ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs
@@ -1047,6 +1047,7 @@ runThreadNetwork
               , cfg = pInfoConfig
               , featureFlags = mempty
               , btime
+              , systemTime
               , chainDB
               , initChainDB = nodeInitChainDB
               , chainSyncFutureCheck =
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ObjectDiffusion/ObjectPool/PerasCert.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ObjectDiffusion/ObjectPool/PerasCert.hs
@@ -11,9 +11,12 @@ module Ouroboros.Consensus.MiniProtocol.ObjectDiffusion.ObjectPool.PerasCert
   , makePerasCertPoolWriterFromChainDB
   ) where
 
+import Control.Monad ((>=>))
 import qualified Data.Map as Map
 import GHC.Exception (throw)
 import Ouroboros.Consensus.Block
+import Ouroboros.Consensus.BlockchainTime (WithArrivalTime)
+import Ouroboros.Consensus.BlockchainTime.WallClock.Types (SystemTime (..), addArrivalTime)
 import Ouroboros.Consensus.MiniProtocol.ObjectDiffusion.ObjectPool.API
 import Ouroboros.Consensus.Storage.ChainDB.API (ChainDB)
 import qualified Ouroboros.Consensus.Storage.ChainDB.API as ChainDB
@@ -52,13 +55,13 @@ makePerasCertPoolReaderFromCertDB perasCertDB =
 
 makePerasCertPoolWriterFromCertDB ::
   (StandardHash blk, IOLike m) =>
-  PerasCertDB m blk -> ObjectPoolWriter PerasRoundNo (PerasCert blk) m
-makePerasCertPoolWriterFromCertDB perasCertDB =
+  SystemTime m ->
+  PerasCertDB m blk ->
+  ObjectPoolWriter PerasRoundNo (PerasCert blk) m
+makePerasCertPoolWriterFromCertDB systemTime perasCertDB =
   ObjectPoolWriter
     { opwObjectId = getPerasCertRound
-    , opwAddObjects = \certs -> do
-        validatePerasCerts certs
-          >>= mapM_ (PerasCertDB.addCert perasCertDB)
+    , opwAddObjects = addPerasCerts systemTime (PerasCertDB.addCert perasCertDB)
     , opwHasObject = do
         certSnapshot <- PerasCertDB.getCertSnapshot perasCertDB
         pure $ PerasCertDB.containsCert certSnapshot
@@ -72,13 +75,13 @@ makePerasCertPoolReaderFromChainDB chainDB =
 
 makePerasCertPoolWriterFromChainDB ::
   (StandardHash blk, IOLike m) =>
-  ChainDB m blk -> ObjectPoolWriter PerasRoundNo (PerasCert blk) m
-makePerasCertPoolWriterFromChainDB chainDB =
+  SystemTime m ->
+  ChainDB m blk ->
+  ObjectPoolWriter PerasRoundNo (PerasCert blk) m
+makePerasCertPoolWriterFromChainDB systemTime chainDB =
   ObjectPoolWriter
     { opwObjectId = getPerasCertRound
-    , opwAddObjects = \certs -> do
-        validatePerasCerts certs
-          >>= mapM_ (ChainDB.addPerasCertAsync chainDB)
+    , opwAddObjects = addPerasCerts systemTime (ChainDB.addPerasCertAsync chainDB)
     , opwHasObject = do
         certSnapshot <- ChainDB.getPerasCertSnapshot chainDB
         pure $ PerasCertDB.containsCert certSnapshot
@@ -106,3 +109,23 @@ validatePerasCerts certs = do
   case traverse (validatePerasCert perasCfg) certs of
     Left validationErr -> throw (PerasCertValidationError validationErr)
     Right validatedCerts -> return validatedCerts
+
+-- | Add a list of 'PerasCert's into an object pool.
+--
+-- NOTE: we first validate the certificates, throwing an exception if any of
+-- them are invalid. We then wrap them with their arrival time, and finally add
+-- them to the pool using the provided adder function.
+--
+-- The order of the first two operations (i.e., validation and timestamping) are
+-- rather arbitrary, and the abstract Peras protocol just assumes it can happen
+-- "within" a slot.
+addPerasCerts ::
+  (StandardHash blk, MonadThrow m) =>
+  SystemTime m ->
+  (WithArrivalTime (ValidatedPerasCert blk) -> m a) ->
+  [PerasCert blk] ->
+  m ()
+addPerasCerts systemTime adder = do
+  validatePerasCerts
+    >=> mapM (addArrivalTime systemTime)
+    >=> mapM_ adder
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/API.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/API.hs
@@ -81,6 +81,7 @@ import Control.ResourceRegistry
 import Data.Typeable (Typeable)
 import GHC.Generics (Generic)
 import Ouroboros.Consensus.Block
+import Ouroboros.Consensus.BlockchainTime.WallClock.Types (WithArrivalTime)
 import Ouroboros.Consensus.HeaderStateHistory
   ( HeaderStateHistory (..)
   )
@@ -396,7 +397,7 @@ data ChainDB m blk = ChainDB
   , getStatistics :: m (Maybe Statistics)
   -- ^ Get statistics from the LedgerDB, in particular the number of entries
   -- in the tables.
-  , addPerasCertAsync :: ValidatedPerasCert blk -> m (AddPerasCertPromise m)
+  , addPerasCertAsync :: WithArrivalTime (ValidatedPerasCert blk) -> m (AddPerasCertPromise m)
   -- ^ Asynchronously insert a certificate to the DB. If this leads to a fork to
   -- be weightier than our current selection, this will trigger a fork switch.
   , getPerasWeightSnapshot :: STM m (WithFingerprint (PerasWeightSnapshot blk))
@@ -537,7 +538,7 @@ newtype AddPerasCertPromise m = AddPerasCertPromise
   -- impossible).
   }
 
-addPerasCertSync :: IOLike m => ChainDB m blk -> ValidatedPerasCert blk -> m ()
+addPerasCertSync :: IOLike m => ChainDB m blk -> WithArrivalTime (ValidatedPerasCert blk) -> m ()
 addPerasCertSync chainDB cert =
   waitPerasCertProcessed =<< addPerasCertAsync chainDB cert
 
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/Impl/ChainSel.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/Impl/ChainSel.hs
@@ -45,6 +45,7 @@ import qualified Data.Set as Set
 import Data.Traversable (for)
 import GHC.Stack (HasCallStack)
 import Ouroboros.Consensus.Block
+import Ouroboros.Consensus.BlockchainTime.WallClock.Types (WithArrivalTime)
 import Ouroboros.Consensus.Config
 import Ouroboros.Consensus.Fragment.Diff (ChainDiff (..))
 import qualified Ouroboros.Consensus.Fragment.Diff as Diff
@@ -328,7 +329,7 @@ addPerasCertAsync ::
   forall m blk.
   (IOLike m, HasHeader blk) =>
   ChainDbEnv m blk ->
-  ValidatedPerasCert blk ->
+  WithArrivalTime (ValidatedPerasCert blk) ->
   m (AddPerasCertPromise m)
 addPerasCertAsync CDB{cdbTracer, cdbChainSelQueue} =
   addPerasCertToQueue (TraceAddPerasCertEvent >$< cdbTracer) cdbChainSelQueue
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/Impl/Types.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/Impl/Types.hs
@@ -94,6 +94,7 @@ import Data.Word (Word64)
 import GHC.Generics (Generic)
 import NoThunks.Class (OnlyCheckWhnfNamed (..))
 import Ouroboros.Consensus.Block
+import Ouroboros.Consensus.BlockchainTime.WallClock.Types (WithArrivalTime)
 import Ouroboros.Consensus.Config
 import Ouroboros.Consensus.Fragment.Diff (ChainDiff)
 import Ouroboros.Consensus.HeaderValidation (HeaderWithTime (..))
@@ -553,7 +554,7 @@ data ChainSelMessage m blk
     ChainSelAddBlock !(BlockToAdd m blk)
   | -- | Add a Peras certificate
     ChainSelAddPerasCert
-      !(ValidatedPerasCert blk)
+      !(WithArrivalTime (ValidatedPerasCert blk))
       -- | Used for 'AddPerasCertPromise'.
       !(StrictTMVar m ())
   | -- | Reprocess blocks that have been postponed by the LoE.
@@ -609,7 +610,7 @@ addPerasCertToQueue ::
   (IOLike m, StandardHash blk) =>
   Tracer m (TraceAddPerasCertEvent blk) ->
   ChainSelQueue m blk ->
-  ValidatedPerasCert blk ->
+  WithArrivalTime (ValidatedPerasCert blk) ->
   m (AddPerasCertPromise m)
 addPerasCertToQueue tracer ChainSelQueue{varChainSelQueue} cert = do
   varProcessed <- newEmptyTMVarIO
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/PerasCertDB/API.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/PerasCertDB/API.hs
@@ -17,12 +17,13 @@ import Data.Map (Map)
 import Data.Word (Word64)
 import NoThunks.Class
 import Ouroboros.Consensus.Block
+import Ouroboros.Consensus.BlockchainTime.WallClock.Types (WithArrivalTime)
 import Ouroboros.Consensus.Peras.Weight
 import Ouroboros.Consensus.Util.IOLike
 import Ouroboros.Consensus.Util.STM (WithFingerprint (..))
 
 data PerasCertDB m blk = PerasCertDB
-  { addCert :: ValidatedPerasCert blk -> m AddPerasCertResult
+  { addCert :: WithArrivalTime (ValidatedPerasCert blk) -> m AddPerasCertResult
   -- ^ Add a Peras certificate to the database. The result indicates whether
   -- the certificate was actually added, or if it was already present.
   , getWeightSnapshot :: STM m (WithFingerprint (PerasWeightSnapshot blk))
@@ -46,7 +47,9 @@ data AddPerasCertResult = AddedPerasCertToDB | PerasCertAlreadyInDB
 data PerasCertSnapshot blk = PerasCertSnapshot
   { containsCert :: PerasRoundNo -> Bool
   -- ^ Do we have the certificate for this round?
-  , getCertsAfter :: PerasCertTicketNo -> Map PerasCertTicketNo (ValidatedPerasCert blk)
+  , getCertsAfter ::
+      PerasCertTicketNo ->
+      Map PerasCertTicketNo (WithArrivalTime (ValidatedPerasCert blk))
   -- ^ Get certificates after the given ticket number (excluded).
   -- The result is a map of ticket numbers to validated certificates.
   }
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/PerasCertDB/Impl.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/PerasCertDB/Impl.hs
@@ -32,6 +32,7 @@ import qualified Data.Set as Set
 import GHC.Generics (Generic)
 import NoThunks.Class
 import Ouroboros.Consensus.Block
+import Ouroboros.Consensus.BlockchainTime.WallClock.Types (WithArrivalTime)
 import Ouroboros.Consensus.Peras.Weight
 import Ouroboros.Consensus.Storage.PerasCertDB.API
 import Ouroboros.Consensus.Util.Args
@@ -152,7 +153,7 @@ implAddCert ::
   , StandardHash blk
   ) =>
   PerasCertDbEnv m blk ->
-  ValidatedPerasCert blk ->
+  WithArrivalTime (ValidatedPerasCert blk) ->
   m AddPerasCertResult
 implAddCert env cert = do
   traceWith pcdbTracer $ AddingPerasCert roundNo boostedPt
@@ -255,13 +256,13 @@ implGarbageCollect PerasCertDbEnv{pcdbVolatileState} slot =
 --
 -- INVARIANT: See 'invariantForPerasVolatileCertState'.
 data PerasVolatileCertState blk = PerasVolatileCertState
-  { pvcsCerts :: !(Map PerasRoundNo (ValidatedPerasCert blk))
+  { pvcsCerts :: !(Map PerasRoundNo (WithArrivalTime (ValidatedPerasCert blk)))
   -- ^ The boosted blocks by 'RoundNo' of all certificates currently in the db.
   , pvcsWeightByPoint :: !(PerasWeightSnapshot blk)
   -- ^ The weight of boosted blocks w.r.t. the certificates currently in the db.
   --
   -- INVARIANT: In sync with 'pvcsCerts'.
-  , pvcsCertsByTicket :: !(Map PerasCertTicketNo (ValidatedPerasCert blk))
+  , pvcsCertsByTicket :: !(Map PerasCertTicketNo (WithArrivalTime (ValidatedPerasCert blk)))
   -- ^ The certificates by 'PerasCertTicketNo'.
   --
   -- INVARIANT: In sync with 'pvcsCerts'.
diff --git a/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Orphans/ToExpr.hs b/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Orphans/ToExpr.hs
@@ -17,6 +17,7 @@ import qualified Control.Monad.Class.MonadTime.SI as SI
 import Data.TreeDiff
 import GHC.Generics (Generic)
 import Ouroboros.Consensus.Block
+import Ouroboros.Consensus.BlockchainTime.WallClock.Types (RelativeTime, WithArrivalTime)
 import Ouroboros.Consensus.HeaderValidation
 import Ouroboros.Consensus.Ledger.Abstract
 import Ouroboros.Consensus.Ledger.Extended
@@ -112,6 +113,8 @@ instance
       , toExpr j
       ]
 
+instance ToExpr RelativeTime where
+  toExpr = defaultExprViaShow
 instance ToExpr ChunkInfo where
   toExpr = defaultExprViaShow
 instance ToExpr FsError where
@@ -127,6 +130,8 @@ deriving anyclass instance ToExpr (HeaderHash blk) => ToExpr (PerasCert blk)
 
 deriving anyclass instance ToExpr (HeaderHash blk) => ToExpr (ValidatedPerasCert blk)
 
+deriving anyclass instance ToExpr a => ToExpr (WithArrivalTime a)
+
 {-------------------------------------------------------------------------------
   si-timers
 --------------------------------------------------------------------------------}
diff --git a/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/ObjectDiffusion/PerasCert/Smoke.hs b/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/ObjectDiffusion/PerasCert/Smoke.hs
@@ -15,6 +15,12 @@ import qualified Data.List.NonEmpty as NE
 import qualified Data.Map as Map
 import Network.TypedProtocol.Driver.Simple (runPeer, runPipelinedPeer)
 import Ouroboros.Consensus.Block.SupportsPeras
+import Ouroboros.Consensus.BlockchainTime.WallClock.Types
+  ( RelativeTime (..)
+  , SystemTime (..)
+  , addArrivalTime
+  , systemTimeCurrent
+  )
 import Ouroboros.Consensus.MiniProtocol.ObjectDiffusion.ObjectPool.API
 import Ouroboros.Consensus.MiniProtocol.ObjectDiffusion.ObjectPool.PerasCert
 import Ouroboros.Consensus.Storage.PerasCertDB.API
@@ -24,7 +30,7 @@ import Ouroboros.Consensus.Storage.PerasCertDB.API
   )
 import qualified Ouroboros.Consensus.Storage.PerasCertDB.API as PerasCertDB
 import qualified Ouroboros.Consensus.Storage.PerasCertDB.Impl as PerasCertDB
-import Ouroboros.Consensus.Util.IOLike
+import Ouroboros.Consensus.Util.IOLike (IOLike, atomically, newTVarIO, stateTVar, throwIO)
 import Ouroboros.Network.Block (Point (..), SlotNo (SlotNo), StandardHash)
 import Ouroboros.Network.Point (Block (Block), WithOrigin (..))
 import Ouroboros.Network.Protocol.ObjectDiffusion.Codec
@@ -77,9 +83,24 @@ instance Arbitrary (Point blk) => Arbitrary (PerasCert blk) where
 instance WithId (PerasCert blk) PerasRoundNo where
   getId = pcCertRound
 
+mockSystemTime :: IOLike m => m (SystemTime m)
+mockSystemTime = do
+  varTime <- newTVarIO 0
+  return $
+    SystemTime
+      { systemTimeCurrent =
+          RelativeTime <$> atomically (stateTVar varTime (\t -> (t, t + 1)))
+      , systemTimeWait =
+          pure ()
+      }
+
 newCertDB ::
-  (IOLike m, StandardHash blk) => PerasCfg blk -> [PerasCert blk] -> m (PerasCertDB m blk)
-newCertDB perasCfg certs = do
+  (IOLike m, StandardHash blk) =>
+  PerasCfg blk ->
+  SystemTime m ->
+  [PerasCert blk] ->
+  m (PerasCertDB m blk)
+newCertDB perasCfg systemTime certs = do
   db <- PerasCertDB.openDB (PerasCertDB.PerasCertDbArgs @Identity nullTracer)
   mapM_
     ( \cert -> do
@@ -88,7 +109,7 @@ newCertDB perasCfg certs = do
                 { vpcCert = cert
                 , vpcCertBoost = perasCfgWeightBoost perasCfg
                 }
-        result <- PerasCertDB.addCert db validatedCert
+        result <- PerasCertDB.addCert db =<< addArrivalTime systemTime validatedCert
         case result of
           AddedPerasCertToDB -> pure ()
           PerasCertAlreadyInDB -> throwIO (userError "Expected AddedPerasCertToDB, but cert was already in DB")
@@ -123,11 +144,12 @@ prop_smoke protocolConstants (ListWithUniqueIds certs) =
       , m [PerasCert TestBlock]
       )
   mkPoolInterfaces = do
-    outboundPool <- newCertDB perasTestCfg certs
-    inboundPool <- newCertDB perasTestCfg []
+    systemTime <- mockSystemTime
+    outboundPool <- newCertDB perasTestCfg systemTime certs
+    inboundPool <- newCertDB perasTestCfg systemTime []
 
     let outboundPoolReader = makePerasCertPoolReaderFromCertDB outboundPool
-        inboundPoolWriter = makePerasCertPoolWriterFromCertDB inboundPool
+        inboundPoolWriter = makePerasCertPoolWriterFromCertDB systemTime inboundPool
         getAllInboundPoolContent = do
           snap <- atomically $ PerasCertDB.getCertSnapshot inboundPool
           let rawContent =
diff --git a/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/ChainDB/Model.hs b/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/ChainDB/Model.hs
@@ -104,6 +104,7 @@ import qualified Data.Set as Set
 import Data.TreeDiff
 import GHC.Generics (Generic)
 import Ouroboros.Consensus.Block
+import Ouroboros.Consensus.BlockchainTime.WallClock.Types (WithArrivalTime)
 import Ouroboros.Consensus.Config
 import Ouroboros.Consensus.HeaderValidation
 import Ouroboros.Consensus.Ledger.Abstract
@@ -148,7 +149,7 @@ data Model blk = Model
   -- ^ The VolatileDB
   , immutableDbChain :: Chain blk
   -- ^ The ImmutableDB
-  , perasCerts :: Map PerasRoundNo (ValidatedPerasCert blk)
+  , perasCerts :: Map PerasRoundNo (WithArrivalTime (ValidatedPerasCert blk))
   , cps :: CPS.ChainProducerState blk
   , currentLedger :: ExtLedgerState blk EmptyMK
   , initLedger :: ExtLedgerState blk EmptyMK
@@ -445,7 +446,7 @@ addPerasCert ::
   forall blk.
   (LedgerSupportsProtocol blk, LedgerTablesAreTrivial (ExtLedgerState blk)) =>
   TopLevelConfig blk ->
-  ValidatedPerasCert blk ->
+  WithArrivalTime (ValidatedPerasCert blk) ->
   Model blk ->
   Model blk
 addPerasCert cfg cert m
diff --git a/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/ChainDB/StateMachine.hs b/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/ChainDB/StateMachine.hs
diff --git a/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/Orphans.hs b/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/Orphans.hs
diff --git a/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/PerasCertDB/Model.hs b/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/PerasCertDB/Model.hs
diff --git a/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/PerasCertDB/StateMachine.hs b/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/PerasCertDB/StateMachine.hs
