Merge from Develop

Merge from Develop

Stratis.Bitcoin.Tests/NodeBuilder.cs

@@ -654,7 +654,7 @@ public Block[] Generate(int blockCount, bool includeUnbroadcasted = true, bool b
 		public bool AddToStratisMempool(Transaction trx)
 		{
 			var fullNode = (_Runner as StratisBitcoinRunner).FullNode;
-			var state = new MemepoolValidationState(true);
+			var state = new MempoolValidationState(true);
 
 			return fullNode.MempoolManager.Validator.AcceptToMemoryPool(state, trx).Result;
 		}

Stratis.Bitcoin.Tests/project.json

@@ -4,13 +4,11 @@
     "buildOptions": { "emitEntryPoint": true },
   "dependencies": {
     "Stratis.Bitcoin": "1.0.0-*",
-    "NBitcoin": "3.0.2.4",
+    "NBitcoin": "3.0.2.5",
     "xunit": "2.2.0",
     "dotnet-test-xunit": "1.0.0-rc2-build10025",
-
     // xunit hack https://github.com/xunit/xunit/issues/1015
     "Microsoft.DotNet.InternalAbstractions": "1.0.0"
-
   },
 
     "frameworks": {

Stratis.Bitcoin/BlockStore/BlockStoreSignaled.cs

@@ -11,7 +11,7 @@
 
 namespace Stratis.Bitcoin.BlockStore
 {
-    public class BlockStoreSignaled : SignaleObserver<Block>
+    public class BlockStoreSignaled : SignalObserver<Block>
 	{
 		private readonly BlockStoreLoop storeLoop;
 		private readonly ConcurrentChain chain;

Stratis.Bitcoin/FullNode.cs

@@ -73,23 +73,13 @@ public bool IsInitialBlockDownload()
 			//	return true;
 			if (this.ConsensusLoop.Tip == null)
 				return true;
-			if (this.ConsensusLoop.Tip.ChainWork < MinimumChainWork(this.Args))
+			if (this.ConsensusLoop.Tip.ChainWork < this.Network.Consensus.MinimumChainWork)
 				return true;
 			if (this.ConsensusLoop.Tip.Header.BlockTime.ToUnixTimeSeconds() < (this.DateTimeProvider.GetTime() - this.Args.MaxTipAge))
 				return true;
 			return false;
 		}
 
-		private static uint256 MinimumChainWork(NodeArgs args)
-		{
-			// TODO: move this to Network.Consensus
-			if (args.RegTest)
-				return uint256.Zero;
-			if (args.Testnet)
-				return uint256.Parse("0x0000000000000000000000000000000000000000000000198b4def2baa9338d6");
-			return uint256.Parse("0x0000000000000000000000000000000000000000002cb971dd56d1c583c20f90");
-		}
-
 		List<IDisposable> _Resources = new List<IDisposable>();
 		public void Start()
 		{

Stratis.Bitcoin/MemoryPool/MempoolBehavior.cs

@@ -179,7 +179,7 @@ private async Task ProcessTxPayloadAsync(Node node, TxPayload transactionPayload
 			// add to local filter
 			await this.manager.MempoolScheduler.WriteAsync(() => this.filterInventoryKnown.TryAdd(trxHash, trxHash));
 
-			var state = new MemepoolValidationState(true);
+			var state = new MempoolValidationState(true);
 			if (!await this.orphans.AlreadyHave(trxHash) && await this.validator.AcceptToMemoryPool(state, trx))
 			{
 				await this.validator.SanityCheck();

Stratis.Bitcoin/MemoryPool/MempoolErrors.cs

@@ -9,12 +9,12 @@ namespace Stratis.Bitcoin.MemoryPool
 
 	public class MempoolErrorException : Exception
 	{
-		public MempoolErrorException(MemepoolValidationState state) : base(state.ErrorMessage)
+		public MempoolErrorException(MempoolValidationState state) : base(state.ErrorMessage)
 		{
 			ValidationState = state;
 		}
 
-		public MemepoolValidationState ValidationState
+		public MempoolValidationState ValidationState
 		{
 			get;
 			private set;

Stratis.Bitcoin/MemoryPool/MempoolOrphans.cs

@@ -117,7 +117,7 @@ public async Task ProcessesOrphans(MempoolBehavior behavior, Transaction tx)
 					// Use a dummy CValidationState so someone can't setup nodes to counter-DoS based on orphan
 					// resolution (that is, feeding people an invalid transaction based on LegitTxX in order to get
 					// anyone relaying LegitTxX banned)
-					MemepoolValidationState stateDummy = new MemepoolValidationState(true);
+					MempoolValidationState stateDummy = new MempoolValidationState(true);
 					if (await this.Validator.AcceptToMemoryPool(stateDummy, orphanTx))
 					{
 						Logging.Logs.Mempool.LogInformation($"accepted orphan tx {orphanHash}");

Stratis.Bitcoin/MemoryPool/MempoolSignaled.cs

@@ -10,7 +10,7 @@
 
 namespace Stratis.Bitcoin.MemoryPool
 {
-    public class MempoolSignaled : SignaleObserver<Block>
+    public class MempoolSignaled : SignalObserver<Block>
 	{
 		private readonly MempoolManager manager;
 		private readonly ConcurrentChain chain;

Stratis.Bitcoin/MemoryPool/MempoolValidationContext.cs

@@ -6,13 +6,13 @@
 
 namespace Stratis.Bitcoin.MemoryPool
 {
-	public class MemepoolValidationState
+	public class MempoolValidationState
 	{
-		public MemepoolValidationState(bool limitFree) : this(limitFree, false, Money.Zero)
+		public MempoolValidationState(bool limitFree) : this(limitFree, false, Money.Zero)
 		{
 		}
 
-		public MemepoolValidationState(bool limitFree, bool overrideMempoolLimit, Money absurdFee)
+		public MempoolValidationState(bool limitFree, bool overrideMempoolLimit, Money absurdFee)
 		{
 			this.LimitFree = limitFree;
 			this.AbsurdFee = absurdFee;
@@ -23,28 +23,28 @@ public MemepoolValidationState(bool limitFree, bool overrideMempoolLimit, Money
 
 		public string ErrorMessage { get; set; }
 
-		public MemepoolValidationState Invalid(MempoolError error)
+		public MempoolValidationState Invalid(MempoolError error)
 		{
 			this.Error = error;
 			this.IsInvalid = true;
 			return this;
 		}
 
-		public MemepoolValidationState Invalid(MempoolError error, string errorMessage)
+		public MempoolValidationState Invalid(MempoolError error, string errorMessage)
 		{
 			this.Error = error;
 			this.IsInvalid = true;
 			this.ErrorMessage = errorMessage;
 			return this;
 		}
 
-		public MemepoolValidationState Fail(MempoolError error)
+		public MempoolValidationState Fail(MempoolError error)
 		{
 			this.Error = error;
 			return this;
 		}
 
-		public MemepoolValidationState Fail(MempoolError error, string errorMessage)
+		public MempoolValidationState Fail(MempoolError error, string errorMessage)
 		{
 			this.Error = error;
 			this.ErrorMessage = errorMessage;
@@ -85,7 +85,7 @@ public override string ToString()
 	/// </summary>
 	public class MempoolValidationContext
     {
-		public MemepoolValidationState State { get; }
+		public MempoolValidationState State { get; }
 
 		public List<uint256> SetConflicts { get; set; }
 
@@ -114,7 +114,7 @@ public class MempoolValidationContext
 		public Money ModifiedFees { get; set; }
 		public long SigOpsCost { get; set; }
 
-		public MempoolValidationContext(Transaction transaction, MemepoolValidationState state)
+		public MempoolValidationContext(Transaction transaction, MempoolValidationState state)
 		{
 			this.Transaction = transaction;
 			this.TransactionHash = transaction.GetHash();

Stratis.Bitcoin/MemoryPool/MempoolValidator.cs

@@ -63,7 +63,7 @@ public MempoolValidator(TxMempool memPool, AsyncLock mempoolScheduler,
 			this.PerformanceCounter = new MempoolPerformanceCounter();
 		}
 
-		public async Task<bool> AcceptToMemoryPoolWithTime(MemepoolValidationState state, Transaction tx)
+		public async Task<bool> AcceptToMemoryPoolWithTime(MempoolValidationState state, Transaction tx)
 		{
 			try
 			{
@@ -90,13 +90,13 @@ public async Task<bool> AcceptToMemoryPoolWithTime(MemepoolValidationState state
 			//FlushStateToDisk(stateDummy, FLUSH_STATE_PERIODIC);
 		}
 
-		public Task<bool> AcceptToMemoryPool(MemepoolValidationState state, Transaction tx)
+		public Task<bool> AcceptToMemoryPool(MempoolValidationState state, Transaction tx)
 		{
 			state.AcceptTime = dateTimeProvider.GetTime();
 			return AcceptToMemoryPoolWithTime(state, tx);
 		}
 
-		private async Task AcceptToMemoryPoolWorker(MemepoolValidationState state, Transaction tx, List<uint256> vHashTxnToUncache)
+		private async Task AcceptToMemoryPoolWorker(MempoolValidationState state, Transaction tx, List<uint256> vHashTxnToUncache)
 		{
 			var context = new MempoolValidationContext(tx, state);
 

Stratis.Bitcoin/Signal.cs

@@ -15,7 +15,7 @@ public interface IBroadcast<in T>
 		void Broadcast(T item);
 	}
 
-	public abstract class SignaleObserver<T> : ObserverBase<T>
+	public abstract class SignalObserver<T> : ObserverBase<T>
 	{
 		protected override void OnErrorCore(Exception error)
 		{
@@ -61,15 +61,5 @@ public Signals()
 
 		public Signaler<Block> Blocks { get; }
 		public Signaler<Transaction> Transactions { get; }
-
-		public void Signal(Block block)
-		{
-			this.Blocks.Broadcast(block);
-		}
-
-		public void Signal(Transaction trx)
-		{
-			this.Transactions.Broadcast(trx);
-		}
 	}
 }

Stratis.Bitcoin/project.json

@@ -3,7 +3,7 @@
 
   "dependencies": {
     "System.Reactive": "3.1.1",
-    "DBreeze": "1.82.0",
+    "DBreeze": "1.83.0",
     "Microsoft.AspNetCore.Diagnostics": "1.1.0",
     "Microsoft.AspNetCore.Hosting": "1.1.0",
     "Microsoft.AspNetCore.Mvc.Core": "1.1.1",
@@ -14,7 +14,7 @@
     "Microsoft.Extensions.Logging.Abstractions": "1.1.0",
     "Microsoft.Extensions.Logging.Console": "1.1.0",
     "Microsoft.Extensions.Logging.Filter": "1.1.0",
-    "NBitcoin": "3.0.2.4",
+    "NBitcoin": "3.0.2.5",
     "System.Xml.XmlSerializer": "4.3.0",
     "Microsoft.Extensions.Caching.Memory": "1.1.0"
   },

Stratis.BitcoinD/project.json

@@ -13,7 +13,7 @@
         "Stratis.Bitcoin": "1.0.0-*",
         "Microsoft.Extensions.Logging.Abstractions": "1.1.0",
       "Microsoft.Extensions.Logging.Console": "1.1.0",
-      "NBitcoin": "3.0.2.4"
+      "NBitcoin": "3.0.2.5"
     },
 
   "frameworks": {