diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-12-24 13:06:06 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-12-24 13:06:32 +0100 |
| commit | e11856515e7c1b7ca4b67041ba51b117df173a11 (patch) | |
| tree | 40f4fc6e29178dd724640995bc1f9a7ce09d2d32 /src/rpc | |
| parent | a057cc08fddd6503c682a2110092fce259346eae (diff) | |
| parent | 46c162df478f3b71bef8217f214ccf202576b733 (diff) | |
Merge #14893: 0.17 [Backport 14890] rpc: Avoid creating non-standard raw transactions
46c162df47 rpc: Avoid creating non-standard raw transactions (MarcoFalke)
Pull request description:
Tree-SHA512: f34678637c8b6559e5c0c2790b682af562479239b92be96e0d41806bade136866f9748487a021eb8c62b6a5027b0a1a2cbdee930243eac93edabef60cbd54eac
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/rawtransaction.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 0925b1c0cf..391e744c90 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -396,7 +396,6 @@ CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniVal rawTx.vin.push_back(in); } - std::set<CTxDestination> destinations; if (!outputs_is_obj) { // Translate array of key-value pairs into dict UniValue outputs_dict = UniValue(UniValue::VOBJ); @@ -412,8 +411,17 @@ CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniVal } outputs = std::move(outputs_dict); } + + // Duplicate checking + std::set<CTxDestination> destinations; + bool has_data{false}; + for (const std::string& name_ : outputs.getKeys()) { if (name_ == "data") { + if (has_data) { + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, duplicate key: data"); + } + has_data = true; std::vector<unsigned char> data = ParseHexV(outputs[name_].getValStr(), "Data"); CTxOut out(0, CScript() << OP_RETURN << data); @@ -465,7 +473,8 @@ static UniValue createrawtransaction(const JSONRPCRequest& request) " } \n" " ,...\n" " ]\n" - "2. \"outputs\" (array, required) a json array with outputs (key-value pairs)\n" + "2. \"outputs\" (array, required) a json array with outputs (key-value pairs), where none of the keys are duplicated.\n" + "That is, each address can only appear once and there can only be one 'data' object.\n" " [\n" " {\n" " \"address\": x.xxx, (obj, optional) A key-value pair. The key (string) is the bitcoin address, the value (float or string) is the amount in " + CURRENCY_UNIT + "\n" @@ -1690,7 +1699,8 @@ UniValue createpsbt(const JSONRPCRequest& request) " } \n" " ,...\n" " ]\n" - "2. \"outputs\" (array, required) a json array with outputs (key-value pairs)\n" + "2. \"outputs\" (array, required) a json array with outputs (key-value pairs), where none of the keys are duplicated.\n" + "That is, each address can only appear once and there can only be one 'data' object.\n" " [\n" " {\n" " \"address\": x.xxx, (obj, optional) A key-value pair. The key (string) is the bitcoin address, the value (float or string) is the amount in " + CURRENCY_UNIT + "\n" |