fix build for update

This commit is contained in:
Michael Toutonghi
2018-05-25 20:15:38 -07:00
parent 94d96afd89
commit b0e452de2a
4 changed files with 43 additions and 30 deletions

View File

@@ -13,9 +13,13 @@
#include "memusage.h"
#include "serialize.h"
#include "uint256.h"
#include "base58.h"
#include "pubkey.h"
#include <assert.h>
#include <stdint.h>
#include <vector>
#include <unordered_map>
#include <boost/foreach.hpp>
#include <boost/unordered_map.hpp>
@@ -436,31 +440,36 @@ public:
friend class CCoinsViewCache;
};
class CLaunchMap
{
public:
std::unordered_map<std::string, CScript> lmap;
CLaunchMap() : lmap() { }
CLaunchMap(std::string *whiteList, std::string *pkh, int count) : lmap()
{
for (int i = 0; i < count; i++)
{
CBitcoinAddress address(pkh[i].c_str());
CKeyID key;
if (address.IsValid() && address.GetKeyID(key))
{
std::vector<unsigned char> adr = std::vector<unsigned char>(key.begin(), key.end());
std::string hash = uint256S(whiteList[i]).ToString();
lmap[hash] = CScript();
lmap[hash] << OP_DUP << OP_HASH160 << adr << OP_EQUALVERIFY << OP_CHECKSIG;
}
}
}
};
static CLaunchMap launchMap = CLaunchMap();
/** CCoinsView that adds a memory cache for transactions to another CCoinsView */
class CCoinsViewCache : public CCoinsViewBacked
{
protected:
class CLaunchMap
{
public:
unordered_map<uint256, CScript> launchMap;
CLaunchMap() { }
CLaunchMap(uint256 *whiteList, uint160 pkh, int count)
{
launchMap = unordered_map<uint256, CScript &>();
for (int i = 0; i < count; i++)
{
launchMap[whiteList[i]] = CScript();
launchMap[whiteList[i]] << OP_DUP << OP_HASH160 << pkh << OP_EQUALVERIFY << OP_CHECKSIG;
}
}
};
static CLaunchMap launchMap();
/* Whether this cache has an active modifier. */
bool hasModifier;
/**
* Make mutable so that we can "fill the cache" even from Get-methods
* declared as "const".
@@ -474,13 +483,12 @@ protected:
/* Cached dynamic memory usage for the inner CCoins objects. */
mutable size_t cachedCoinsUsage;
const CScript &GetSpendFor(const CCoins *coins, const CTxIn& input) const;
public:
CCoinsViewCache(CCoinsView *baseIn);
~CCoinsViewCache();
// Standard CCoinsView methods
static CLaunchMap &LaunchMap() { return launchMap; }
bool GetAnchorAt(const uint256 &rt, ZCIncrementalMerkleTree &tree) const;
bool GetNullifier(const uint256 &nullifier) const;
bool GetCoins(const uint256 &txid, CCoins &coins) const;
@@ -554,6 +562,8 @@ public:
const CTxOut &GetOutputFor(const CTxIn& input) const;
const CScript &GetSpendFor(const CTxIn& input) const;
static const CScript &GetSpendFor(const CCoins *coins, const CTxIn& input);
friend class CCoinsModifier;
private: