mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge 5ee6b76c69 into merged_master (Bitcoin PR bitcoin/bitcoin#29325)
This commit is contained in:
commit
17631653e2
50 changed files with 176 additions and 168 deletions
|
|
@ -234,9 +234,7 @@ void TxToUniv(const CTransaction& tx, const uint256& block_hash, UniValue& entry
|
|||
entry.pushKV("wtxid", tx.GetWitnessHash().GetHex());
|
||||
entry.pushKV("withash", tx.GetWitnessOnlyHash().GetHex());
|
||||
}
|
||||
// Transaction version is actually unsigned in consensus checks, just signed in memory,
|
||||
// so cast to unsigned before giving it to the user.
|
||||
entry.pushKV("version", static_cast<int64_t>(static_cast<uint32_t>(tx.nVersion)));
|
||||
entry.pushKV("version", tx.version);
|
||||
entry.pushKV("size", tx.GetTotalSize());
|
||||
entry.pushKV("vsize", (GetTransactionWeight(tx) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR);
|
||||
entry.pushKV("weight", GetTransactionWeight(tx));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue