move protocol out of the consensus calss and in to the consensus factory (#128)

dangershony · web-flow · commit 2e4816b077ae · 2020-05-24T02:25:00.000+01:00
diff --git a/src/Blockcore/BlockPulling/BlockPuller.cs b/src/Blockcore/BlockPulling/BlockPuller.cs
@@ -225,7 +225,7 @@ public BlockPuller(IChainState chainState, NodeSettings nodeSettings, IDateTimeP
 
             this.networkPeerRequirement = new NetworkPeerRequirement
             {
-                MinVersion = nodeSettings.MinProtocolVersion ?? nodeSettings.Network.Consensus.ConsensusProtocol.ProtocolVersion,
+                MinVersion = nodeSettings.MinProtocolVersion ?? nodeSettings.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion,
                 RequiredServices = NetworkPeerServices.Network
             };
 
diff --git a/src/Blockcore/Configuration/NodeSettings.cs b/src/Blockcore/Configuration/NodeSettings.cs
@@ -135,7 +135,7 @@ public NodeSettings(Network network = null, string agent = "Blockcore",
             // Log arguments.
             this.Logger.LogDebug("Arguments: network='{0}', protocolVersion='{1}', agent='{2}', args='{3}'.",
                 this.Network == null ? "(None)" : this.Network.Name,
-                this.Network?.Consensus.ConsensusProtocol.ProtocolVersion,
+                this.Network?.Consensus.ConsensusFactory.Protocol.ProtocolVersion,
                 this.Agent,
                 args == null ? "(None)" : string.Join(" ", args));
 
diff --git a/src/Blockcore/Connection/ConnectionManager.cs b/src/Blockcore/Connection/ConnectionManager.cs
@@ -134,7 +134,7 @@ public ConnectionManager(IDateTimeProvider dateTimeProvider,
 
             this.Parameters.UserAgent = $"{this.ConnectionSettings.Agent}:{versionProvider.GetVersion()}";
 
-            this.Parameters.Version = this.NodeSettings.Network.Consensus.ConsensusProtocol.ProtocolVersion;
+            this.Parameters.Version = this.NodeSettings.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion;
 
             nodeStats.RegisterStats(this.AddComponentStats, StatsType.Component, this.GetType().Name, 1100);
         }
diff --git a/src/Blockcore/Controllers/NodeController.cs b/src/Blockcore/Controllers/NodeController.cs
@@ -141,7 +141,7 @@ public IActionResult Status()
             var model = new StatusModel
             {
                 Version = this.fullNode.Version?.ToString() ?? "0",
-                ProtocolVersion = (uint)(this.nodeSettings.Network.Consensus.ConsensusProtocol.ProtocolVersion),
+                ProtocolVersion = (uint)(this.nodeSettings.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion),
                 Difficulty = GetNetworkDifficulty(this.networkDifficulty)?.Difficulty ?? 0,
                 Agent = this.connectionManager.ConnectionSettings.Agent,
                 ExternalAddress = this.selfEndpointTracker.MyExternalAddress.Address.ToString(),
diff --git a/src/Blockcore/P2P/PeerConnector.cs b/src/Blockcore/P2P/PeerConnector.cs
@@ -125,7 +125,7 @@ protected PeerConnector(
             this.PeerAddressManager = peerAddressManager;
             this.networkPeerDisposer = new NetworkPeerDisposer(this.loggerFactory, this.asyncProvider, this.OnPeerDisposed);
             this.selfEndpointTracker = selfEndpointTracker;
-            this.Requirements = new NetworkPeerRequirement { MinVersion = nodeSettings.MinProtocolVersion ?? nodeSettings.Network.Consensus.ConsensusProtocol.ProtocolVersion };
+            this.Requirements = new NetworkPeerRequirement { MinVersion = nodeSettings.MinProtocolVersion ?? nodeSettings.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion };
 
             this.connectionInterval = this.CalculateConnectionInterval();
         }
diff --git a/src/External/NBitcoin/Consensus.cs b/src/External/NBitcoin/Consensus.cs
@@ -98,12 +98,8 @@ public class Consensus : IConsensus
         /// <inheritdoc />
         public List<Type> MempoolRules { get; set; }
 
-        /// <inheritdoc />
-        public ConsensusProtocol ConsensusProtocol { get; }
-
         public Consensus(
             ConsensusFactory consensusFactory,
-            ConsensusProtocol consensusProtocol,
             ConsensusOptions consensusOptions,
             int coinType,
             uint256 hashGenesisBlock,
@@ -170,11 +166,6 @@ public Consensus(
             this.ConsensusRules = new ConsensusRules();
             this.MempoolRules = new List<Type>();
             this.ProofOfStakeTimestampMask = proofOfStakeTimestampMask;
-            this.ConsensusProtocol = consensusProtocol;
-
-            // this is a small hack to allow acess to protocol verison
-            // form serialization code.
-            this.ConsensusFactory.Protocol = this.ConsensusProtocol;
         }
     }
 }
diff --git a/src/External/NBitcoin/ConsensusFactory.cs b/src/External/NBitcoin/ConsensusFactory.cs
@@ -131,7 +131,7 @@ public virtual Transaction CreateTransaction(byte[] bytes)
 
     public class ConsensusProtocol
     {
-        public uint ProtocolVersion { get; set; } = Protocol.ProtocolVersion.WITNESS_VERSION;
+        public uint ProtocolVersion { get; set; } = Protocol.ProtocolVersion.FEEFILTER_VERSION;
 
         public uint MinProtocolVersion { get; set; } = Protocol.ProtocolVersion.SENDHEADERS_VERSION;
     }
diff --git a/src/External/NBitcoin/IConsensus.cs b/src/External/NBitcoin/IConsensus.cs
@@ -145,10 +145,5 @@ public interface IConsensus
 
         /// <summary>Group of mempool validation rules used by the given network.</summary>
         List<Type> MempoolRules { get; set; }
-
-        /// <summary>
-        /// Information about the consensus protocol.
-        /// </summary>
-        ConsensusProtocol ConsensusProtocol { get; }
     }
 }
diff --git a/src/Features/Blockcore.Features.PoA/PoANetwork.cs b/src/Features/Blockcore.Features.PoA/PoANetwork.cs
@@ -105,15 +105,14 @@ public PoANetwork()
 
             var bip9Deployments = new NoBIP9Deployments();
 
-            ConsensusProtocol consensusProtocol = new ConsensusProtocol()
+            consensusFactory.Protocol = new ConsensusProtocol()
             {
-                ProtocolVersion = (uint)ProtocolVersion.PROVEN_HEADER_VERSION,
-                MinProtocolVersion = (uint)ProtocolVersion.POS_PROTOCOL_VERSION,
+                ProtocolVersion = ProtocolVersion.PROVEN_HEADER_VERSION,
+                MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
             };
 
             this.Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: consensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: 105,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Features/Blockcore.Features.RPC/Controllers/FullNodeController.cs b/src/Features/Blockcore.Features.RPC/Controllers/FullNodeController.cs
@@ -259,7 +259,7 @@ public GetInfoModel GetInfo()
             var model = new GetInfoModel
             {
                 Version = this.FullNode?.Version?.ToUint() ?? 0,
-                ProtocolVersion = this.Network.Consensus.ConsensusProtocol.ProtocolVersion,
+                ProtocolVersion = this.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion,
                 Blocks = this.ChainState?.ConsensusTip?.Height ?? 0,
                 TimeOffset = this.ConnectionManager?.ConnectedPeers?.GetMedianTimeOffset() ?? 0,
                 Connections = this.ConnectionManager?.ConnectedPeers?.Count(),
@@ -429,7 +429,7 @@ public NetworkInfoModel GetNetworkInfo()
             {
                 Version = this.FullNode?.Version?.ToUint() ?? 0,
                 SubVersion = this.Settings?.Agent,
-                ProtocolVersion = this.Network.Consensus.ConsensusProtocol.ProtocolVersion,
+                ProtocolVersion = this.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion,
                 IsLocalRelay = this.ConnectionManager?.Parameters?.IsRelay ?? false,
                 TimeOffset = this.ConnectionManager?.ConnectedPeers?.GetMedianTimeOffset() ?? 0,
                 Connections = this.ConnectionManager?.ConnectedPeers?.Count(),
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinMain.cs b/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinMain.cs
@@ -67,15 +67,14 @@ public BitcoinMain()
                 [BitcoinBIP9Deployments.Segwit] = new BIP9DeploymentsParameters("Segwit", 1, 1479168000, 1510704000, BIP9DeploymentsParameters.DefaultMainnetThreshold)
             };
 
-            ConsensusProtocol consensusProtocol = new ConsensusProtocol()
+            consensusFactory.Protocol = new ConsensusProtocol()
             {
                 ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
                 MinProtocolVersion = ProtocolVersion.SENDHEADERS_VERSION,
             };
 
             this.Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: consensusProtocol,
                 consensusOptions: new ConsensusOptions(), // Default - set to Bitcoin params.
                 coinType: 0,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinRegTest.cs b/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinRegTest.cs
@@ -50,9 +50,14 @@ public BitcoinRegTest()
                 [BitcoinBIP9Deployments.Segwit] = new BIP9DeploymentsParameters("Segwit", 1, BIP9DeploymentsParameters.AlwaysActive, 999999999, BIP9DeploymentsParameters.AlwaysActive)
             };
 
+            consensusFactory.Protocol = new ConsensusProtocol()
+            {
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
+                MinProtocolVersion = ProtocolVersion.SENDHEADERS_VERSION,
+            };
+
             this.Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: this.Consensus.ConsensusProtocol,
                 consensusOptions: new ConsensusOptions(), // Default - set to Bitcoin params.
                 coinType: 0,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinTest.cs b/src/Networks/Bitcoin/Blockcore.Networks.Bitcoin/BitcoinTest.cs
@@ -51,9 +51,14 @@ public BitcoinTest()
                 [BitcoinBIP9Deployments.Segwit] = new BIP9DeploymentsParameters("Segwit", 1, 1462060800, 1493596800, BIP9DeploymentsParameters.DefaultTestnetThreshold)
             };
 
