Don't nuke witness data when signing fails

sipa · sipa · commit 5d2e22437b22 · 2021-06-12T12:25:28.000-07:00
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
@@ -217,7 +217,6 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato
     bool solved = SignStep(provider, creator, fromPubKey, result, whichType, SigVersion::BASE, sigdata);
     bool P2SH = false;
     CScript subscript;
-    sigdata.scriptWitness.stack.clear();
 
     if (solved && whichType == TxoutType::SCRIPTHASH)
     {
@@ -254,6 +253,7 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato
         sigdata.witness = true;
     }
 
+    if (!sigdata.witness) sigdata.scriptWitness.stack.clear();
     if (P2SH) {
         result.push_back(std::vector<unsigned char>(subscript.begin(), subscript.end()));
     }

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,6 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato`
`217`	`217`	`bool solved = SignStep(provider, creator, fromPubKey, result, whichType, SigVersion::BASE, sigdata);`
`218`	`218`	`bool P2SH = false;`
`219`	`219`	`CScript subscript;`
`220`		`- sigdata.scriptWitness.stack.clear();`
`221`	`220`
`222`	`221`	`if (solved && whichType == TxoutType::SCRIPTHASH)`
`223`	`222`	`{`
`@@ -254,6 +253,7 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato`
`254`	`253`	`sigdata.witness = true;`
`255`	`254`	`}`
`256`	`255`
	`256`	`+ if (!sigdata.witness) sigdata.scriptWitness.stack.clear();`
`257`	`257`	`if (P2SH) {`
`258`	`258`	`result.push_back(std::vector<unsigned char>(subscript.begin(), subscript.end()));`
`259`	`259`	`}`