GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: various linter / CI compiler error fixes

Browse source 
Includes changing TRUE to OP_TRUE for anyone-can-spend output name,
to avoid symbol conflict on win64 builds, which is really obnoxious.
This commit is contained in:
Andrew Poelstra 2020-12-04 15:20:42 +00:00
parent 1e98c9fa9e
commit 68bfd70b43
41 changed files with 132 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/script/standard.cpp
View file

@ -69,7 +69,7 @@ std::string GetTxnOutputType(TxoutType t)
case TxoutType::WITNESS_V0_SCRIPTHASH: return "witness_v0_scripthash";
case TxoutType::WITNESS_V1_TAPROOT: return "witness_v1_taproot";
case TxoutType::WITNESS_UNKNOWN: return "witness_unknown";
case TxoutType::TRUE: return "true";
case TxoutType::OP_TRUE: return "true";
case TxoutType::FEE: return "fee";
}
assert(false);
@ -126,7 +126,7 @@ TxoutType Solver(const CScript& scriptPubKey, std::vector<std::vector<unsigned c
vSolutionsRet.clear();
if (Params().anyonecanspend_aremine && scriptPubKey == CScript() << OP_TRUE) {
return TxoutType::TRUE;
return TxoutType::OP_TRUE;
}
// Fee outputs are for elements-style transactions only