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

fixup proposal checks

Browse source
This commit is contained in:
Gregory Sanders 2019-06-19 11:01:45 -04:00
parent 04cc76743e
commit a3cf151de1
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/validation.cpp
View file

@ -3504,13 +3504,13 @@ static bool ContextualCheckDynaFedHeader(const CBlockHeader& block, CValidationS
int fedpeg_version = 0; int fedpeg_version = 0;
std::vector<unsigned char> fedpeg_program; std::vector<unsigned char> fedpeg_program;
if (!proposed.m_fedpegscript.IsWitnessProgram(fedpeg_version, fedpeg_program)) { if (!proposed.m_fedpeg_program.IsWitnessProgram(fedpeg_version, fedpeg_program)) {
return state.Invalid(false, REJECT_INVALID, "invalid-dyna-fed", "proposed fedpegscript must be native segwit scriptPubkey"); return state.Invalid(false, REJECT_INVALID, "invalid-dyna-fed", "proposed fedpegs program must be native segwit scriptPubkey");
} }
// for v0, fedpegscript's scriptPubKey must match. v1+ is unencumbered. // for v0, fedpegscript's scriptPubKey must match. v1+ is unencumbered.
if (fedpeg_version == 0) { if (fedpeg_version == 0) {
CScript computed_program = CScript() << ToByteVector(WitnessV0ScriptHash(proposed.m_fedpegscript)); CScript computed_program = GetScriptForDestination(WitnessV0ScriptHash(proposed.m_fedpegscript));
if (computed_program != proposed.m_fedpeg_program) { if (computed_program != proposed.m_fedpeg_program) {
return state.Invalid(false, REJECT_INVALID, "invalid-dyna-fed", "proposed v0 segwit fedpegscript must match proposed fedpeg witness program"); return state.Invalid(false, REJECT_INVALID, "invalid-dyna-fed", "proposed v0 segwit fedpegscript must match proposed fedpeg witness program");
} }