DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix coinbase spend after 10080 & seg fault

Browse Source
This commit is contained in:
Michael Toutonghi
2018-05-25 21:52:53 -07:00
parent da45808f5f
commit c1e7194760
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/coins.cpp
View File

@@ -394,7 +394,7 @@ const CScript &CCoinsViewCache::GetSpendFor(const CCoins *coins, const CTxIn& in
return LaunchMap().lmap[hc]; return LaunchMap().lmap[hc];
} }
} }
else return coins->vout[input.prevout.n].scriptPubKey; return coins->vout[input.prevout.n].scriptPubKey;
} }
const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const

2
src/main.cpp
View File

@@ -2069,7 +2069,7 @@ namespace Consensus {
if (fCoinbaseEnforcedProtectionEnabled && if (fCoinbaseEnforcedProtectionEnabled &&
consensusParams.fCoinbaseMustBeProtected && consensusParams.fCoinbaseMustBeProtected &&
!tx.vout.empty() && !tx.vout.empty() &&
(strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || nSpendHeight >= 10080)) { (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || (nSpendHeight >= 10080 && coins->nHeight >= 10080)) {
return state.Invalid( return state.Invalid(
error("CheckInputs(): tried to spend coinbase with transparent outputs"), error("CheckInputs(): tried to spend coinbase with transparent outputs"),
REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs"); REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs");