Allow override of CreatePayload

NBitcoin/ConsensusFactory.cs

@@ -79,6 +79,50 @@ public bool TryCreateNew<T>(out T result) where T : IBitcoinSerializable
 			return success;
 		}
 
+		public virtual Payload CreatePayload(string command)
+		{
+			return command switch
+			{
+				"inv" => new InvPayload(),
+				"tx" => new TxPayload(),
+				"getdata" => new GetDataPayload(),
+				"headers" => new HeadersPayload(),
+				"block" => new BlockPayload(),
+#if !NOSOCKET
+				"addr" => new AddrPayload(),
+				"addrv2" => new AddrV2Payload(),
+				"version" => new VersionPayload(),
+#endif
+				"ping" => new PingPayload(),
+				"pong" => new PongPayload(),
+				"getaddr" => new GetAddrPayload(),
+				"blocktxn" => new BlockTxnPayload(),
+				"cmpctblock" => new CmpctBlockPayload(),
+				"cfilter" => new CompactFilterPayload(),
+				"cfcheckpt" => new CompactFilterCheckPointPayload(),
+				"cfheaders" => new CompactFilterHeadersPayload(),
+				"feefilter" => new FeeFilterPayload(),
+				"filteradd" => new FilterAddPayload(),
+				"filterload" => new FilterLoadPayload(),
+				"getblocktxn" => new GetBlockTxnPayload(),
+				"getblocks" => new GetBlocksPayload(),
+				"getcfilters" => new GetCompactFiltersPayload(),
+				"getcfheaders" => new GetCompactFilterHeadersPayload(),
+				"getcfcheckpt" => new GetCompactFilterCheckPointPayload(),
+				"getheaders" => new GetHeadersPayload(),
+				"havewitness" => new HaveWitnessPayload(),
+				"mempool" => new MempoolPayload(),
+				"merkleblock" => new MerkleBlockPayload(),
+				"sendaddrv2" => new SendAddrV2Payload(),
+				"sendcmpct" => new SendCmpctPayload(),
+				"sendheaders" => new SendHeadersPayload(),
+				"utxos" => new UTxOutputPayload(),
+				"verack" => new VerAckPayload(),
+				"wtxidrelay" => new WTxIdRelayPayload(),
+				_ => new UnknownPayload(command)
+			};
+		}
+
 		public virtual ProtocolCapabilities GetProtocolCapabilities(uint protocolVersion)
 		{
 			return new ProtocolCapabilities()

NBitcoin/Protocol/BitcoinSerializablePayload.cs

@@ -6,7 +6,7 @@
 
 namespace NBitcoin.Protocol
 {
-	public class BitcoinSerializablePayload<T> : Payload where T : IBitcoinSerializable, new()
+	public abstract class BitcoinSerializablePayload<T> : Payload where T : IBitcoinSerializable, new()
 	{
 		public BitcoinSerializablePayload()
 		{

NBitcoin/Protocol/Message.cs

@@ -72,7 +72,6 @@ public bool IfPayloadIs<TPayload>(Action<TPayload> action) where TPayload : Payl
 		// We use this for big blocks, because the default array pool would allocate a new array. We do not need lot's of bucket such arrays are short lived.
 		readonly static Lazy<ArrayPool<byte>> BigArrayPool = new Lazy<ArrayPool<byte>>(() => ArrayPool<byte>.Create(0x02000000, 5), false);
 		ArrayPool<byte> GetArrayPool(int size) => size < 1_048_576 ? ArrayPool<byte>.Shared : BigArrayPool.Value;
-
 		public void ReadWrite(BitcoinStream stream)
 		{
 			if (Payload == null && stream.Serializing)
@@ -130,7 +129,7 @@ public void ReadWrite(BitcoinStream stream)
 					BitcoinStream payloadStream = new BitcoinStream(new MemoryStream(payloadBytes, 0, length, false), false);
 					payloadStream.CopyParameters(stream);
 
-					var payload = PayloadFactory.Instance.Create(Command);
+					var payload = stream.ConsensusFactory.CreatePayload(Command);
 					if (payload is UnknownPayload)
 						Logs.NodeServer.LogWarning("Unknown command received {command}", Command);
 

NBitcoin/Protocol/Payload.cs

@@ -6,14 +6,14 @@
 
 namespace NBitcoin.Protocol
 {
-	public class Payload : IBitcoinSerializable
+	/// <summary>
+	/// A P2P Bitcoin payload
+	/// </summary>
+	public abstract class Payload : IBitcoinSerializable
 	{
-		public virtual string Command
+		public abstract string Command
 		{
-			get
-			{
-				return PayloadFactory.Instance.GetCommand(this);
-			}
+			get;
 		}
 
 		#region IBitcoinSerializable Members
@@ -34,7 +34,7 @@ public virtual void ReadWriteCore(BitcoinStream stream)
 
 		public override string ToString()
 		{
-			return this.GetType().Name;
+			return Command;
 		}
 	}
 }

NBitcoin/Protocol/Payloads/AddrPayload.cs

@@ -13,6 +13,7 @@ namespace NBitcoin.Protocol
 
 	public class AddrPayload : Payload, IBitcoinSerializable
 	{
+		public override string Command => "addr";
 		NetworkAddress[] addr_list = new NetworkAddress[0];
 		public NetworkAddress[] Addresses
 		{
@@ -56,6 +57,7 @@ public override string ToString()
 
 	public class AddrV2Payload : AddrPayload
 	{
+		public override string Command => "addrv2";
 		public AddrV2Payload()
 			: base()
 		{
@@ -79,4 +81,4 @@ public override void ReadWriteCore(BitcoinStream stream)
 		}
 	}
 }
-#endif
+#endif

NBitcoin/Protocol/Payloads/BlockPayload.cs

@@ -12,6 +12,7 @@ namespace NBitcoin.Protocol
 
 	public class BlockPayload : BitcoinSerializablePayload<Block>
 	{
+		public override string Command => "block";
 		public BlockPayload()
 		{
 

NBitcoin/Protocol/Payloads/BlockTxnPayload.cs

@@ -9,6 +9,7 @@ namespace NBitcoin.Protocol
 
 	public class BlockTxnPayload : Payload
 	{
+		public override string Command => "blocktxn";
 
 		uint256 _BlockId;
 		public uint256 BlockId

NBitcoin/Protocol/Payloads/CmpctBlockPayload.cs

@@ -11,6 +11,7 @@ namespace NBitcoin.Protocol
 
 	public class CmpctBlockPayload : Payload
 	{
+		public override string Command => "cmpctblock";
 		public CmpctBlockPayload()
 		{
 

NBitcoin/Protocol/Payloads/CompactFilterPayload.cs

@@ -9,6 +9,7 @@ namespace NBitcoin.Protocol
 
 	public class CompactFilterPayload : Payload
 	{
+		public override string Command => "cfilter";
 		private byte _FilterType = (byte)FilterType.Basic;
 		private byte[] _FilterBytes;
 		private uint256 _BlockHash = new uint256();
@@ -61,6 +62,7 @@ public CompactFilterPayload()
 
 	public class CompactFilterCheckPointPayload : Payload
 	{
+		public override string Command => "cfcheckpt";
 		protected byte _FilterType = (byte)FilterType.Basic;
 		protected uint256 _StopHash = uint256.Zero;
 		protected List<uint256> _FilterHeaders = new List<uint256>();
@@ -112,6 +114,7 @@ public override void ReadWriteCore(BitcoinStream stream)
 
 	public class CompactFilterHeadersPayload: CompactFilterCheckPointPayload
 	{
+		public override string Command => "cfheaders";
 		private uint256 _PreviousFilterHeader = uint256.Zero;
 
 		public override void ReadWriteCore(BitcoinStream stream)

NBitcoin/Protocol/Payloads/FeeFilterPayload.cs

@@ -6,6 +6,7 @@ namespace NBitcoin.Protocol
 
 	public class FeeFilterPayload : Payload
 	{
+		public override string Command => "feefilter";
 		public FeeFilterPayload()
 		{
 			_feeRate = FeeRate.Zero;

NBitcoin/Protocol/Payloads/FilterAddPayload.cs

@@ -9,6 +9,7 @@ namespace NBitcoin.Protocol
 
 	public class FilterAddPayload : Payload
 	{
+		public override string Command => "filteradd";
 		public FilterAddPayload()
 		{
 

NBitcoin/Protocol/Payloads/FilterLoadPayload.cs

@@ -12,6 +12,7 @@ namespace NBitcoin.Protocol
 
 	public class FilterLoadPayload : BitcoinSerializablePayload<BloomFilter>
 	{
+		public override string Command => "filterload";
 		public FilterLoadPayload()
 		{
 

NBitcoin/Protocol/Payloads/GetAddrPayload.cs

@@ -12,5 +12,6 @@ namespace NBitcoin.Protocol
 
 	public class GetAddrPayload : Payload
 	{
+		public override string Command => "getaddr";
 	}
 }

NBitcoin/Protocol/Payloads/GetBlockTxnPayload.cs

@@ -9,6 +9,7 @@ namespace NBitcoin.Protocol
 
 	public class GetBlockTxnPayload : Payload
 	{
+		public override string Command => "getblocktxn";
 
 		uint256 _BlockId = uint256.Zero;
 		public uint256 BlockId

NBitcoin/Protocol/Payloads/GetBlocksPayload.cs

@@ -12,6 +12,7 @@ namespace NBitcoin.Protocol
 
 	public class GetBlocksPayload : Payload
 	{
+		public override string Command => "getblocks";
 		public GetBlocksPayload(BlockLocator locator)
 		{
 			BlockLocators = locator;

NBitcoin/Protocol/Payloads/GetCompactFiltersPayload.cs

@@ -65,6 +65,7 @@ public override void ReadWriteCore(BitcoinStream stream)
 
 	public class GetCompactFiltersPayload : CompactFiltersQueryPayload
 	{
+		public override string Command => "getcfilters";
 		public GetCompactFiltersPayload(FilterType filterType, uint startHeight, uint256 stopHash)
 			: base(filterType, startHeight, stopHash)
 		{
@@ -79,6 +80,7 @@ public GetCompactFiltersPayload() { }
 
 	public class GetCompactFilterHeadersPayload : CompactFiltersQueryPayload
 	{
+		public override string Command => "getcfheaders";
 		public GetCompactFilterHeadersPayload(FilterType filterType, uint startHeight, uint256 stopHash)
 			: base(filterType, startHeight, stopHash)
 		{
@@ -90,6 +92,7 @@ public GetCompactFilterHeadersPayload() { }
 
 	public class GetCompactFilterCheckPointPayload : Payload
 	{
+		public override string Command => "getcfcheckpt";
 		private byte _FilterType;
 		private uint256 _StopHash;
 

NBitcoin/Protocol/Payloads/GetDataPayload.cs

@@ -12,6 +12,7 @@ namespace NBitcoin.Protocol
 
 	public class GetDataPayload : Payload
 	{
+		public override string Command => "getdata";
 		public GetDataPayload()
 		{
 		}

NBitcoin/Protocol/Payloads/GetHeadersPayload.cs

@@ -12,6 +12,7 @@ namespace NBitcoin.Protocol
 
 	public class GetHeadersPayload : Payload
 	{
+		public override string Command => "getheaders";
 		public GetHeadersPayload()
 		{
 

NBitcoin/Protocol/Payloads/HaveWitnessPayload.cs

@@ -9,6 +9,7 @@ namespace NBitcoin.Protocol
 
 	public class HaveWitnessPayload : Payload
 	{
+		public override string Command => "havewitness";
 		public HaveWitnessPayload()
 		{
 

NBitcoin/Protocol/Payloads/HeadersPayload.cs

@@ -13,6 +13,7 @@ namespace NBitcoin.Protocol
 
 	public class HeadersPayload : Payload
 	{
+		public override string Command => "headers";
 		class BlockHeaderWithTxCount : IBitcoinSerializable
 		{
 			public BlockHeaderWithTxCount()

NBitcoin/Protocol/Payloads/InvPayload.cs

@@ -12,6 +12,7 @@ namespace NBitcoin.Protocol
 
 	public class InvPayload : Payload, IBitcoinSerializable, IEnumerable<InventoryVector>
 	{
+		public override string Command => "inv";
 		public InvPayload()
 		{
 

NBitcoin/Protocol/Payloads/MempoolPayload.cs

@@ -12,5 +12,6 @@ namespace NBitcoin.Protocol
 
 	public class MempoolPayload : Payload
 	{
+		public override string Command => "mempool";
 	}
 }