Restore zcash coinbase rule and launch fix at 10080

This commit is contained in:
Michael Toutonghi
2018-05-25 15:10:07 -07:00
parent a65fe46f84
commit 6c8e1cdfb7
5 changed files with 38 additions and 7 deletions

View File

@@ -11,6 +11,7 @@
#include "komodo_defs.h"
#include <assert.h>
#include <unordered_map>
/**
* calculate number of bytes for the bitmask, and its number of non-zero bytes
@@ -379,11 +380,20 @@ const CTxOut &CCoinsViewCache::GetOutputFor(const CTxIn& input) const
return coins->vout[input.prevout.n];
}
const CScript &CCoinsViewCache::GetSpendFor(const CCoins *coins, const CTxIn& input) const
{
assert(coins);
if (launchMap.launchMap.count(input.prevout.hash))
{
return launchMap.launchMap[input.prevout.hash];
}
else return coins->vout[input.prevout.n].scriptPubKey;
}
const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const
{
const CCoins* coins = AccessCoins(input.prevout.hash);
assert(coins);
return coins->vout[input.prevout.n].scriptPubKey;
return GetSpendFor(coins, input);
}
//uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime);