Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Getrawtransaction show denominations #410

Merged
merged 3 commits into from
May 10, 2019
Merged

Getrawtransaction show denominations #410

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b938e1a
Show denomination to users
May 8, 2019
43b9316
Adding anonymity group to the output
May 10, 2019
30230e1
After some clarification
a-bezrukov May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/rpc/rawtransaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fInclud

namespace {
void fillStdFields(UniValue & out, CTxIn const & txin) {
out.push_back(Pair("txid", txin.prevout.hash.GetHex()));
out.push_back(Pair("vout", (int64_t)txin.prevout.n));
UniValue o(UniValue::VOBJ);
o.push_back(Pair("asm", ScriptToAsmStr(txin.scriptSig, true)));
o.push_back(Pair("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
Expand All @@ -88,16 +86,21 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
in.push_back(Pair("coinbase", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
} else if (txin.IsZerocoinSpendV3()){
std::unique_ptr<sigma::CoinSpendV3> spend;
uint32_t pubcoinId;
try {
std::tie(spend, std::ignore) = ParseSigmaSpend(txin);
std::tie(spend, pubcoinId) = ParseSigmaSpend(txin);
} catch (CBadTxIn&) {
throw JSONRPCError(RPC_DATABASE_ERROR, "An error occurred during processing the Sigma spend information");
}
in.push_back(Pair("anonymityGroup", int64_t(txin.prevout.n)));
in.push_back(Pair("groupId", int64_t(pubcoinId)));
ultimaweapon marked this conversation as resolved.
Show resolved Hide resolved
fillStdFields(in, txin);

in.push_back(Pair("value", ValueFromAmount(spend->getIntDenomination())));
in.push_back(Pair("valueSat", spend->getIntDenomination()));
} else {
in.push_back(Pair("txid", txin.prevout.hash.GetHex()));
in.push_back(Pair("vout", (int64_t)txin.prevout.n));
fillStdFields(in, txin);

CTransaction prevTx;
Expand Down