X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Frpcrawtransaction.cpp;h=127215665ff362b731592f006e423fe1690e82ff;hp=776789810dbc85e564776aa3d9271814d7037ea3;hb=fbd44e84d5841867d36d295d4f347fd5e55d293f;hpb=90d203d2e37a06a368a5ebc3af03c1d3af7ec04e

diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index 7767898..1272156 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -49,7 +49,7 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out, bool fIncludeH
 
             CMalleableKeyView view;
             if (pwalletMain->CheckOwnership(CPubKey(vSolutions[0]), CPubKey(vSolutions[1]), view))
-                out.push_back(Pair("pubkeyPair", view.GetMalleablePubKey().ToString()));
+                out.push_back(Pair("pubkeyPair", CBitcoinAddress(view.GetMalleablePubKey()).ToString()));
         }
         else
         {
@@ -293,23 +293,29 @@ Value createrawtransaction(const Array& params, bool fHelp)
         // Create output destination script
         CScript scriptPubKey;
         CBitcoinAddress address(s.name_);
-        if (!address.IsValid())
+
+        if (address.IsValid())
         {
-            CMalleablePubKey mpk(s.name_);
-            if (!mpk.IsValid())
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid output destination: ")+s.name_);
+            if (!address.IsPair())
+            {
+                scriptPubKey.SetDestination(address.Get());
+                if (setAddress.count(address))
+                    throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_);
+                setAddress.insert(address);
+            }
+            else
+            {
+                CMalleablePubKey mpk;
+                if (!mpk.setvch(address.GetData()))
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid output destination: ")+s.name_);
 
-            CPubKey keyVariant, R;
-            mpk.GetVariant(R, keyVariant);
-            scriptPubKey.SetDestination(R, keyVariant);
+                CPubKey R, pubKeyVariant;
+                mpk.GetVariant(R, pubKeyVariant);
+                scriptPubKey.SetDestination(R, pubKeyVariant);
+            }
         }
         else
-        {
-            scriptPubKey.SetDestination(address.Get());
-            if (setAddress.count(address))
-                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_);
-            setAddress.insert(address);
-        }
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid output destination: ")+s.name_);
 
         int64_t nAmount = AmountFromValue(s.value_);