More user-friendly error message when partially signing

meshcollider · meshcollider · commit df10edfd03fe · 2017-09-11T22:15:44.000+12:00
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -873,7 +873,12 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
 
         ScriptError serror = SCRIPT_ERR_OK;
         if (!VerifyScript(txin.scriptSig, prevPubKey, &txin.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {
-            TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));
+            if (serror == SCRIPT_ERR_INVALID_STACK_OPERATION) {
+                // Unable to sign input and verification failed (possible attempt to partially sign).
+                TxInErrorToJSON(txin, vErrors, "Unable to sign input, invalid stack size (possibly missing key)");
+            } else {
+                TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));
+            }
         }
     }
     bool fComplete = vErrors.empty();

Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,12 @@ UniValue signrawtransaction(const JSONRPCRequest& request)`
`873`	`873`
`874`	`874`	`ScriptError serror = SCRIPT_ERR_OK;`
`875`	`875`	`if (!VerifyScript(txin.scriptSig, prevPubKey, &txin.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {`
`876`		`- TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));`
	`876`	`+ if (serror == SCRIPT_ERR_INVALID_STACK_OPERATION) {`
	`877`	`+ // Unable to sign input and verification failed (possible attempt to partially sign).`
	`878`	`+ TxInErrorToJSON(txin, vErrors, "Unable to sign input, invalid stack size (possibly missing key)");`
	`879`	`+ } else {`
	`880`	`+ TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));`
	`881`	`+ }`
`877`	`882`	`}`
`878`	`883`	`}`
`879`	`884`	`bool fComplete = vErrors.empty();`