Merge pull request #5149 from IntersectMBO/coot/random-1.2

Consensus integration changes

Author: coot

decentralized-message-queue/app/Main.hs

@@ -9,7 +9,7 @@ import Control.Tracer (Tracer (..))
 import Data.Void (Void)
 import Debug.Trace (traceShowM)
 import Options.Applicative
-import System.Random (newStdGen, splitGen)
+import System.Random (newStdGen, split)
 
 import DMQ.Configuration (mkDiffusionConfiguration,
            readConfigurationFileOrError)
@@ -44,7 +44,7 @@ runDMQ cliopts@CLIOptions {
   nt <- readTopologyFileOrError @() @() topologyFile
 
   stdGen <- newStdGen
-  let (psRng, policyRng) = splitGen stdGen
+  let (psRng, policyRng) = split stdGen
 
   nodeKernel <- newNodeKernel psRng
 

decentralized-message-queue/decentralized-message-queue.cabal

@@ -92,7 +92,7 @@ library
     ouroboros-network-api ^>=0.14,
     ouroboros-network-framework ^>=0.18,
     ouroboros-network-protocols ^>=0.14.0.1,
-    random >=1 && <1.4,
+    random ^>=1.2,
     text >=1.2.4 && <2.2,
     typed-protocols ^>=1.0,
 

docs/network-spec/miniprotocols.tex

@@ -2253,9 +2253,13 @@ \section{Node-to-client protocol}
   \begin{center}
     \begin{tabular}{l|l}
       \header{version} & \header{description} \\\hline
-      \texttt{NodeToClientV\_16} & Add ImmutableTip to LocalStateQuery, Conway, GetStakeDelegDeposits query \\
-      \texttt{NodeToClientV\_17} & GetProposals, GetRatifyState queries \\
-      \texttt{NodeToClientV\_18} & GetFuturePParams query \\
+      \texttt{NodeToClientV\_16} & Conway era, \texttt{ImmutableTip} and \texttt{GetStakeDelegDeposits} queries \\
+      \texttt{NodeToClientV\_17} & \texttt{GetProposals}, \texttt{GetRatifyState} queries \\
+      \texttt{NodeToClientV\_18} & \texttt{GetFuturePParams} query \\
+      \texttt{NodeToClientV\_19} & \texttt{GetBigLedgerPeerSnapshot} query\\
+      \texttt{NodeToClientV\_20} & \texttt{QueryStakePoolDefaultVote} query; \\
+                                 & added \texttt{MsgGetMeasures} and \texttt{MsgReplyGetMeasures} queries \\
+      \texttt{NodeToClientV\_21} & new codecs for \texttt{PParams} and \texttt{CompactGenesis} \\
     \end{tabular}
     \caption{Node-to-client protocol versions}
     \label{table:node-to-client-protocol-versions}

ouroboros-network-api/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### Breaking changes
 
+* Added `NodeToClientV_21`.
+
 ### Non-breaking changes
 
 * `IsLedgerPeer` added to `Ouroboros.Network.LedgerPeers.Types` module.

ouroboros-network-api/src/Ouroboros/Network/NodeToClient/Version.hs

@@ -41,18 +41,19 @@ data NodeToClientVersion
     -- | NodeToClientV_15
     -- -- ^ added `query` to NodeToClientVersionData
     = NodeToClientV_16
-    -- ^ added @ImmutableTip@ to @LocalStateQuery@, enabled
-    -- @CardanoNodeToClientVersion11@, i.e., Conway and
-    -- @GetStakeDelegDeposits@.
+    -- ^  Conway era (enabled @CardanoNodeToClientVersion11@);
+    -- added @ImmutableTip@ and @GetStakeDelegDeposits@ queries to @LocalStateQuery@
     | NodeToClientV_17
     -- ^ added @GetProposals@ and @GetRatifyState@ queries
     | NodeToClientV_18
     -- ^ added @GetFuturePParams@ query
     | NodeToClientV_19
-    -- ^ added @GetLedgerPeerSnapshot@
+    -- ^ added @GetBigLedgerPeerSnapshot@ query
     | NodeToClientV_20
-    -- ^ added @QueryStakePoolDefaultVote@,
-    -- added @MsgGetMeasures@ / @MsgReplyGetMeasures@ to @LocalTxMonitor@
+    -- ^ added @QueryStakePoolDefaultVote@ query;
+    -- added @MsgGetMeasures@ and @MsgReplyGetMeasures@ to @LocalTxMonitor@
+    | NodeToClientV_21
+    -- ^ new codecs for @PParams@ and @CompactGenesis@
   deriving (Eq, Ord, Enum, Bounded, Show, Generic, NFData)
 
 -- | We set 16ths bit to distinguish `NodeToNodeVersion` and
@@ -71,6 +72,7 @@ nodeToClientVersionCodec = CodecCBORTerm { encodeTerm, decodeTerm }
           NodeToClientV_18 -> enc 18
           NodeToClientV_19 -> enc 19
           NodeToClientV_20 -> enc 20
+          NodeToClientV_21 -> enc 21
         where
           enc :: Int -> CBOR.Term
           enc = CBOR.TInt . (`setBit` nodeToClientVersionBit)
@@ -82,6 +84,7 @@ nodeToClientVersionCodec = CodecCBORTerm { encodeTerm, decodeTerm }
             18 -> Right NodeToClientV_18
             19 -> Right NodeToClientV_19
             20 -> Right NodeToClientV_20
+            21 -> Right NodeToClientV_21
             n  -> Left (unknownTag n)
         where
           dec :: CBOR.Term -> Either (Text, Maybe Int) Int

ouroboros-network-framework/demo/connection-manager.hs

@@ -50,7 +50,7 @@ import Network.TypedProtocol.Peer
 
 import Options.Applicative
 
-import System.Random (SplitGen)
+import System.Random (RandomGen)
 import System.Random qualified as Random
 
 import Network.TypedProtocol.ReqResp.Client
@@ -105,32 +105,32 @@ data ClientAndServerData = ClientAndServerData {
 
 
 {-
-genList :: SplitGen g => (g -> a) -> Int -> g -> [a]
+genList :: RandomGen g => (g -> a) -> Int -> g -> [a]
 genList gen = go []
   where
     go !acc len _g | len < 0 = acc
     go !acc len  g =
         go (a : acc) (pred len) g''
       where
-        (g', g'') = Random.splitGen g
+        (g', g'') = Random.split g
         !a = gen g'
 -}
 
-genInfList :: SplitGen g => (g -> a) -> g -> [a]
+genInfList :: RandomGen g => (g -> a) -> g -> [a]
 genInfList gen g =
-    case Random.splitGen g of
+    case Random.split g of
       (g', g'') -> gen g' : genInfList gen g''
 
 
-genClientAndServerData :: forall g. SplitGen g
+genClientAndServerData :: forall g. RandomGen g
                        => g -> Int -> ClientAndServerData
 genClientAndServerData g0 len = ClientAndServerData {
         hotInitiatorRequests         = genListOfLists g1,
         warmInitiatorRequests        = genListOfLists g2,
         establishedInitiatorRequests = genListOfLists g3
       }
     where
-      (g1, (g2, g3)) = Random.splitGen <$> Random.splitGen g0
+      (g1, (g2, g3)) = Random.split <$> Random.split g0
 
       genListOfLists :: g -> [[Int]]
       genListOfLists = \g -> genInfList (take len . Random.randoms) g

ouroboros-network-framework/ouroboros-network-framework.cabal

@@ -83,7 +83,7 @@ library
     ouroboros-network-testing,
     psqueues,
     quiet,
-    random,
+    random ^>=1.2,
     text,
     typed-protocols:{typed-protocols, cborg, stateful} ^>=1.0,
 

ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/Server/Sim.hs

@@ -59,7 +59,7 @@ import Data.Proxy (Proxy (..))
 import Data.Set (Set)
 import Data.Set qualified as Set
 import Data.Typeable (Typeable)
-import System.Random (StdGen, mkStdGen, splitGen)
+import System.Random (StdGen, mkStdGen, split)
 
 import Text.Printf
 
@@ -745,7 +745,7 @@ multinodeExperiment inboundTrTracer trTracer inboundTracer debugTracer cmTracer
         connVar <- newTVarIO Map.empty
         labelTVarIO connVar $ "connVar/" ++ show name
         threadId <- myThreadId
-        stdGen <- atomically (stateTVar stdGenVar splitGen)
+        stdGen <- atomically (stateTVar stdGenVar split)
         forkJob jobpool
           $ Job
               ( withInitiatorOnlyConnectionManager
@@ -779,7 +779,7 @@ multinodeExperiment inboundTrTracer trTracer inboundTracer debugTracer cmTracer
         connVar <- newTVarIO Map.empty
         labelTVarIO connVar $ "connVar/" ++ show name
         threadId <- myThreadId
-        stdGen <- atomically (stateTVar stdGenVar splitGen)
+        stdGen <- atomically (stateTVar stdGenVar split)
         let job =
               case dataFlow of
                 Duplex ->

ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs

@@ -44,7 +44,8 @@ import Data.Functor (void, ($>))
 import Data.Proxy (Proxy (..))
 import Data.Typeable (Typeable)
 import GHC.Stack (CallStack, HasCallStack, callStack)
-import System.Random (StdGen, splitGen)
+import System.Random (StdGen)
+import System.Random qualified as Random
 
 import Data.List qualified as List
 import Data.Map.Strict (Map)
@@ -826,7 +827,7 @@ with args@Arguments {
               Just a  -> Map.insert connId (a, connThread, connVar)
                                     choiceMap'
 
-      stdGen <- stateTVar stdGenVar splitGen
+      stdGen <- stateTVar stdGenVar Random.split
       let pruneSet = prunePolicy
                        stdGen
                        ((\(a,_,_) -> a) <$> choiceMap)
@@ -1330,7 +1331,7 @@ with args@Arguments {
         (trace, mutableConnState@MutableConnState { connVar, connStateId }
               , eHandleWedge) <- atomically $ do
           state <- readTMVar stateVar
-          stdGen <- stateTVar stdGenVar splitGen
+          stdGen <- stateTVar stdGenVar Random.split
           case State.lookupByRemoteAddr stdGen peerAddr state of
             Just mutableConnState@MutableConnState { connVar, connStateId } -> do
               connState <- readTVar connVar

ouroboros-network-framework/testlib/Test/Ouroboros/Network/ConnectionManager/Experiments.hs

@@ -59,7 +59,8 @@ import Data.Proxy (Proxy (..))
 import Data.Typeable (Typeable)
 import Data.Void (Void)
 
-import System.Random (StdGen, splitGen)
+import System.Random (StdGen)
+import System.Random qualified as Random
 
 import Test.QuickCheck
 
@@ -738,7 +739,7 @@ unidirectionalExperiment
     -> ClientAndServerData req
     -> m Property
 unidirectionalExperiment stdGen timeouts snocket makeBearer confSock socket clientAndServerData = do
-    let (stdGen', stdGen'') = splitGen stdGen
+    let (stdGen', stdGen'') = Random.split stdGen
     nextReqs <- oneshotNextRequests clientAndServerData
     connStateIdSupply <- atomically $ CM.newConnStateIdSupply (Proxy @m)
     withInitiatorOnlyConnectionManager
@@ -825,7 +826,7 @@ bidirectionalExperiment
 bidirectionalExperiment
     useLock stdGen timeouts snocket makeBearer confSock socket0 socket1 localAddr0 localAddr1
     clientAndServerData0 clientAndServerData1 = do
-      let (stdGen', stdGen'') = splitGen stdGen
+      let (stdGen', stdGen'') = Random.split stdGen
       lock <- newTMVarIO ()
       connStateIdSupply <- atomically $ CM.newConnStateIdSupply (Proxy @m)
       nextRequests0 <- oneshotNextRequests clientAndServerData0