Skip to content

Set the correct magic field #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
karknu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Set the correct magic field #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dmq-node/changelog.d/20260126_155406_karl.fb.knutsson_cardano_magic.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Breaking

- Have the cardano-network-magic cli option set the correct magic field
- Add a dmq-network-magic cli option
29 changes: 19 additions & 10 deletions dmq-node/src/DMQ/Configuration/CLIOptions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}