+            consensusFactory.Protocol = new ConsensusProtocol()
+            {
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
+                MinProtocolVersion = ProtocolVersion.SENDHEADERS_VERSION,
+            };
+
             this.Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: this.Consensus.ConsensusProtocol,
                 consensusOptions: new ConsensusOptions(), // Default - set to Bitcoin params.
                 coinType: 1,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/City/City/Networks/CityMain.cs b/src/Networks/City/City/Networks/CityMain.cs
@@ -82,15 +82,14 @@ public CityMain()
                 [BuriedDeployments.BIP66] = 0
             };
 
-            ConsensusProtocol consensusProtocol = new ConsensusProtocol()
+            consensusFactory.Protocol = new ConsensusProtocol()
             {
-                ProtocolVersion = ProtocolVersion.PROVEN_HEADER_VERSION,
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
                 MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
             };
 
             Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: consensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: setup.CoinType,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/City/City/Networks/CityRegTest.cs b/src/Networks/City/City/Networks/CityRegTest.cs
@@ -7,6 +7,7 @@
 using NBitcoin;
 using NBitcoin.BouncyCastle.Math;
 using NBitcoin.DataEncoders;
+using NBitcoin.Protocol;
 
 namespace City.Networks
 {
@@ -64,9 +65,14 @@ public CityRegTest()
                 [BuriedDeployments.BIP66] = 0
             };
 
