WIP: Use protocolMagic from Genesis cfg

Breaks backwards compatibility with previous versions where the magic number was hardcoded to 0. XXX Uses non-master ourboros-network. Don't merge.
IntersectMBO · Oct 17, 2019 · 54f7f5f · 54f7f5f
1 parent 12070bf
commit 54f7f5f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/cabal.project b/cabal.project
@@ -122,37 +122,37 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 815278131bd5ab070199712e167659c472b466ce
+  tag: 2c52171fd88c4ca4a63de052f902714e0cac513b
   subdir: ouroboros-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 815278131bd5ab070199712e167659c472b466ce
+  tag: 2c52171fd88c4ca4a63de052f902714e0cac513b
   subdir: ouroboros-consensus
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 815278131bd5ab070199712e167659c472b466ce
+  tag: 2c52171fd88c4ca4a63de052f902714e0cac513b
   subdir: typed-protocols
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 815278131bd5ab070199712e167659c472b466ce
+  tag: 2c52171fd88c4ca4a63de052f902714e0cac513b
   subdir: typed-protocols-cbor
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 815278131bd5ab070199712e167659c472b466ce
+  tag: 2c52171fd88c4ca4a63de052f902714e0cac513b
   subdir: network-mux
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 815278131bd5ab070199712e167659c472b466ce
+  tag: 2c52171fd88c4ca4a63de052f902714e0cac513b
   subdir: io-sim-classes
 
 source-repository-package

diff --git a/cardano-node/src/Cardano/CLI/Tx/BenchmarkingNodeToNode.hs b/cardano-node/src/Cardano/CLI/Tx/BenchmarkingNodeToNode.hs
@@ -29,7 +29,7 @@ import           Ouroboros.Consensus.Block (BlockProtocol)
 import           Ouroboros.Consensus.Mempool.API (GenTxId, GenTx)
 import           Ouroboros.Consensus.Node.Run (RunNode)
 import           Ouroboros.Consensus.NodeNetwork (ProtocolCodecs(..), protocolCodecs)
-import           Ouroboros.Consensus.Protocol.Abstract (NodeConfig)
+import           Ouroboros.Consensus.Protocol.Abstract (NodeConfig, protocolNetworkMagic)
 import           Ouroboros.Network.Mux (OuroborosApplication(..))
 import qualified Ouroboros.Network.NodeToNode as NtN
 import           Ouroboros.Network.Protocol.BlockFetch.Client (BlockFetchClient(..), blockFetchClientPeer)
@@ -84,7 +84,7 @@ benchmarkConnectTxSubmit trs nc localAddr remoteAddr myTxSubClient = do
   peerMultiplex =
     simpleSingletonVersions
       NtN.NodeToNodeV_1
-      (NtN.NodeToNodeVersionData { NtN.networkMagic = 0})
+      (NtN.NodeToNodeVersionData { NtN.networkMagic = protocolNetworkMagic nc})
       (NtN.DictVersion NtN.nodeToNodeCodecCBORTerm)
       $ OuroborosInitiatorApplication $ \peer ptcl ->
           case ptcl of

diff --git a/cardano-node/src/Cardano/CLI/Tx/Submission.hs b/cardano-node/src/Cardano/CLI/Tx/Submission.hs
@@ -124,7 +124,8 @@ localInitiatorNetworkApplication
 localInitiatorNetworkApplication tracer protoInfoConfig tx =
     simpleSingletonVersions
       NodeToClient.NodeToClientV_1
-      (NodeToClient.NodeToClientVersionData { NodeToClient.networkMagic = 0 })
+      (NodeToClient.NodeToClientVersionData
+        { NodeToClient.networkMagic = protocolNetworkMagic protoInfoConfig })
       (NodeToClient.DictVersion NodeToClient.nodeToClientCodecCBORTerm)
 
   $ OuroborosInitiatorApplication $ \peer ptcl -> case ptcl of

diff --git a/cardano-node/src/Cardano/Chairman.hs b/cardano-node/src/Cardano/Chairman.hs
@@ -379,7 +379,7 @@ localInitiatorNetworkApplication
 localInitiatorNetworkApplication coreNodeId chainsVar securityParam maxBlockNo chairmanTracer chainSyncTracer localTxSubmissionTracer pInfoConfig =
     simpleSingletonVersions
       NodeToClientV_1
-      (NodeToClientVersionData { networkMagic = 0 })
+      (NodeToClientVersionData (protocolNetworkMagic pInfoConfig))
       (DictVersion nodeToClientCodecCBORTerm)
 
   $ OuroborosInitiatorApplication $ \peer ptcl -> case ptcl of

diff --git a/cardano-node/src/Cardano/Node/Run.hs b/cardano-node/src/Cardano/Node/Run.hs
@@ -49,8 +49,6 @@ import           Cardano.Config.Types (CardanoConfiguration (..))
 import           Cardano.Config.Logging (LoggingLayer (..))
 
 import           Ouroboros.Network.Block
-import           Ouroboros.Network.NodeToClient (NodeToClientVersionData (..))
-import           Ouroboros.Network.NodeToNode (NodeToNodeVersionData (..))
 import           Ouroboros.Network.Subscription.Dns
 
 import           Ouroboros.Consensus.Node (NodeKernel (getChainDB),
@@ -209,8 +207,7 @@ handleSimpleNode
           , rnaDnsProducers            = dnsProducers
           , rnaHandshakeTracer         = nullTracer
           , rnaHandshakeLocalTracer    = nullTracer
-          , rnaNodeToNodeVersionData   = NodeToNodeVersionData 1
-          , rnaNodeToClientVersionData = NodeToClientVersionData 1
+          , rnaNetworkMagic            = Consensus.protocolNetworkMagic cfg
           }
 
         producerSubscription :: RemoteAddress -> DnsSubscriptionTarget

diff --git a/cardano-node/src/Cardano/Wallet/Client.hs b/cardano-node/src/Cardano/Wallet/Client.hs
@@ -112,7 +112,7 @@ localInitiatorNetworkApplication
 localInitiatorNetworkApplication Proxy chainSyncTracer localTxSubmissionTracer pInfoConfig =
     simpleSingletonVersions
       NodeToClientV_1
-      (NodeToClientVersionData { networkMagic = 0 })
+      (NodeToClientVersionData { networkMagic = protocolNetworkMagic pInfoConfig })
       (DictVersion nodeToClientCodecCBORTerm)
 
   $ OuroborosInitiatorApplication $ \peer ptcl -> case ptcl of