QA: RPC: Change signrawtransaction behaviour to search all accounts f…

…or keys Note we might want to modify 'signrawtransaction' in future to bring back the other possible 'account safe' behaviour Fixes #195
muntorg · Feb 25, 2020 · 7dec878 · 7dec878
1 parent b70d51d
commit 7dec878
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -765,28 +765,28 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
             std::vector<unsigned char> pkData(ParseHexO(prevOut, "scriptPubKey"));
             CScript scriptPubKey(pkData.begin(), pkData.end());
 
-            //fixme: (PHASE4) implement
-            /*{
+            //fixme: (PHASE4) implement for other transaction types
+            {
                 const Coin& coin = view.AccessCoin(out);
-                if (!coin.IsSpent() && coin.out.scriptPubKey != scriptPubKey) {
+                if (!coin.IsSpent() && coin.out.output.scriptPubKey != scriptPubKey) {
                     std::string err("Previous output scriptPubKey mismatch:\n");
-                    err = err + ScriptToAsmStr(coin.out.scriptPubKey) + "\nvs:\n"+
-                        ScriptToAsmStr(scriptPubKey);
+                    err = err + ScriptToAsmStr(coin.out.output.scriptPubKey) + "\nvs:\n" + ScriptToAsmStr(scriptPubKey);
                     throw JSONRPCError(RPC_DESERIALIZATION_ERROR, err);
                 }
                 Coin newcoin;
-                newcoin.out.scriptPubKey = scriptPubKey;
+                newcoin.out.output.scriptPubKey = scriptPubKey;
                 newcoin.out.nValue = 0;
                 if (prevOut.exists("amount")) {
                     newcoin.out.nValue = AmountFromValue(find_value(prevOut, "amount"));
                 }
                 newcoin.nHeight = 1;
                 view.AddCoin(out, std::move(newcoin), true);
-            }*/
+            }
 
             // if redeemScript given and not using the local wallet (private keys
             // given), add redeemScript to the tempKeystore so it can be signed:
-            if (fGivenKeys && (scriptPubKey.IsPayToScriptHash() )) {
+            if (fGivenKeys && (scriptPubKey.IsPayToScriptHash() ))
+            {
                 RPCTypeCheckObj(prevOut,
                     {
                         {"txid", UniValueType(UniValue::VSTR)},
@@ -805,10 +805,21 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
     }
 
 #ifdef ENABLE_WALLET
-    //fixme: (FUT) (BIP44) (MED)
-    CKeyStore* keystore = ((fGivenKeys || !pwallet || !pwallet->activeAccount) ? &tempKeystore : pwallet->activeAccount);
+    std::vector<CKeyStore*> accountsToTry;
+    if (fGivenKeys || !pwallet || !pwallet->activeAccount)
+    {
+        accountsToTry.push_back(&tempKeystore);
+    }
+    else
+    {
+        for (const auto& accountPair : pactiveWallet->mapAccounts)
+        {
+            accountsToTry.push_back(accountPair.second);
+        }
+    }
 #else
-    CKeyStore* keystore = &tempKeystore;
+    std::vector<CKeyStore*> accountsToTry;
+    accountsToTry.push_back(&tempKeystore);
 #endif
 
     int nHashType = SIGHASH_ALL;
@@ -864,8 +875,6 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
         CKeyID signingKeyID = ExtractSigningPubkeyFromTxOutput(coin.out, SignType::Spend);
 
         SignatureData sigdata;
-        std::vector<CKeyStore*> accountsToTry;
-        accountsToTry.push_back(keystore);
         // Only sign SIGHASH_SINGLE if there's a corresponding output:
         if (!fHashSingle || (i < mergedTx.vout.size()))
             ProduceSignature(MutableTransactionSignatureCreator(signingKeyID, accountsToTry, &mergedTx, i, amount, nHashType), coin.out, sigdata, signType, mergedTx.nVersion);