+            consensusFactory.Protocol = new ConsensusProtocol()
+            {
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
+                MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
+            };
+
             Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: this.Consensus.ConsensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: setup.CoinType,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/City/City/Networks/CityTest.cs b/src/Networks/City/City/Networks/CityTest.cs
@@ -7,6 +7,7 @@
 using NBitcoin;
 using NBitcoin.BouncyCastle.Math;
 using NBitcoin.DataEncoders;
+using NBitcoin.Protocol;
 
 namespace City.Networks
 {
@@ -64,9 +65,14 @@ public CityTest()
                 [BuriedDeployments.BIP66] = 0
             };
 
+            consensusFactory.Protocol = new ConsensusProtocol()
+            {
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
+                MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
+            };
+
             Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: this.Consensus.ConsensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: setup.CoinType,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisMain.cs b/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisMain.cs
@@ -112,15 +112,14 @@ public StratisMain()
                     BIP9DeploymentsParameters.DefaultMainnetThreshold)
             };
 
-            ConsensusProtocol consensusProtocol = new ConsensusProtocol()
+            consensusFactory.Protocol = new ConsensusProtocol()
             {
-                ProtocolVersion = ProtocolVersion.PROVEN_HEADER_VERSION,
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
                 MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
             };
 
             this.Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: consensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: 105,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisRegTest.cs b/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisRegTest.cs
@@ -76,9 +76,14 @@ public StratisRegTest()
                 [StratisBIP9Deployments.ColdStaking] = new BIP9DeploymentsParameters("ColdStaking", 2, BIP9DeploymentsParameters.AlwaysActive, 999999999, BIP9DeploymentsParameters.AlwaysActive),
             };
 
+            consensusFactory.Protocol = new ConsensusProtocol()
+            {
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
+                MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
+            };
+
             this.Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: this.Consensus.ConsensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: 105,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisTest.cs b/src/Networks/Stratis/Blockcore.Networks.Stratis/StratisTest.cs
