mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Merge b5a271334c into merged_master (Bitcoin PR bitcoin/bitcoin#28922)
This commit is contained in:
commit
26b9abc2f2
59 changed files with 161 additions and 151 deletions
|
|
@ -795,7 +795,6 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
|
|||
|
||||
for (size_t i = (fCheckMemPool) ? 1 : 0; i < uriParts.size(); i++)
|
||||
{
|
||||
uint256 txid;
|
||||
int32_t nOutput;
|
||||
std::string strTxid = uriParts[i].substr(0, uriParts[i].find('-'));
|
||||
std::string strOutput = uriParts[i].substr(uriParts[i].find('-')+1);
|
||||
|
|
@ -803,8 +802,7 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
|
|||
if (!ParseInt32(strOutput, &nOutput) || !IsHex(strTxid))
|
||||
return RESTERR(req, HTTP_BAD_REQUEST, "Parse error");
|
||||
|
||||
txid.SetHex(strTxid);
|
||||
vOutPoints.emplace_back(txid, (uint32_t)nOutput);
|
||||
vOutPoints.emplace_back(TxidFromString(strTxid), (uint32_t)nOutput);
|
||||
}
|
||||
|
||||
if (vOutPoints.size() > 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue