Fix some warnings (which appeared after previous commit)

Author: knocte

NBitcoin/BIP174/PartiallySignedTransaction.cs

@@ -108,13 +108,24 @@ public class PSBT : IEquatable<PSBT>
 		public PSBTOutputList Outputs { get; }
 
 		internal UnKnownKVMap unknown = new UnKnownKVMap(BytesComparer.Instance);
+
+		[Obsolete("Use Parse(_,_,RBF)")]
 		public static PSBT Parse(string hexOrBase64, Network network)
+		{
+			return Parse(hexOrBase64, network, false);
+		}
+		[Obsolete("Use Parse(_,_,RBF)")]
+		public static PSBT Parse(string hexOrBase64, ConsensusFactory consensusFactory)
+		{
+			return Parse(hexOrBase64, consensusFactory, false);
+		}
+		public static PSBT Parse(string hexOrBase64, Network network, bool RBF)
 		{
 			if (network == null)
 				throw new ArgumentNullException(nameof(network));
-			return Parse(hexOrBase64, network.Consensus.ConsensusFactory);
+			return Parse(hexOrBase64, network.Consensus.ConsensusFactory, RBF);
 		}
-		public static PSBT Parse(string hexOrBase64, ConsensusFactory consensusFactory)
+		public static PSBT Parse(string hexOrBase64, ConsensusFactory consensusFactory, bool RBF)
 		{
 			if (hexOrBase64 == null)
 				throw new ArgumentNullException(nameof(hexOrBase64));
@@ -126,21 +137,31 @@ public static PSBT Parse(string hexOrBase64, ConsensusFactory consensusFactory)
 			else
 				raw = Encoders.Base64.DecodeData(hexOrBase64);
 
-			return Load(raw, consensusFactory);
+			return Load(raw, consensusFactory, RBF);
 		}
+		[Obsolete("Use Load(_,_,RBF)")]
 		public static PSBT Load(byte[] rawBytes, Network network)
+		{
+			return Load(rawBytes, network, false);
+		}
+		public static PSBT Load(byte[] rawBytes, Network network, bool RBF)
 		{
 			if (network == null)
 				throw new ArgumentNullException(nameof(network));
-			return Load(rawBytes, network.Consensus.ConsensusFactory);
+			return Load(rawBytes, network.Consensus.ConsensusFactory, RBF);
 		}
+		[Obsolete("Use Load(_,_,RBF)")]
 		public static PSBT Load(byte[] rawBytes, ConsensusFactory consensusFactory)
+		{
+			return Load(rawBytes, consensusFactory, false);
+		}
+		public static PSBT Load(byte[] rawBytes, ConsensusFactory consensusFactory, bool RBF)
 		{
 			if (rawBytes == null)
 				throw new ArgumentNullException(nameof(rawBytes));
 			var stream = new BitcoinStream(rawBytes);
 			stream.ConsensusFactory = consensusFactory;
-			var ret = new PSBT(stream);
+			var ret = new PSBT(stream, RBF);
 			return ret;
 		}
 
@@ -162,7 +183,7 @@ private PSBT(Transaction transaction)
 			}
 		}
 
-		internal PSBT(BitcoinStream stream)
+		internal PSBT(BitcoinStream stream, bool RBF)
 		{
 			Inputs = new PSBTInputList();
 			Outputs = new PSBTOutputList();
@@ -186,7 +207,7 @@ internal PSBT(BitcoinStream stream)
 							throw new FormatException("Invalid PSBT. Contains illegal value in key global tx");
 						if (tx != null)
 							throw new FormatException("Duplicate Key, unsigned tx already provided");
-						tx = stream.ConsensusFactory.CreateTransaction();
+						tx = stream.ConsensusFactory.CreateTransaction(RBF);
 						uint size = 0;
 						stream.ReadWriteAsVarInt(ref size);
 						var pos = stream.Counter.ReadenBytes;

NBitcoin/ConsensusFactory.cs

@@ -106,10 +106,16 @@ public virtual BlockHeader CreateBlockHeader()
 #pragma warning restore CS0618 // Type or member is obsolete
 		}
 
+		[Obsolete("Use CreateTransaction(RBF)")]
 		public virtual Transaction CreateTransaction()
 		{
+			return CreateTransaction(false);
+		}
+
+		public virtual Transaction CreateTransaction(bool RBF)
+		{
 #pragma warning disable CS0618 // Type or member is obsolete
-			return new Transaction();
+			return new Transaction(RBF);
 #pragma warning restore CS0618 // Type or member is obsolete
 		}
 

NBitcoin/Transaction.cs

@@ -1258,7 +1258,7 @@ public bool RBF
 		{
 			get
 			{
-				return Inputs.Any(i => i.Sequence < 0xffffffff - 1);
+				return this._RBF;
 			}
 		}
 
@@ -1279,17 +1279,31 @@ public uint Version
 		protected TxOutList vout;
 		protected LockTime nLockTime;
 
+		private bool _RBF;
+
 
 		[Obsolete("You should better use Transaction.Create(Network network)")]
-		public Transaction()
+		public Transaction(): this(false)
 		{
+		}
+
+		[Obsolete("You should better use Transaction.Create(Network network, bool RBF)")]
+		public Transaction(bool RBF)
+		{
 			vin = new TxInList(this);
 			vout = new TxOutList(this);
+			this._RBF = RBF;
 		}
 
+		[Obsolete("You should better use Transaction.Create(Network network, bool RBF)")]
 		public static Transaction Create(Network network)
 		{
 			return network.Consensus.ConsensusFactory.CreateTransaction();
+		}
+
+		public static Transaction Create(Network network, bool RBF)
+		{
+			return network.Consensus.ConsensusFactory.CreateTransaction(RBF);
 		}
 
 		[Obsolete("You should instantiate Transaction from Transaction.Parse(string hex, Network network)")]
@@ -1667,7 +1681,7 @@ public void Sign(ISecret[] secrets, ICoin[] coins)
 		/// <param name="coins">Coins to sign</param>
 		public void Sign(Key[] keys, ICoin[] coins)
 		{
-			TransactionBuilder builder = this.GetConsensusFactory().CreateTransactionBuilder();
+			TransactionBuilder builder = this.GetConsensusFactory().CreateTransactionBuilder(_RBF);
 			builder.AddKeys(keys);
 			builder.AddCoins(coins);
 			builder.SignTransactionInPlace(this);