Merge pull request #5244 from IntersectMBO/coot/dmq-node-removed-evolution-config

dmq-node: removed KES evolution config

Author: coot

dmq-node/app/Main.hs

@@ -6,7 +6,6 @@
 
 module Main where
 
-import Control.Exception (throwIO)
 import Control.Monad (void, when)
 import Control.Tracer (Tracer (..), nullTracer, traceWith)
 
@@ -23,7 +22,6 @@ import System.Exit (exitSuccess)
 import System.Random (newStdGen, split)
 
 import Cardano.Git.Rev (gitRev)
-import Cardano.KESAgent.KES.Evolution qualified as KES
 import Cardano.KESAgent.Protocols.StandardCrypto (StandardCrypto)
 
 import DMQ.Configuration
@@ -70,7 +68,6 @@ runDMQ commandLineConfig = do
     let dmqConfig@Configuration {
           dmqcPrettyLog            = I prettyLog,
           dmqcTopologyFile         = I topologyFile,
-          dmqcShelleyGenesisFile   = I genesisFile,
           dmqcHandshakeTracer      = I handshakeTracer,
           dmqcLocalHandshakeTracer = I localHandshakeTracer,
           dmqcVersion              = I version
@@ -91,19 +88,12 @@ runDMQ commandLineConfig = do
                            | otherwise
                            -> Just gitrev
       Text.putStr $ Text.unlines $
-        [ "dmq-node version: " <> Text.pack (showVersion Meta.version) ]
-        ++
-        [ "git revision: " <> rev
-        | rev <- maybeToList cleanGitRev
-        ]
+          "dmq-node version: " <> Text.pack (showVersion Meta.version)
+        : [ "git revision: " <> rev
+          | rev <- maybeToList cleanGitRev
+          ]
       exitSuccess
 
-    res <- KES.evolutionConfigFromGenesisFile genesisFile
-    evolutionConfig <- case res of
-      Left err -> traceWith tracer (WithEventType "ShelleyGenesisFile" err)
-               >> throwIO (userError $ err)
-      Right ev -> return ev
-
     traceWith tracer (WithEventType "Configuration" dmqConfig)
     nt <- readTopologyFileOrError topologyFile
     traceWith tracer (WithEventType "NetworkTopology" nt)
@@ -114,7 +104,6 @@ runDMQ commandLineConfig = do
     withNodeKernel @StandardCrypto
                    tracer
                    dmqConfig
-                   evolutionConfig
                    psRng $ \nodeKernel -> do
       dmqDiffusionConfiguration <- mkDiffusionConfiguration dmqConfig nt
 

dmq-node/changelog.d/20251118_165634_coot_dmq_node_removed_evolution_config.md

@@ -0,0 +1,3 @@
+### Breaking
+
+- Removed KES evolution configuration & genesis file from the DMQ configuration.

dmq-node/src/DMQ/Configuration.hs

@@ -90,10 +90,6 @@ data Configuration' f =
     dmqcPortNumber                                 :: f PortNumber,
     dmqcConfigFile                                 :: f FilePath,
     dmqcTopologyFile                               :: f FilePath,
-    dmqcShelleyGenesisFile                         :: f FilePath,
-    -- ^ shelley genesis file, e.g.
-    -- `/configuration/cardano/mainnet-shelley-genesis.json` in `cardano-node`
-    -- repo.
     dmqcAcceptedConnectionsLimit                   :: f AcceptedConnectionsLimit,
     dmqcDiffusionMode                              :: f DiffusionMode,
     dmqcTargetOfRootPeers                          :: f Int,
@@ -214,7 +210,6 @@ defaultConfiguration = Configuration {
       dmqcPortNumber                                 = I 3_141,
       dmqcConfigFile                                 = I "dmq.configuration.yaml",
       dmqcTopologyFile                               = I "dmq.topology.json",
-      dmqcShelleyGenesisFile                         = I "mainnet-shelley-genesis.json",
       dmqcAcceptedConnectionsLimit                   = I defaultAcceptedConnectionsLimit,
       dmqcDiffusionMode                              = I InitiatorAndResponderDiffusionMode,
       dmqcTargetOfRootPeers                          = I targetNumberOfRootPeers,
@@ -305,8 +300,6 @@ instance FromJSON PartialConfig where
       dmqcDiffusionMode <- Last <$> v .:? "DiffusionMode"
       dmqcPeerSharing <- Last <$> v .:? "PeerSharing"
 
-      dmqcShelleyGenesisFile <- Last <$> v .:? "ShelleyGenesisFile"
-
       dmqcTargetOfRootPeers                 <- Last <$> v .:? "TargetNumberOfRootPeers"
       dmqcTargetOfKnownPeers                <- Last <$> v .:? "TargetNumberOfKnownPeers"
       dmqcTargetOfEstablishedPeers          <- Last <$> v .:? "TargetNumberOfEstablishedPeers"
@@ -383,7 +376,6 @@ instance ToJSON Configuration where
            , "LocalAddress"                               .= unI dmqcLocalAddress
            , "ConfigFile"                                 .= unI dmqcConfigFile
            , "TopologyFile"                               .= unI dmqcTopologyFile
-           , "ShelleyGenesisFile"                         .= unI dmqcShelleyGenesisFile
            , "AcceptedConnectionsLimit"                   .= unI dmqcAcceptedConnectionsLimit
            , "DiffusionMode"                              .= unI dmqcDiffusionMode
            , "TargetOfRootPeers"                          .= unI dmqcTargetOfRootPeers

dmq-node/src/DMQ/Diffusion/NodeKernel.hs

@@ -30,7 +30,6 @@ import System.Random (StdGen)
 import System.Random qualified as Random
 
 import Cardano.KESAgent.KES.Crypto (Crypto (..))
-import Cardano.KESAgent.KES.Evolution qualified as KES
 
 import Ouroboros.Network.BlockFetch (FetchClientRegistry,
            newFetchClientRegistry)
@@ -60,7 +59,6 @@ data NodeKernel crypto ntnAddr m =
   , peerSharingRegistry :: !(PeerSharingRegistry ntnAddr m)
   , peerSharingAPI      :: !(PeerSharingAPI ntnAddr StdGen m)
   , mempool             :: !(Mempool m SigId (Sig crypto))
-  , evolutionConfig     :: !(KES.EvolutionConfig)
   , sigChannelVar       :: !(TxChannelsVar m ntnAddr SigId (Sig crypto))
   , sigMempoolSem       :: !(TxMempoolSem m)
   , sigSharedTxStateVar :: !(SharedTxStateVar m ntnAddr SigId (Sig crypto))
@@ -70,10 +68,9 @@ newNodeKernel :: ( MonadLabelledSTM m
                  , MonadMVar m
                  , Ord ntnAddr
                  )
-              => KES.EvolutionConfig
-              -> StdGen
+              => StdGen
               -> m (NodeKernel crypto ntnAddr m)
-newNodeKernel evolutionConfig rng = do
+newNodeKernel rng = do
   publicPeerSelectionStateVar <- makePublicPeerSelectionStateVar
 
   fetchClientRegistry <- newFetchClientRegistry
@@ -96,7 +93,6 @@ newNodeKernel evolutionConfig rng = do
                   , peerSharingRegistry
                   , peerSharingAPI
                   , mempool
-                  , evolutionConfig
                   , sigChannelVar
                   , sigMempoolSem
                   , sigSharedTxStateVar
@@ -118,7 +114,6 @@ withNodeKernel :: forall crypto ntnAddr m a.
                   )
                => (forall ev. Aeson.ToJSON ev => Tracer m (WithEventType ev))
                -> Configuration
-               -> KES.EvolutionConfig
                -> StdGen
                -> (NodeKernel crypto ntnAddr m -> m a)
                -- ^ as soon as the callback exits the `mempoolWorker` and all
@@ -128,13 +123,12 @@ withNodeKernel tracer
                Configuration {
                  dmqcSigSubmissionLogicTracer = I sigSubmissionLogicTracer
                }
-               evolutionConfig
                rng k = do
   nodeKernel@NodeKernel { mempool,
                           sigChannelVar,
                           sigSharedTxStateVar
                         }
-    <- newNodeKernel evolutionConfig rng
+    <- newNodeKernel rng
   withAsync (mempoolWorker mempool)
           $ \mempoolThread ->
     withAsync (decisionLogicThreads

dmq-node/src/DMQ/NodeToNode.hs

@@ -196,7 +196,6 @@ ntnApps
     , peerSharingRegistry
     , peerSharingAPI
     , mempool
-    , evolutionConfig
     , sigChannelVar
     , sigMempoolSem
     , sigSharedTxStateVar
@@ -235,7 +234,7 @@ ntnApps
     -- mempool.
     mempoolWriter = Mempool.getWriter sigId
                                       (pure ()) -- TODO not needed
-                                      (\_ -> validateSig evolutionConfig)
+                                      (\_ -> validateSig)
                                       (\_ -> True)
                                       mempool
 

dmq-node/src/DMQ/Protocol/SigSubmission/Type.hs

@@ -47,7 +47,6 @@ import Cardano.Crypto.DSIGN.Class (ContextDSIGN, DSIGNAlgorithm, VerKeyDSIGN)
 import Cardano.Crypto.DSIGN.Class qualified as DSIGN
 import Cardano.Crypto.KES.Class (KESAlgorithm (..), Signable)
 import Cardano.KESAgent.KES.Crypto as KES
-import Cardano.KESAgent.KES.Evolution qualified as KES
 import Cardano.KESAgent.KES.OCert (KESPeriod (..), OCert (..), OCertSignable,
            validateOCert)
 
@@ -291,11 +290,9 @@ validateSig :: forall crypto.
                , ContextKES (KES crypto) ~ ()
                , Signable (KES crypto) ByteString
                )
-            => KES.EvolutionConfig
-            -> Sig crypto
+            => Sig crypto
             -> Either SigValidationError ()
-validateSig _ec
-            Sig { sigSignedBytes = signedBytes,
+validateSig Sig { sigSignedBytes = signedBytes,
                   sigKESPeriod,
                   sigOpCertificate = SigOpCertificate ocert@OCert {
                       ocertKESPeriod,

dmq-node/test/DMQ/Protocol/SigSubmission/Test.hs

@@ -832,7 +832,7 @@ prop_validateSig
   -> Property
 prop_validateSig constr = ioProperty $ do
     sig <- runWithConstr constr
-    return $ case validateSig KES.defEvolutionConfig sig of
+    return $ case validateSig sig of
       Left err -> counterexample ("KES seed: " ++ show (ctx constr))
                 . counterexample ("KES vk key: " ++ show (ocertVkHot . getSigOpCertificate . sigOpCertificate $ sig))
                 . counterexample (show sig)