zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rpc: fix issue for querying txids for p2sh addresses

This commit is contained in:
Braydon Fuller 2016-03-09 17:40:40 -05:00 committed by Simon
parent a9948959b5
commit 098c127ae6
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qa/rpc-tests/addressindex.py
View File

@ -42,11 +42,17 @@ class AddressIndexTest(BitcoinTestFramework):
assert_equal(self.nodes[2].getbalance(), 0)
txid0 = self.nodes[0].sendtoaddress("mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs", 10)
txidb0 = self.nodes[0].sendtoaddress("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", 10)
self.nodes[0].generate(1)
txid1 = self.nodes[0].sendtoaddress("mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs", 15)
txidb1 = self.nodes[0].sendtoaddress("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", 15)
self.nodes[0].generate(1)
txid2 = self.nodes[0].sendtoaddress("mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs", 20)
txidb2 = self.nodes[0].sendtoaddress("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", 20)
self.nodes[0].generate(1)
self.sync_all()
txids = self.nodes[1].getaddresstxids("mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs");
@ -55,5 +61,12 @@ class AddressIndexTest(BitcoinTestFramework):
assert_equal(txids[1], txid1);
assert_equal(txids[2], txid2);
txidsb = self.nodes[1].getaddresstxids("2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br");
assert_equal(len(txidsb), 3);
assert_equal(txidsb[0], txidb0);
assert_equal(txidsb[1], txidb1);
assert_equal(txidsb[2], txidb2);
if __name__ == '__main__':
AddressIndexTest().main()

11
src/rpc/misc.cpp
View File

@ -519,18 +519,17 @@ UniValue getaddresstxids(const UniValue& params, bool fHelp)
);
CBitcoinAddress address(params[0].get_str());
if (!address.IsValid())
uint160 hashBytes;
int type = 0;
if (!address.GetIndexKey(hashBytes, type)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
}
CKeyID keyID;
address.GetKeyID(keyID);
int type = 1; // TODO
std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
LOCK(cs_main);
if (!GetAddressIndex(keyID, type, addressIndex))
if (!GetAddressIndex(hashBytes, type, addressIndex))
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for address");
UniValue result(UniValue::VARR);