Fix Bug : Incorrectly generate P2SH with P2 pub key hash redeem

MetacoSA · Sep 26, 2014 · 5a337b6 · 5a337b6
1 parent 262b06f
commit 5a337b6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/NBitcoin.Tests/script_tests.cs b/NBitcoin.Tests/script_tests.cs
@@ -485,7 +485,7 @@ public void CanParseAndGeneratePayToScript()
 
 			var scriptPubkey = "OP_HASH160 b5b88dd9befc9236915fcdbb7fd50052df50c855 OP_EQUAL";
 
-			var scriptSig = "3044022064f45a382a15d3eb5e7fe72076eec4ef0f56fde1adfd710866e729b9e5f3383d02202720a895914c69ab49359087364f06d337a2138305fbc19e20d18da78415ea9301 51210364bd4b02a752798342ed91c681a48793bb1c0853cbcd0b978c55e53485b8e27c210364bd4b02a752798342ed91c681a48793bb1c0853cbcd0b978c55e53485b8e27d52ae";
+			var scriptSig = "0 3044022064f45a382a15d3eb5e7fe72076eec4ef0f56fde1adfd710866e729b9e5f3383d02202720a895914c69ab49359087364f06d337a2138305fbc19e20d18da78415ea9301 51210364bd4b02a752798342ed91c681a48793bb1c0853cbcd0b978c55e53485b8e27c210364bd4b02a752798342ed91c681a48793bb1c0853cbcd0b978c55e53485b8e27d52ae";
 
 			var pubParams = template.ExtractScriptPubKeyParameters(new Script(scriptPubkey));
 			Assert.Equal("b5b88dd9befc9236915fcdbb7fd50052df50c855", pubParams.ToString());

diff --git a/NBitcoin/Properties/AssemblyInfo.cs b/NBitcoin/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.3")]
+[assembly: AssemblyVersion("1.0.5.4")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/NBitcoin/StandardScriptTemplate.cs b/NBitcoin/StandardScriptTemplate.cs
@@ -289,7 +289,8 @@ public PayToScriptHashSigParameters ExtractScriptSigParameters(Script scriptSig)
 		public Script GenerateScriptSig(TransactionSignature[] signatures, Script redeemScript)
 		{
 			List<Op> ops = new List<Op>();
-			bool multiSig = signatures.Length > 1;
+			PayToMultiSigTemplate multiSigTemplate = new PayToMultiSigTemplate();
+			bool multiSig = multiSigTemplate.CheckScriptPubKey(redeemScript);
 			if(multiSig)
 				ops.Add(OpcodeType.OP_0);
 			foreach(var sig in signatures)