GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reverse endianness of asset field in gettxout to match everywhere else

Browse source
This commit is contained in:
Gregory Sanders 2017-07-19 07:36:31 -04:00
parent 3c376534e3
commit bfe4e517a5
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qa/rpc-tests/confidential_transactions.py
View file

@ -161,12 +161,22 @@ class CTTest (BitcoinTestFramework):
{unconfidential_address: value4,
change_address: unspent[0]["amount"] - value4 - fee, "fee":fee});
tx = self.nodes[0].blindrawtransaction(tx)
tx_signed = self.nodes[0].signrawtransaction(tx)
txid = self.nodes[0].sendrawtransaction(tx_signed['hex'])
decodedtx = self.nodes[0].decoderawtransaction(tx_signed["hex"])
self.nodes[0].generate(101)
self.sync_all()
txout0 = self.nodes[0].gettxout(txid, 0)
txout1 = self.nodes[0].gettxout(txid, 1)
if "asset" in txout0:
assert_equal(txout0["asset"], decodedtx["vout"][0]["asset"])
elif "asset" in txout1:
assert_equal(txout1["asset"], decodedtx["vout"][1]["asset"])
else:
raise Exception("No unconfidential output detected when one should exist")
node0 -= value4
node2 += value4
assert_equal(self.nodes[0].getbalance()["bitcoin"], node0)

2
src/rpc/blockchain.cpp
View file

@ -965,7 +965,7 @@ UniValue gettxout(const JSONRPCRequest& request)
ret.push_back(Pair("amountcommitment", HexStr(coins.vout[n].nValue.vchCommitment)));
}
if (coins.vout[n].nAsset.IsExplicit()) {
ret.push_back(Pair("asset", HexStr(coins.vout[n].nAsset.vchCommitment)));
ret.push_back(Pair("asset", coins.vout[n].nAsset.GetAsset().GetHex()));
} else {
ret.push_back(Pair("assetcommitment", HexStr(coins.vout[n].nAsset.vchCommitment)));
}