BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #9756: Return error when importmulti called with invalid address. 

9acf25c Return error when importmulti called with invalid address. (Russell Yanofsky)
This commit is contained in:
Wladimir J. van der Laan 2017-02-15 15:31:04 +01:00
parent 476cc47da0 9acf25cc01
commit 7a93af8340
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qa/rpc-tests/importmulti.py
View File

@ -64,6 +64,16 @@ class ImportMultiTest (BitcoinTestFramework):
watchonly_address = address['address'] watchonly_address = address['address']
watchonly_timestamp = timestamp watchonly_timestamp = timestamp
print("Should not import an invalid address")
result = self.nodes[1].importmulti([{
"scriptPubKey": {
"address": "not valid address",
},
"timestamp": "now",
}])
assert_equal(result[0]['success'], False)
assert_equal(result[0]['error']['code'], -5)
assert_equal(result[0]['error']['message'], 'Invalid address')
# ScriptPubKey + internal # ScriptPubKey + internal
print("Should import a scriptPubKey with internal flag") print("Should import a scriptPubKey with internal flag")

3
src/wallet/rpcdump.cpp
View File

@ -672,6 +672,9 @@ UniValue ProcessImport(const UniValue& data, const int64_t timestamp)
if (!isScript) { if (!isScript) {
address = CBitcoinAddress(output); address = CBitcoinAddress(output);
if (!address.IsValid()) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
}
script = GetScriptForDestination(address.Get()); script = GetScriptForDestination(address.Get());
} else { } else {
if (!IsHex(output)) { if (!IsHex(output)) {