@@ -94,9 +94,14 @@ public StratisTest()
                     BIP9DeploymentsParameters.DefaultTestnetThreshold)
             };
 
+            consensusFactory.Protocol = new ConsensusProtocol()
+            {
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
+                MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
+            };
+
             this.Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: this.Consensus.ConsensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: 105,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/Xds/Blockcore.Networks.Xds/XdsMain.cs b/src/Networks/Xds/Blockcore.Networks.Xds/XdsMain.cs
@@ -79,15 +79,14 @@ public XdsMain()
                 [XdsBIP9Deployments.Segwit] = new BIP9DeploymentsParameters("Segwit", 1, BIP9DeploymentsParameters.AlwaysActive, 999999999, BIP9DeploymentsParameters.AlwaysActive)
             };
 
-            ConsensusProtocol consensusProtocol = new ConsensusProtocol()
+            consensusFactory.Protocol = new ConsensusProtocol()
             {
-                ProtocolVersion = (uint)ProtocolVersion.PROVEN_HEADER_VERSION,
-                MinProtocolVersion = (uint)ProtocolVersion.POS_PROTOCOL_VERSION,
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
+                MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
             };
 
             this.Consensus = new NBitcoin.Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: consensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: (int)this.GenesisNonce,
                 hashGenesisBlock: this.Genesis.GetHash(),
diff --git a/src/Networks/x42/x42/Networks/Consensus/x42Consensus.cs b/src/Networks/x42/x42/Networks/Consensus/x42Consensus.cs
@@ -154,12 +154,8 @@ public class x42Consensus : IConsensus
         /// <inheritdoc />
         public Money LastProofOfStakeRewardHeight { get; }
 
-        /// <inheritdoc />
-        public ConsensusProtocol ConsensusProtocol { get; }
-
         public x42Consensus(
             ConsensusFactory consensusFactory,
-            ConsensusProtocol consensusProtocol,
             ConsensusOptions consensusOptions,
             int coinType,
             uint256 hashGenesisBlock,
@@ -233,7 +229,6 @@ uint proofOfStakeTimestampMask
             this.MempoolRules = new List<Type>();
             this.PosEmptyCoinbase = posEmptyCoinbase;
             this.ProofOfStakeTimestampMask = proofOfStakeTimestampMask;
-            this.ConsensusProtocol = consensusProtocol;
         }
     }
 }
diff --git a/src/Networks/x42/x42/Networks/x42Main.cs b/src/Networks/x42/x42/Networks/x42Main.cs
@@ -88,15 +88,14 @@ public x42Main()
                 [x42BIP9Deployments.Segwit] = new BIP9DeploymentsParameters("Segwit", 1, new DateTime(2020, 3, 1, 0, 0, 0, DateTimeKind.Utc), new DateTime(2021, 3, 1, 0, 0, 0, DateTimeKind.Utc), BIP9DeploymentsParameters.DefaultMainnetThreshold)
             };
 
-            ConsensusProtocol consensusProtocol = new ConsensusProtocol()
+            consensusFactory.Protocol = new ConsensusProtocol()
             {
-                ProtocolVersion = ProtocolVersion.PROVEN_HEADER_VERSION,
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
                 MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
             };
 
             this.Consensus = new x42Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: consensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: setup.CoinType,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/x42/x42/Networks/x42RegTest.cs b/src/Networks/x42/x42/Networks/x42RegTest.cs
@@ -7,6 +7,7 @@
 using NBitcoin;
 using NBitcoin.BouncyCastle.Math;
 using NBitcoin.DataEncoders;
+using NBitcoin.Protocol;
 
 namespace x42.Networks
 {
@@ -64,9 +65,14 @@ public x42RegTest()
                 [BuriedDeployments.BIP66] = 0
             };
 
