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

MERGE-FIX: Fix functional tests

Browse source
This commit is contained in:
Steven Roose 2019-05-22 16:54:03 +01:00
parent 473e1e9ca1
commit efe4e8ff04
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
23 changed files with 97 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/rpc/blockchain.cpp
View file

@ -2371,6 +2371,7 @@ UniValue scantxoutset(const JSONRPCRequest& request)
unspent.pushKV("txid", outpoint.hash.GetHex());
unspent.pushKV("vout", (int32_t)outpoint.n);
unspent.pushKV("scriptPubKey", HexStr(txo.scriptPubKey.begin(), txo.scriptPubKey.end()));
unspent.pushKV("desc", descriptors[txo.scriptPubKey]);
if (txo.nValue.IsExplicit()) {
unspent.pushKV("amount", ValueFromAmount(txo.nValue.GetAmount()));
} else {