From 02195f71b1958a146126676d1a6b5e73788ffc16 Mon Sep 17 00:00:00 2001 From: Karl Knutsson Date: Mon, 26 Jan 2026 15:50:33 +0100 Subject: [PATCH] Set the correct magic field When one specifies the cardano-network-magic cli option it should set the cardano network's magic not the dmq network's magic. Add cli dmq-network-magic option for setting the dmq network's magic. --- ...6_155406_karl.fb.knutsson_cardano_magic.md | 4 +++ dmq-node/src/DMQ/Configuration/CLIOptions.hs | 29 ++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 dmq-node/changelog.d/20260126_155406_karl.fb.knutsson_cardano_magic.md diff --git a/dmq-node/changelog.d/20260126_155406_karl.fb.knutsson_cardano_magic.md b/dmq-node/changelog.d/20260126_155406_karl.fb.knutsson_cardano_magic.md new file mode 100644 index 0000000..36e0973 --- /dev/null +++ b/dmq-node/changelog.d/20260126_155406_karl.fb.knutsson_cardano_magic.md @@ -0,0 +1,4 @@ +### Breaking + +- Have the cardano-network-magic cli option set the correct magic field +- Add a dmq-network-magic cli option diff --git a/dmq-node/src/DMQ/Configuration/CLIOptions.hs b/dmq-node/src/DMQ/Configuration/CLIOptions.hs index 2670782..b1ed4ad 100644 --- a/dmq-node/src/DMQ/Configuration/CLIOptions.hs +++ b/dmq-node/src/DMQ/Configuration/CLIOptions.hs @@ -68,6 +68,13 @@ parseCLIOptions = <> help "The network magic of cardano-node client for local connections" ) ) + <*> optional ( + option auto + ( long "dmq-network-magic" + <> metavar "dmq node network magic" + <> help "The network magic of the dmq network" + ) + ) <*> optional ( switch ( long "version" @@ -77,14 +84,16 @@ parseCLIOptions = ) where mkConfiguration ipv4 ipv6 portNumber localAddress - 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 + configFile topologyFile cardanoNodeSocket cardanoNetworkMagic dmqNetworkMagic + 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, + dmqcCardanoNetworkMagic = Last (NetworkMagic <$> cardanoNetworkMagic), + dmqcNetworkMagic = Last (NetworkMagic <$> dmqNetworkMagic), + dmqcVersion = Last version }