mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-20 13:37:28 +02:00
Merge 1ed8a0f8d2 into merged_master (Bitcoin PR bitcoin/bitcoin#28113)
This commit is contained in:
commit
2d6c3f1aa0
8 changed files with 65 additions and 50 deletions
|
|
@ -595,6 +595,16 @@ static CAmount AmountFromValue(const UniValue& value)
|
|||
return amount;
|
||||
}
|
||||
|
||||
static std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName)
|
||||
{
|
||||
std::string strHex;
|
||||
if (v.isStr())
|
||||
strHex = v.getValStr();
|
||||
if (!IsHex(strHex))
|
||||
throw std::runtime_error(strName + " must be hexadecimal string (not '" + strHex + "')");
|
||||
return ParseHex(strHex);
|
||||
}
|
||||
|
||||
static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
|
||||
{
|
||||
int nHashType = SIGHASH_ALL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue