|
|
@ -305,8 +305,8 @@ static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& str |
|
|
|
bool bScriptHash = false; |
|
|
|
bool bScriptHash = false; |
|
|
|
if (vStrInputParts.size() == 3) { |
|
|
|
if (vStrInputParts.size() == 3) { |
|
|
|
std::string flags = vStrInputParts[2]; |
|
|
|
std::string flags = vStrInputParts[2]; |
|
|
|
bSegWit = (flags.find("W") != std::string::npos); |
|
|
|
bSegWit = (flags.find('W') != std::string::npos); |
|
|
|
bScriptHash = (flags.find("S") != std::string::npos); |
|
|
|
bScriptHash = (flags.find('S') != std::string::npos); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (bSegWit) { |
|
|
|
if (bSegWit) { |
|
|
@ -367,8 +367,8 @@ static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& s |
|
|
|
bool bScriptHash = false; |
|
|
|
bool bScriptHash = false; |
|
|
|
if (vStrInputParts.size() == numkeys + 4) { |
|
|
|
if (vStrInputParts.size() == numkeys + 4) { |
|
|
|
std::string flags = vStrInputParts.back(); |
|
|
|
std::string flags = vStrInputParts.back(); |
|
|
|
bSegWit = (flags.find("W") != std::string::npos); |
|
|
|
bSegWit = (flags.find('W') != std::string::npos); |
|
|
|
bScriptHash = (flags.find("S") != std::string::npos); |
|
|
|
bScriptHash = (flags.find('S') != std::string::npos); |
|
|
|
} |
|
|
|
} |
|
|
|
else if (vStrInputParts.size() > numkeys + 4) { |
|
|
|
else if (vStrInputParts.size() > numkeys + 4) { |
|
|
|
// Validate that there were no more parameters passed
|
|
|
|
// Validate that there were no more parameters passed
|
|
|
@ -447,8 +447,8 @@ static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& str |
|
|
|
bool bScriptHash = false; |
|
|
|
bool bScriptHash = false; |
|
|
|
if (vStrInputParts.size() == 3) { |
|
|
|
if (vStrInputParts.size() == 3) { |
|
|
|
std::string flags = vStrInputParts.back(); |
|
|
|
std::string flags = vStrInputParts.back(); |
|
|
|
bSegWit = (flags.find("W") != std::string::npos); |
|
|
|
bSegWit = (flags.find('W') != std::string::npos); |
|
|
|
bScriptHash = (flags.find("S") != std::string::npos); |
|
|
|
bScriptHash = (flags.find('S') != std::string::npos); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (scriptPubKey.size() > MAX_SCRIPT_SIZE) { |
|
|
|
if (scriptPubKey.size() > MAX_SCRIPT_SIZE) { |
|
|
|