X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Frpcrawtransaction.cpp;h=0b29059fb955649a103b9302bd506a83c2b8c3a3;hb=fd3e29de89dadb40606f9b5c258b673ba9f24798;hp=4bcf911fb3014257e070810cd85b528112316737;hpb=c69eb1bd70e0dc94095d63b0de50dc8d2910ea0e;p=novacoin.git diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 4bcf911..0b29059 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -3,11 +3,9 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include - #include "base58.h" #include "bitcoinrpc.h" -#include "txdb.h" +#include "txdb-leveldb.h" #include "init.h" #include "main.h" #include "net.h" @@ -15,7 +13,6 @@ using namespace std; using namespace boost; -using namespace boost::assign; using namespace json_spirit; void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out, bool fIncludeHex) @@ -43,17 +40,21 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out, bool fIncludeH if (type == TX_PUBKEY_DROP) { vector vSolutions; - if (!Solver(scriptPubKey, type, vSolutions)) - { - out.push_back(Pair("keyVariant", HexStr(vSolutions[0]))); - out.push_back(Pair("R", HexStr(vSolutions[1]))); - } - } + Solver(scriptPubKey, type, vSolutions); + out.push_back(Pair("keyVariant", HexStr(vSolutions[0]))); + out.push_back(Pair("R", HexStr(vSolutions[1]))); - Array a; - BOOST_FOREACH(const CTxDestination& addr, addresses) - a.push_back(CBitcoinAddress(addr).ToString()); - out.push_back(Pair("addresses", a)); + CMalleableKeyView view; + if (pwalletMain->CheckOwnership(CPubKey(vSolutions[0]), CPubKey(vSolutions[1]), view)) + out.push_back(Pair("pubkeyPair", CBitcoinAddress(view.GetMalleablePubKey()).ToString())); + } + else + { + Array a; + for (const CTxDestination& addr : addresses) + a.push_back(CBitcoinAddress(addr).ToString()); + out.push_back(Pair("addresses", a)); + } } else { @@ -68,7 +69,7 @@ void TxToJSON(const CTransaction& tx, const uint256& hashBlock, Object& entry) entry.push_back(Pair("time", (int64_t)tx.nTime)); entry.push_back(Pair("locktime", (int64_t)tx.nLockTime)); Array vin; - BOOST_FOREACH(const CTxIn& txin, tx.vin) + for (const CTxIn& txin : tx.vin) { Object in; if (tx.IsCoinBase()) @@ -165,7 +166,7 @@ Value listunspent(const Array& params, bool fHelp) "Results are an array of Objects, each of which has:\n" "{txid, vout, scriptPubKey, amount, confirmations}"); - RPCTypeCheck(params, list_of(int_type)(int_type)(array_type)); + RPCTypeCheck(params, {int_type, int_type, array_type}); int nMinDepth = 1; if (params.size() > 0) @@ -179,7 +180,7 @@ Value listunspent(const Array& params, bool fHelp) if (params.size() > 2) { Array inputs = params[2].get_array(); - BOOST_FOREACH(Value& input, inputs) + for (Value& input : inputs) { CBitcoinAddress address(input.get_str()); if (!address.IsValid()) @@ -193,7 +194,7 @@ Value listunspent(const Array& params, bool fHelp) Array results; vector vecOutputs; pwalletMain->AvailableCoins(vecOutputs, false); - BOOST_FOREACH(const COutput& out, vecOutputs) + for (const COutput& out : vecOutputs) { if (out.nDepth < nMinDepth || out.nDepth > nMaxDepth) continue; @@ -226,7 +227,7 @@ Value listunspent(const Array& params, bool fHelp) CTxDestination address; if (ExtractDestination(pk, address)) { - const CScriptID& hash = boost::get(address); + const CScriptID& hash = std::get(address); CScript redeemScript; if (pwalletMain->GetCScript(hash, redeemScript)) entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end()))); @@ -254,14 +255,14 @@ Value createrawtransaction(const Array& params, bool fHelp) "Note that the transaction's inputs are not signed, and\n" "it is not stored in the wallet or transmitted to the network."); - RPCTypeCheck(params, list_of(array_type)(obj_type)); + RPCTypeCheck(params, {array_type, obj_type}); Array inputs = params[0].get_array(); Object sendTo = params[1].get_obj(); CTransaction rawTx; - BOOST_FOREACH(Value& input, inputs) + for (Value& input : inputs) { const Object& o = input.get_obj(); @@ -284,18 +285,27 @@ Value createrawtransaction(const Array& params, bool fHelp) } set setAddress; - BOOST_FOREACH(const Pair& s, sendTo) + for (const Pair& s : sendTo) { + // Create output destination script + CScript scriptPubKey; CBitcoinAddress address(s.name_); - if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid NovaCoin address: ")+s.name_); - if (setAddress.count(address)) - throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_); - setAddress.insert(address); + if (address.IsValid()) + { + scriptPubKey.SetAddress(address); + + // Don't perform duplication checking for pubkey-pair addresses + if (!address.IsPair()) + { + if (setAddress.count(address)) + throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_); + setAddress.insert(address); + } + } + else + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid output destination: ")+s.name_); - CScript scriptPubKey; - scriptPubKey.SetDestination(address.Get()); int64_t nAmount = AmountFromValue(s.value_); CTxOut out(nAmount, scriptPubKey); @@ -323,7 +333,7 @@ Value decoderawtransaction(const Array& params, bool fHelp) "decoderawtransaction \n" "Return a JSON object representing the serialized, hex-encoded transaction."); - RPCTypeCheck(params, list_of(str_type)); + RPCTypeCheck(params, {str_type}); vector txData(ParseHex(params[0].get_str())); CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION); @@ -348,7 +358,7 @@ Value decodescript(const Array& params, bool fHelp) "decodescript \n" "Decode a hex-encoded script."); - RPCTypeCheck(params, list_of(str_type)); + RPCTypeCheck(params, {str_type}); Object r; CScript script; @@ -381,7 +391,7 @@ Value signrawtransaction(const Array& params, bool fHelp) " complete : 1 if transaction has a complete set of signature (0 if not)" + HelpRequiringPassphrase()); - RPCTypeCheck(params, list_of(str_type)(array_type)(array_type)(str_type), true); + RPCTypeCheck(params, {str_type, array_type, array_type, str_type}, true); vector txData(ParseHex(params[0].get_str())); CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION); @@ -421,7 +431,7 @@ Value signrawtransaction(const Array& params, bool fHelp) tempTx.FetchInputs(txdb, unused, false, false, mapPrevTx, fInvalid); // Copy results into mapPrevOut: - BOOST_FOREACH(const CTxIn& txin, tempTx.vin) + for (const CTxIn& txin : tempTx.vin) { const uint256& prevHash = txin.prevout.hash; if (mapPrevTx.count(prevHash) && mapPrevTx[prevHash].second.vout.size()>txin.prevout.n) @@ -435,7 +445,7 @@ Value signrawtransaction(const Array& params, bool fHelp) { fGivenKeys = true; Array keys = params[2].get_array(); - BOOST_FOREACH(Value k, keys) + for (Value k : keys) { CBitcoinSecret vchSecret; bool fGood = vchSecret.SetString(k.get_str()); @@ -455,14 +465,14 @@ Value signrawtransaction(const Array& params, bool fHelp) if (params.size() > 1 && params[1].type() != null_type) { Array prevTxs = params[1].get_array(); - BOOST_FOREACH(Value& p, prevTxs) + for (Value& p : prevTxs) { if (p.type() != obj_type) throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "expected object with {\"txid'\",\"vout\",\"scriptPubKey\"}"); Object prevOut = p.get_obj(); - RPCTypeCheck(prevOut, map_list_of("txid", str_type)("vout", int_type)("scriptPubKey", str_type)); + RPCTypeCheck(prevOut, {{"txid", str_type}, {"vout", int_type}, {"scriptPubKey", str_type}}); string txidHex = find_value(prevOut, "txid").get_str(); if (!IsHex(txidHex)) @@ -500,7 +510,7 @@ Value signrawtransaction(const Array& params, bool fHelp) Value v = find_value(prevOut, "redeemScript"); if (fGivenKeys && scriptPubKey.IsPayToScriptHash()) { - RPCTypeCheck(prevOut, map_list_of("txid", str_type)("vout", int_type)("scriptPubKey", str_type)("redeemScript",str_type)); + RPCTypeCheck(prevOut, {{"txid", str_type}, {"vout", int_type}, {"scriptPubKey", str_type}, {"redeemScript",str_type}}); Value v = find_value(prevOut, "redeemScript"); if (!(v == Value::null)) { @@ -518,14 +528,14 @@ Value signrawtransaction(const Array& params, bool fHelp) if (params.size() > 3 && params[3].type() != null_type) { static map mapSigHashValues = - boost::assign::map_list_of - (string("ALL"), int(SIGHASH_ALL)) - (string("ALL|ANYONECANPAY"), int(SIGHASH_ALL|SIGHASH_ANYONECANPAY)) - (string("NONE"), int(SIGHASH_NONE)) - (string("NONE|ANYONECANPAY"), int(SIGHASH_NONE|SIGHASH_ANYONECANPAY)) - (string("SINGLE"), int(SIGHASH_SINGLE)) - (string("SINGLE|ANYONECANPAY"), int(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY)) - ; + { + {"ALL", SIGHASH_ALL}, + {"ALL|ANYONECANPAY", SIGHASH_ALL|SIGHASH_ANYONECANPAY}, + {"NONE", SIGHASH_NONE}, + {"NONE|ANYONECANPAY", SIGHASH_NONE|SIGHASH_ANYONECANPAY}, + {"SINGLE", SIGHASH_SINGLE}, + {"SINGLE|ANYONECANPAY", SIGHASH_SINGLE|SIGHASH_ANYONECANPAY} + }; string strHashType = params[3].get_str(); if (mapSigHashValues.count(strHashType)) nHashType = mapSigHashValues[strHashType]; @@ -552,7 +562,7 @@ Value signrawtransaction(const Array& params, bool fHelp) SignSignature(keystore, prevPubKey, mergedTx, i, nHashType); // ... and merge in other signatures: - BOOST_FOREACH(const CTransaction& txv, txVariants) + for (const CTransaction& txv : txVariants) { txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, txin.scriptSig, txv.vin[i].scriptSig); } @@ -576,7 +586,7 @@ Value sendrawtransaction(const Array& params, bool fHelp) "sendrawtransaction \n" "Submits raw transaction (serialized, hex-encoded) to local node and network."); - RPCTypeCheck(params, list_of(str_type)); + RPCTypeCheck(params, {str_type}); // parse hex string from parameter vector txData(ParseHex(params[0].get_str())); @@ -629,7 +639,6 @@ Value createmultisig(const Array& params, bool fHelp) int nRequired = params[0].get_int(); const Array& keys = params[1].get_array(); - string strAccount; // Gather public keys if (nRequired < 1) @@ -640,7 +649,7 @@ Value createmultisig(const Array& params, bool fHelp) "(got %" PRIszu " keys, but need at least %d to redeem)", keys.size(), nRequired)); if (keys.size() > 16) throw runtime_error("Number of addresses involved in the multisignature address creation > 16\nReduce the number"); - std::vector pubkeys; + std::vector pubkeys; pubkeys.resize(keys.size()); for (unsigned int i = 0; i < keys.size(); i++) { @@ -658,16 +667,18 @@ Value createmultisig(const Array& params, bool fHelp) if (!pwalletMain->GetPubKey(keyID, vchPubKey)) throw runtime_error( strprintf("no full public key for address %s",ks.c_str())); - if (!vchPubKey.IsValid() || !pubkeys[i].SetPubKey(vchPubKey)) + if (!vchPubKey.IsFullyValid()) throw runtime_error(" Invalid public key: "+ks); + pubkeys[i] = vchPubKey; } // Case 2: hex public key else if (IsHex(ks)) { CPubKey vchPubKey(ParseHex(ks)); - if (!vchPubKey.IsValid() || !pubkeys[i].SetPubKey(vchPubKey)) + if (!vchPubKey.IsFullyValid()) throw runtime_error(" Invalid public key: "+ks); + pubkeys[i] = vchPubKey; } else {