Skip to content

print P2WSH redeemScript in getrawtransaction if it s not a pubkey #6

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

Closed
czzarr wants to merge 1 commit into from
Closed

print P2WSH redeemScript in getrawtransaction if it s not a pubkey #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/rpc/rawtransaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
txinwitness.push_back(HexStr(item.begin(), item.end()));
}
in.push_back(Pair("txinwitness", txinwitness));
// try to parse the last item as a pubkey
// In version 0, there are two valid witness types: P2WPKH and P2WSH.
// P2WPKH witnesses have two items on the witness stack, the second of which is a public key.
// We test whether the last item on the witness stack is a valid public key, and if it isn't we try to parse it as a redeem script.
// if someone constructed the redeem script to look like a pubkey, then he's insane
CPubKey pubkey(tx.wit.vtxinwit[i].scriptWitness.stack.back().begin(), tx.wit.vtxinwit[i].scriptWitness.stack.back().end());
if (!pubkey.IsFullyValid()) {
CScript redeemScript(tx.wit.vtxinwit[i].scriptWitness.stack.back().begin(), tx.wit.vtxinwit[i].scriptWitness.stack.back().end());
UniValue r(UniValue::VOBJ);
ScriptPubKeyToJSON(redeemScript, r, true);
in.push_back(Pair("redeemScript", r));
}
}

}
Expand Down