+            consensusFactory.Protocol = new ConsensusProtocol()
+            {
+                ProtocolVersion = ProtocolVersion.FEEFILTER_VERSION,
+                MinProtocolVersion = ProtocolVersion.POS_PROTOCOL_VERSION,
+            };
+
             this.Consensus = new x42Consensus(
                 consensusFactory: consensusFactory,
-                consensusProtocol: this.Consensus.ConsensusProtocol,
                 consensusOptions: consensusOptions,
                 coinType: setup.CoinType,
                 hashGenesisBlock: genesisBlock.GetHash(),
diff --git a/src/Networks/x42/x42/Networks/x42Test.cs b/src/Networks/x42/x42/Networks/x42Test.cs
diff --git a/src/Tests/Blockcore.Features.RPC.Tests/Controller/FullNodeControllerTest.cs b/src/Tests/Blockcore.Features.RPC.Tests/Controller/FullNodeControllerTest.cs
diff --git a/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs b/src/Tests/Blockcore.IntegrationTests/API/ApiSteps.cs
diff --git a/src/Tests/Blockcore.IntegrationTests/RPC/GetInfoActionTests.cs b/src/Tests/Blockcore.IntegrationTests/RPC/GetInfoActionTests.cs

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ public BlockPuller(IChainState chainState, NodeSettings nodeSettings, IDateTimeP`
`225`	`225`
`226`	`226`	`this.networkPeerRequirement = new NetworkPeerRequirement`
`227`	`227`	`{`
`228`		`- MinVersion = nodeSettings.MinProtocolVersion ?? nodeSettings.Network.Consensus.ConsensusProtocol.ProtocolVersion,`
	`228`	`+ MinVersion = nodeSettings.MinProtocolVersion ?? nodeSettings.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion,`
`229`	`229`	`RequiredServices = NetworkPeerServices.Network`
`230`	`230`	`};`
`231`	`231`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public ConnectionManager(IDateTimeProvider dateTimeProvider,`
`134`	`134`
`135`	`135`	`this.Parameters.UserAgent = $"{this.ConnectionSettings.Agent}:{versionProvider.GetVersion()}";`
`136`	`136`
`137`		`- this.Parameters.Version = this.NodeSettings.Network.Consensus.ConsensusProtocol.ProtocolVersion;`
	`137`	`+ this.Parameters.Version = this.NodeSettings.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion;`
`138`	`138`
`139`	`139`	`nodeStats.RegisterStats(this.AddComponentStats, StatsType.Component, this.GetType().Name, 1100);`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public IActionResult Status()`
`141`	`141`	`var model = new StatusModel`
`142`	`142`	`{`
`143`	`143`	`Version = this.fullNode.Version?.ToString() ?? "0",`
`144`		`- ProtocolVersion = (uint)(this.nodeSettings.Network.Consensus.ConsensusProtocol.ProtocolVersion),`
	`144`	`+ ProtocolVersion = (uint)(this.nodeSettings.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion),`
`145`	`145`	`Difficulty = GetNetworkDifficulty(this.networkDifficulty)?.Difficulty ?? 0,`
`146`	`146`	`Agent = this.connectionManager.ConnectionSettings.Agent,`
`147`	`147`	`ExternalAddress = this.selfEndpointTracker.MyExternalAddress.Address.ToString(),`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ protected PeerConnector(`
`125`	`125`	`this.PeerAddressManager = peerAddressManager;`
`126`	`126`	`this.networkPeerDisposer = new NetworkPeerDisposer(this.loggerFactory, this.asyncProvider, this.OnPeerDisposed);`
`127`	`127`	`this.selfEndpointTracker = selfEndpointTracker;`
`128`		`- this.Requirements = new NetworkPeerRequirement { MinVersion = nodeSettings.MinProtocolVersion ?? nodeSettings.Network.Consensus.ConsensusProtocol.ProtocolVersion };`
	`128`	`+ this.Requirements = new NetworkPeerRequirement { MinVersion = nodeSettings.MinProtocolVersion ?? nodeSettings.Network.Consensus.ConsensusFactory.Protocol.ProtocolVersion };`
`129`	`129`
`130`	`130`	`this.connectionInterval = this.CalculateConnectionInterval();`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public virtual Transaction CreateTransaction(byte[] bytes)`
`131`	`131`
`132`	`132`	`public class ConsensusProtocol`
`133`	`133`	`{`
`134`		`- public uint ProtocolVersion { get; set; } = Protocol.ProtocolVersion.WITNESS_VERSION;`
	`134`	`+ public uint ProtocolVersion { get; set; } = Protocol.ProtocolVersion.FEEFILTER_VERSION;`
`135`	`135`
`136`	`136`	`public uint MinProtocolVersion { get; set; } = Protocol.ProtocolVersion.SENDHEADERS_VERSION;`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,10 +145,5 @@ public interface IConsensus`
`145`	`145`
`146`	`146`	`/// <summary>Group of mempool validation rules used by the given network.</summary>`
`147`	`147`	`List<Type> MempoolRules { get; set; }`
`148`		`-`
`149`		`- /// <summary>`
`150`		`- /// Information about the consensus protocol.`
`151`		`- /// </summary>`
`152`		`- ConsensusProtocol ConsensusProtocol { get; }`
`153`	`148`	`}`
`154`	`149`	`}`