highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-16 15:43:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

DecodeHexTx: Try case where txn has inputs first

Browse Source
This commit is contained in:
Gregory Sanders
2019-12-19 10:32:44 -05:00
parent 988eaf2fcb
commit 6020ce3c01
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core_read.cpp
View File

@@ -117,11 +117,12 @@ bool DecodeHexTx(CMutableTransaction& tx, const std::string& hex_tx, bool try_no
std::vector<unsigned char> txData(ParseHex(hex_tx)); std::vector<unsigned char> txData(ParseHex(hex_tx));
if (try_no_witness) { if (try_witness) {
CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS); CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION);
try { try {
ssData >> tx; ssData >> tx;
if (ssData.eof() && (!try_witness || CheckTxScriptsSanity(tx))) { // If transaction looks sane, we don't try other mode even if requested
if (ssData.empty() && (!try_no_witness || CheckTxScriptsSanity(tx))) {
return true; return true;
} }
} catch (const std::exception&) { } catch (const std::exception&) {
@@ -129,8 +130,8 @@ bool DecodeHexTx(CMutableTransaction& tx, const std::string& hex_tx, bool try_no
} }
} }
if (try_witness) { if (try_no_witness) {
CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION); CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS);
try { try {
ssData >> tx; ssData >> tx;
if (ssData.empty()) { if (ssData.empty()) {