mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Merge 30e8a79aef into merged_master (Bitcoin PR bitcoin/bitcoin#30482)
This commit is contained in:
commit
985fd76510
16 changed files with 98 additions and 82 deletions
|
|
@ -234,15 +234,6 @@ bool DecodeHexBlk(CBlock& block, const std::string& strHexBlk)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ParseHashStr(const std::string& strHex, uint256& result)
|
||||
{
|
||||
if ((strHex.size() != 64) || !IsHex(strHex))
|
||||
return false;
|
||||
|
||||
result.SetHex(strHex);
|
||||
return true;
|
||||
}
|
||||
|
||||
util::Result<int> SighashFromStr(const std::string& sighash)
|
||||
{
|
||||
static const std::map<std::string, int> map_sighash_values = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue