Add cardano-network-magic to cli options

Defaults to Cardano mainnet

Author: crocodile-dentist

dmq-node/src/DMQ/Configuration.hs

@@ -32,6 +32,8 @@ module DMQ.Configuration
   , LocalAddress (..)
   ) where
 
+import Cardano.Chain.Genesis (mainnetProtocolMagicId)
+import Cardano.Crypto.ProtocolMagic (ProtocolMagicId(..))
 import Control.Concurrent.Class.MonadSTM.Strict
 import Control.Monad.Class.MonadThrow
 import Control.Monad.Class.MonadTime.SI (DiffTime)
@@ -99,7 +101,10 @@ data Configuration' f =
     dmqcProtocolIdleTimeout                        :: f DiffTime,
     dmqcChurnInterval                              :: f DiffTime,
     dmqcPeerSharing                                :: f PeerSharing,
+    -- network magic for the DMQ network itself
     dmqcNetworkMagic                               :: f NetworkMagic,
+    -- network magic for local connections to a cardano-node
+    dmqcCardanoNetworkMagic                        :: f NetworkMagic,
     dmqcCardanoNodeSocket                          :: f FilePath,
     dmqcPrettyLog                                  :: f Bool,
 
@@ -205,6 +210,8 @@ defaultConfiguration = Configuration {
       dmqcIPv6                                       = I Nothing,
       dmqcLocalAddress                               = I (LocalAddress "dmq-node.socket"),
       dmqcNetworkMagic                               = I NetworkMagic { unNetworkMagic = 3_141_592 },
+      dmqcCardanoNetworkMagic                        =
+        I (NetworkMagic . unProtocolMagicId $ mainnetProtocolMagicId),
       dmqcPortNumber                                 = I 3_141,
       dmqcConfigFile                                 = I "dmq.configuration.yaml",
       dmqcTopologyFile                               = I "dmq.topology.json",
@@ -296,6 +303,7 @@ instance FromJSON PartialConfig where
       dmqcLocalAddress <- Last . fmap LocalAddress <$> v .:? "LocalAddress"
       dmqcPortNumber <- Last . fmap (fromIntegral @Int) <$> v.:? "PortNumber"
       dmqcNetworkMagic <- Last . fmap NetworkMagic <$> v .:? "NetworkMagic"
+      dmqcCardanoNetworkMagic <- Last . fmap NetworkMagic <$> v .:? "CardanoNetworkMagic"
       dmqcDiffusionMode <- Last <$> v .:? "DiffusionMode"
       dmqcPeerSharing <- Last <$> v .:? "PeerSharing"
       dmqcCardanoNodeSocket <- Last <$> v .:? "CardanoNodeSocket"
@@ -358,11 +366,11 @@ instance FromJSON PartialConfig where
 
       pure $
         Configuration
-          { dmqcIPv4         = Last dmqcIPv4
-          , dmqcIPv6         = Last dmqcIPv6
-          , dmqcConfigFile   = mempty
-          , dmqcTopologyFile = mempty
-          , dmqcVersion      = mempty
+          { dmqcIPv4                = Last dmqcIPv4
+          , dmqcIPv6                = Last dmqcIPv6
+          , dmqcConfigFile          = mempty
+          , dmqcTopologyFile        = mempty
+          , dmqcVersion             = mempty
           , ..
           }
 
@@ -390,6 +398,7 @@ instance ToJSON Configuration where
            , "ChurnInterval"                              .= unI dmqcChurnInterval
            , "PeerSharing"                                .= unI dmqcPeerSharing
            , "NetworkMagic"                               .= unNetworkMagic (unI dmqcNetworkMagic)
+           , "CardanoNetworkMagic"                        .= unNetworkMagic (unI dmqcCardanoNetworkMagic)
            , "PrettyLog"                                  .= unI dmqcPrettyLog
            , "MuxTracer"                                  .= unI dmqcMuxTracer
            , "ChannelTracer"                              .= unI dmqcChannelTracer

dmq-node/src/DMQ/Configuration/CLIOptions.hs

@@ -4,6 +4,7 @@ import Data.Monoid (Last (..))
 import Options.Applicative
 
 import DMQ.Configuration
+import Ouroboros.Network.Magic (NetworkMagic (..))
 
 parseCLIOptions :: Parser PartialConfig
 parseCLIOptions =
@@ -55,11 +56,18 @@ parseCLIOptions =
         )
     <*> optional (
           strOption
-          (   long "cardano-node-socket"
+          (  long "cardano-node-socket"
           <> metavar "Cardano node socket path"
           <> help "Used for local connections to Cardano node"
           )
         )
+    <*> optional (
+          option auto
+          (  long "cardano-network-magic"
+          <> metavar "Cardano node network magic"
+          <> help "The network magic of cardano-node client for local connections"
+          )
+        )
     <*> optional (
           switch
           (   long "version"
@@ -69,13 +77,14 @@ parseCLIOptions =
         )
   where
     mkConfiguration ipv4 ipv6 portNumber localAddress
-                    configFile topologyFile cardanoNodeSocket version =
+                    configFile topologyFile cardanoNodeSocket networkMagic version =
       mempty { dmqcIPv4              = Last (Just <$> ipv4),
                dmqcIPv6              = Last (Just <$> ipv6),
                dmqcLocalAddress      = Last (LocalAddress <$> localAddress),
                dmqcPortNumber        = Last portNumber,
                dmqcConfigFile        = Last configFile,
                dmqcTopologyFile      = Last topologyFile,
                dmqcCardanoNodeSocket = Last cardanoNodeSocket,
+               dmqcNetworkMagic      = Last (NetworkMagic <$> networkMagic),
                dmqcVersion           = Last version
              }

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

@@ -40,6 +40,7 @@ import Ouroboros.Consensus.Shelley.Ledger.Query
 import Ouroboros.Network.BlockFetch (FetchClientRegistry,
            newFetchClientRegistry)
 import Ouroboros.Network.ConnectionId (ConnectionId (..))
+import Ouroboros.Network.Magic (NetworkMagic (..))
 import Ouroboros.Network.PeerSelection.Governor.Types
            (makePublicPeerSelectionStateVar)
 import Ouroboros.Network.PeerSelection.LedgerPeers.Type (LedgerPeerSnapshot,
@@ -171,14 +172,15 @@ withNodeKernel :: forall crypto ntnAddr m a.
                => (forall ev. Aeson.ToJSON ev => Tracer m (WithEventType ev))
                -> Configuration
                -> StdGen
-               -> (NodeKernel crypto ntnAddr m -> m (Either SomeException Void))
+               -> (NetworkMagic -> NodeKernel crypto ntnAddr m -> m (Either SomeException Void))
                -> (NodeKernel crypto ntnAddr m -> m a)
                -- ^ as soon as the callback exits the `mempoolWorker` and all
                -- decision logic threads will be killed
                -> m a
 withNodeKernel tracer
                Configuration {
-                 dmqcSigSubmissionLogicTracer = I sigSubmissionLogicTracer
+                 dmqcSigSubmissionLogicTracer = I sigSubmissionLogicTracer,
+                 dmqcCardanoNetworkMagic      = I networkMagic
                }
                rng
                mkStakePoolMonitor k = do
@@ -198,7 +200,7 @@ withNodeKernel tracer
                 sigChannelVar
                 sigSharedTxStateVar)
             $ \sigLogicThread ->
-      withAsync (mkStakePoolMonitor nodeKernel) \spmAid -> do
+      withAsync (mkStakePoolMonitor networkMagic nodeKernel) \spmAid -> do
         link mempoolThread
         link sigLogicThread
         link spmAid

dmq-node/src/DMQ/NodeToClient/LocalStateQueryClient.hs

@@ -20,9 +20,7 @@ import Data.Map.Strict qualified as Map
 import Data.Proxy
 import Data.Void
 
-import Cardano.Chain.Genesis
 import Cardano.Chain.Slotting
-import Cardano.Crypto.ProtocolMagic
 import Cardano.Network.NodeToClient
 import Cardano.Slotting.EpochInfo.API
 import Cardano.Slotting.Time
@@ -152,20 +150,18 @@ cardanoClient _tracer StakePools { stakePoolsVar, ledgerPeersVar, ledgerBigPeers
 connectToCardanoNode :: Tracer IO (WithEventType String)
                      -> LocalSnocket
                      -> FilePath
+                     -> NetworkMagic
                      -> NodeKernel crypto ntnAddr IO
                      -> IO (Either SomeException Void)
-connectToCardanoNode tracer localSnocket' snocketPath nodeKernel =
+connectToCardanoNode tracer localSnocket' snocketPath networkMagic nodeKernel =
   connectTo
    localSnocket'
    nullNetworkConnectTracers --debuggingNetworkConnectTracers
    (combineVersions
      [ simpleSingletonVersions
          version
          NodeToClientVersionData {
-             networkMagic =
-                   NetworkMagic -- 2 {- preview net -}
-                 . unProtocolMagicId
-                 $ mainnetProtocolMagicId
+             networkMagic
            , query = False
          }
          \_version ->