Refactor EnsureMarkerInserted

MetacoSA · Nov 6, 2014 · d7396b5 · d7396b5
1 parent ec11b89
commit d7396b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/NBitcoin/OpenAsset/ColorMarker.cs b/NBitcoin/OpenAsset/ColorMarker.cs
@@ -147,7 +147,7 @@ private void WriteLEB128(ulong value, BitcoinStream stream)
 
 		public ColorMarker()
 		{
-
+			Quantities = new ulong[0];
 		}
 		public ColorMarker(Script script)
 		{

diff --git a/NBitcoin/TransactionBuilder.cs b/NBitcoin/TransactionBuilder.cs
@@ -222,12 +222,14 @@ public ColorMarker GetColorMarker(bool issuance)
 
 			private TxOut EnsureMarkerInserted()
 			{
-				var txout = Transaction.Outputs.FirstOrDefault(o => Script.IsNullOrEmpty(o.ScriptPubKey));
-				if(txout == null)
+				int position;
+				if(ColorMarker.Get(Transaction, out position) != null)
+					return Transaction.Outputs[position];
+				var txout = Transaction.AddOutput(new TxOut()
 				{
-					txout = Transaction.AddOutput(new TxOut());
-					txout.Value = Money.Zero;
-				}
+					ScriptPubKey = new ColorMarker().GetScript()
+				});
+				txout.Value = Money.Zero;
 				return txout;
 			}
 
@@ -363,14 +365,14 @@ public TransactionBuilder AddKeys(params Key[] keys)
 		}
 
 		public TransactionBuilder AddCoins(params ICoin[] coins)
-        {
-            return AddCoins((IEnumerable<ICoin>)coins);
-        }
+		{
+			return AddCoins((IEnumerable<ICoin>)coins);
+		}
 
-        public TransactionBuilder AddCoins(IEnumerable<ICoin> coins)
-        {
+		public TransactionBuilder AddCoins(IEnumerable<ICoin> coins)
+		{
 			foreach(var coin in coins)
-			{ 
+			{
 				CurrentGroup.Coins.Add(coin);
 			}
 			return this;