Merge pull request stratisproject#262 from fassadlr/channelnetwork

[Channels] Subclass Network and create FeeNetwork / ChannelNetwork

src/NBitcoin.Tests/pos_transaction_tests.cs

@@ -1715,7 +1715,7 @@ private static StandardTransactionPolicy RelayPolicy(Network network)
             {
                 MaxTransactionSize = null,
                 MaxTxFee = null,
-                MinRelayTxFee = new FeeRate(Money.Satoshis(network.MinRelayTxFee)),
+                MinRelayTxFee = new FeeRate(Money.Satoshis(((FeeNetwork)network).MinRelayTxFee)),
                 ScriptVerify = ScriptVerify.Standard & ~ScriptVerify.LowS
             };
         }

src/NBitcoin/FeeNetwork.cs

@@ -0,0 +1,33 @@
+namespace NBitcoin
+{
+    public class FeeNetwork : Network
+    {
+        /// <summary>
+        /// Mininum fee rate for all transactions.
+        /// Fees smaller than this are considered zero fee for transaction creation.
+        /// Be careful setting this: if you set it to zero then a transaction spammer can cheaply fill blocks using
+        /// 1-satoshi-fee transactions. It should be set above the real cost to you of processing a transaction.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="MinRelayTxFee"/> and <see cref="MinTxFee"/> are typically the same value to prevent dos attacks on the network.
+        /// If <see cref="MinRelayTxFee"/> is less than <see cref="MinTxFee"/>, an attacker can broadcast a lot of transactions with fees between these two values,
+        /// which will lead to transactions filling the mempool without ever being mined.
+        /// </remarks>
+        public long MinTxFee { get; protected set; }
+
+        /// <summary>
+        /// A fee rate that will be used when fee estimation has insufficient data.
+        /// </summary>
+        public long FallbackFee { get; protected set; }
+
+        /// <summary>
+        /// The minimum fee under which transactions may be rejected from being relayed.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="MinRelayTxFee"/> and <see cref="MinTxFee"/> are typically the same value to prevent dos attacks on the network.
+        /// If <see cref="MinRelayTxFee"/> is less than <see cref="MinTxFee"/>, an attacker can broadcast a lot of transactions with fees between these two values,
+        /// which will lead to transactions filling the mempool without ever being mined.
+        /// </remarks>
+        public long MinRelayTxFee { get; protected set; }
+    }
+}

src/NBitcoin/Network.cs

@@ -83,39 +83,6 @@ public abstract class Network
         /// </summary>
         public int MaxTipAge { get; protected set; }
 
-        /// <summary>
-        /// Mininum fee rate for all transactions.
-        /// Fees smaller than this are considered zero fee for transaction creation.
-        /// Be careful setting this: if you set it to zero then a transaction spammer can cheaply fill blocks using
-        /// 1-satoshi-fee transactions. It should be set above the real cost to you of processing a transaction.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="MinRelayTxFee"/> and <see cref="MinTxFee"/> are typically the same value to prevent dos attacks on the network.
-        /// If <see cref="MinRelayTxFee"/> is less than <see cref="MinTxFee"/>, an attacker can broadcast a lot of transactions with fees between these two values,
-        /// which will lead to transactions filling the mempool without ever being mined.
-        /// </remarks>
-        public long MinTxFee { get; protected set; }
-
-        /// <summary>
-        /// A fee rate that will be used when fee estimation has insufficient data.
-        /// </summary>
-        public long FallbackFee { get; protected set; }
-
-        /// <summary>
-        /// The minimum fee under which transactions may be rejected from being relayed.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="MinRelayTxFee"/> and <see cref="MinTxFee"/> are typically the same value to prevent dos attacks on the network.
-        /// If <see cref="MinRelayTxFee"/> is less than <see cref="MinTxFee"/>, an attacker can broadcast a lot of transactions with fees between these two values,
-        /// which will lead to transactions filling the mempool without ever being mined.
-        /// </remarks>
-        public long MinRelayTxFee { get; protected set; }
-
-        /// <summary>
-        /// Port on which to listen for incoming RPC connections.
-        /// </summary>
-        public int DefaultRPCPort { get; protected set; }
-
         /// <summary>
         /// Port on which to listen for incoming API connections.
         /// </summary>
@@ -125,7 +92,7 @@ public abstract class Network
         /// The default port on which nodes of this network communicate with external clients.
         /// </summary>
         public int DefaultPort { get; protected set; }
-        
+
         /// <summary>
         /// The default port on which SignalR broadcasts for this network.
         /// </summary>

src/NBitcoin/Policy/StandardTransactionPolicy.cs

@@ -48,16 +48,16 @@ public class StandardTransactionPolicy : ITransactionPolicy
         /// </summary>
         public bool CheckScriptPubKey { get; set; }
 
-        private readonly Network network;
+        private readonly FeeNetwork network;
 
         public StandardTransactionPolicy(Network network)
         {
-            this.network = network;
+            this.network = (FeeNetwork)network;
             this.ScriptVerify = NBitcoin.ScriptVerify.Standard;
             this.MaxTransactionSize = 100000;
             // TODO: replace fee params with whats in Network.
             this.MaxTxFee = new FeeRate(Money.Coins(0.1m));
-            this.MinRelayTxFee = new FeeRate(Money.Satoshis(network.MinRelayTxFee));
+            this.MinRelayTxFee = new FeeRate(Money.Satoshis(this.network.MinRelayTxFee));
             this.CheckFee = true;
             this.CheckScriptPubKey = true;
         }

src/Stratis.Bitcoin.Features.PoA/PoANetwork.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using NBitcoin;
 using NBitcoin.DataEncoders;
-using Stratis.Bitcoin.Consensus.Rules;
 using Stratis.Bitcoin.Features.Consensus.Rules.CommonRules;
 using Stratis.Bitcoin.Features.MemoryPool.Rules;
 using Stratis.Bitcoin.Features.PoA.BasePoAFeatureConsensusRules;
@@ -21,7 +20,7 @@ namespace Stratis.Bitcoin.Features.PoA
     /// Also feel free to change target spacing, premine height and premine reward.
     /// Don't set target spacing to be less than 10 sec.
     /// </remarks>
-    public class PoANetwork : Network
+    public class PoANetwork : FeeNetwork
     {
         /// <summary> The name of the root folder containing the different PoA blockchains.</summary>
         private const string NetworkRootFolderName = "poa";
@@ -49,7 +48,6 @@ public PoANetwork()
             this.DefaultPort = 16438;
             this.DefaultMaxOutboundConnections = 16;
             this.DefaultMaxInboundConnections = 109;
-            this.DefaultRPCPort = 16474;
             this.DefaultAPIPort = 37221; // TODO: Confirm
             this.MaxTipAge = 2 * 60 * 60;
             this.MinTxFee = 10000;

src/Stratis.Bitcoin.Features.Wallet.Tests/WalletTransactionHandlerTest.cs

@@ -68,7 +68,7 @@ public void BuildTransactionFeeTooLowDefaultsToMinimumFee()
             TransactionBuildContext context = CreateContext(this.Network, testContext.WalletReference, "password", testContext.DestinationKeys.PubKey.ScriptPubKey, new Money(7500), FeeType.Low, 0);
             Transaction transactionResult = testContext.WalletTransactionHandler.BuildTransaction(context);
 
-            Assert.Equal(new Money(this.Network.MinTxFee, MoneyUnit.Satoshi), context.TransactionFee);
+            Assert.Equal(new Money(((FeeNetwork)this.Network).MinTxFee, MoneyUnit.Satoshi), context.TransactionFee);
         }
 
         [Fact]