#include <boost/format.hpp>
#include <boost/assign/list_of.hpp>
-#include <boost/iterator/counting_iterator.hpp>
using namespace json_spirit;
using namespace std;
}
else
{
- vInputs = vector<int>(boost::counting_iterator<int>( 0 ), boost::counting_iterator<int>( tx.vout.size() ));
+ for (size_t i = 0; i != tx.vout.size(); ++i) vInputs.push_back(i);
}
CTxDB txdb("r");
if (IsInitialBlockDownload())
throw JSONRPCError(-10, "NovaCoin is downloading blocks...");
- typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
+ typedef map<uint256, pair<shared_ptr<CBlock>, CScript> > mapNewBlock_t;
static mapNewBlock_t mapNewBlock;
- static vector<CBlock*> vNewBlock;
+ static vector<std::shared_ptr<CBlock>> vNewBlock;
static CReserveKey reservekey(pwalletMain);
if (params.size() == 0)
static unsigned int nTransactionsUpdatedLast;
static CBlockIndex* pindexPrev;
static int64_t nStart;
- static CBlock* pblock;
+ static shared_ptr<CBlock> pblock;
if (pindexPrev != pindexBest ||
(nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60))
{
{
// Deallocate old blocks since they're obsolete now
mapNewBlock.clear();
- BOOST_FOREACH(CBlock* pblock, vNewBlock)
- delete pblock;
vNewBlock.clear();
}
nTransactionsUpdatedLast = nTransactionsUpdated;
// Get saved block
if (!mapNewBlock.count(pdata->hashMerkleRoot))
return false;
- CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
+ std::shared_ptr<CBlock> pblock = mapNewBlock[pdata->hashMerkleRoot].first;
pblock->nTime = pdata->nTime;
pblock->nNonce = pdata->nNonce;
if (IsInitialBlockDownload())
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "NovaCoin is downloading blocks...");
- typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
+ typedef map<uint256, pair<shared_ptr<CBlock>, CScript> > mapNewBlock_t;
static mapNewBlock_t mapNewBlock; // FIXME: thread safety
- static vector<CBlock*> vNewBlock;
+ static vector<shared_ptr<CBlock>> vNewBlock;
static CReserveKey reservekey(pwalletMain);
if (params.size() == 0)
static unsigned int nTransactionsUpdatedLast;
static CBlockIndex* pindexPrev;
static int64_t nStart;
- static CBlock* pblock;
+ static shared_ptr<CBlock> pblock;
if (pindexPrev != pindexBest ||
(nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60))
{
{
// Deallocate old blocks since they're obsolete now
mapNewBlock.clear();
- BOOST_FOREACH(CBlock* pblock, vNewBlock)
- delete pblock;
vNewBlock.clear();
}
// Get saved block
if (!mapNewBlock.count(pdata->hashMerkleRoot))
return false;
- CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
+ std::shared_ptr<CBlock> pblock = mapNewBlock[pdata->hashMerkleRoot].first;
pblock->nTime = pdata->nTime;
pblock->nNonce = pdata->nNonce;
static unsigned int nTransactionsUpdatedLast;
static CBlockIndex* pindexPrev;
static int64_t nStart;
- static CBlock* pblock;
+ static std::shared_ptr<CBlock> pblock;
if (pindexPrev != pindexBest ||
(nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 5))
{
// Create new block
if(pblock)
{
- delete pblock;
- pblock = NULL;
+ pblock.reset();
}
pblock = CreateNewBlock(pwalletMain);
if (!pblock)